修改bug

public/MP_verify_rNyUroYZg10KvSym.txt

@@ -0,0 +1 @@
+rNyUroYZg10KvSym

src/components/tradeAgency/fee-oceanFreight.vue

@@ -1187,6 +1187,12 @@ export default {
                     })
                 }
                 if (type == 'C') {
+                    for (let row of this.form.feeCenterListC) {
+                        if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                            this.$refs.crudC.rowCell(row, row.$index)
+                            return this.$message.error((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
+                        }
+                    }
                     for (let index in this.selectionCList) {
                         if (this.selectionCList[index].accStatus != 0) {
                             return this.$message.error("已生成账单");

src/views/tirePartsMall/statisticAnalysis/customAnalysis/index.vue

@@ -115,12 +115,12 @@ export default {
                     },
                     {
                         label: "仓库",
-                        prop: "storageName",
+                        prop: "deliveryWarehouseName",
                         overHidden: true,
                     },
                     {
                         label: '业务员',
-                        prop: "salerName",
+                        prop: "salesmanName",
                         search: true,
                         type: "select",
                         props: {
@@ -132,7 +132,7 @@ export default {
                     },
                     {
                         label: "购买途径",
-                        prop: "businessSource",
+                        prop: "purchaseMethod",
                         overHidden: true,
                     }
                 ]

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -219,9 +219,9 @@
                         <span v-else>{{ row.goodsName }}</span>
                     </template>
                     <tempalte slot="goodsType" slot-scope="{ row }">
-                        <dic-select  v-if="row.$cellEdit && !row.srcId" v-model="row.goodsType"
-                            placeholder="类型" key="dictKey" label="dictValue"
-                            url="/blade-system/dict-biz/dictionary?code=goods-type" :filterable="true"></dic-select>
+                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsType" placeholder="类型"
+                            key="dictKey" label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
+                            :filterable="true"></dic-select>
                         <span v-else>{{ row.goodsType }}</span>
                     </tempalte>
                     <tempalte slot="number" slot-scope="{ row }">
@@ -432,9 +432,9 @@ export default {
     name: "detailsPage",
     data() {
         return {
-            dicTitle:null,
+            dicTitle: null,
             parentId: null,
-            dicCode:null,
+            dicCode: null,
             carForm: {
                 // id: null,
                 // inspectionFleetId: null,
@@ -1560,7 +1560,7 @@ export default {
             }
             if (name == '类型') {
                 this.$refs.dictbiz.open()
-                this.dicTitle='添加类型'
+                this.dicTitle = '添加类型'
                 this.parentId = '1813125517193330690'
                 this.dicCode = 'goods-type'
             }
@@ -1572,7 +1572,7 @@ export default {
             }
         },
         getAllWorkDicts() {
-            this.dicTitle=null
+            this.dicTitle = null
             this.parentId = null
             this.dicCode = null
         },
@@ -2321,7 +2321,6 @@ export default {
                                 this.$emit('updateKey')
                             }
                             this.getDetails(res.data.data.id)
-
                         }).finally(() => {
                             loading.close();
                         })
@@ -2333,33 +2332,35 @@ export default {
         },
         application() {
             if (this.form.feeCenterListD.length == 0 && this.form.feeCenterListC.length == 0) return this.$message.error("费用不能为空");
-            this.$confirm("确定请核数据?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                let obj = {}
-                obj = {
-                    id: this.form.id,
-                    url: '/tradeAgency/oceanFreightImport/index',
-                    pageStatus: '',
-                    pageLabel: '海运进口(T)',
-                }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
+            if (this.$refs.feeInfo.submitValidate()) {
+                this.$confirm("确定请核数据?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    let obj = {}
+                    obj = {
+                        id: this.form.id,
+                        url: '/tradeAgency/oceanFreightImport/index',
+                        pageStatus: '',
+                        pageLabel: '海运进口(T)',
+                    }
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    checkAgent(obj).then(res => {
+                        this.$message.success("请核成功");
+                        this.editDisabled = true
+                        this.optionForm.disabled = true
+                        this.getDetails(res.data.data.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
                 });
-                checkAgent(obj).then(res => {
-                    this.$message.success("请核成功");
-                    this.editDisabled = true
-                    this.optionForm.disabled = true
-                    this.getDetails(res.data.data.id)
-                }).finally(() => {
-                    loading.close();
-                })
-            });
+            }
         },
         revokeApplication() {
             this.$confirm("确定撤销请核?", {