Merge remote-tracking branch 'origin/dev' into dev

src/views/approveDataH/index.vue

@@ -246,25 +246,25 @@ export default {
       if (type == 'HYCK-DJ') {
         obj = {
           businessType: 'HYCK',
-          classifyCode: '业务',
+          classifyCode: '费用',
           groupCode: '销售报告'
         }
       } else if (type == 'HYJK-DJ') {
         obj = {
           businessType: 'HYJK',
-          classifyCode: '业务',
+          classifyCode: '费用',
           groupCode: '销售报告'
         }
       } else if (type == 'KYCK-DJ') {
         obj = {
           businessType: 'KYCK',
-          classifyCode: '业务',
+          classifyCode: '费用',
           groupCode: '销售报告'
         }
       } else if (type == 'KYJK-DJ') {
         obj = {
           businessType: 'KYJK',
-          classifyCode: '业务',
+          classifyCode: '费用',
           groupCode: '销售报告'
         }
       } else if (type == 'HYCK-FFSQ') {
@@ -310,7 +310,7 @@ export default {
       // this.$nextTick(()=>{
       //     this.$refs.reportformsList.onLoad(page,{
       //         businessType:'HYCK',
-      //         classifyCode:'业务',
+      //         classifyCode:'费用',
       //         groupCode:'销售报告'
       //     })
       // })

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -461,7 +461,7 @@
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun" :printShow="true"
-                businessType="HYJK" classifyCode='业务' groupCode='销售报告'></check-schedule>
+                businessType="HYJK" classifyCode='费用' groupCode='销售报告'></check-schedule>
         </el-dialog>
 
         <!--预览报表弹窗-->

src/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue

@@ -322,7 +322,8 @@ export default {
         let cc = this.classifycodes.find(j => j.value==this.classifycode)
 
         if(cc) {
-            this.query.classifyCode = '业务,费用';
+            // this.query.classifyCode = '业务,费用';
+            this.query.classifyCode = cc.name
 
             let col = this.optionBack.column.find(c=>c.prop=="classifyCode")
             console.log('report.created.classifycode', col)

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -296,7 +296,7 @@
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun" :printShow="true"
-                businessType="HYCK" classifyCode='业务' groupCode='销售报告'></check-schedule>
+                businessType="HYCK" classifyCode='费用' groupCode='销售报告'></check-schedule>
         </el-dialog>
 
         <!--预览报表弹窗-->

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -2374,8 +2374,6 @@ export default {
             console.log('onSuccessUploadMagicHandZipFile.res', res)
             try {
                 if (Object.keys(res).length) {
-                    console.log('onSuccessUploadMagicHandZipFile.res', res)
-
                     postMagicHandImportBills(res).then(res1 => {
                         this.$message.success("测试提交 MH 成功");
                     });

src/views/iosBasicData/reportClose/AEreportClose/bgdetails.vue

@@ -762,7 +762,7 @@ export default {
             if (this.form.feeCenterListD.length == 0 && this.form.feeCenterListC.length == 0) return this.$message.error('此订单没有费用明细')
             getreportsList(1, 10, {
                 businessType: 'BGAE',
-                classifyCode: '业务',
+                classifyCode: '费用',
                 groupCode: '销售报告'
             }).then(res => {
                 if (res.data.data.records.length == 1) {
@@ -779,7 +779,7 @@ export default {
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
                             businessType: 'BGAE',
-                            classifyCode: '业务',
+                            classifyCode: '费用',
                             groupCode: '销售报告'
                         })
                     })

src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue

@@ -763,7 +763,7 @@ export default {
             if (this.form.feeCenterListD.length == 0 && this.form.feeCenterListC.length == 0) return this.$message.error('此订单没有费用明细')
             getreportsList(1, 10, {
                 businessType: 'BGAI',
-                classifyCode: '业务',
+                classifyCode: '费用',
                 groupCode: '销售报告'
             }).then(res => {
                 if (res.data.data.records.length == 1) {
@@ -780,7 +780,7 @@ export default {
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
                             businessType: 'BGAI',
-                            classifyCode: '业务',
+                            classifyCode: '费用',
                             groupCode: '销售报告'
                         })
                     })

src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -746,7 +746,7 @@ export default {
             if (this.form.feeCenterListD.length == 0 && this.form.feeCenterListC.length == 0) return this.$message.error('此订单没有费用明细')
             getreportsList(1, 10, {
                 businessType: 'BGSE',
-                classifyCode: '业务',
+                classifyCode: '费用',
                 groupCode: '销售报告'
             }).then(res => {
                 if (res.data.data.records.length == 1) {
@@ -763,7 +763,7 @@ export default {
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
                             businessType: 'BGSE',
-                            classifyCode: '业务',
+                            classifyCode: '费用',
                             groupCode: '销售报告'
                         })
                     })

src/views/iosBasicData/reportClose/SIreportClose/bgdetails.vue

@@ -760,7 +760,7 @@ export default {
             if (this.form.feeCenterListD.length == 0 && this.form.feeCenterListC.length == 0) return this.$message.error('此订单没有费用明细')
             getreportsList(1, 10, {
                 businessType: 'BGSI',
-                classifyCode: '业务',
+                classifyCode: '费用',
                 groupCode: '销售报告'
             }).then(res => {
                 if (res.data.data.records.length == 1) {
@@ -777,7 +777,7 @@ export default {
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
                             businessType: 'BGSI',
-                            classifyCode: '业务',
+                            classifyCode: '费用',
                             groupCode: '销售报告'
                         })
                     })

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -50,7 +50,7 @@
                             url="/blade-sales-part/tire/center/warehouse/storage/list?current=1&size=5"
                             :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('storageName', $event)"
-                            :disabled="editButton || form.status == 1"></dic-select>
+                            :disabled="editButton || form.status == 1||form.planItemsList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="warehouseKeeperName">
                         <dic-select v-model="form.warehouseKeeperName" placeholder="库管" key="id" label="realName"
@@ -832,6 +832,7 @@ export default {
             //     return this.$message.error('请保存数据')
             // }
             this.form.centerShipCostList.push({
+                goodsNum:this.form.goodsTotalNum,
                 $cellEdit: true
             })
         },

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -50,7 +50,7 @@
                             url="/blade-sales-part/tire/center/warehouse/storage/list?current=1&size=5"
                             :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('storageName', $event)"
-                            :disabled="editButton || form.status == 1"></dic-select>
+                            :disabled="editButton || form.status == 1||form.planItemsList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="warehouseKeeperName">
                         <dic-select v-model="form.warehouseKeeperName" placeholder="库管" key="id" label="realName"