货代报表更改 2024-1-26

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

@@ -47,7 +47,7 @@
       disabled:{
         type:Boolean,
         default:false,
-      }
+      },
     },
     data() {
       return {
@@ -55,11 +55,11 @@
         isPrintTheBoxNumber: false,
         bbDisabled: false,
         form: {
-            businessType:'HYCK'
+            businessType:'KYCK'
         },
         formReport: {},
         query: {
-            businessType:'HYCK',
+            businessType:'KYCK',
             classifyCode:'业务',
         },
         loading: true,
@@ -468,7 +468,7 @@
               billId:this.id,
               reportCode:this.form.code,
               groupCode:this.form.groupCode,
-               type:'HYCK'
+               type:'KYCK'
           })
           // 获取的数据赋值
           console.log(res.data.data,584)
@@ -515,7 +515,7 @@
               billId:this.id,
               reportCode:row.classifyCode,
               groupCode:row.groupCode,
-              type:'HYCK'
+              type:'KYCK'
           }).then(res=>{
               this.handleReportPreview(url,res.data.data.data)
           })

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

@@ -247,7 +247,7 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports :id="form.id" :disabled="detailData.seeDisabled"></business-reports>
+            <business-reports :id="form.id" :disabled="detailData.seeDisabled" businessType="KYCK" ></business-reports>
         </el-dialog>
     </div>
 </template>
@@ -1303,9 +1303,14 @@ import {
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
-                console.log(Object.values(this.comprehensiveForm).join(','),1257)
+                let multiArr = []
+                for(let i in this.comprehensiveForm) {
+                    if (this.comprehensiveForm[i]) {
+                        multiArr.push(this.comprehensiveForm[i])
+                    }
+                }
                 // 多选集合转换成字符串赋值
-                this.form.comprehensive = Object.values(this.comprehensiveForm).join(',')
+                this.form.comprehensive = multiArr.join(',')
                 // 费用 收 赋值数据
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
@@ -1489,23 +1494,23 @@ import {
                 // }
                 // 把字符串集合转换一下
                 // 是否随机
-                this.comprehensiveForm.random = this.form.comprehensive.split(',').indexOf('随机') != -1?'随机':null
+                this.$set(this.comprehensiveForm,'random',this.form.comprehensive.split(',').indexOf('随机') != -1?'随机':null)
                 // 合同
-                this.comprehensiveForm.contract = this.form.comprehensive.split(',').indexOf('合同') != -1?'合同':null
+                this.$set(this.comprehensiveForm,'contract',this.form.comprehensive.split(',').indexOf('合同') != -1?'合同':null)
                 // 发票
-                this.comprehensiveForm.invoice = this.form.comprehensive.split(',').indexOf('发票') != -1?'发票':null
+                this.$set(this.comprehensiveForm,'invoice',this.form.comprehensive.split(',').indexOf('发票') != -1?'发票':null)
                 // 装箱单
-                this.comprehensiveForm.Packing = this.form.comprehensive.split(',').indexOf('装箱单') != -1?'装箱单':null
+                this.$set(this.comprehensiveForm,'Packing',this.form.comprehensive.split(',').indexOf('装箱单') != -1?'装箱单':null)
                 // 配额证
-                this.comprehensiveForm.quota = this.form.comprehensive.split(',').indexOf('配额证') != -1?'配额证':null
+                this.$set(this.comprehensiveForm,'quota',this.form.comprehensive.split(',').indexOf('配额证') != -1?'配额证':null)
                 // 许可证
-                this.comprehensiveForm.license = this.form.comprehensive.split(',').indexOf('许可证') != -1?'许可证':null
+                this.$set(this.comprehensiveForm,'license',this.form.comprehensive.split(',').indexOf('许可证') != -1?'许可证':null)
                 // 产地证
-                this.comprehensiveForm.producer = this.form.comprehensive.split(',').indexOf('产地证') != -1?'产地证':null
+                this.$set(this.comprehensiveForm,'producer',this.form.comprehensive.split(',').indexOf('产地证') != -1?'产地证':null)
                 // 手册
-                this.comprehensiveForm.manual = this.form.comprehensive.split(',').indexOf('手册') != -1?'手册':null
+                this.$set(this.comprehensiveForm,'manual',this.form.comprehensive.split(',').indexOf('手册') != -1?'手册':null)
                 // 核销单
-                this.comprehensiveForm.writeoffDoc = this.form.comprehensive.split(',').indexOf('核销单') != -1?'核销单':null
+                this.$set(this.comprehensiveForm,'writeoffDoc',this.form.comprehensive.split(',').indexOf('核销单') != -1?'核销单':null)
                 if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                     this.columnforfun('corpCnName').disabled = true
                     this.columnforfun('srcType').disabled = true

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

@@ -55,11 +55,11 @@
         isPrintTheBoxNumber: false,
         bbDisabled: false,
         form: {
-            businessType:'HYCK'
+            businessType:'KYJK'
         },
         formReport: {},
         query: {
-            businessType:'HYCK',
+            businessType:'KYJK',
             classifyCode:'业务',
         },
         loading: true,
@@ -468,7 +468,7 @@
               billId:this.id,
               reportCode:this.form.code,
               groupCode:this.form.groupCode,
-               type:'HYCK'
+               type:'KYJK'
           })
           // 获取的数据赋值
           console.log(res.data.data,584)
@@ -515,7 +515,7 @@
               billId:this.id,
               reportCode:row.classifyCode,
               groupCode:row.groupCode,
-              type:'HYCK'
+              type:'KYJK'
           }).then(res=>{
               this.handleReportPreview(url,res.data.data.data)
           })

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

@@ -247,7 +247,7 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports :id="form.id" :disabled="detailData.seeDisabled"></business-reports>
+            <business-reports :id="form.id" :disabled="detailData.seeDisabled" ></business-reports>
         </el-dialog>
     </div>
 </template>
@@ -1303,11 +1303,14 @@ import {
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
-                console.log(this.comprehensiveForm,1306)
-                console.log(Object.values(this.comprehensiveForm).join(','),1257)
-                return
+                let multiArr = []
+                for(let i in this.comprehensiveForm) {
+                    if (this.comprehensiveForm[i]) {
+                        multiArr.push(this.comprehensiveForm[i])
+                    }
+                }
                 // 多选集合转换成字符串赋值
-                this.form.comprehensive = Object.values(this.comprehensiveForm).join(',')
+                this.form.comprehensive = multiArr.join(',')
                 // 费用 收 赋值数据
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'