货代 2024-2-05

src/router/views/index.js

@@ -3081,5 +3081,66 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/decisionAnalysis/index')
     }]
   },
+  // 海运出口报关
+  {
+    path: '/iosBasicData/reportClose/SEreportClose/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/reportClose/SEreportClose/index',
+      name: '海运出口报关',
+      meta: {
+        i18n: '/iosBasicData/reportClose/SEreportClose/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/reportClose/SEreportClose/index')
+    }]
+  },
+  // 海运进口报关
+  {
+    path: '/iosBasicData/reportClose/SIreportClose/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/reportClose/SIreportClose/index',
+      name: '海运进口报关',
+      meta: {
+        i18n: '/iosBasicData/reportClose/SIreportClose/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/reportClose/SIreportClose/index')
+    }]
+  },
+  // 空运出口报关
+  {
+    path: '/iosBasicData/reportClose/AEreportClose/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/reportClose/AEreportClose/index',
+      name: '空运出口报关',
+      meta: {
+        i18n: '/iosBasicData/reportClose/AEreportClose/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/reportClose/AEreportClose/index')
+    }]
+  },
+  // 空运进口报关
+  {
+    path: '/iosBasicData/reportClose/AIreportClose/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/reportClose/AIreportClose/index',
+      name: '空运进口报关',
+      meta: {
+        i18n: '/iosBasicData/reportClose/AIreportClose/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/reportClose/AIreportClose/index')
+    }]
+  },
+
 
 ]

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

@@ -965,6 +965,17 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 let portArr = ['destination','finalDestination']
                 let cnPorArr = ['departure','departureAddr','pot']
                 if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        // 国家名称
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        // 国家代码
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -981,6 +992,13 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 有中文名称的港口
                 else if (cnPorArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -993,6 +1011,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 没有中文名的港口
                 else if (portArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'Name','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -1003,6 +1027,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'commodity') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'hscode','')
+                        this.$set(this.assemblyForm,'commodityShName','')
+                        this.$set(this.assemblyForm,'commodityCnName','')
+                        this.$set(this.assemblyForm,'commodityEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'hscode',item.hsCode)
@@ -1014,6 +1044,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 船名
                 else if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -1043,6 +1078,10 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 包装
                 else if (name == 'packingUnit') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'packingUnitId','')
+                        this.$set(this.assemblyForm,'packingUnit','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'packingUnitId',item.id)
@@ -1052,6 +1091,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 订舱代理
                 else if (name == 'bookingAgent') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'bookingAgentId','')
+                        this.$set(this.assemblyForm,'bookingAgentCnName','')
+                        this.$set(this.assemblyForm,'bookingAgentEnName','')
+                        this.$set(this.assemblyForm,'bookingRemarks','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'bookingAgentId',item.id)
@@ -1063,6 +1108,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -1073,6 +1123,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // COLOADER
                 else if (name == 'coloaderCnName') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'coloaderId','')
+                        this.$set(this.assemblyForm,'coloaderCnName','')
+                        this.$set(this.assemblyForm,'coloaderEnName','')
+                    }
                     for(let item of this.coloaderCnNameData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'coloaderId',item.id)
@@ -1082,7 +1137,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'cargoType') {
-                    this.$set(this.assemblyForm,'cargoType',value)
+                    this.$set(this.assemblyForm,'cargoType',value?value:'')
                     if (value == 'danger') {
                         // 危险品
                         this.DangerousGoodsAdd()
@@ -1090,6 +1145,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 主运单提供者
                 else if (name == 'waybillCnName') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'waybillId','')
+                        this.$set(this.assemblyForm,'waybillCnName','')
+                        this.$set(this.assemblyForm,'waybillEnName','')
+                    }
                     for(let item of this.waybillCnNameData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'waybillId',item.id)
@@ -1099,7 +1159,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else {
-                    this.$set(this.assemblyForm,name,value)
+                    this.$set(this.assemblyForm,name,value?value:'')
                 }
             },
             // 获取计算属性数据
@@ -1148,24 +1208,24 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 // 4E00-9FBF   CJK 统一表意符号  F900-FAFF   CJK 兼容象形文字
                 // FE30-FE4F   CJK 兼容形式    FF00-FFEF   全角ASCII、全角标点
                 // 匹配中文字符
-                let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
-                this.assemblyForm[name] = a
+                // let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
+                // this.assemblyForm[name] = a
             },
             // text文本框input
             textareaBlur(name){
                 console.log(name,1160)
-                if (this.assemblyForm[name].length > (35 * 5)) {
-                    this.$message({
-                        message: '输入的字体已经超出五行',
-                        type: 'warning'
-                    });
-                }
-                let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr']
-                if (arr.indexOf(name) != -1) {
-                    console.log(this.assemblyForm[name],1133)
-                    this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
-                }
-                this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
+                // if (this.assemblyForm[name].length > (35 * 5)) {
+                //     this.$message({
+                //         message: '输入的字体已经超出五行',
+                //         type: 'warning'
+                //     });
+                // }
+                // let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr']
+                // if (arr.indexOf(name) != -1) {
+                //     console.log(this.assemblyForm[name],1133)
+                //     this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
+                // }
+                // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
             },
             // 同通知人
             notifybyfun(){

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

@@ -509,16 +509,20 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
                     border
+                    show-summary
                     size="mini"
                     :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                     :cell-style="{padding:'0px',fontSize:'12px'}"
@@ -529,18 +533,12 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="mblno" label="MB/L NO" width="140px" />
-                    <el-table-column prop="amountDr" label="应收金额" />
-                    <el-table-column prop="amountCr" label="应付金额" />
-                    <el-table-column prop="amountDrUsd" label="应收金额USD" width="140px" />
-                    <el-table-column prop="amountCrUsd" label="应付金额USD" width="140px" />
-                    <el-table-column prop="amountDrLoc" label="应收金额合计" width="140px" />
-                    <el-table-column prop="amountCrLoc" label="应付金额合计" width="140px" />
-                    <el-table-column prop="stlAmountDr" label="已结算应收金额" width="140px" />
-                    <el-table-column prop="stlAmountCr" label="已结算应付金额" width="140px" />
-                    <el-table-column prop="stlAmountDrUsd" label="已结算应收金额USD" width="140px" />
-                    <el-table-column prop="stlAmountCrUsd" label="已结算应付金额USD" width="140px" />
-                    <el-table-column prop="stlAmountDrLoc" label="已结算应收金额合计" width="140px" />
-                    <el-table-column prop="stlAmountCrLoc" label="已结算应付金额合计" width="140px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}r`" :label="`应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rUsd`" :label="`应${dcDialogType == 'D'?'收':'付'}金额USD`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rLoc`" :label="`应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="150px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}r`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rUsd`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额USD`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rLoc`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="180px" />
                 </el-table>
             </div>
         </el-dialog>
@@ -691,6 +689,7 @@
                 },
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位数据
+                dcDialogType:'', // 往来单位弹窗dc判断
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1257,6 +1256,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })
             },

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

@@ -75,7 +75,7 @@
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入航空公司英文" ></el-input>
+                                  clearable placeholder="航空公司英文" ></el-input>
                     </el-col>
                 </el-col>
                 <el-col :span="6">
@@ -578,6 +578,11 @@
             corpChange(value,name){
                 let arr = ['mshipper','mconsignee','mnotify','mnotify2']
                 if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -587,6 +592,12 @@
                     }
                 }
                 else if (name == 'carrier') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'carrierId','')
+                        this.$set(this.assemblyForm,'carrierCnName','')
+                        this.$set(this.assemblyForm,'carrierEnName','')
+                        this.$set(this.assemblyForm,'carrierArgreementNo','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'carrierId',item.id)
@@ -598,6 +609,12 @@
                 }
                 // 订舱代理
                 else if (name == 'bookingAgent') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'bookingAgentId','')
+                        this.$set(this.assemblyForm,'bookingAgentCnName','')
+                        this.$set(this.assemblyForm,'bookingAgentEnName','')
+                        this.$set(this.assemblyForm,'bookingRemarks','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'bookingAgentId',item.id)
@@ -609,6 +626,17 @@
                 }
                 // 航站
                 else if (name == 'cy') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyId','')
+                        this.$set(this.assemblyForm,'cyCode','')
+                        this.$set(this.assemblyForm,'cyCnName','')
+                        this.$set(this.assemblyForm,'cyEnName','')
+                        this.$set(this.assemblyForm,'cyRemarks','')
+                        // 联系人
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'cyId',item.id)
@@ -627,6 +655,11 @@
                 }
                 // 场站联系人
                 else if (name == 'cyContacts') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyContactsData) {
                         if (item.cname == value) {
                             this.$set(this.assemblyForm,'cyTel',item.tel)
@@ -637,6 +670,11 @@
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -647,6 +685,17 @@
                 }
                 // 四个主表
                 else if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        // 国家名称
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        // 国家代码
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -663,6 +712,12 @@
                 }
                 // 中转港
                 else if (name == 'pot') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'potId','')
+                        this.$set(this.assemblyForm,'potCode','')
+                        this.$set(this.assemblyForm,'potCnName','')
+                        this.$set(this.assemblyForm,'potEnName','')
+                    }
                     for (let item of this.potData) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'potId',item.id)
@@ -673,7 +728,7 @@
                     }
                 }
                 else {
-                    this.assemblyForm[name] = value
+                    this.assemblyForm[name] = value?value:''
                 }
             },
 

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

@@ -645,7 +645,7 @@ import {
                     // if (oldValue == 'MM') {
                     //     this.form.hblno = ''
                     // }
-                    // 只要分单不能编辑
+                    // 只有分单不能编辑
                     if (oldValue == 'MH') {
                         this.columnforfun('hblno').disabled = true
                     }else {
@@ -1087,7 +1087,7 @@ import {
                 // 如果不是分单
                 if (this.form.billType != 'MH') {
                     this.$message({
-                        message: '只要分单需要申请',
+                        message: '只有分单需要申请',
                         type: 'warning'
                     });
                     return

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

@@ -969,6 +969,17 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 let portArr = ['destination','finalDestination']
                 let cnPorArr = ['departure','departureAddr','pot']
                 if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        // 国家名称
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        // 国家代码
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -985,6 +996,13 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 有中文名称的港口
                 else if (cnPorArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -997,6 +1015,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 没有中文名的港口
                 else if (portArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'Name','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -1007,6 +1031,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'commodity') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'hscode','')
+                        this.$set(this.assemblyForm,'commodityShName','')
+                        this.$set(this.assemblyForm,'commodityCnName','')
+                        this.$set(this.assemblyForm,'commodityEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'hscode',item.hsCode)
@@ -1018,6 +1048,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 船名
                 else if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -1047,6 +1082,10 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 包装
                 else if (name == 'packingUnit') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'packingUnitId','')
+                        this.$set(this.assemblyForm,'packingUnit','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'packingUnitId',item.id)
@@ -1056,6 +1095,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 订舱代理
                 else if (name == 'bookingAgent') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'bookingAgentId','')
+                        this.$set(this.assemblyForm,'bookingAgentCnName','')
+                        this.$set(this.assemblyForm,'bookingAgentEnName','')
+                        this.$set(this.assemblyForm,'bookingRemarks','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'bookingAgentId',item.id)
@@ -1067,6 +1112,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -1077,6 +1127,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // COLOADER
                 else if (name == 'coloaderCnName') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'coloaderId','')
+                        this.$set(this.assemblyForm,'coloaderCnName','')
+                        this.$set(this.assemblyForm,'coloaderEnName','')
+                    }
                     for(let item of this.coloaderCnNameData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'coloaderId',item.id)
@@ -1086,7 +1141,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'cargoType') {
-                    this.$set(this.assemblyForm,'cargoType',value)
+                    this.$set(this.assemblyForm,'cargoType',value?value:'')
                     if (value == 'danger') {
                         // 危险品
                         this.DangerousGoodsAdd()
@@ -1094,6 +1149,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 主运单提供者
                 else if (name == 'waybillCnName') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'waybillId','')
+                        this.$set(this.assemblyForm,'waybillCnName','')
+                        this.$set(this.assemblyForm,'waybillEnName','')
+                    }
                     for(let item of this.waybillCnNameData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'waybillId',item.id)
@@ -1103,7 +1163,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else {
-                    this.$set(this.assemblyForm,name,value)
+                    this.$set(this.assemblyForm,name,value?value:'')
                 }
             },
             // 获取计算属性数据
@@ -1152,24 +1212,24 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 // 4E00-9FBF   CJK 统一表意符号  F900-FAFF   CJK 兼容象形文字
                 // FE30-FE4F   CJK 兼容形式    FF00-FFEF   全角ASCII、全角标点
                 // 匹配中文字符
-                let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
-                this.assemblyForm[name] = a
+                // let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
+                // this.assemblyForm[name] = a
             },
             // text文本框input
             textareaBlur(name){
                 console.log(name,1160)
-                if (this.assemblyForm[name].length > (35 * 5)) {
-                    this.$message({
-                        message: '输入的字体已经超出五行',
-                        type: 'warning'
-                    });
-                }
-                let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr']
-                if (arr.indexOf(name) != -1) {
-                    console.log(this.assemblyForm[name],1133)
-                    this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
-                }
-                this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
+                // if (this.assemblyForm[name].length > (35 * 5)) {
+                //     this.$message({
+                //         message: '输入的字体已经超出五行',
+                //         type: 'warning'
+                //     });
+                // }
+                // let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr']
+                // if (arr.indexOf(name) != -1) {
+                //     console.log(this.assemblyForm[name],1133)
+                //     this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
+                // }
+                // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
             },
             // 同通知人
             notifybyfun(){

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

@@ -509,16 +509,20 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
-            <div style="padding-bottom: 30px;" >
+            <span slot="title">
+                <el-button type="primary" size="mini" >导出</el-button>
+            </span>
+            <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
                     border
+                    show-summary
                     size="mini"
                     :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                     :cell-style="{padding:'0px',fontSize:'12px'}"
@@ -529,18 +533,12 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="mblno" label="MB/L NO" width="140px" />
-                    <el-table-column prop="amountDr" label="应收金额" />
-                    <el-table-column prop="amountCr" label="应付金额" />
-                    <el-table-column prop="amountDrUsd" label="应收金额USD" width="140px" />
-                    <el-table-column prop="amountCrUsd" label="应付金额USD" width="140px" />
-                    <el-table-column prop="amountDrLoc" label="应收金额合计" width="140px" />
-                    <el-table-column prop="amountCrLoc" label="应付金额合计" width="140px" />
-                    <el-table-column prop="stlAmountDr" label="已结算应收金额" width="140px" />
-                    <el-table-column prop="stlAmountCr" label="已结算应付金额" width="140px" />
-                    <el-table-column prop="stlAmountDrUsd" label="已结算应收金额USD" width="140px" />
-                    <el-table-column prop="stlAmountCrUsd" label="已结算应付金额USD" width="140px" />
-                    <el-table-column prop="stlAmountDrLoc" label="已结算应收金额合计" width="140px" />
-                    <el-table-column prop="stlAmountCrLoc" label="已结算应付金额合计" width="140px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}r`" :label="`应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rUsd`" :label="`应${dcDialogType == 'D'?'收':'付'}金额USD`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rLoc`" :label="`应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="150px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}r`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rUsd`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额USD`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rLoc`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="180px" />
                 </el-table>
             </div>
         </el-dialog>
@@ -697,6 +695,7 @@
                 },
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                dcDialogType:'', // 往来单位弹窗dc判断
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1263,6 +1262,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })
             },

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

@@ -578,6 +578,11 @@
             corpChange(value,name){
                 let arr = ['mshipper','mconsignee','mnotify','mnotify2']
                 if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -587,6 +592,12 @@
                     }
                 }
                 else if (name == 'carrier') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'carrierId','')
+                        this.$set(this.assemblyForm,'carrierCnName','')
+                        this.$set(this.assemblyForm,'carrierEnName','')
+                        this.$set(this.assemblyForm,'carrierArgreementNo','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'carrierId',item.id)
@@ -598,6 +609,12 @@
                 }
                 // 订舱代理
                 else if (name == 'bookingAgent') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'bookingAgentId','')
+                        this.$set(this.assemblyForm,'bookingAgentCnName','')
+                        this.$set(this.assemblyForm,'bookingAgentEnName','')
+                        this.$set(this.assemblyForm,'bookingRemarks','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'bookingAgentId',item.id)
@@ -609,6 +626,17 @@
                 }
                 // 航站
                 else if (name == 'cy') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyId','')
+                        this.$set(this.assemblyForm,'cyCode','')
+                        this.$set(this.assemblyForm,'cyCnName','')
+                        this.$set(this.assemblyForm,'cyEnName','')
+                        this.$set(this.assemblyForm,'cyRemarks','')
+                        // 联系人
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'cyId',item.id)
@@ -627,6 +655,11 @@
                 }
                 // 场站联系人
                 else if (name == 'cyContacts') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyContactsData) {
                         if (item.cname == value) {
                             this.$set(this.assemblyForm,'cyTel',item.tel)
@@ -637,6 +670,11 @@
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -647,6 +685,17 @@
                 }
                 // 四个主表
                 else if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        // 国家名称
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        // 国家代码
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -663,6 +712,12 @@
                 }
                 // 中转港
                 else if (name == 'pot') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'potId','')
+                        this.$set(this.assemblyForm,'potCode','')
+                        this.$set(this.assemblyForm,'potCnName','')
+                        this.$set(this.assemblyForm,'potEnName','')
+                    }
                     for (let item of this.potData) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'potId',item.id)
@@ -673,7 +728,7 @@
                     }
                 }
                 else {
-                    this.assemblyForm[name] = value
+                    this.assemblyForm[name] = value?value:''
                 }
             },
 

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

@@ -646,7 +646,7 @@ import {
                     // if (oldValue == 'MM') {
                     //     this.form.hblno = ''
                     // }
-                    // 只要分单不能编辑
+                    // 只有分单不能编辑
                     if (oldValue == 'MH') {
                         this.columnforfun('hblno').disabled = true
                     }else {
@@ -1085,7 +1085,7 @@ import {
                 // 如果不是分单
                 if (this.form.billType != 'MH') {
                     this.$message({
-                        message: '只要分单需要申请',
+                        message: '只有分单需要申请',
                         type: 'warning'
                     });
                     return

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -841,6 +841,17 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 let portArr = ['placeReceipt','destination']
                 let cnPorArr = ['pol','pod']
                 if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        // 国家名称
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        // 国家代码
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -857,6 +868,13 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 有中文名称的港口
                 else if (cnPorArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -880,6 +898,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 没有中文名的港口
                 else if (portArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'Name','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -891,6 +915,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 船名
                 else if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -920,6 +949,10 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 包装
                 else if (name == 'packingUnit') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'packingUnitId','')
+                        this.$set(this.assemblyForm,'packingUnit','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'packingUnitId',item.id)
@@ -929,6 +962,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -938,14 +976,14 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'cargoType') {
-                    this.$set(this.assemblyForm,'cargoType',value)
+                    this.$set(this.assemblyForm,'cargoType',value?value:'')
                     if (value == 'danger') {
                         // 危险品
                         this.DangerousGoodsAdd()
                     }
                 }
                 else {
-                    this.$set(this.assemblyForm,name,value)
+                    this.$set(this.assemblyForm,name,value?value:'')
                 }
             },
             // 通知人添加第二个通知人弹窗
@@ -1023,24 +1061,24 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 // 4E00-9FBF   CJK 统一表意符号  F900-FAFF   CJK 兼容象形文字
                 // FE30-FE4F   CJK 兼容形式    FF00-FFEF   全角ASCII、全角标点
                 // 匹配中文字符
-                let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
-                this.assemblyForm[name] = a
+                // let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
+                // this.assemblyForm[name] = a
             },
             // text文本框input
             textareaBlur(name){
                 console.log(name,1160)
-                if (this.assemblyForm[name].length > (35 * 5)) {
-                    this.$message({
-                        message: '输入的字体已经超出五行',
-                        type: 'warning'
-                    });
-                }
-                let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr','hnotify2Details']
-                if (arr.indexOf(name) != -1) {
-                    console.log(this.assemblyForm[name],1133)
-                    this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
-                }
-                this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
+                // if (this.assemblyForm[name].length > (35 * 5)) {
+                //     this.$message({
+                //         message: '输入的字体已经超出五行',
+                //         type: 'warning'
+                //     });
+                // }
+                // let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr','hnotify2Details']
+                // if (arr.indexOf(name) != -1) {
+                //     console.log(this.assemblyForm[name],1133)
+                //     this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
+                // }
+                // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
             },
             // 同通知人
             notifybyfun(){

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -8,6 +8,7 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :cell-style="{padding:'0px',textAlign:'center'}"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -37,18 +38,17 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
                 @click.stop="editfun(scope.row, scope.index)"
                 :disabled="seeDisabled">
                 {{scope.row.$cellEdit?'保存':'编辑'}}
             </el-button>
-            <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                :disabled="seeDisabled"
-                @click.stop="rowDel(scope.row)"
-            >删 除</el-button>
+            <!--<el-button-->
+            <!--    size="mini"-->
+            <!--    type="text"-->
+            <!--    icon="el-icon-delete"-->
+            <!--    :disabled="seeDisabled"-->
+            <!--    @click.stop="rowDel(scope.row)"-->
+            <!--&gt;删 除</el-button>-->
         </template>
         <template slot-scope="{row}" slot="cntrTypeCodeForm">
             <search-query :datalist="cntrTypeCodeData"
@@ -109,8 +109,8 @@ import {number} from "echarts";
         selectionList: [],
         option:{},
         optionBack: {
-          height:'140',
-            maxHeight:'140',
+          height:'150',
+            maxHeight:'150',
           calcHeight: 30,
           tip: false,
           searchShow: true,
@@ -126,6 +126,7 @@ import {number} from "echarts";
             cancelBtn:false,
             cellBtn:true, // 行编辑
             menuWidth:140,
+            menu:true,
           column: [
             {
               label: "尺码箱型",
@@ -154,17 +155,21 @@ import {number} from "echarts";
               }]
             },
             {
+                label: "件数",
+                prop: "number",
+                type:"number",
+                width:'120',
+                cell:true,
+                controls:false,
+                precision:0,
+            },
+            {
               label: "毛重(KGS)",
               prop: "grossWeight",
               width:'120',
               type:"number",
               cell:true,
-                controls:false,
-              rules: [{
-                  required: true,
-                  message: " ",
-                  trigger: "blur"
-              }]
+              controls:false,
             },
             {
               label: "净重(KGS)",
@@ -172,7 +177,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
-                controls:false,
+              controls:false,
             },
             {
               label: "体积(CBM)",
@@ -180,18 +185,13 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
-                controls:false,
-              rules: [{
-                 required: true,
-                 message: " ",
-                 trigger: "blur"
-              }]
+              controls:false,
             },
             {
               label: "温度",
               prop: "temperature",
               cell:true,
-                controls:false,
+              controls:false,
               type:"number",
               width: "120"
             },
@@ -467,14 +467,6 @@ import {number} from "echarts";
                     name: "箱量",
                     value: "quantity",
                 },
-                {
-                    name: "毛重(KGM)",
-                    value: "grossWeight",
-                },
-                {
-                    name: "体积(CBM)",
-                    value: "measurement",
-                }
 
             ]
           if (!requiredMessage(row,rulesRow)) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -513,16 +513,20 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
-            <div style="padding-bottom: 30px;" >
+            <span slot="title">
+                <el-button type="primary" size="mini" >导出</el-button>
+            </span>
+            <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
                     border
+                    show-summary
                     size="mini"
                     :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                     :cell-style="{padding:'0px',fontSize:'12px'}"
@@ -533,18 +537,12 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="mblno" label="MB/L NO" width="140px" />
-                    <el-table-column prop="amountDr" label="应收金额" />
-                    <el-table-column prop="amountCr" label="应付金额" />
-                    <el-table-column prop="amountDrUsd" label="应收金额USD" width="140px" />
-                    <el-table-column prop="amountCrUsd" label="应付金额USD" width="140px" />
-                    <el-table-column prop="amountDrLoc" label="应收金额合计" width="140px" />
-                    <el-table-column prop="amountCrLoc" label="应付金额合计" width="140px" />
-                    <el-table-column prop="stlAmountDr" label="已结算应收金额" width="140px" />
-                    <el-table-column prop="stlAmountCr" label="已结算应付金额" width="140px" />
-                    <el-table-column prop="stlAmountDrUsd" label="已结算应收金额USD" width="140px" />
-                    <el-table-column prop="stlAmountCrUsd" label="已结算应付金额USD" width="140px" />
-                    <el-table-column prop="stlAmountDrLoc" label="已结算应收金额合计" width="140px" />
-                    <el-table-column prop="stlAmountCrLoc" label="已结算应付金额合计" width="140px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}r`" :label="`应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rUsd`" :label="`应${dcDialogType == 'D'?'收':'付'}金额USD`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rLoc`" :label="`应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="150px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}r`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rUsd`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额USD`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rLoc`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="180px" />
                 </el-table>
             </div>
         </el-dialog>
@@ -701,6 +699,7 @@
                 },
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                dcDialogType:'', // 往来单位弹窗dc判断
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1286,6 +1285,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })
             },

src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue

@@ -36,10 +36,10 @@
                                           :selectValue="assemblyForm.cyContacts"
                                           :filterable="true"
                                           :clearable="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
+                                          :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
                                           :buttonIf="false"
                                           :forParameter="{key:'id',label:'cname',value:'cname'}"
-                                          placeholder="请选择联系人"
+                                          placeholder="联系人"
                                           @corpChange="corpChange($event,'cyContacts')"
                                           @corpFocus="remoteMethod($event, 'cyContacts')" >
                             </search-query>
@@ -53,8 +53,8 @@
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress"
                                   size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                  clearable placeholder="请输入地址" ></el-input>
+                                  :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
+                                  clearable placeholder="地址" ></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -437,6 +437,17 @@
                 let inttraArr = ['inttraDoorTo','inttraToDoor']
                 let numberOfArr = ['Obl','Copy']
                 if (name == 'cy') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyId','')
+                        this.$set(this.assemblyForm,'cyCode','')
+                        this.$set(this.assemblyForm,'cyCnName','')
+                        this.$set(this.assemblyForm,'cyEnName','')
+                        this.$set(this.assemblyForm,'cyRemarks','')
+                        // 联系人
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'cyId',item.id)
@@ -444,7 +455,6 @@
                             this.$set(this.assemblyForm,'cyCnName',item.cnName)
                             this.$set(this.assemblyForm,'cyEnName',item.enName)
                             this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
-
                             // 查询场站联系人
                             getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
                                 this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
@@ -456,6 +466,11 @@
                 }
                 // 场站联系人
                 else if (name == 'cyContacts') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyContactsData) {
                         if (item.cname == value) {
                             this.$set(this.assemblyForm,'cyTel',item.tel)
@@ -476,6 +491,10 @@
                 }
                 // 份数
                 else if (numberOfArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'numberOf' + name,'')
+                        this.$set(this.assemblyForm,'numberOf' + name + 'Digit','')
+                    }
                     for(let item of this.numberOfData) {
                         if (item.dictValue == value) {
                             this.$set(this.assemblyForm,'numberOf' + name,item.dictValue)
@@ -484,7 +503,7 @@
                     }
                 }
                 else {
-                    this.assemblyForm[name] = value
+                    this.assemblyForm[name] = value?value:''
                 }
             },
             // 发送INTTRA EDI弹窗开启

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

@@ -670,7 +670,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     // if (oldValue == 'MM') {
                     //     this.form.hblno = ''
                     // }
-                    // 只要分单不能编辑
+                    // 只有分单不能编辑
                     if (oldValue == 'MH') {
                         this.columnforfun('hblno').disabled = true
                     }else {
@@ -1137,7 +1137,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 // 如果不是分单
                 if (this.form.billType != 'MH') {
                     this.$message({
-                        message: '只要分单需要申请',
+                        message: '只有分单需要申请',
                         type: 'warning'
                     });
                     return

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

@@ -350,16 +350,16 @@
                                         <span style="padding-left: 20px"></span>
                                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.hscode"
                                                   size="small" autocomplete="off"
-                                                  :disabled="detailData.seeDisabled"
-                                                  clearable placeholder="请输入商品 HS-CODE" ></el-input>
+                                                  :disabled="detailData.seeDisabled || !assemblyForm.commodityCnName"
+                                                  clearable placeholder="商品 HS-CODE" ></el-input>
                                     </el-col>
                                 </el-form-item>
                             </div>
                             <div>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.commodityEnName"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入商品简称" ></el-input>
+                                          :disabled="detailData.seeDisabled || !assemblyForm.commodityCnName"
+                                          clearable placeholder="商品名称" ></el-input>
                             </div>
                             <div style="margin-top: 4px">
                                 <el-form-item label="货描" prop="cargoType" label-width="40px" >
@@ -497,8 +497,8 @@
                             <el-col :span="15">
                                 <el-input type="age" style="width: 100%;margin-left: 20px;" v-model="assemblyForm.bookingAgentEnName"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入订舱代理" ></el-input>
+                                          :disabled="detailData.seeDisabled || !assemblyForm.bookingAgentCnName"
+                                          clearable placeholder="订舱代理" ></el-input>
                             </el-col>
                         </el-form-item>
                         <div>
@@ -1051,6 +1051,15 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 let portArr = ['placeReceipt','destination','placeDelivery']
                 let cnPorArr = ['pol','pod','pot']
                 if (arr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'Details','')
+                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        this.$set(this.assemblyForm,name + 'CntyCode','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -1067,6 +1076,13 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 有中文名称的港口
                 else if (cnPorArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'CnName','')
+                        this.$set(this.assemblyForm,name + 'EnName','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -1090,6 +1106,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 没有中文名的港口
                 else if (portArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,name + 'Id','')
+                        this.$set(this.assemblyForm,name + 'Name','')
+                        this.$set(this.assemblyForm,name + 'Code','')
+                        this.$set(this.assemblyForm,name + 'NamePrint','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,name + 'Id',item.id)
@@ -1100,6 +1122,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'commodity') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'hscode','')
+                        this.$set(this.assemblyForm,'commodityShName','')
+                        this.$set(this.assemblyForm,'commodityCnName','')
+                        this.$set(this.assemblyForm,'commodityEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'hscode',item.hsCode)
@@ -1111,6 +1139,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 船名
                 else if (name == 'vessel') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'vesselId','')
+                        this.$set(this.assemblyForm,'vesselCnName','')
+                        this.$set(this.assemblyForm,'vesselEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.enName == value) {
                             this.$set(this.assemblyForm,'vesselId',item.id)
@@ -1130,7 +1163,6 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
-                            console.log(item,1115)
                             this.$set(this.assemblyForm,'carrierId',item.id)
                             this.$set(this.assemblyForm,'carrierCnName',item.cnName)
                             this.$set(this.assemblyForm,'carrierEnName',item.enName)
@@ -1141,6 +1173,10 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 包装
                 else if (name == 'packingUnit') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'packingUnitId','')
+                        this.$set(this.assemblyForm,'packingUnit','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'packingUnitId',item.id)
@@ -1150,6 +1186,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 订舱代理
                 else if (name == 'bookingAgent') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'bookingAgentId','')
+                        this.$set(this.assemblyForm,'bookingAgentCnName','')
+                        this.$set(this.assemblyForm,'bookingAgentEnName','')
+                        this.$set(this.assemblyForm,'bookingRemarks','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'bookingAgentId',item.id)
@@ -1161,6 +1203,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // 航线
                 else if (name == 'line') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'lineId','')
+                        this.$set(this.assemblyForm,'lineCnName','')
+                        this.$set(this.assemblyForm,'lineEnName','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'lineId',item.id)
@@ -1171,6 +1218,11 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 }
                 // COLOADER
                 else if (name == 'coloaderCnName') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'coloaderId','')
+                        this.$set(this.assemblyForm,'coloaderCnName','')
+                        this.$set(this.assemblyForm,'coloaderEnName','')
+                    }
                     for(let item of this.coloaderCnNameData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'coloaderId',item.id)
@@ -1180,14 +1232,14 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     }
                 }
                 else if (name == 'cargoType') {
-                    this.$set(this.assemblyForm,'cargoType',value)
+                    this.$set(this.assemblyForm,'cargoType',value?value:'')
                     if (value == 'danger') {
                         // 危险品
                         this.DangerousGoodsAdd()
                     }
                 }
                 else {
-                    this.$set(this.assemblyForm,name,value)
+                    this.$set(this.assemblyForm,name,value?value:'')
                 }
             },
             // 通知人添加第二个通知人弹窗
@@ -1264,24 +1316,24 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 // 4E00-9FBF   CJK 统一表意符号  F900-FAFF   CJK 兼容象形文字
                 // FE30-FE4F   CJK 兼容形式    FF00-FFEF   全角ASCII、全角标点
                 // 匹配中文字符
-                let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
-                this.assemblyForm[name] = a
+                // let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
+                // this.assemblyForm[name] = a
             },
             // text文本框input
             textareaBlur(name){
                 console.log(name,1160)
-                if (this.assemblyForm[name].length > (35 * 5)) {
-                    this.$message({
-                        message: '输入的字体已经超出五行',
-                        type: 'warning'
-                    });
-                }
-                let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr','hnotify2Details']
-                if (arr.indexOf(name) != -1) {
-                    console.log(this.assemblyForm[name],1133)
-                    this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
-                }
-                this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
+                // if (this.assemblyForm[name].length > (35 * 5)) {
+                //     this.$message({
+                //         message: '输入的字体已经超出五行',
+                //         type: 'warning'
+                //     });
+                // }
+                // let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr','hnotify2Details']
+                // if (arr.indexOf(name) != -1) {
+                //     console.log(this.assemblyForm[name],1133)
+                //     this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
+                // }
+                // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
             },
             // 同通知人
             notifybyfun(){

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -7,6 +7,7 @@
                :permission="permissionList"
                :before-open="beforeOpen"
                v-model="form"
+               :cell-style="{padding:'0px',textAlign:'center'}"
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
@@ -37,18 +38,17 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
                 @click.stop="editfun(scope.row, scope.index)"
                 :disabled="seeDisabled">
                 {{scope.row.$cellEdit?'保存':'编辑'}}
             </el-button>
-            <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                :disabled="seeDisabled"
-                @click.stop="rowDel(scope.row)"
-            >删 除</el-button>
+            <!--<el-button-->
+            <!--    size="mini"-->
+            <!--    type="text"-->
+            <!--    icon="el-icon-delete"-->
+            <!--    :disabled="seeDisabled"-->
+            <!--    @click.stop="rowDel(scope.row)"-->
+            <!--&gt;删 除</el-button>-->
         </template>
         <template slot-scope="{row}" slot="cntrTypeCodeForm">
             <search-query :datalist="cntrTypeCodeData"
@@ -109,9 +109,9 @@ import {number} from "echarts";
         selectionList: [],
         option:{},
         optionBack: {
-          height:'140',
+          height:'150',
           calcHeight: 30,
-          maxHeight:'140',
+          maxHeight:'150',
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -119,13 +119,14 @@ import {number} from "echarts";
           index: true,
           viewBtn: true,
           selection: true,
-            labelWidth:'120',
+          labelWidth:'120',
           dialogClickModal: false,
             updateBtn:false,
             saveBtn:false,
             cancelBtn:false,
             cellBtn:true, // 行编辑
-            menuWidth:140,
+            menuWidth:130,
+            menu:true,
           column: [
             {
               label: "尺码箱型",
@@ -154,17 +155,21 @@ import {number} from "echarts";
               }]
             },
             {
+                label: "件数",
+                prop: "number",
+                type:"number",
+                width:'120',
+                cell:true,
+                controls:false,
+                precision:0,
+            },
+            {
               label: "毛重(KGS)",
               prop: "grossWeight",
               width:'120',
               type:"number",
               cell:true,
               controls:false,
-              rules: [{
-                  required: true,
-                  message: " ",
-                  trigger: "blur"
-              }]
             },
             {
               label: "净重(KGS)",
@@ -181,11 +186,6 @@ import {number} from "echarts";
               type:"number",
               cell:true,
               controls:false,
-              rules: [{
-                 required: true,
-                 message: " ",
-                 trigger: "blur"
-              }]
             },
             {
               label: "温度",
@@ -287,6 +287,15 @@ import {number} from "echarts";
           this.option = await this.getColumnData(this.getColumnName(309.1), this.optionBack);
       },
       methods: {
+        // 一键编辑
+        oneTouchEditefun(){
+            for (let item of this.assemblyForm.preContainersList) {
+                this.$refs.crud.rowCell(item,item.$index)
+            }
+
+            console.log(this.assemblyForm.preContainersList,294)
+            // $cellEdit
+        },
         // 批量保存
         batchSavefun(){
             if (!this.assemblyForm.id) {
@@ -467,14 +476,6 @@ import {number} from "echarts";
                     name: "箱量",
                     value: "quantity",
                 },
-                {
-                    name: "毛重(KGM)",
-                    value: "grossWeight",
-                },
-                {
-                    name: "体积(CBM)",
-                    value: "measurement",
-                }
 
             ]
           if (!requiredMessage(row,rulesRow)) {
@@ -651,5 +652,5 @@ import {number} from "echarts";
   };
 </script>
 
-<style>
+<style scoped>
 </style>

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

@@ -524,16 +524,20 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
                     border
+                    show-summary
                     size="mini"
                     :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                     :cell-style="{padding:'0px',fontSize:'12px'}"
@@ -544,18 +548,12 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="mblno" label="MB/L NO" width="140px" />
-                    <el-table-column prop="amountDr" label="应收金额" />
-                    <el-table-column prop="amountCr" label="应付金额" />
-                    <el-table-column prop="amountDrUsd" label="应收金额USD" width="140px" />
-                    <el-table-column prop="amountCrUsd" label="应付金额USD" width="140px" />
-                    <el-table-column prop="amountDrLoc" label="应收金额合计" width="140px" />
-                    <el-table-column prop="amountCrLoc" label="应付金额合计" width="140px" />
-                    <el-table-column prop="stlAmountDr" label="已结算应收金额" width="140px" />
-                    <el-table-column prop="stlAmountCr" label="已结算应付金额" width="140px" />
-                    <el-table-column prop="stlAmountDrUsd" label="已结算应收金额USD" width="140px" />
-                    <el-table-column prop="stlAmountCrUsd" label="已结算应付金额USD" width="140px" />
-                    <el-table-column prop="stlAmountDrLoc" label="已结算应收金额合计" width="140px" />
-                    <el-table-column prop="stlAmountCrLoc" label="已结算应付金额合计" width="140px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}r`" :label="`应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rUsd`" :label="`应${dcDialogType == 'D'?'收':'付'}金额USD`" width="120px" />
+                    <el-table-column sortable :prop="`amount${dcDialogType}rLoc`" :label="`应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="150px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}r`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额CNY`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rUsd`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额USD`" width="160px" />
+                    <el-table-column sortable :prop="`stlAmount${dcDialogType}rLoc`" :label="`已结算应${dcDialogType == 'D'?'收':'付'}金额合计CNY`" width="180px" />
                 </el-table>
             </div>
         </el-dialog>
@@ -712,6 +710,7 @@
                 },
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                dcDialogType:'', // 往来单位弹窗dc判断
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1298,6 +1297,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })
             },
@@ -2576,4 +2576,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

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

@@ -36,10 +36,10 @@
                                           :selectValue="assemblyForm.cyContacts"
                                           :filterable="true"
                                           :clearable="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
+                                          :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
                                           :buttonIf="false"
                                           :forParameter="{key:'id',label:'cname',value:'cname'}"
-                                          placeholder="请选择联系人"
+                                          placeholder="联系人"
                                           @corpChange="corpChange($event,'cyContacts')"
                                           @corpFocus="remoteMethod($event, 'cyContacts')" >
                             </search-query>
@@ -53,8 +53,8 @@
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress"
                                   size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                  clearable placeholder="请输入地址" ></el-input>
+                                  :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
+                                  clearable placeholder="地址" ></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -565,6 +565,17 @@
                 let inttraArr = ['inttraDoorTo','inttraToDoor']
                 let numberOfArr = ['Obl','Copy']
                 if (name == 'cy') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyId','')
+                        this.$set(this.assemblyForm,'cyCode','')
+                        this.$set(this.assemblyForm,'cyCnName','')
+                        this.$set(this.assemblyForm,'cyEnName','')
+                        this.$set(this.assemblyForm,'cyRemarks','')
+                        // 联系人
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyData) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'cyId',item.id)
@@ -572,7 +583,6 @@
                             this.$set(this.assemblyForm,'cyCnName',item.cnName)
                             this.$set(this.assemblyForm,'cyEnName',item.enName)
                             this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
-
                             // 查询场站联系人
                             getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
                                 this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
@@ -584,6 +594,11 @@
                 }
                 // 场站联系人
                 else if (name == 'cyContacts') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'cyTel','')
+                        this.$set(this.assemblyForm,'cyAddress','')
+                        this.$set(this.assemblyForm,'cyContacts','')
+                    }
                     for(let item of this.cyContactsData) {
                         if (item.cname == value) {
                             this.$set(this.assemblyForm,'cyTel',item.tel)
@@ -604,6 +619,10 @@
                 }
                 // 份数
                 else if (numberOfArr.indexOf(name) != -1) {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'numberOf' + name,'')
+                        this.$set(this.assemblyForm,'numberOf' + name + 'Digit','')
+                    }
                     for(let item of this.numberOfData) {
                         if (item.dictValue == value) {
                             this.$set(this.assemblyForm,'numberOf' + name,item.dictValue)
@@ -612,7 +631,7 @@
                     }
                 }
                 else {
-                    this.assemblyForm[name] = value
+                    this.assemblyForm[name] = value?value:''
                 }
             },
             // 发送INTTRA EDI弹窗开启

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

@@ -683,7 +683,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     // if (oldValue == 'MM') {
                     //     this.form.hblno = ''
                     // }
-                    // 只要分单不能编辑
+                    // 只有分单不能编辑
                     if (oldValue == 'MH') {
                         this.columnforfun('hblno').disabled = true
                     }else {
@@ -1196,7 +1196,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 // 如果不是分单
                 if (this.form.billType != 'MH') {
                     this.$message({
-                        message: '只要分单需要申请',
+                        message: '只有分单需要申请',
                         type: 'warning'
                     });
                     return

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

@@ -732,7 +732,7 @@
                     type: "warning"
                 })
                     .then(() => {
-                        return customsdeclarationRemove(ids);
+                        return customsdeclarationRemove(ids.join(','));
                     })
                     .then(() => {
                         this.onLoad(this.page);

src/views/iosBasicData/reportClose/AIreportClose/assembly/TableDetails.vue

@@ -383,9 +383,6 @@
                     if (!item.recordNo) {
                         sum += ` 序号${item.$index + 1}备案序号`
                     }
-                    if (!item.hblno) {
-                        sum += ` 序号${item.$index + 1}分单号`
-                    }
                     if (!item.commodityName) {
                         sum += ` 序号${item.$index + 1}商品名称`
                     }

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

@@ -446,7 +446,7 @@
                                                       :buttonIf="false"
                                                       :disabled="detailData.seeDisabled"
                                                       placeholder="请选择成交方式"
-                                                      :forParameter="{key:'dictValue',label:'dictValue',value:'dictValue'}"
+                                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                                       @remoteMethod="dealMethodWorkDictsfun"
                                                       @corpChange="corpChange($event,'dealMethod')"
                                                       @corpFocus="dealMethodWorkDictsfun">
@@ -1271,9 +1271,12 @@
                 })
             },
             // 成交方式
-            dealMethodWorkDictsfun(){
-                getWorkDicts('transaction_method_los').then(res=>{
-                    this.dealMethodData = res.data.data
+            dealMethodWorkDictsfun(cnName){
+                // getWorkDicts('transaction_method_los').then(res=>{
+                //     this.dealMethodData = res.data.data
+                // })
+                getBtrademodesList(1,10,{cnName}).then(res=>{
+                    this.dealMethodData = res.data.data.records
                 })
             },
             // 出口口岸

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

@@ -732,7 +732,7 @@
                     type: "warning"
                 })
                     .then(() => {
-                        return customsdeclarationRemove(ids);
+                        return customsdeclarationRemove(ids.join(','));
                     })
                     .then(() => {
                         this.onLoad(this.page);

src/views/iosBasicData/reportClose/SEreportClose/assembly/TableDetails.vue

@@ -2,7 +2,7 @@
     <div>
         <avue-crud :option="option"
                    :table-loading="loading"
-                   :data="tableData"
+                   :data="form.customsDeclarationGoodsList"
                    id="out-table"
                    :header-cell-class-name="headerClassName"
                    ref="crud"
@@ -52,7 +52,7 @@
                               @corpChange="corpChange($event,'commodityName',row)"
                               @corpFocus="commoditybcommodityListfun">
                 </search-query>
-                <span v-else >{{row.commodityName}}}</span>
+                <span v-else >{{row.commodityName}}</span>
             </template>
             <template slot="specificationModel" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.specificationModel" size="small"
@@ -73,7 +73,7 @@
                               @corpChange="corpChange($event,'destinationCountryCnName',row)"
                               @corpFocus="destinationCountrybcountrysListfun">
                 </search-query>
-                <span v-else >{{row.destinationCountryCnName}}}</span>
+                <span v-else >{{row.destinationCountryCnName}}</span>
             </template>
             <template slot="transactionUnit" slot-scope="{ row }">
                 <search-query v-if="row.edit"
@@ -133,7 +133,7 @@
                               @corpChange="corpChange($event,'legalUnit',row)"
                               @corpFocus="legalUnitBunitsListfun">
                 </search-query>
-                <span v-else >{{row.legalUnit}}}</span>
+                <span v-else >{{row.legalUnit}}</span>
             </template>
             <template slot="legalQuantity" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.legalQuantity" size="small"
@@ -192,10 +192,6 @@
                 type:Boolean,
                 default:false,
             },
-            tableData:{
-                type:Array,
-                default: []
-            },
             roleName:{
                 type:Array,
                 default:[]
@@ -342,7 +338,6 @@
                     ]
                 },
                 loading:false,
-                tableData:[],
                 commodityData:[], // 商品名称
                 destinationCountryData:[], // 目的国
                 transactionUnitData:[], // 成交单位
@@ -357,14 +352,15 @@
         methods: {
             // 添加
             addCfun(){
-                this.tableData.push({
+                this.form.customsDeclarationGoodsList.push({
                     edit:true,
                     currency:'CNY'
                 })
             },
             // 一键编辑
             oneclickEditingfun(){
-                for (let item of this.tableData) {
+                for (let item of this.form.customsDeclarationGoodsList) {
+                    this.$delete(item, 'edit')
                     this.$set(item,'edit',true)
                 }
             },
@@ -379,7 +375,7 @@
                 }
                 // 判断必填项
                 let sum = '请输入'
-                for (let item of this.tableData) {
+                for (let item of this.form.customsDeclarationGoodsList) {
                     if (!item.recordNo) {
                         sum += ` 序号${item.$index + 1}备案序号`
                     }
@@ -426,7 +422,7 @@
             },
             // 保存接口
             customsdeclarationgoodssSubmitfun(){
-                let arr = this.tableData.map((item,index)=>{
+                let arr = this.form.customsDeclarationGoodsList.map((item,index)=>{
                     item.sort = Number(index) + 1
                     item.pid = this.form.id
                     return item
@@ -444,7 +440,7 @@
                     type: "warning"
                 }).then(()=>{
                     let multiList = this.handleSelectionData
-                    let arr = this.tableData
+                    let arr = this.form.customsDeclarationGoodsList
                     // 获取有id 的数据
                     const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
                     let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据

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

@@ -203,7 +203,7 @@
                                         </el-row>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业名称:" prop="enterpriseCnName" label-width="80px">
                                         <search-query :datalist="enterpriseData"
                                                       :selectValue="form.enterpriseCnName"
@@ -220,7 +220,7 @@
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业海关编码:" prop="billNo" label-width="100px">
                                         <el-input style="width: 100%;" v-model="form.enterpriseCode"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -228,6 +228,23 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
+                                    <el-form-item label="所属团队:" prop="enterpriseCnName" label-width="80px">
+                                        <search-query :datalist="teamData"
+                                                      :selectValue="form.teamName"
+                                                      :filterable="true"
+                                                      :clearable="true"
+                                                      :remote="true"
+                                                      :buttonIf="false"
+                                                      :disabled="detailData.seeDisabled"
+                                                      placeholder="请选择所属团队"
+                                                      :forParameter="{key:'id',label:'postName',value:'postName'}"
+                                                      @remoteMethod="postSelectByUserfun"
+                                                      @corpChange="corpChange($event,'teamName')"
+                                                      @corpFocus="postSelectByUserfun">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
                                     <el-form-item label="订舱号" prop="bookingNo" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.bookingNo"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -569,9 +586,9 @@
                         </basic-container>
                     </el-form>
                     <basic-container>
-                        <table-details :tableData="form.customsDeclarationGoodsList" :form="form" :roleName="roleName"
+                        <table-details :form="form" :roleName="roleName"
                                        :disabled="detailData.seeDisabled"
-                                       @billsDetailfun="customsdeclarationDetailfun(this.form.id)" ></table-details>
+                                       @billsDetailfun="customsdeclarationDetailfun(form.id)" ></table-details>
                     </basic-container>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
@@ -638,6 +655,7 @@
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
     import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+    import { postSelectByUser } from '@/api/iosBasicData/bills'
 
     export default {
         components: {reportformsList, reportContainer, reports, feecenter, SearchQuery,TableDetails},
@@ -690,6 +708,7 @@
                 srcForParameter:{ key:'id', label:'title', value:'title'}, // 来源详情配置项数据
                 declarationMethodData:[], // 申报方式字典数据
                 enterpriseData:[], // 企业数据
+                teamData:[], // 所属团队
                 vesselData:[], // 船名数据
                 tradeMethodData:[], // 贸易条款数据
                 destinationCountryData:[], // 运抵国数据
@@ -855,10 +874,12 @@
             },
             // 大保存
             savefun(){
+
                 // 经营单位
                 if (!this.form.corpId) {
                     return this.$message.warning('请填写经营单位！')
                 }
+
                 let multiArr = []
                 for (let i in this.comprehensiveForm) {
                     if (this.comprehensiveForm[i]) {
@@ -1301,6 +1322,12 @@
                     this.packingUnitData = res.data.data.records
                 })
             },
+            // 获取所属岗位数据
+            postSelectByUserfun(){
+                postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
+                    this.teamData = res.data.data
+                })
+            },
             // 预览报表
             handleReportPreview(url,data){
                 console.log(url,1670)

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

@@ -651,6 +651,7 @@
                         {
                             label: "备注",
                             prop: "remarks",
+                            overHidden:true
                         },
                         {
                             label: "创建人",
@@ -732,7 +733,7 @@
                     type: "warning"
                 })
                     .then(() => {
-                        return customsdeclarationRemove(ids);
+                        return customsdeclarationRemove(ids.join(','));
                     })
                     .then(() => {
                         this.onLoad(this.page);

src/views/iosBasicData/reportClose/SIreportClose/assembly/TableDetails.vue

@@ -2,7 +2,7 @@
     <div>
         <avue-crud :option="option"
                    :table-loading="loading"
-                   :data="tableData"
+                   :data="form.customsDeclarationGoodsList"
                    id="out-table"
                    :header-cell-class-name="headerClassName"
                    ref="crud"
@@ -192,10 +192,6 @@
                 type:Boolean,
                 default:false,
             },
-            tableData:{
-                type:Array,
-                default: []
-            },
             roleName:{
                 type:Array,
                 default:[]
@@ -342,7 +338,6 @@
                     ]
                 },
                 loading:false,
-                tableData:[],
                 commodityData:[], // 商品名称
                 destinationCountryData:[], // 目的国
                 transactionUnitData:[], // 成交单位
@@ -357,14 +352,15 @@
         methods: {
             // 添加
             addCfun(){
-                this.tableData.push({
+                this.form.customsDeclarationGoodsList.push({
                     edit:true,
                     currency:'CNY'
                 })
             },
             // 一键编辑
             oneclickEditingfun(){
-                for (let item of this.tableData) {
+                for (let item of this.form.customsDeclarationGoodsList) {
+                    this.$delete(item, 'edit')
                     this.$set(item,'edit',true)
                 }
             },
@@ -379,7 +375,7 @@
                 }
                 // 判断必填项
                 let sum = '请输入'
-                for (let item of this.tableData) {
+                for (let item of this.form.customsDeclarationGoodsList) {
                     if (!item.recordNo) {
                         sum += ` 序号${item.$index + 1}备案序号`
                     }
@@ -426,7 +422,7 @@
             },
             // 保存接口
             customsdeclarationgoodssSubmitfun(){
-                let arr = this.tableData.map((item,index)=>{
+                let arr = this.form.customsDeclarationGoodsList.map((item,index)=>{
                     item.sort = Number(index) + 1
                     item.pid = this.form.id
                     return item
@@ -444,7 +440,7 @@
                     type: "warning"
                 }).then(()=>{
                     let multiList = this.handleSelectionData
-                    let arr = this.tableData
+                    let arr = this.form.customsDeclarationGoodsList
                     // 获取有id 的数据
                     const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
                     let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据

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

@@ -203,7 +203,7 @@
                                         </el-row>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业名称:" prop="enterpriseCnName" label-width="80px">
                                         <search-query :datalist="enterpriseData"
                                                       :selectValue="form.enterpriseCnName"
@@ -220,7 +220,7 @@
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业海关编码:" prop="billNo" label-width="100px">
                                         <el-input style="width: 100%;" v-model="form.enterpriseCode"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -228,6 +228,23 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
+                                    <el-form-item label="所属团队:" prop="enterpriseCnName" label-width="80px">
+                                        <search-query :datalist="teamData"
+                                                      :selectValue="form.teamName"
+                                                      :filterable="true"
+                                                      :clearable="true"
+                                                      :remote="true"
+                                                      :buttonIf="false"
+                                                      :disabled="detailData.seeDisabled"
+                                                      placeholder="请选择所属团队"
+                                                      :forParameter="{key:'id',label:'postName',value:'postName'}"
+                                                      @remoteMethod="postSelectByUserfun"
+                                                      @corpChange="corpChange($event,'teamName')"
+                                                      @corpFocus="postSelectByUserfun">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
                                     <el-form-item label="订舱号" prop="bookingNo" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.bookingNo"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -569,9 +586,9 @@
                         </basic-container>
                     </el-form>
                     <basic-container>
-                        <table-details :tableData="form.customsDeclarationGoodsList" :form="form" :roleName="roleName"
+                        <table-details :form="form" :roleName="roleName"
                                        :disabled="detailData.seeDisabled"
-                                       @billsDetailfun="customsdeclarationDetailfun(this.form.id)" ></table-details>
+                                       @billsDetailfun="customsdeclarationDetailfun(form.id)" ></table-details>
                     </basic-container>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
@@ -636,6 +653,7 @@
     import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
+    import { postSelectByUser } from '@/api/iosBasicData/bills'
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -688,6 +706,7 @@
                 srcForParameter:{ key:'id', label:'title', value:'title'}, // 来源详情配置项数据
                 declarationMethodData:[], // 申报方式字典数据
                 enterpriseData:[], // 企业数据
+                teamData:[], // 所属团队
                 vesselData:[], // 船名数据
                 tradeMethodData:[], // 贸易条款数据
                 destinationCountryData:[], // 运抵国数据
@@ -1299,6 +1318,12 @@
                     this.packingUnitData = res.data.data.records
                 })
             },
+            // 获取所属岗位数据
+            postSelectByUserfun(){
+                postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
+                    this.teamData = res.data.data
+                })
+            },
             //返回列表
             backToList() {
                 this.$emit('goBack')

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

@@ -732,7 +732,7 @@
                     type: "warning"
                 })
                     .then(() => {
-                        return customsdeclarationRemove(ids);
+                        return customsdeclarationRemove(ids.join(','));
                     })
                     .then(() => {
                         this.onLoad(this.page);