修改禅道1963的问题

src/util/contrastData.js

@@ -2,8 +2,10 @@
 export function contrastObj(newval, oldval) {
   let reg = /^[A-Za-z]+$/;
   for (let key in newval) {
-    if (reg.test(key) && !(newval[key] instanceof Array) && (newval[key] != oldval[key] && (newval[key] || oldval[key]))) {
-      return true
+    if(typeof newval[key]=='string'){
+      if (reg.test(key) && !(newval[key] instanceof Array) && (newval[key] != oldval[key] && (newval[key] || oldval[key]))) {
+        return true
+      }
     }
   }
   return false

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

@@ -59,7 +59,8 @@
                                                                 style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
                                                                 @click="applyforfun(item[0].label)">{{ item[0].label }}
                                                             </span>
-                                                            <span v-else style="color: #1e9fff">{{ item[0].label }}</span>
+                                                            <span v-else style="color: #1e9fff">{{ item[0].label
+                                                                }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -67,8 +68,9 @@
                                                         <!--           @click="applyforfun(item[0].label)" >-->
                                                         <!--</el-button>-->
                                                         <search-query v-else-if="item[0].type == 'select'"
-                                                            :datalist="item[0].dicData" :selectValue="form[item[0].prop]"
-                                                            :filterable="true" :allowCreate="item[0].allowCreate || false"
+                                                            :datalist="item[0].dicData"
+                                                            :selectValue="form[item[0].prop]" :filterable="true"
+                                                            :allowCreate="item[0].allowCreate || false"
                                                             :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[0].disabled"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
@@ -96,8 +98,9 @@
                                                             value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
                                                         </el-date-picker>
                                                         <search-query v-else-if="item[1].type == 'select'"
-                                                            :datalist="item[1].dicData" :selectValue="form[item[1].prop]"
-                                                            :filterable="true" :clearable="false" :remote="true"
+                                                            :datalist="item[1].dicData"
+                                                            :selectValue="form[item[1].prop]" :filterable="true"
+                                                            :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
@@ -107,8 +110,9 @@
                                                         </search-query>
 
                                                         <tree-select v-else-if="item[1].type == 'tree'"
-                                                            v-model="form[item[1].prop]" filterable :data="item[1].dicData"
-                                                            :props="item[1].forParameter" nodeKey="title" size="small"
+                                                            v-model="form[item[1].prop]" filterable
+                                                            :data="item[1].dicData" :props="item[1].forParameter"
+                                                            nodeKey="title" size="small"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :multiple="false" :clearable="false"
                                                             :placeholder="`${item[1].text || ''}`"
@@ -128,8 +132,9 @@
                                                             <span style="color: #1e9fff">{{ item[2].label }}</span>
                                                         </span>
                                                         <search-query v-if="item[2].type == 'select'"
-                                                            :datalist="item[2].dicData" :selectValue="form[item[2].prop]"
-                                                            :filterable="true" :clearable="false" :remote="true"
+                                                            :datalist="item[2].dicData"
+                                                            :selectValue="form[item[2].prop]" :filterable="true"
+                                                            :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[2].disabled"
                                                             :buttonIf="false" :forParameter="item[2].forParameter"
                                                             :placeholder="`${item[2].text || ''}`"
@@ -152,19 +157,23 @@
                                                     <span style="color: #1e9fff">{{ item.label }}</span>
                                                 </span>
                                                 <search-query v-if="item.type == 'select'" :datalist="item.dicData"
-                                                    :selectValue="form[item.prop]" :filterable="true" :clearable="false"
-                                                    :remote="true" :disabled="detailData.seeDisabled || item.disabled"
+                                                    ref="searchQueryRef" :selectValue="form[item.prop]"
+                                                    :filterable="true" :clearable="false" :remote="true"
+                                                    :disabled="detailData.seeDisabled || item.disabled"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
                                                     :placeholder="`${item.text || ''}`"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
                                                     @corpChange="corpChange($event, item.prop)"
-                                                    @corpFocus="remoteMethod($event, item.prop)">
-                                                    <bcorps v-if="item.slot == 'bcorps'"></bcorps>
+                                                    @corpFocus="remoteMethod($event, item.prop)"
+                                                    @eldialogConfirm="eldialogConfirm(item.slot)">
+                                                    <bcorps v-if="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
+                                                        @selectionChange="eldialogMultipleChoice($event, item.slot)">
+                                                    </bcorps>
                                                     <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'">
                                                     </bcorpstypedefine>
                                                 </search-query>
-                                                <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
-                                                    size="small" autocomplete="off"
+                                                <el-input v-else type="age" style="width: 100%;"
+                                                    v-model="form[item.prop]" size="small" autocomplete="off"
                                                     :disabled="detailData.seeDisabled || item.disabled"
                                                     :placeholder="item.text || ''"></el-input>
                                             </el-form-item>
@@ -213,7 +222,8 @@
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
-                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData"
+                        :assemblyForm="form"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" class="scrollable-container" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"
@@ -341,7 +351,7 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList: []
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -365,7 +375,7 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList: []
             },
             // 循环的配置
             basicData: {
@@ -811,7 +821,7 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName }).then(res => {
                 this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
                     item.cnName = item.cnName + ' - ' + item.shortName
                     return item
@@ -959,6 +969,60 @@ export default {
             }
 
         },
+        // 下拉多选弹窗数据多选回调
+        eldialogMultipleChoice(list, name) {
+            if (name == 'bcorps') {
+                let arr = []
+                if (list.length > 1) {
+                    this.$refs.bcorps[0].$refs.crud.toggleSelection() // 先清空所以选择的数据
+                    arr = [list[list.length - 1]] // 获取最新点击的数组
+                    this.$refs.bcorps[0].$refs.crud.toggleSelection(arr, true) // 把刚点击的数组变成选择状态
+                } else {
+                    arr = list
+                }
+                this.$refs.bcorps[0].selectionList = arr
+            } else {
+
+            }
+        },
+        // 下拉多选弹窗的确认
+        eldialogConfirm(name) {
+            if (name == 'bcorps') {
+                if (this.$refs.bcorps[0].isShow) {
+                    console.log('列表确认')
+                    this.form.corpCnName = this.$refs.bcorps[0].selectionList[0].cnName
+                    this.form.corpEnName = this.$refs.bcorps[0].selectionList[0].enName
+                    this.form.corpId = this.$refs.bcorps[0].selectionList[0].id
+                    this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
+                    // 获取 客户op数据
+                    this.getBcorpsattnListfun()
+                    // 业务来源参数带出
+                    this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
+                    this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
+                    this.$set(this.form, 'srcCnName', this.$refs.bcorps[0].selectionList[0].srcCnName)
+                    this.$set(this.form, 'srcEnName', this.$refs.bcorps[0].selectionList[0].srcEnName)
+                    this.columnforfun('srcType').disabled = false
+                    this.columnforfun('srcCnName').disabled = false
+                    // 航线带出往来单位的优势航线
+                    this.$set(this.form, 'lineCnName', this.$refs.bcorps[0].selectionList[0].advantageRoute)
+                    // 带出发货人数据
+                    this.$set(this.form, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
+                    this.$set(this.form, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
+                    this.$set(this.form, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
+                    this.$set(this.form, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
+                    this.$set(this.form, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
+                    this.$set(this.form, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
+                    this.$set(this.form, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.columnforfun('corpAttnName').disabled = false
+                    this.columnforfun('corpAttnTel').disabled = false
+                    this.columnforfun('corpAttnEmail').disabled = false
+                } else {
+                    console.log('详情确认')
+                    this.$refs.bcorps[0].$refs.detail.submitForm()
+                }
+            }
+            this.$refs.searchQueryRef[0].corpVisible = false
+        },
         // 下拉的监听事件
         corpChange(value, name) {
             if (name == 'operatorName') {
@@ -1222,7 +1286,7 @@ export default {
             } else {
                 this.$emit('goBack')
             }
-      
+
         },
         // 单据请核
         DocumentApproval() {
@@ -1913,10 +1977,11 @@ export default {
 
 </script>
 
-<style scoped  lang="scss">
-::v-deep .el-tabs--border-card>.el-tabs__content{
-    padding:4px !important;
+<style scoped lang="scss">
+::v-deep .el-tabs--border-card>.el-tabs__content {
+    padding: 4px !important;
 }
+
 .scrollable-container {
     height: 84vh;
     /* 设置容器高度 */
@@ -1944,12 +2009,15 @@ export default {
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-::v-deep .basic-container .el-card__body{
+
+::v-deep .basic-container .el-card__body {
     padding: 6px 20px;
 }
-::v-deep .el-tabs__header{
+
+::v-deep .el-tabs__header {
     margin: 0 0 5px;
 }
+
 .isShow {
     display: none;
 }

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

@@ -152,14 +152,18 @@
                                                     <span style="color: #1e9fff">{{ item.label }}</span>
                                                 </span>
                                                 <search-query v-if="item.type == 'select'" :datalist="item.dicData"
-                                                    :selectValue="form[item.prop]" :filterable="true" :clearable="false"
-                                                    :remote="true" :disabled="detailData.seeDisabled || item.disabled"
+                                                    ref="searchQueryRef" :selectValue="form[item.prop]"
+                                                    :filterable="true" :clearable="false" :remote="true"
+                                                    :disabled="detailData.seeDisabled || item.disabled"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
                                                     :placeholder="`${item.text || ''}`"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
                                                     @corpChange="corpChange($event, item.prop)"
-                                                    @corpFocus="remoteMethod($event, item.prop)">
-                                                    <bcorps v-if="item.slot == 'bcorps'"></bcorps>
+                                                    @corpFocus="remoteMethod($event, item.prop)"
+                                                    @eldialogConfirm="eldialogConfirm(item.slot)">
+                                                    <bcorps v-if="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
+                                                        @selectionChange="eldialogMultipleChoice($event, item.slot)">
+                                                    </bcorps>
                                                     <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'">
                                                     </bcorpstypedefine>
                                                 </search-query>
@@ -957,6 +961,60 @@ export default {
             }
 
         },
+              // 下拉多选弹窗数据多选回调
+              eldialogMultipleChoice(list, name) {
+            if (name == 'bcorps') {
+                let arr = []
+                if (list.length > 1) {
+                    this.$refs.bcorps[0].$refs.crud.toggleSelection() // 先清空所以选择的数据
+                    arr = [list[list.length - 1]] // 获取最新点击的数组
+                    this.$refs.bcorps[0].$refs.crud.toggleSelection(arr, true) // 把刚点击的数组变成选择状态
+                } else {
+                    arr = list
+                }
+                this.$refs.bcorps[0].selectionList = arr
+            } else {
+
+            }
+        },
+        // 下拉多选弹窗的确认
+        eldialogConfirm(name) {
+            if (name == 'bcorps') {
+                if (this.$refs.bcorps[0].isShow) {
+                    console.log('列表确认')
+                    this.form.corpCnName = this.$refs.bcorps[0].selectionList[0].cnName
+                    this.form.corpEnName = this.$refs.bcorps[0].selectionList[0].enName
+                    this.form.corpId = this.$refs.bcorps[0].selectionList[0].id
+                    this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
+                    // 获取 客户op数据
+                    this.getBcorpsattnListfun()
+                    // 业务来源参数带出
+                    this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
+                    this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
+                    this.$set(this.form, 'srcCnName', this.$refs.bcorps[0].selectionList[0].srcCnName)
+                    this.$set(this.form, 'srcEnName', this.$refs.bcorps[0].selectionList[0].srcEnName)
+                    this.columnforfun('srcType').disabled = false
+                    this.columnforfun('srcCnName').disabled = false
+                    // 航线带出往来单位的优势航线
+                    this.$set(this.form, 'lineCnName', this.$refs.bcorps[0].selectionList[0].advantageRoute)
+                    // 带出发货人数据
+                    this.$set(this.form, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
+                    this.$set(this.form, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
+                    this.$set(this.form, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
+                    this.$set(this.form, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
+                    this.$set(this.form, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
+                    this.$set(this.form, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
+                    this.$set(this.form, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.columnforfun('corpAttnName').disabled = false
+                    this.columnforfun('corpAttnTel').disabled = false
+                    this.columnforfun('corpAttnEmail').disabled = false
+                } else {
+                    console.log('详情确认')
+                    this.$refs.bcorps[0].$refs.detail.submitForm()
+                }
+            }
+            this.$refs.searchQueryRef[0].corpVisible = false
+        },
         // 下拉的监听事件
         corpChange(value, name) {
             if (name == 'operatorName') {

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

@@ -119,7 +119,7 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hshipperData" :selectValue="assemblyForm.hshipperCnName"
+                                    <search-query :datalist="hshipperData" :selectValue="assemblyForm.detail.hshipperCnName"
                                         :filterable="true" :clearable="true" :remote="true" :addIf="true"
                                         :tableIf="false" :disabled="detailData.seeDisabled"
                                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -130,7 +130,7 @@
                                     </search-query>
                                 </el-col>
                                 <el-col :span="8">
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.hshipperCntyName"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hshipperCntyName"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                         placeholder="国家"></el-input>
                                 </el-col>
@@ -138,7 +138,7 @@
                         </el-form-item>
                         <div style="margin-top: 4px">
                             <el-form-item label="" prop="hshipperDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hshipperDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hshipperDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
                                     clearable placeholder="请输入发货人提单描述"
                                     @blur="textareaBlur('hshipperDetails')"></el-input>
@@ -151,7 +151,7 @@
                             <div>
                                 <el-col :span="16">
                                     <search-query :datalist="hconsigneeData"
-                                        :selectValue="assemblyForm.hconsigneeCnName" :filterable="true"
+                                        :selectValue="assemblyForm.detail.hconsigneeCnName" :filterable="true"
                                         :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                         :addIf="true" :tableIf="false"
                                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -163,7 +163,7 @@
                                 </el-col>
                                 <el-col :span="4">
                                     <span style="padding-left: 10px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.hconsigneeCntyName"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hconsigneeCntyName"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                         placeholder="收货人"></el-input>
                                 </el-col>
@@ -176,7 +176,7 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hconsigneeDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hconsigneeDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hconsigneeDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
                                     clearable placeholder="请输入收货人提单描述"
                                     @blur="textareaBlur('hconsigneeDetails')"></el-input>
@@ -188,7 +188,7 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hnotifyData" :selectValue="assemblyForm.hnotifyCnName"
+                                    <search-query :datalist="hnotifyData" :selectValue="assemblyForm.detail.hnotifyCnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
                                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -203,7 +203,7 @@
                                         style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
                                         <div style="flex: 4">
                                             <el-input type="age" style="width: 100%;"
-                                                v-model="assemblyForm.hnotifyCntyName" size="small" autocomplete="off"
+                                                v-model="assemblyForm.detail.hnotifyCntyName" size="small" autocomplete="off"
                                                 :disabled="detailData.seeDisabled" clearable
                                                 placeholder="通知人"></el-input>
                                         </div>
@@ -218,7 +218,7 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hnotifyDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotifyDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hnotifyDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
                                     clearable placeholder="请输入通知人提单描述"
                                     @blur="textareaBlur('hnotifyDetails')"></el-input>
@@ -457,7 +457,7 @@
                             <!--          :disabled="detailData.seeDisabled || generateBillsfalse"-->
                             <!--          clearable placeholder="请输入联系人" ></el-input>-->
                             <search-query :datalist="cyContactsData" :selectValue="assemblyForm.cyContacts"
-                                :filterable="true" :clearable="true" :allowCreate="true"
+                                :filterable="true" :clearable="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
                                 :buttonIf="false" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
                                 placeholder="联系人" @corpChange="corpChange($event, 'cyContacts')"
@@ -496,7 +496,7 @@
                     <el-row :gutter="20">
                         <el-col :span="12">
                             <el-form-item label="通知人" prop="hnotify2CnName">
-                                <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.hnotify2CnName"
+                                <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.detail.hnotify2CnName"
                                     :filterable="true" :clearable="true" :remote="true"
                                     :disabled="detailData.seeDisabled" :buttonIf="false"
                                     :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
@@ -508,14 +508,14 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="国家" prop="hnotify2CntyName">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotify2CntyName"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hnotify2CntyName"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="国家"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="提单描述" prop="hnotify2Details">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotify2Details"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hnotify2Details"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4"
                                     clearable placeholder="请输入通知人提单描述"
                                     @blur="textareaBlur('hnotify2Details')"></el-input>
@@ -849,27 +849,27 @@ export default {
             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.detail, name + 'Id', '')
+                    this.$set(this.assemblyForm.detail, name + 'CnName', '')
+                    this.$set(this.assemblyForm.detail, name + 'EnName', '')
+                    this.$set(this.assemblyForm.detail, name + 'Code', '')
+                    this.$set(this.assemblyForm.detail, name + 'Details', '')
                     // 国家名称
-                    this.$set(this.assemblyForm, name + 'CntyName', '')
+                    this.$set(this.assemblyForm.detail, name + 'CntyName', '')
                     // 国家代码
-                    this.$set(this.assemblyForm, name + 'CntyCode', '')
+                    this.$set(this.assemblyForm.detail, name + 'CntyCode', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
-                        this.$set(this.assemblyForm, name + 'Id', item.id)
-                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
-                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
-                        this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'Details', item.details)
+                        this.$set(this.assemblyForm.detail, name + 'Id', item.id)
+                        this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm.detail, name + 'Code', item.code)
+                        this.$set(this.assemblyForm.detail, name + 'Details', item.details)
                         // 国家名称
-                        this.$set(this.assemblyForm, name + 'CntyName', item.cntyName)
+                        this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
                         // 国家代码
-                        this.$set(this.assemblyForm, name + 'CntyCode', item.cntyCode)
+                        this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
                     }
                 }
             }

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

@@ -9,7 +9,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">ERNNO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediErnno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediErnno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写ERNNO" ></el-input>
@@ -20,7 +20,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">VAENO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediVaeno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写VAENO" ></el-input>
@@ -33,7 +33,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">TACNO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediTacno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediTacno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写TACNO" ></el-input>
@@ -44,7 +44,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEMAL</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediVaeno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写IEMAL" ></el-input>
@@ -76,7 +76,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEIEC</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediIeiec"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIeiec"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写IEIEC" ></el-input>
@@ -87,7 +87,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEGSTIN</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediIegstin"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIegstin"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请填写IEGSTIN" ></el-input>

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

@@ -220,7 +220,7 @@
                         <el-col :span="12">
                             <el-form-item :label="`${assemblyForm.serviceTerms} 客户名称`" prop="hNotify2CnName">
                                 <search-query :datalist="inttraData"
-                                    :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]" :filterable="true"
+                                    :selectValue="assemblyForm.detail[`inttra${inttraTitle}CorpName`]" :filterable="true"
                                     :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                                     :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                     :placeholder="`请选择${assemblyForm.serviceTerms} 客户名称`"
@@ -233,7 +233,7 @@
                         <el-col :span="12">
                             <el-form-item :label="`${assemblyForm.serviceTerms} 客户地址`">
                                 <el-input type="age" style="width: 100%;"
-                                    v-model="assemblyForm[`inttra${inttraTitle}CorpAddr`]" size="small" autocomplete="off"
+                                    v-model="assemblyForm.detail[`inttra${inttraTitle}CorpAddr`]" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入${assemblyForm.serviceTerms} 客户地址`"></el-input>
                             </el-form-item>
@@ -241,7 +241,7 @@
                         <el-col :span="12">
                             <el-form-item :label="`${assemblyForm.serviceTerms} 客户联系人`">
                                 <el-input type="age" style="width: 100%;"
-                                    v-model="assemblyForm[`inttra${inttraTitle}CorpContacts`]" size="small"
+                                    v-model="assemblyForm.detail[`inttra${inttraTitle}CorpContacts`]" size="small"
                                     autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入${assemblyForm.serviceTerms} 客户联系人`"></el-input>
                             </el-form-item>
@@ -249,7 +249,7 @@
                         <el-col :span="12">
                             <el-form-item :label="`${assemblyForm.serviceTerms} 客户联系人电话`">
                                 <el-input type="age" style="width: 100%;"
-                                    v-model="assemblyForm[`inttra${inttraTitle}CorpTel`]" size="small" autocomplete="off"
+                                    v-model="assemblyForm.detail[`inttra${inttraTitle}CorpTel`]" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入${assemblyForm.serviceTerms} 客户联系人电话`"></el-input>
                             </el-form-item>
@@ -431,10 +431,10 @@ export default {
             else if (inttraArr.indexOf(name) != -1) {
                 for (let item of this.inttraData) {
                     if (item.cnName == value) {
-                        this.$set(this.assemblyForm, `inttra${this.inttraTitle}CorpName`, item.cnName)
-                        this.$set(this.assemblyForm, `inttra${this.inttraTitle}CorpAddr`, item.cnAddr)
-                        this.$set(this.assemblyForm, `inttra${this.inttraTitle}CorpContacts`, item.attnName)
-                        this.$set(this.assemblyForm, `inttra${this.inttraTitle}CorpTel`, item.attnTel)
+                        this.$set(this.assemblyForm.detail, `inttra${this.inttraTitle}CorpName`, item.cnName)
+                        this.$set(this.assemblyForm.detail, `inttra${this.inttraTitle}CorpAddr`, item.cnAddr)
+                        this.$set(this.assemblyForm.detail, `inttra${this.inttraTitle}CorpContacts`, item.attnName)
+                        this.$set(this.assemblyForm.detail, `inttra${this.inttraTitle}CorpTel`, item.attnTel)
                     }
                 }
             }

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

@@ -194,7 +194,7 @@
                             <span style="color: #1e9fff">MB/L 发货人</span>
                         </span>
                         <search-query :datalist="mshipperData"
-                                      :selectValue="assemblyForm.mshipperCnName"
+                                      :selectValue="assemblyForm.detail.mshipperCnName"
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
@@ -208,7 +208,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mshipperDetails" >
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mshipperDetails"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mshipperDetails"
                                       size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled" rows="4"
                                       clearable placeholder="发货人提单描述" ></el-input>
@@ -221,7 +221,7 @@
                             <span style="color: #1e9fff">MB/L 收货人</span>
                         </span>
                         <search-query :datalist="mconsigneeData"
-                                      :selectValue="assemblyForm.mconsigneeCnName"
+                                      :selectValue="assemblyForm.detail.mconsigneeCnName"
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
@@ -235,7 +235,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mconsigneeCntyName" >
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mconsigneeCntyName"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mconsigneeCntyName"
                                       size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled" rows="4"
                                       clearable placeholder="发货人提单描述" ></el-input>
@@ -248,7 +248,7 @@
                             <span style="color: #1e9fff">MB/L 通知人</span>
                         </span>
                         <search-query :datalist="mnotifyData"
-                                      :selectValue="assemblyForm.mnotifyCnName"
+                                      :selectValue="assemblyForm.detail.mnotifyCnName"
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
@@ -262,7 +262,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mnotifyCntyName" >
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotifyCntyName"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotifyCntyName"
                                       size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled" rows="4"
                                       clearable placeholder="通知人提单描述" ></el-input>
@@ -275,7 +275,7 @@
                             <span style="color: #1e9fff">第二通知人</span>
                         </span>
                         <search-query :datalist="mnotify2Data"
-                                      :selectValue="assemblyForm.mnotify2CnName"
+                                      :selectValue="assemblyForm.detail.mnotify2CnName"
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
@@ -289,7 +289,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mnotify2Details" >
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotify2Details"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotify2Details"
                                       size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled" rows="4"
                                       clearable placeholder="第二通知人提单描述" ></el-input>
@@ -414,15 +414,15 @@
                 else if (arr.indexOf(name) != -1) {
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
-                            this.$set(this.assemblyForm,name + 'Id',item.id)
-                            this.$set(this.assemblyForm,name + 'CnName',item.cnName)
-                            this.$set(this.assemblyForm,name + 'EnName',item.enName)
-                            this.$set(this.assemblyForm,name + 'Code',item.code)
-                            this.$set(this.assemblyForm,name + 'Details',item.details)
+                            this.$set(this.assemblyForm.detail,name + 'Id',item.id)
+                            this.$set(this.assemblyForm.detail,name + 'CnName',item.cnName)
+                            this.$set(this.assemblyForm.detail,name + 'EnName',item.enName)
+                            this.$set(this.assemblyForm.detail,name + 'Code',item.code)
+                            this.$set(this.assemblyForm.detail,name + 'Details',item.details)
                             // 国家名称
-                            this.$set(this.assemblyForm,name + 'CntyName',item.cntyName)
+                            this.$set(this.assemblyForm.detail,name + 'CntyName',item.cntyName)
                             // 国家代码
-                            this.$set(this.assemblyForm,name + 'CntyCode',item.cntyCode)
+                            this.$set(this.assemblyForm.detail,name + 'CntyCode',item.cntyCode)
                         }
                     }
                 }

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

@@ -380,7 +380,8 @@ export default {
                 podEnName:'',
                 podNamePrint:'',
                 destinationName:'',
-                destinationNamePrint:''
+                destinationNamePrint:'',
+                detail:{}
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -412,7 +413,8 @@ export default {
                 podEnName:'',
                 podNamePrint:'',
                 destinationName:'',
-                destinationNamePrint:''
+                destinationNamePrint:'',
+                detail:{}
             },
             // 循环的配置
             basicData: {
@@ -442,7 +444,6 @@ export default {
                             label: "客户OP", // 客户联系人姓名 电话和邮箱带出来，可以修改 往来单位接口 需要传一个客户名称的值过去
                             prop: "corpAttnName",
                             text: "姓名",
-                            allowCreate: true,
                             type: 'select',
                             dicData: [],
                             span: 10,
@@ -992,13 +993,16 @@ export default {
                     // 航线带出往来单位的优势航线
                     this.$set(this.form, 'lineCnName', this.$refs.bcorps[0].selectionList[0].advantageRoute)
                     // 带出发货人数据
-                    this.$set(this.form, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
-                    this.$set(this.form, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
-                    this.$set(this.form, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
-                    this.$set(this.form, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
-                    this.$set(this.form, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
-                    this.$set(this.form, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
-                    this.$set(this.form, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.$set(this.form.detail, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
+                    this.$set(this.form.detail, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
+                    this.$set(this.form.detail, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
+                    this.$set(this.form.detail, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
+                    this.$set(this.form.detail, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
+                    this.$set(this.form.detail, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
+                    this.$set(this.form.detail, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.columnforfun('corpAttnName').disabled = false
+                    this.columnforfun('corpAttnTel').disabled = false
+                    this.columnforfun('corpAttnEmail').disabled = false
                 } else {
                     console.log('详情确认')
                     this.$refs.bcorps[0].$refs.detail.submitForm()
@@ -1406,31 +1410,13 @@ export default {
                         msgs.push('所属团队')
                     }
                     for (let item of this.form.feeCenterListD) {
-                        if (!item.corpId) {
-                            msgs.push(`应收序号${item.$index + 1}往来单位`)
-                        }
-                        if (!item.feeId) {
-                            msgs.push(`应收序号${item.$index + 1}费用简称`)
-                        }
-                        if (!item.elementsCode) {
-                            msgs.push(`应收序号${item.$index + 1}核算要素`)
-                        }
-                        if (!item.curCode) {
-                            msgs.push(`应收序号${item.$index + 1}币种`)
+                        if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                            msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
                         }
                     }
                     for (let item of this.form.feeCenterListC) {
-                        if (!item.corpId) {
-                            msgs.push(`应付序号${item.$index + 1}往来单位`)
-                        }
-                        if (!item.feeId) {
-                            msgs.push(`应付序号${item.$index + 1}费用简称`)
-                        }
-                        if (!item.elementsCode) {
-                            msgs.push(`应付序号${item.$index + 1}核算要素`)
-                        }
-                        if (!item.curCode) {
-                            msgs.push(`应付序号${item.$index + 1}币种`)
+                        if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                            msgs.push(`应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
                         }
                     }
                     if (msgs.length > 0) {
@@ -1769,7 +1755,7 @@ export default {
             if (status == 'toAddEdit') {
                 this.$emit(status)
             }
-
+            this.oldForm = this.deepClone(this.form);
         },
         // tbas切换
         handleClick(tba, event) {
@@ -1915,7 +1901,6 @@ export default {
                         if (this.form.corpCnName == e.cnName)
                             this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                     })
-                    this.oldForm = this.deepClone(this.form);
                 })
             }
 

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

@@ -10,7 +10,7 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hshipperData" :selectValue="assemblyForm.hshipperCnName"
+                                    <search-query :datalist="hshipperData" :selectValue="assemblyForm.detail.hshipperCnName"
                                         :filterable="true" :clearable="true" :remote="true" :addIf="true" :tableIf="false"
                                         :disabled="detailData.seeDisabled"
                                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择发货人"
@@ -20,7 +20,7 @@
                                     </search-query>
                                 </el-col>
                                 <el-col :span="8">
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.hshipperCntyName"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hshipperCntyName"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                         placeholder="发货人"></el-input>
                                 </el-col>
@@ -28,7 +28,7 @@
                         </el-form-item>
                         <div style="margin-top: 4px">
                             <el-form-item label="" prop="hshipperDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hshipperDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hshipperDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
                                     placeholder="请输入发货人提单描述" @blur="textareaBlur('hshipperDetails')"></el-input>
                             </el-form-item>
@@ -39,7 +39,7 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hconsigneeData" :selectValue="assemblyForm.hconsigneeCnName"
+                                    <search-query :datalist="hconsigneeData" :selectValue="assemblyForm.detail.hconsigneeCnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
                                         placeholder="请选择收货人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -50,7 +50,7 @@
                                 </el-col>
                                 <el-col :span="4">
                                     <span style="padding-left: 10px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.hconsigneeCntyName"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hconsigneeCntyName"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                         placeholder="收货人"></el-input>
                                 </el-col>
@@ -63,7 +63,7 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hconsigneeDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hconsigneeDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hconsigneeDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
                                     placeholder="请输入收货人提单描述" @blur="textareaBlur('hconsigneeDetails')"></el-input>
                             </el-form-item>
@@ -74,7 +74,7 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hnotifyData" :selectValue="assemblyForm.hnotifyCnName"
+                                    <search-query :datalist="hnotifyData" :selectValue="assemblyForm.detail.hnotifyCnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
                                         placeholder="请选择通知人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -87,7 +87,7 @@
                                     <div
                                         style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
                                         <div style="flex: 4">
-                                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotifyCntyName"
+                                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hnotifyCntyName"
                                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                                 placeholder="通知人"></el-input>
                                         </div>
@@ -101,7 +101,7 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hnotifyDetails">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotifyDetails"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hnotifyDetails"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
                                     placeholder="请输入通知人提单描述" @blur="textareaBlur('hnotifyDetails')"></el-input>
                             </el-form-item>
@@ -656,7 +656,7 @@
                             <!--          :disabled="detailData.seeDisabled || generateBillsfalse"-->
                             <!--          clearable placeholder="请输入联系人" ></el-input>-->
                             <search-query :datalist="cyContactsData" :selectValue="assemblyForm.cyContacts"
-                                :filterable="true" :clearable="true" :allowCreate="true"
+                                :filterable="true" :clearable="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
                                 :buttonIf="false" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
                                 placeholder="联系人" @corpChange="corpChange($event, 'cyContacts')"
@@ -695,7 +695,7 @@
                     <el-row :gutter="20">
                         <el-col :span="12">
                             <el-form-item label="通知人" prop="hnotify2CnName">
-                                <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.hnotify2CnName"
+                                <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.detail.hnotify2CnName"
                                     :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                     :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                     placeholder="请选择通知人" @remoteMethod="remoteMethod($event, 'hnotify2')"
@@ -706,14 +706,14 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="国家" prop="hnotify2CntyName">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotify2CntyName"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hnotify2CntyName"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="国家"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="提单描述" prop="hnotify2Details">
-                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotify2Details"
+                                <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.hnotify2Details"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                     placeholder="请输入通知人提单描述" @blur="textareaBlur('hnotify2Details')"></el-input>
                             </el-form-item>
@@ -1146,29 +1146,30 @@ export default {
             let cnPorArr = ['pol', 'pod', 'pot']
             if (arr.indexOf(name) != -1) {
                 if (!value) {
-                    console.log(1111)
-                    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', '')
+                    this.$set(this.assemblyForm.detail, name + 'Id', '')
+                    this.$set(this.assemblyForm.detail, name + 'Id', '')
+                    this.$set(this.assemblyForm.detail, name + 'CnName', '')
+                    this.$set(this.assemblyForm.detail, name + 'EnName', '')
+                    this.$set(this.assemblyForm.detail, name + 'Code', '')
+                    this.$set(this.assemblyForm.detail, name + 'Details', '')
+                    this.$set(this.assemblyForm.detail, name + 'CntyName', '')
+                    this.$set(this.assemblyForm.detail, name + 'CntyCode', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
-                        this.$set(this.assemblyForm, name + 'Id', item.id)
-                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
-                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
-                        this.$set(this.assemblyForm, name + 'Code', item.code)
+                        console.log(item.cntyCode,1231231)
+                        this.$set(this.assemblyForm.detail, name + 'Id', item.id)
+                        this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm.detail, name + 'Code', item.code)
                         // this.$set(this.assemblyForm,name + 'Details',item.details)
                         if (!this.assemblyForm[name + 'Details']) {
-                            this.$set(this.assemblyForm, name + 'Details', item.details)
+                            this.$set(this.assemblyForm.detail, name + 'Details', item.details)
                         }
                         // 国家名称
-                        this.$set(this.assemblyForm, name + 'CntyName', item.cntyName)
+                        this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
                         // 国家代码
-                        this.$set(this.assemblyForm, name + 'CntyCode', item.cntyCode)
+                        this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
                     }
                 }
             }
@@ -1480,13 +1481,13 @@ export default {
             if (this.detailData.seeDisabled) {
                 return;
             }
-            this.$set(this.assemblyForm, 'hnotifyId', this.assemblyForm.hconsigneeId)
-            this.$set(this.assemblyForm, 'hnotifyCnName', this.assemblyForm.hconsigneeCnName)
-            this.$set(this.assemblyForm, 'hnotifyEnName', this.assemblyForm.hconsigneeEnName)
-            this.$set(this.assemblyForm, 'hnotifyCode', this.assemblyForm.hconsigneeCode)
-            this.$set(this.assemblyForm, 'hnotifyDetails', this.assemblyForm.hconsigneeDetails)
-            this.$set(this.assemblyForm, 'hnotifyCntyName', this.assemblyForm.hconsigneeCntyName)
-            this.$set(this.assemblyForm, 'hnotifyCntyCode', this.assemblyForm.hconsigneeCntyCode)
+            this.$set(this.assemblyForm.detail, 'hnotifyId', this.assemblyForm.detail.hconsigneeId)
+            this.$set(this.assemblyForm.detail, 'hnotifyCnName', this.assemblyForm.detail.hconsigneeCnName)
+            this.$set(this.assemblyForm.detail, 'hnotifyEnName', this.assemblyForm.detail.hconsigneeEnName)
+            this.$set(this.assemblyForm.detail, 'hnotifyCode', this.assemblyForm.detail.hconsigneeCode)
+            this.$set(this.assemblyForm.detail, 'hnotifyDetails', this.assemblyForm.detail.hconsigneeDetails)
+            this.$set(this.assemblyForm.detail, 'hnotifyCntyName', this.assemblyForm.detail.hconsigneeCntyName)
+            this.$set(this.assemblyForm.detail, 'hnotifyCntyCode', this.assemblyForm.detail.hconsigneeCntyCode)
         },
         // 邮箱跳转
         emailJump(name) {

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

@@ -9,7 +9,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">ERNNO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediErnno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediErnno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入ERNNO" ></el-input>
@@ -20,7 +20,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">VAENO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediVaeno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入VAENO" ></el-input>
@@ -33,7 +33,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">TACNO</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediTacno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediTacno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入TACNO" ></el-input>
@@ -44,7 +44,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEMAL</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediVaeno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入IEMAL" ></el-input>
@@ -76,7 +76,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEIEC</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediIeiec"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIeiec"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入IEIEC" ></el-input>
@@ -87,7 +87,7 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEGSTIN</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.ediIegstin"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIegstin"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入IEGSTIN" ></el-input>

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

@@ -2315,6 +2315,7 @@ export default {
             } else {
                 srcBillId = this.assemblyForm.id
             }
+            console.log(srcBillId)
             const res = await getBunitsPage({ srcBillId })
             this.unitNoData = []
             let boxarr40 = ['40HC', '40GP']

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

@@ -239,7 +239,7 @@
                             <span style="color: #1e9fff">退舱日期</span>
                         </span>
                         <el-date-picker v-model="assemblyForm.bookingWithdrawTime" type="date" style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled"
+                            value-format="yyyy-MM-dd HH:mm" size="small" disabled
                             placeholder="请选择退舱日期">
                         </el-date-picker>
                     </el-form-item>
@@ -359,7 +359,7 @@
                     <el-row v-if="inttraDoorToVisible" :gutter="20">
                         <el-col :span="12">
                             <el-form-item :label="`DOOR TO 客户名称`" prop="hNotify2CnName">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpName`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraDoorToCorpName`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 DOOR TO 客户名称`"
                                     @input="inttraTitleInput($event, 'CorpName')"></el-input>
@@ -367,7 +367,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`DOOR TO 客户地址`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpAddr`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraDoorToCorpAddr`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入${inttraText} 客户地址`"
                                     @input="inttraTitleInput($event, 'CorpAddr')"></el-input>
@@ -375,7 +375,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`DOOR TO 联系人`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpContacts`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraDoorToCorpContacts`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 DOOR TO 联系人`"
                                     @input="inttraTitleInput($event, 'CorpContacts')"></el-input>
@@ -383,7 +383,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`DOOR TO 联系电话`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpTel`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraDoorToCorpTel`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 DOOR TO 联系人电话`"
                                     @input="inttraTitleInput($event, 'CorpTel')"></el-input>
@@ -395,7 +395,7 @@
                     <el-row v-if="inttraToDoorVisible" :gutter="20">
                         <el-col :span="12">
                             <el-form-item :label="`TO DOOR 客户名称`" prop="hNotify2CnName">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpName`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraToDoorCorpName`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 TO DOOR 客户名称`"
                                     @input="inttraTitleInput($event, 'CorpName')"></el-input>
@@ -403,7 +403,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`TO DOOR 客户地址`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpAddr`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraToDoorCorpAddr`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 TO DOOR 客户地址`"
                                     @input="inttraTitleInput($event, 'CorpAddr')"></el-input>
@@ -411,7 +411,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`TO DOOR 联系人`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpContacts`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraToDoorCorpContacts`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 TO DOOR 联系人`"
                                     @input="inttraTitleInput($event, 'CorpContacts')"></el-input>
@@ -419,7 +419,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item :label="`TO DOOR 联系电话`">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpTel`]"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail[`inttraToDoorCorpTel`]"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     :placeholder="`请输入 TO DOOR 联系人电话`"
                                     @input="inttraTitleInput($event, 'CorpTel')"></el-input>

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

@@ -156,7 +156,7 @@
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 发货人</span>
                         </span>
-                        <search-query :datalist="mshipperData" :selectValue="assemblyForm.mshipperCnName" :filterable="true"
+                        <search-query :datalist="mshipperData" :selectValue="assemblyForm.detail.mshipperCnName" :filterable="true"
                             :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                             :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择MB/L 发货人"
                             @remoteMethod="remoteMethod($event, 'mshipper')" @corpChange="corpChange($event, 'mshipper')"
@@ -165,7 +165,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mshipperDetails">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mshipperDetails"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mshipperDetails"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="MB/L 发货人"></el-input>
                         </el-form-item>
@@ -176,7 +176,7 @@
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 收货人</span>
                         </span>
-                        <search-query :datalist="mconsigneeData" :selectValue="assemblyForm.mconsigneeCnName"
+                        <search-query :datalist="mconsigneeData" :selectValue="assemblyForm.detail.mconsigneeCnName"
                             :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                             :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                             placeholder="请选择MB/L 收货人" @remoteMethod="remoteMethod($event, 'mconsignee')"
@@ -185,7 +185,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mconsigneeCntyName">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mconsigneeCntyName"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mconsigneeCntyName"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="MB/L 收货人"></el-input>
                         </el-form-item>
@@ -196,7 +196,7 @@
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 通知人</span>
                         </span>
-                        <search-query :datalist="mnotifyData" :selectValue="assemblyForm.mnotifyCnName" :filterable="true"
+                        <search-query :datalist="mnotifyData" :selectValue="assemblyForm.detail.mnotifyCnName" :filterable="true"
                             :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                             :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择MB/L 通知人"
                             @remoteMethod="remoteMethod($event, 'mnotify')" @corpChange="corpChange($event, 'mnotify')"
@@ -205,7 +205,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mnotifyCntyName">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotifyCntyName"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotifyCntyName"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="MB/L 通知人"></el-input>
                         </el-form-item>
@@ -216,7 +216,7 @@
                         <span slot="label">
                             <span style="color: #1e9fff">第二通知人</span>
                         </span>
-                        <search-query :datalist="mnotify2Data" :selectValue="assemblyForm.mnotify2CnName" :filterable="true"
+                        <search-query :datalist="mnotify2Data" :selectValue="assemblyForm.detail.mnotify2CnName" :filterable="true"
                             :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                             :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择第二通知人"
                             @remoteMethod="remoteMethod($event, 'mnotify2')" @corpChange="corpChange($event, 'mnotify2')"
@@ -225,7 +225,7 @@
                     </el-form-item>
                     <div style="margin-top: 10px">
                         <el-form-item label="" prop="mnotify2Details">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotify2Details"
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotify2Details"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="请输入第二通知人提单描述"></el-input>
                         </el-form-item>
@@ -353,15 +353,15 @@ export default {
             else if (arr.indexOf(name) != -1) {
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
-                        this.$set(this.assemblyForm, name + 'Id', item.id)
-                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
-                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
-                        this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'Details', item.details)
+                        this.$set(this.assemblyForm.detail, name + 'Id', item.id)
+                        this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm.detail, name + 'Code', item.code)
+                        this.$set(this.assemblyForm.detail, name + 'Details', item.details)
                         // 国家名称
-                        this.$set(this.assemblyForm, name + 'CntyName', item.cntyName)
+                        this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
                         // 国家代码
-                        this.$set(this.assemblyForm, name + 'CntyCode', item.cntyCode)
+                        this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
                     }
                 }
             }

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

@@ -409,6 +409,7 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
+                detail: {}
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -446,6 +447,7 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
+                detail: {}
             },
             // 循环的配置
             basicData: {
@@ -798,6 +800,7 @@ export default {
                             return false
                         }
                     })
+                    console.log(arr, 12345)
                     // 判断是否有温度
                     if (arr[0]) {
                         // 判断之前是否是冻货
@@ -1009,7 +1012,8 @@ export default {
                         if (item.name == this.form.operatorName) {
                             this.$set(this.form, 'accDeptName', item.deptName)
                             this.$set(this.form, 'accDept', item.deptId)
-                            this.$set(this.form, 'operatorDept', item.deptId)
+                            console.log(item.deptId.split(',').pop())
+                            this.$set(this.form, 'operatorDept', item.deptId.split(',').pop())
                             this.$set(this.form, 'operatorDeptName', item.deptId)
                         }
                     }
@@ -1092,10 +1096,10 @@ export default {
                 userGetList(1, 10, { roleId: '业务员' }).then(res => {
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
-            }else{
+            } else {
                 userGetList(1, 10, { account }).then(res => {
                     this.columnforfun('srcCnName').dicData = res.data.data.records
-                }) 
+                })
             }
 
         },
@@ -1153,13 +1157,16 @@ export default {
                     // 航线带出往来单位的优势航线
                     this.$set(this.form, 'lineCnName', this.$refs.bcorps[0].selectionList[0].advantageRoute)
                     // 带出发货人数据
-                    this.$set(this.form, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
-                    this.$set(this.form, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
-                    this.$set(this.form, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
-                    this.$set(this.form, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
-                    this.$set(this.form, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
-                    this.$set(this.form, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
-                    this.$set(this.form, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.$set(this.form.detail, 'hshipperId', this.$refs.bcorps[0].selectionList[0].id)
+                    this.$set(this.form.detail, 'hshipperCnName', this.$refs.bcorps[0].selectionList[0].cnName)
+                    this.$set(this.form.detail, 'hshipperEnName', this.$refs.bcorps[0].selectionList[0].enName)
+                    this.$set(this.form.detail, 'hshipperCode', this.$refs.bcorps[0].selectionList[0].code)
+                    this.$set(this.form.detail, 'hshipperDetails', this.$refs.bcorps[0].selectionList[0].details)
+                    this.$set(this.form.detail, 'hshipperCntyName', this.$refs.bcorps[0].selectionList[0].cntyName)
+                    this.$set(this.form.detail, 'hshipperCntyCode', this.$refs.bcorps[0].selectionList[0].cntyCode)
+                    this.columnforfun('corpAttnName').disabled = false
+                    this.columnforfun('corpAttnTel').disabled = false
+                    this.columnforfun('corpAttnEmail').disabled = false
                 } else {
                     console.log('详情确认')
                     console.log(this.$refs.bcorps, 962)
@@ -1180,13 +1187,16 @@ export default {
                     // 航线带出往来单位的优势航线
                     this.$set(this.form, 'lineCnName', this.$refs.bcorps[0].$refs.detail.formData.advantageRoute)
                     // 带出发货人数据
-                    this.$set(this.form, 'hshipperId', this.$refs.bcorps[0].$refs.detail.formData.id)
-                    this.$set(this.form, 'hshipperCnName', this.$refs.bcorps[0].$refs.detail.formData.cnName)
-                    this.$set(this.form, 'hshipperEnName', this.$refs.bcorps[0].$refs.detail.formData.enName)
-                    this.$set(this.form, 'hshipperCode', this.$refs.bcorps[0].$refs.detail.formData.code)
-                    this.$set(this.form, 'hshipperDetails', this.$refs.bcorps[0].$refs.detail.formData.details)
-                    this.$set(this.form, 'hshipperCntyName', this.$refs.bcorps[0].$refs.detail.formData.cntyName)
-                    this.$set(this.form, 'hshipperCntyCode', this.$refs.bcorps[0].$refs.detail.formData.cntyCode)
+                    this.$set(this.form.detail, 'hshipperId', this.$refs.bcorps[0].$refs.detail.formData.id)
+                    this.$set(this.form.detail, 'hshipperCnName', this.$refs.bcorps[0].$refs.detail.formData.cnName)
+                    this.$set(this.form.detail, 'hshipperEnName', this.$refs.bcorps[0].$refs.detail.formData.enName)
+                    this.$set(this.form.detail, 'hshipperCode', this.$refs.bcorps[0].$refs.detail.formData.code)
+                    this.$set(this.form.detail, 'hshipperDetails', this.$refs.bcorps[0].$refs.detail.formData.details)
+                    this.$set(this.form.detail, 'hshipperCntyName', this.$refs.bcorps[0].$refs.detail.formData.cntyName)
+                    this.$set(this.form.detail, 'hshipperCntyCode', this.$refs.bcorps[0].$refs.detail.formData.cntyCode)
+                    this.columnforfun('corpAttnName').disabled = false
+                    this.columnforfun('corpAttnTel').disabled = false
+                    this.columnforfun('corpAttnEmail').disabled = false
                 }
             }
             this.$refs.searchQueryRef[0].corpVisible = false
@@ -1248,7 +1258,7 @@ export default {
                     if (item.name == value) {
                         this.form.operatorName = item.name
                         this.form.operatorId = item.id
-                        this.form.operatorDept = item.deptId
+                        this.form.operatorDept = item.deptId.split(',').pop()
                         this.form.operatorDeptName = item.deptName
                     }
                 }
@@ -1302,7 +1312,7 @@ export default {
                         this.$set(this.form, 'srcId', item.srcId)
                         this.$set(this.form, 'srcCnName', item.srcCnName)
                         this.$set(this.form, 'srcEnName', item.srcEnName)
-                        this.$set(this.form, 'srcDeptId', item.deptId)
+                        this.$set(this.form, 'srcDeptId', item.deptId.split(',').pop())
                         this.$set(this.form, 'srcDeptName', item.deptName)
                         this.columnforfun('srcType').disabled = false
                         this.columnforfun('srcCnName').disabled = false
@@ -1365,7 +1375,7 @@ export default {
                             this.$set(this.form, 'srcId', item.id)
                             this.$set(this.form, 'srcCnName', item.name)
                             this.$set(this.form, 'srcEnName', item.name)
-                            this.$set(this.form, 'srcDeptId', item.deptId)
+                            this.$set(this.form, 'srcDeptId', item.deptId.split(',').pop())
                             this.$set(this.form, 'srcDeptName', item.deptName)
                         } else if (this.form.srcType == 'AGENT') {
                             // 代理
@@ -1614,31 +1624,22 @@ export default {
                         msgs.push('所属团队')
                     }
                     for (let item of this.form.feeCenterListD) {
-                        if (!item.corpId) {
-                            msgs.push(`应收序号${item.$index + 1}往来单位`)
-                        }
-                        if (!item.feeId) {
-                            msgs.push(`应收序号${item.$index + 1}费用简称`)
-                        }
-                        if (!item.elementsId) {
-                            msgs.push(`应收序号${item.$index + 1}核算要素`)
-                        }
-                        if (!item.curCode) {
-                            msgs.push(`应收序号${item.$index + 1}币种`)
+                        if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                            msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
                         }
+                        // if (!item.feeId) {
+                        //     msgs.push(`应收第${item.$index + 1}行费用简称`)
+                        // }
+                        // if (!item.elementsId) {
+                        //     msgs.push(`应收第${item.$index + 1}行核算要素`)
+                        // }
+                        // if (!item.curCode) {
+                        //     msgs.push(`应收第${item.$index + 1}行币种`)
+                        // }
                     }
                     for (let item of this.form.feeCenterListC) {
-                        if (!item.corpId) {
-                            msgs.push(`应付序号${item.$index + 1}往来单位`)
-                        }
-                        if (!item.feeId) {
-                            msgs.push(`应付序号${item.$index + 1}费用简称`)
-                        }
-                        if (!item.elementsId) {
-                            msgs.push(`应付序号${item.$index + 1}核算要素`)
-                        }
-                        if (!item.curCode) {
-                            msgs.push(`应付序号${item.$index + 1}币种`)
+                        if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                            msgs.push(`应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
                         }
                     }
                     if (msgs.length > 0) {
@@ -2007,6 +2008,7 @@ export default {
             if (status == 'toAddEdit') {
                 this.$emit(status)
             }
+            this.oldForm = this.deepClone(this.form);
         },
         // tbas切换
         handleClick(tba, event) {
@@ -2030,171 +2032,7 @@ export default {
             billsListAll({ masterId }).then(res => {
                 this.billsListAllData = res.data.data
             })
-        },
-
-
-        // 下拉 把拼接的拆分
-        searchSplit() {
-            // 发货人
-            if (this.form.hshipperCnName) {
-                this.form.hshipperCnName = this.form.hshipperCnName.split(' - ')[0]
-            }
-            // 收货人
-            if (this.form.hconsigneeCnName) {
-                this.form.hconsigneeCnName = this.form.hconsigneeCnName.split(' - ')[0]
-            }
-            // 通知人
-            if (this.form.hnotifyCnName) {
-                this.form.hnotifyCnName = this.form.hnotifyCnName.split(' - ')[0]
-            }
-            // 第二通知人
-            if (this.form.hnotify2CnName) {
-                this.form.hnotify2CnName = this.form.hnotify2CnName.split(' - ')[0]
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                this.form.coloaderCnName = this.form.coloaderCnName.split(' - ')[0]
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                this.form.carrierCnName = this.form.carrierCnName.split(' - ')[0]
-            }
-            // 收货地
-            if (this.form.placeReceiptName) {
-                this.form.placeReceiptName = this.form.placeReceiptName.split(' - ')[0]
-                this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint.split(' - ')[0]
-            }
-            // 装货港
-            if (this.form.polEnName) {
-                this.form.polEnName = this.form.polEnName.split(' - ')[0]
-                this.form.polNamePrint = this.form.polNamePrint.split(' - ')[0]
-            }
-            // 卸货港
-            if (this.form.podEnName) {
-                this.form.podEnName = this.form.podEnName.split(' - ')[0]
-                this.form.podNamePrint = this.form.podNamePrint.split(' - ')[0]
-            }
-            // 目的地
-            if (this.form.destinationName) {
-                this.form.destinationName = this.form.destinationName.split(' - ')[0]
-                this.form.destinationNamePrint = this.form.destinationNamePrint.split(' - ')[0]
-            }
-            // 交货地
-            if (this.form.placeDeliveryName) {
-                this.form.placeDeliveryName = this.form.placeDeliveryName.split(' - ')[0]
-                this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint.split(' - ')[0]
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName.split(' - ')[0]
-                this.form.potNamePrint = this.form.potNamePrint.split(' - ')[0]
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
-            }
-            // 客户名称
-            if (this.form.corpCnName) {
-                this.form.corpCnName = this.form.corpCnName.split(' - ')[0]
-            }
-
-        },
-        // 下拉 中文名称和编号拼接
-        searchMontage() {
-            // 发货人
-            if (this.form.hshipperCnName) {
-                this.form.hshipperCnName = this.form.hshipperCnName + ' - ' + this.form.hshipperCode
-            }
-            // 收货人
-            if (this.form.hconsigneeCnName) {
-                this.form.hconsigneeCnName = this.form.hconsigneeCnName + ' - ' + this.form.hconsigneeCode
-            }
-            // 通知人
-            if (this.form.hnotifyCnName) {
-                this.form.hnotifyCnName = this.form.hnotifyCnName + ' - ' + this.form.hnotifyCode
-            }
-            // 第二通知人
-            if (this.form.hnotify2CnName) {
-                this.form.hnotify2CnName = this.form.hnotify2CnName + ' - ' + this.form.hnotify2Code
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1, 10, { cnName: this.form.coloaderCnName, status: 0, corpTypeName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.coloaderCnName == e.cnName) {
-                            this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + e.code
-                        }
-                    })
-                    // this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
-                })
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                let corpTypeName = '船公司'
-                getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, status: 0, corpTypeName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.carrierCnName == e.cnName) {
-                            this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
-                        }
-                    })
-                    // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
-                })
-                // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
-            }
-            // 收货地
-            if (this.form.placeReceiptName) {
-                this.form.placeReceiptName = this.form.placeReceiptName + ' - ' + this.form.placeReceiptCode
-                this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint + ' - ' + this.form.placeReceiptCode
-            }
-            // 装货港
-            if (this.form.polEnName) {
-                this.form.polEnName = this.form.polEnName + ' - ' + this.form.polCode
-                this.form.polNamePrint = this.form.polNamePrint + ' - ' + this.form.polCode
-            }
-            // 卸货港
-            if (this.form.podEnName) {
-                this.form.podEnName = this.form.podEnName + ' - ' + this.form.podCode
-                this.form.podNamePrint = this.form.podNamePrint + ' - ' + this.form.podCode
-            }
-            // 目的地
-            if (this.form.destinationName) {
-                this.form.destinationName = this.form.destinationName + ' - ' + this.form.destinationCode
-                this.form.destinationNamePrint = this.form.destinationNamePrint + ' - ' + this.form.destinationCode
-            }
-            // 交货地
-            if (this.form.placeDeliveryName) {
-                this.form.placeDeliveryName = this.form.placeDeliveryName + ' - ' + this.form.placeDeliveryCode
-                this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint + ' - ' + this.form.placeDeliveryCode
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName + ' - ' + this.form.potCode
-                this.form.potNamePrint = this.form.potNamePrint + ' - ' + this.form.potCode
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
-                    res.data.data.records.forEach(e => {
-                        if (this.form.vesselCnName == e.cnName) {
-                            this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
-                        }
-                    })
-                })
-            }
-            // 客户名称
-            if (this.form.corpCnName) {
-                getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.corpCnName == e.cnName) {
-                            this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
-                        }
-                    })
-                    this.oldForm = this.deepClone(this.form);
-                })
-            }
-        },
+        }
     },
 }
 
@@ -2239,7 +2077,7 @@ export default {
 }
 
 ::v-deep .el-tabs__header {
-    margin: 0 0 5px;
+    margin: 0 05px;
 }
 
 .isShow {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -347,13 +347,13 @@
                     <el-col :span="4">
                         <div class="bottomFlex" style="color: #81B337">
                             <span>应收CNY:</span>
-                            <span class="weightnum">${{ form.amountDr || 0 }}元</span>
+                            <span class="weightnum">￥{{ form.amountDr || 0 }}元</span>
                         </div>
                     </el-col>
                     <el-col :span="4">
                         <div class="bottomFlex" style="color: #6BBCD1">
                             <span>应付CNY:</span>
-                            <span class="weightnum">${{ form.amountCr || 0 }}元</span>
+                            <span class="weightnum">￥{{ form.amountCr || 0 }}元</span>
                         </div>
                     </el-col>
                     <el-col :span="4">

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -2434,9 +2434,7 @@ export default {
                             return this.$message.error("箱信息:" + (!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.number ? "件数," : '') + (!row.netWeight ? "净重," : '') + (!row.amount ? "总金额" : '') + "不能为空");
                         }
                     }
-                    console.log(1111)
                     if (this.$refs.feeInfo.submitValidate()) {
-                        console.log(22222)
                         const loading = this.$loading({
                             lock: true,
                             text: '加载中',

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -1174,23 +1174,28 @@ export default {
                 column: [
                     {
                         label: '户头',
-                        prop: 'account'
+                        prop: 'account',
+                        overHidden: true,
                     },
                     {
                         label: '账号',
-                        prop: 'accountNumber'
+                        prop: 'accountNumber',
+                        overHidden: true,
                     },
                     {
                         label: '银行',
-                        prop: 'bank'
+                        prop: 'bank',
+                        overHidden: true,
                     },
                     {
                         label: '金额',
-                        prop: 'amount'
+                        prop: 'amount',
+                        overHidden: true,
                     },
                     {
                         label: '备注',
-                        prop: 'remarks'
+                        prop: 'remarks',
+                        overHidden: true,
                     }
                 ]
             },
@@ -1203,23 +1208,28 @@ export default {
                 column: [
                     {
                         label: '开票抬头',
-                        prop: 'invoiceHeader'
+                        prop: 'invoiceHeader',
+                        overHidden: true,
                     },
                     {
                         label: '开票金额',
-                        prop: 'amount'
+                        prop: 'amount',
+                        overHidden: true,
                     },
                     {
                         label: '税率',
-                        prop: 'taxRate'
+                        prop: 'taxRate',
+                        overHidden: true,
                     },
                     {
                         label: '开票内容',
-                        prop: 'invoiceContent'
+                        prop: 'invoiceContent',
+                        overHidden: true,
                     },
                     {
                         label: '备注',
-                        prop: 'remarks'
+                        prop: 'remarks',
+                        overHidden: true,
                     }
                 ]
             },
@@ -1233,42 +1243,52 @@ export default {
                     {
                         label: '结算单位',
                         prop: "corpName",
+                        overHidden: true,
                     },
                     {
                         label: '合同号',
                         prop: "contractNo",
+                        overHidden: true,
                     },
                     {
                         label: '提单号',
-                        prop: 'billNo'
+                        prop: 'billNo',
+                        overHidden: true,
                     },
                     {
                         label: '金额',
-                        prop: 'amount'
+                        prop: 'amount',
+                        overHidden: true,
                     },
                     {
                         label: '金额(USD)',
-                        prop: 'amountUsd'
+                        prop: 'amountUsd',
+                        overHidden: true,
                     },
                     {
                         label: '汇率',
-                        prop: 'exchangeRate'
+                        prop: 'exchangeRate',
+                        overHidden: true,
                     },
                     {
                         label: '报关单号',
-                        prop: 'customsDeclarationNo'
+                        prop: 'customsDeclarationNo',
+                        overHidden: true,
                     },
                     {
                         label: '日期',
-                        prop: 'date'
+                        prop: 'date',
+                        overHidden: true,
                     },
                     {
                         label: '状态',
-                        prop: 'status'
+                        prop: 'status',
+                        overHidden: true,
                     },
                     {
                         label: '备注',
-                        prop: 'remarks'
+                        prop: 'remarks',
+                        overHidden: true,
                     }
                 ]
             },
@@ -1281,27 +1301,33 @@ export default {
                 column: [
                     {
                         label: '提单号',
-                        prop: 'billNo'
+                        prop: 'billNo',
+                        overHidden: true,
                     },
                     {
                         label: '日期',
-                        prop: 'date'
+                        prop: 'date',
+                        overHidden: true,
                     },
                     {
                         label: '操作人',
-                        prop: 'createUserName'
+                        prop: 'createUserName',
+                        overHidden: true,
                     },
                     {
                         label: '原金额',
-                        prop: 'amount'
+                        prop: 'amount',
+                        overHidden: true,
                     },
                     {
                         label: '修改金额',
-                        prop: 'amountUsd'
+                        prop: 'amountUsd',
+                        overHidden: true,
                     },
                     {
                         label: '备注',
-                        prop: 'remarks'
+                        prop: 'remarks',
+                        overHidden: true,
                     }
                 ]
             },