修改禅道1963 轮胎账务管理

src/api/iosBasicData/reports.js

@@ -24,7 +24,7 @@ export const reportsDetail = (id) => {
 
 export const reportsRemove = (ids) => {
   return request({
-    url: '/api/blade-los/reports/remove',
+    url: '/api/blade-los/reportslog/remove',
     method: 'post',
     params: {
       ids,

src/components/iosbasic-data/searchquery.vue

@@ -10,8 +10,14 @@
                     <el-option v-for="item in datalist" :key="item[forParameter.key]" :label="item[forParameter.label]"
                         :value="item[forParameter.value]"
                         :disabled="item[forParameter.disabled] ? item[forParameter.disabled] == disabledStatus : false">
-                        <span style="float: left">{{ item[forParameter.label] }}</span>
-                        <span v-if="desc" style="float: right; color: #8492a6; font-size: 13px">{{ item[forParameter.desc]}}</span>
+                        <span v-if="!joinData" style="float: left">{{ item[forParameter.label] }}</span>
+                        <span v-if="joinData" style="float: left">
+                           <!-- <span v-if="joinType==1">{{ item[forParameter.short] }}----{{  item[forParameter.label] }}</span> -->
+                           <span>{{ item[forParameter.label] }} - {{  item[forParameter.short] }}</span>
+                        </span>
+                        
+                        <span v-if="desc" style="float: right; color: #8492a6; font-size: 13px">{{
+                            item[forParameter.desc]}}</span>
                     </el-option>
                 </el-select>
             </div>
@@ -69,7 +75,7 @@ export default {
                 label: 'label',
                 value: 'value',
                 disabled: false,
-                desc:'desc'
+                desc: 'desc'
             }
         },
         // 两个按钮是否显示
@@ -149,7 +155,15 @@ export default {
         desc: {
             type: Boolean,
             default: false
-        }
+        },
+        joinData: {
+            type: Boolean,
+            default: false
+        },
+        joinType: {
+            type: Number,
+            default: 1
+        },
     },
     watch: {
         // // 监听
@@ -174,7 +188,7 @@ export default {
         corpFocus() {
             this.$emit('corpFocus')
         },
-        corpClear(){
+        corpClear() {
             this.$emit('corpClear')
         },
         // 下拉change
@@ -233,4 +247,5 @@ export default {
     background-image: none;
     background-color: #FFF;
     border-color: #EBEEF5;
-}</style>
+}
+</style>

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

@@ -1499,6 +1499,7 @@ export default {
             // 多选集合转换成字符串赋值
             this.form.comprehensive = multiArr.join(',')
             // 费用 收 赋值数据
+            this.form.shortName=this.form.corpCnName.split('-')[1]
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = 'D'
                 row.sort = Number(index) + 1

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

@@ -1487,6 +1487,7 @@ export default {
             // 多选集合转换成字符串赋值
             this.form.comprehensive = multiArr.join(',')
             // 费用 收 赋值数据
+            this.form.shortName=this.form.corpCnName.split('-')[1]
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = 'D'
                 row.sort = Number(index) + 1

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

@@ -41,7 +41,8 @@
         <!--添加编辑弹窗-->
         <el-dialog title="单证操作" :close-on-click-modal="false" :visible.sync="documentVisible" append-to-body width="60%"
             :before-close="corpTypeClose">
-            <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'" :documentForm="documentForm"></Dispatch-Notice>
+            <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'"
+                :documentForm="documentForm"></Dispatch-Notice>
             <Purchase-Notice v-else-if="businesstypeData.reportsType == 'RHTZ'"
                 :documentForm="documentForm"></Purchase-Notice>
             <BillofLadingDetails v-else-if="businesstypeData.reportsType == 'TDXQ'" :documentForm="documentForm">
@@ -91,7 +92,7 @@ import PurchaseNotice from "@/views/iosBasicData/OceanFreightImport/bills/assemb
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import BillofLadingDetails
     from "@/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/BillofLadingDetails.vue";
-
+import { dateFormat } from "@/util/date";
 export default {
     components: { BillofLadingDetails, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice },
     data() {
@@ -455,8 +456,24 @@ export default {
 
             }
             obj.printContent = JSON.stringify({
-                data: this.documentForm,
-                // url:this.documenturl
+                data: {
+                    ...this.documentForm,
+                    to: this.documentForm.corpCnName,
+                    attn: this.documentForm.corpAttnName,
+                    fm: this.documentForm.createUserName,
+                    fax: this.documentForm.fax,
+                    cc: this.documentForm.cc,
+                    email: this.documentForm.ematl,
+                    department: this.documentForm.corpAttnName,
+                    operate: this.documentForm.operatorName,
+                    mobilePhone: this.documentForm.mobilePhone,
+                    remarks: this.documentForm.cyRemarks,
+                    contacts: this.documentForm.cyContacts,
+                    deliverylocation: this.documentForm.cyCnName,
+                    shippingAgency: this.documentForm.bookingAgentCnName,
+                    Telephone: this.documentForm.cyTel,
+                    datetime: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss')
+                }
             })
             // 保存
             reportslogSubmit(obj).then(res => {
@@ -534,6 +551,9 @@ export default {
         },
         // 左侧筛选
         nodeClick(data) {
+            this.editData = {}
+            this.documentForm = {}
+            this.businesstypeData = {}
             this.businesstypeData = data
             this.reportslogListfun(this.documentPage, { reportsType: data.reportsType });
         },
@@ -552,6 +572,7 @@ export default {
         corpTypeClose(done) {
             this.editData = {}
             this.documentForm = {}
+            this.businesstypeData = {}
             done();
         },
         // 点击搜索触发

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

@@ -11,10 +11,10 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="placeReceiptData"
-                                        :selectValue="assemblyForm.placeReceiptName" :filterable="true"
+                                        :selectValue="assemblyForm.placeReceiptCode" :filterable="true"
                                         :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                         :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :joinData="true" :forParameter="{ key: 'id',short:'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择国外收货地" @remoteMethod="remoteMethod($event, 'placeReceipt')"
                                         @corpChange="corpChange($event, 'placeReceipt')"
                                         @corpFocus="remoteMethod($event, 'placeReceipt')">
@@ -34,10 +34,10 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
+                                    <search-query :datalist="polData" :selectValue="assemblyForm.polCode"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :joinData="true" :forParameter="{ key: 'id',short:'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择装货港" @remoteMethod="remoteMethod($event, 'pol')"
                                         @corpChange="corpChange($event, 'pol')"
                                         @corpFocus="remoteMethod($event, 'pol')">
@@ -58,10 +58,10 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
+                                    <search-query :datalist="podData" :selectValue="assemblyForm.podCode"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :joinData="true" :forParameter="{ key: 'id',short:'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择卸货港" @remoteMethod="remoteMethod($event, 'pod')"
                                         @corpChange="corpChange($event, 'pod')"
                                         @corpFocus="remoteMethod($event, 'pod')">
@@ -82,10 +82,10 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="destinationData"
-                                        :selectValue="assemblyForm.destinationName" :filterable="true" :clearable="true"
+                                        :selectValue="assemblyForm.destinationCode" :filterable="true" :clearable="true"
                                         :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
                                         :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :joinData="true" :forParameter="{ key: 'id',short:'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择目的地" @remoteMethod="remoteMethod($event, 'destination')"
                                         @corpChange="corpChange($event, 'destination')"
                                         @corpFocus="remoteMethod($event, 'destination')">
@@ -121,8 +121,8 @@
                                 <el-col :span="16">
                                     <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' }"
+                                        :tableIf="false" :disabled="detailData.seeDisabled" :joinData="true"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                                         placeholder="请选择发货人" @addJump="addJump('hshipper')"
                                         @remoteMethod="remoteMethod($event, 'hshipper')"
                                         @corpChange="corpChange($event, 'hshipper')"
@@ -153,8 +153,8 @@
                                     <search-query :datalist="hconsigneeData"
                                         :selectValue="assemblyForm.detail.hconsigneeCnName" :filterable="true"
                                         :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
-                                        :addIf="true" :tableIf="false"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        :addIf="true" :tableIf="false" :joinData="true"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                                         placeholder="请选择收货人" @addJump="addJump('hconsignee')"
                                         @remoteMethod="remoteMethod($event, 'hconsignee')"
                                         @corpChange="corpChange($event, 'hconsignee')"
@@ -189,9 +189,9 @@
                             <div>
                                 <el-col :span="16">
                                     <search-query :datalist="hnotifyData" :selectValue="assemblyForm.detail.hnotifyCnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                                         placeholder="请选择通知人" @addJump="addJump('hconsignee')"
                                         @remoteMethod="remoteMethod($event, 'hnotify')"
                                         @corpChange="corpChange($event, 'hnotify')"
@@ -327,9 +327,9 @@
                                     @click="emailJump()">船公司</span>
                             </span>
                             <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
-                                :filterable="true" :clearable="true" :remote="true"
+                                :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择船公司"
+                                :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }" placeholder="请选择船公司"
                                 @remoteMethod="remoteMethod($event, 'carrier')"
                                 @corpChange="corpChange($event, 'carrier')"
                                 @corpFocus="remoteMethod($event, 'carrier')">
@@ -497,9 +497,9 @@
                         <el-col :span="12">
                             <el-form-item label="通知人" prop="hnotify2CnName">
                                 <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.detail.hnotify2CnName"
-                                    :filterable="true" :clearable="true" :remote="true"
+                                    :filterable="true" :clearable="true" :remote="true"  :joinData="true"
                                     :disabled="detailData.seeDisabled" :buttonIf="false"
-                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
+                                    :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
                                     @remoteMethod="remoteMethod($event, 'hnotify2')"
                                     @corpChange="corpChange($event, 'hnotify2')"
                                     @corpFocus="remoteMethod($event, 'hnotify2')">
@@ -888,7 +888,7 @@ export default {
                         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 + 'NamePrint', item.enName.split('-')[1])
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
@@ -898,7 +898,7 @@ export default {
                             this.$set(this.assemblyForm, 'destinationId', item.id)
                             this.$set(this.assemblyForm, 'destinationName', item.enName)
                             this.$set(this.assemblyForm, 'destinationCode', item.code)
-                            this.$set(this.assemblyForm, 'destinationNamePrint', item.enName.split('-')[1])
+                            this.$set(this.assemblyForm, 'destinationNamePrint', item.enName)
                         }
                     }
                 }
@@ -916,7 +916,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                     }
                 }
             }
@@ -1204,76 +1204,52 @@ export default {
         hshipperBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hshipperData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hshipperData = res.data.data.records
             })
         },
         // 获取收货人数据 （往来单位 前四个代理）
         hconsigneeBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hconsigneeData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hconsigneeData = res.data.data.records
             })
         },
         // 获取通知人数据 （往来单位 前四个代理）
         hnotifyBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hnotifyData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hnotifyData = res.data.data.records
             })
         },
         // 获取第二通知人数据 （往来单位 前四个代理）
         hnotify2BcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hnotify2Data = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hnotify2Data = res.data.data.records
             })
         },
         // 收货地数据 （港口表）
         placeReceiptBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.placeReceiptData = res.data.data.records.map(item => {
-                    item.enName = item.code + ' - ' + item.enName
-                    return item
-                })
+                this.placeReceiptData = res.data.data.records
             })
         },
         // 装货港数据
         polBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.polData = res.data.data.records.map(item => {
-                    item.enName = item.code + ' - ' + item.enName
-                    return item
-                })
+                this.polData = res.data.data.records
             })
         },
         // 卸货港数据
         podBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.podData = res.data.data.records.map(item => {
-                    item.enName = item.code + ' - ' + item.enName
-                    return item
-                })
+                this.podData = res.data.data.records
             })
         },
         // 目的地
         destinationBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.destinationData = res.data.data.records.map(item => {
-                    item.enName = item.code + ' - ' + item.enName
-                    return item
-                })
+                this.destinationData = res.data.data.records
             })
         },
         // 包装数据
@@ -1286,19 +1262,13 @@ export default {
         carrierBcorpslistByTypefun(cnName) {
             let corpTypeName = '船公司'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.carrierData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.carrierData = res.data.data.records
             })
         },
         // 船名
         vesselBvesselsListfun(cnName) {
             getBvesselsList(1, 10, { cnName, status: 0 }).then(res => {
-                this.vesselData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.vesselData = res.data.data.records
             })
         },
         // 航线数据

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -1,146 +1,131 @@
 <template>
     <div>
         <el-form :model="documentForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
-            <el-form-item label="TO:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName"
-                          size="small" autocomplete="off" clearable placeholder="TO" >
+            <el-form-item label="TO:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName" size="small"
+                    autocomplete="off" clearable placeholder="TO">
                 </el-input>
             </el-form-item>
-            <el-form-item label="CC:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.cc"
-                          size="small" autocomplete="off" clearable placeholder="CC" >
+            <el-form-item label="CC:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.cc" size="small" autocomplete="off"
+                    clearable placeholder="CC">
                 </el-input>
             </el-form-item>
-            <el-form-item label="FM:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.createUserName"
-                          size="small" autocomplete="off" clearable placeholder="FM" >
+            <el-form-item label="FM:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.createUserName" size="small"
+                    autocomplete="off" clearable placeholder="FM">
                 </el-input>
             </el-form-item>
-            <el-form-item label="提单号码:" prop="corpCnName" >
+            <el-form-item label="提单号码:" prop="corpCnName">
                 <el-row>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.mblno"
-                                  size="small" autocomplete="off" clearable placeholder="MBL NO" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.mblno" size="small"
+                            autocomplete="off" clearable placeholder="MBL NO">
                         </el-input>
                     </el-col>
                     <el-col :span="11">
                         <span style="margin-left: 15px"></span>
-                        <el-date-picker v-model="documentForm.billDate" clearable style="width: 100%"
-                                        type="date" size="small"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="请选择时间">
+                        <el-date-picker v-model="documentForm.billDate" clearable style="width: 100%" type="datetime"
+                            size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                         </el-date-picker>
                     </el-col>
                 </el-row>
             </el-form-item>
-            <el-form-item label="船名/航次:" prop="corpCnName" >
+            <el-form-item label="船名/航次:" prop="corpCnName">
                 <el-row>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName"
-                                  size="small" autocomplete="off" clearable placeholder="船名/航次" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName" size="small"
+                            autocomplete="off" clearable placeholder="船名/航次">
                         </el-input>
                     </el-col>
                     <el-col :span="11">
                         <span style="margin-left: 15px"></span>
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.billNo"
-                                  size="small" autocomplete="off" clearable placeholder="业务编号" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.billNo" size="small"
+                            autocomplete="off" clearable placeholder="业务编号">
                         </el-input>
                     </el-col>
                 </el-row>
             </el-form-item>
-            <el-form-item label="箱量:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr"
-                          size="small" autocomplete="off" clearable placeholder="箱量" >
+            <el-form-item label="箱量:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr" size="small"
+                    autocomplete="off" clearable placeholder="箱量">
                 </el-input>
             </el-form-item>
 
-            <el-form-item label="场站:" prop="corpCnName" >
-                <search-query :datalist="cyData"
-                              :selectValue="documentForm.cyCnName"
-                              :filterable="true"
-                              :clearable="true"
-                              :remote="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              placeholder="请选择场站"
-                              @remoteMethod="cyBcorpslistByType"
-                              @corpChange="corpChange($event,'cy')"
-                              @corpFocus="cyBcorpslistByType" >
+            <el-form-item label="场站:" prop="corpCnName">
+                <search-query :datalist="cyData" :selectValue="documentForm.cyCnName" :filterable="true"
+                    :clearable="true" :remote="true" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
+                    @remoteMethod="cyBcorpslistByType" @corpChange="corpChange($event, 'cy')"
+                    @corpFocus="cyBcorpslistByType">
                 </search-query>
             </el-form-item>
             <el-row>
                 <el-col :span="12">
-                    <el-form-item label="联系人:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts"
-                                  size="small" autocomplete="off" clearable placeholder="场站联系人" >
+                    <el-form-item label="联系人:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts" size="small"
+                            autocomplete="off" clearable placeholder="场站联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="联系电话:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel"
-                                  size="small" autocomplete="off" clearable placeholder="场站联系电话" >
+                    <el-form-item label="联系电话:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel" size="small"
+                            autocomplete="off" clearable placeholder="场站联系电话">
                         </el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-form-item label="工厂名称:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryName"
-                          size="small" autocomplete="off" clearable placeholder="工厂名称" >
+            <el-form-item label="工厂名称:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryName" size="small"
+                    autocomplete="off" clearable placeholder="工厂名称">
                 </el-input>
             </el-form-item>
-            <el-form-item label="工厂地址:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryAddress"
-                          size="small" autocomplete="off" clearable placeholder="工厂地址" >
+            <el-form-item label="工厂地址:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryAddress" size="small"
+                    autocomplete="off" clearable placeholder="工厂地址">
                 </el-input>
             </el-form-item>
             <el-row>
                 <el-col :span="12">
-                    <el-form-item label="联系人:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系人" >
+                    <el-form-item label="联系人:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts" size="small"
+                            autocomplete="off" clearable placeholder="工厂联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="联系电话:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryTel"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系电话" >
+                    <el-form-item label="联系电话:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryTel" size="small"
+                            autocomplete="off" clearable placeholder="工厂联系电话">
                         </el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-form-item label="派车时间:" prop="corpCnName" >
-                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择派车时间">
+            <el-form-item label="派车时间:" prop="corpCnName">
+                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
+                    size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择派车时间">
                 </el-date-picker>
             </el-form-item>
-            <el-form-item label="费用确认:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation"
-                          size="small" autocomplete="off" clearable placeholder="费用确认" >
+            <el-form-item label="费用确认:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation" size="small"
+                    autocomplete="off" clearable placeholder="费用确认">
                 </el-input>
             </el-form-item>
             <div style="display: flex;align-items: center;margin-left: 25px">
                 <span style="width: 60px;text-align: right;">请于</span>
-                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择时间">
+                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                 </el-date-picker>
                 <span>前到达指定工厂,并于</span>
-                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择时间">
+                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
+                    value-format="yyyy-MM-dd HH:mm:ss"  placeholder="请选择时间">
                 </el-date-picker>
                 <span>前回场站</span>
             </div>
-            <el-form-item label="备注:" prop="remarks" >
-                <el-input type="textarea" style="width: 100%;" v-model="documentForm.bookingRemarks"
-                          size="small" autocomplete="off" rows="3"
-                          clearable placeholder="备注"></el-input>
+            <el-form-item label="备注:" prop="remarks">
+                <el-input type="textarea" style="width: 100%;" v-model="documentForm.bookingRemarks" size="small"
+                    autocomplete="off" rows="3" clearable placeholder="备注"></el-input>
             </el-form-item>
         </el-form>
     </div>
@@ -148,48 +133,48 @@
 
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 
 export default {
-    components: {SearchQuery},
+    components: { SearchQuery },
     data() {
         return {
-            cyData:[], // 场站
+            cyData: [], // 场站
         }
     },
-    props:{
-        documentForm:{
-            type:Object,
-            default:{}
+    props: {
+        documentForm: {
+            type: Object,
+            default: {}
         }
     },
-    methods:{
-        corpChange(value,name) {
+    methods: {
+        corpChange(value, name) {
             if (name == 'cy') {
                 if (!value) {
-                    this.$set(this.documentForm,'cyId','')
-                    this.$set(this.documentForm,'cyCode','')
-                    this.$set(this.documentForm,'cyCnName','')
-                    this.$set(this.documentForm,'cyEnName','')
-                    this.$set(this.documentForm,'cyContacts','')
-                    this.$set(this.documentForm,'cyTel','')
+                    this.$set(this.documentForm, 'cyId', '')
+                    this.$set(this.documentForm, 'cyCode', '')
+                    this.$set(this.documentForm, 'cyCnName', '')
+                    this.$set(this.documentForm, 'cyEnName', '')
+                    this.$set(this.documentForm, 'cyContacts', '')
+                    this.$set(this.documentForm, 'cyTel', '')
                 }
-                for(let item of this.cyData) {
+                for (let item of this.cyData) {
                     if (item.cnName == value) {
-                        this.$set(this.documentForm,'cyId',item.id)
-                        this.$set(this.documentForm,'cyCode',item.code)
-                        this.$set(this.documentForm,'cyCnName',item.cnName)
-                        this.$set(this.documentForm,'cyEnName',item.enName)
-                        this.$set(this.documentForm,'cyContacts',item.contacts)
-                        this.$set(this.documentForm,'cyTel',item.tel)
+                        this.$set(this.documentForm, 'cyId', item.id)
+                        this.$set(this.documentForm, 'cyCode', item.code)
+                        this.$set(this.documentForm, 'cyCnName', item.cnName)
+                        this.$set(this.documentForm, 'cyEnName', item.enName)
+                        this.$set(this.documentForm, 'cyContacts', item.contacts)
+                        this.$set(this.documentForm, 'cyTel', item.tel)
                     }
                 }
             }
         },
         // 获取场站数据
-        cyBcorpslistByType(cnName){
+        cyBcorpslistByType(cnName) {
             let corpTypeName = '场站'
-            getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
+            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
                 this.cyData = res.data.data.records
             })
         },

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -2,16 +2,16 @@
     <el-form :model="documentForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
         <el-row>
             <el-col :span="12">
-                <el-form-item label="TO:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName"
-                              size="small" autocomplete="off" clearable placeholder="TO" >
+                <el-form-item label="TO:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName" size="small"
+                        autocomplete="off" clearable placeholder="TO">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="ATTN:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.corpAttnName"
-                              size="small" autocomplete="off" clearable placeholder="ATTN" >
+                <el-form-item label="ATTN:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.corpAttnName" size="small"
+                        autocomplete="off" clearable placeholder="ATTN">
                     </el-input>
                 </el-form-item>
             </el-col>
@@ -19,195 +19,177 @@
                 <div>贵公司储运之货物:</div>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="件数:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.quantity"
-                              size="small" autocomplete="off" clearable placeholder="件数" >
+                <el-form-item label="件数:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.quantity" size="small"
+                        autocomplete="off" clearable placeholder="件数">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="重量:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.grossWeight"
-                              size="small" autocomplete="off" clearable placeholder="重量" >
+                <el-form-item label="重量:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.grossWeight" size="small"
+                        autocomplete="off" clearable placeholder="重量">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="体积:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.measurement"
-                              size="small" autocomplete="off" clearable placeholder="体积" >
+                <el-form-item label="体积:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.measurement" size="small"
+                        autocomplete="off" clearable placeholder="体积">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="箱量:" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr"
-                              size="small" autocomplete="off" clearable placeholder="请输入箱量" >
+                <el-form-item label="箱量:" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr" size="small"
+                        autocomplete="off" clearable placeholder="请输入箱量">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="目的港:" prop="corpCnName" >
-                    <search-query :datalist="destinationData"
-                                  :selectValue="documentForm.destinationName"
-                                  :filterable="true"
-                                  :clearable="true"
-                                  :remote="true"
-                                  :buttonIf="false"
-                                  :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                  @remoteMethod="destinationBportsListfun"
-                                  @corpChange="corpChange($event,'destinationName')"
-                                  @corpFocus="destinationBportsListfun" >
+                <el-form-item label="目的港:" prop="corpCnName">
+                    <search-query :datalist="destinationData" :selectValue="documentForm.destinationName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
+                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                        @remoteMethod="destinationBportsListfun" @corpChange="corpChange($event, 'destinationName')"
+                        @corpFocus="destinationBportsListfun">
                     </search-query>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="预配船名/航次" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName"
-                              size="small" autocomplete="off" clearable placeholder="预配船名/航次" >
+                <el-form-item label="预配船名/航次" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName" size="small"
+                        autocomplete="off" clearable placeholder="预配船名/航次">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="预计开航日:" prop="corpCnName" >
-                    <el-date-picker v-model="documentForm.etd" clearable style="width: 100%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="选择预计开航日/ETD">
+                <el-form-item label="预计开航日:" prop="corpCnName">
+                    <el-date-picker v-model="documentForm.etd" clearable style="width: 100%" type="datetime"
+                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择预计开航日/ETD">
                     </el-date-picker>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="提单号" prop="corpCnName" >
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.mblno"
-                              size="small" autocomplete="off" clearable placeholder="提单号" >
+                <el-form-item label="提单号" prop="corpCnName">
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.mblno" size="small"
+                        autocomplete="off" clearable placeholder="提单号">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-form-item label="请于:" prop="corpCnName" >
-                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 30%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="请选择时间">
+                <el-form-item label="请于:" prop="corpCnName">
+                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 30%" type="datetime"
+                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                     </el-date-picker>
                     <span style="margin-left: 10px">前将货物送至指定位置</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-form-item label="请于:" prop="corpCnName" >
-                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 30%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="请选择时间">
+                <el-form-item label="请于:" prop="corpCnName">
+                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 30%" type="datetime"
+                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                     </el-date-picker>
                     <span style="margin-left: 10px">前通关</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="截单和VGM截止时间:" prop="corpCnName" label-width="130px">
-                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="请选择截单和VGM截止时间">
+                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%" type="datetime"
+                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择截单和VGM截止时间">
                     </el-date-picker>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="船代:" prop="corpCnName">
-                    <el-input type="age" style="width: 50%;" v-model="documentForm.bookingAgentCnName"
-                              size="small" autocomplete="off" clearable placeholder="船代" >
+                    <el-input type="age" style="width: 50%;" v-model="documentForm.bookingAgentCnName" size="small"
+                        autocomplete="off" clearable placeholder="船代">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="入货地点:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyCnName"
-                              size="small" autocomplete="off" clearable placeholder="请选择入货地点" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyCnName" size="small"
+                        autocomplete="off" clearable placeholder="请选择入货地点">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="集装箱提取检查代码:" prop="corpCnName" label-width="130px">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.containerCheck"
-                              size="small" autocomplete="off" clearable placeholder="集装箱提取检查代码" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.containerCheck" size="small"
+                        autocomplete="off" clearable placeholder="集装箱提取检查代码">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="联系人:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts"
-                              size="small" autocomplete="off" clearable placeholder="联系人" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts" size="small"
+                        autocomplete="off" clearable placeholder="联系人">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="联系电话:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel"
-                              size="small" autocomplete="off" clearable placeholder="联系电话" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel" size="small"
+                        autocomplete="off" clearable placeholder="联系电话">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="REMARKS:" prop="corpCnName">
-                    <el-input type="textarea" style="width: 100%;" v-model="documentForm.cyRemarks"
-                              size="small" autocomplete="off" clearable placeholder="REMARKS" >
+                    <el-input type="textarea" style="width: 100%;" v-model="documentForm.cyRemarks" size="small"
+                        autocomplete="off" clearable placeholder="REMARKS">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="HLCL免费箱使" prop="corpCnName" label-width="95px">
-                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy"
-                              size="small" autocomplete="off" clearable placeholder="HLCL免费箱使" >
+                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
+                        autocomplete="off" clearable placeholder="HLCL免费箱使">
                     </el-input>
                     <span style="margin-left: 10px">天</span>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="部门:" prop="corpCnName">
-                    <tree-select v-model="documentForm.accDeptName" filterable
-                                 :data="departmentData"
-                                 :props="{label: 'title', children:'children'}"
-                                 nodeKey="title"
-                                 size="small"
-                                 :multiple="false"
-                                 placeholder="请选择部门"
-                                 @input="corpChange($event,'department')">
+                    <tree-select v-model="documentForm.accDeptName" filterable :data="departmentData"
+                        :props="{ label: 'title', children: 'children' }" nodeKey="title" size="small" :multiple="false"
+                        placeholder="请选择部门" @input="corpChange($event, 'department')">
                     </tree-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="FAX:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.fax"
-                              size="small" autocomplete="off" clearable placeholder="FAX" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.fax" size="small" autocomplete="off"
+                        clearable placeholder="FAX">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="操作:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.operatorName"
-                              size="small" autocomplete="off" clearable placeholder="操作" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.operatorName" size="small"
+                        autocomplete="off" clearable placeholder="操作">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="EMAIL:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.ematl"
-                              size="small" autocomplete="off" clearable placeholder="EMAIL" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.ematl" size="small"
+                        autocomplete="off" clearable placeholder="EMAIL">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="TEL:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.tel"
-                              size="small" autocomplete="off" clearable placeholder="TEL" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.tel" size="small" autocomplete="off"
+                        clearable placeholder="TEL">
                     </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="手机:" prop="corpCnName">
-                    <el-input type="age" style="width: 100%;" v-model="documentForm.mobilePhone"
-                              size="small" autocomplete="off" clearable placeholder="手机" >
+                    <el-input type="age" style="width: 100%;" v-model="documentForm.mobilePhone" size="small"
+                        autocomplete="off" clearable placeholder="手机">
                     </el-input>
                 </el-form-item>
             </el-col>
@@ -219,53 +201,53 @@
 
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {bportsList} from "@/api/iosBasicData/bports";
-import {getDeptTree} from "@/api/system/dept";
+import { bportsList } from "@/api/iosBasicData/bports";
+import { getDeptTree } from "@/api/system/dept";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 
 export default {
-    components: {TreeSelect, SearchQuery},
-    data(){
+    components: { TreeSelect, SearchQuery },
+    data() {
         return {
-            destinationData:[], // 目的港数据
-            departmentData:[], // 部门
+            destinationData: [], // 目的港数据
+            departmentData: [], // 部门
         }
     },
-    props:{
+    props: {
         // 表单对象
-        documentForm:{
-            type:Object,
-            default:{}
+        documentForm: {
+            type: Object,
+            default: {}
         },
 
     },
     created() {
         this.getLazylistfun()
     },
-    methods:{
-        corpChange(value,name){
+    methods: {
+        corpChange(value, name) {
             if (name == 'destinationName') {
-                for(let item of this.destinationData) {
+                for (let item of this.destinationData) {
                     if (item.enName == value) {
-                        this.$set(this.documentForm,'destinationId',item.id)
-                        this.$set(this.documentForm,'destinationName',item.enName)
-                        this.$set(this.documentForm,'destinationCode',item.code)
-                        this.$set(this.documentForm,'destinationNamePrint',item.enName)
+                        this.$set(this.documentForm, 'destinationId', item.id)
+                        this.$set(this.documentForm, 'destinationName', item.enName)
+                        this.$set(this.documentForm, 'destinationCode', item.code)
+                        this.$set(this.documentForm, 'destinationNamePrint', item.enName)
                     }
                 }
-            }else {
-                this.$set(this.documentForm,name,value)
+            } else {
+                this.$set(this.documentForm, name, value)
             }
         },
         // 目的地
-        destinationBportsListfun(enName){
-            bportsList(1,10,{enName,status: 0}).then(res=>{
+        destinationBportsListfun(enName) {
+            bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.destinationData = res.data.data.records
             })
         },
         // 获取机构管理接口
-        getLazylistfun(){
-            getDeptTree().then(res=>{
+        getLazylistfun() {
+            getDeptTree().then(res => {
                 this.departmentData = res.data.data
             })
         },

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

@@ -79,7 +79,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"-->
@@ -87,8 +88,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 || showLock"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
@@ -117,8 +119,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 || showLock"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
@@ -128,8 +131,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 || showLock"
                                                             :multiple="false" :clearable="false"
                                                             :placeholder="`${item[1].text || ''}`"
@@ -150,8 +154,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 || showLock"
                                                             :buttonIf="false" :forParameter="item[2].forParameter"
                                                             :placeholder="`${item[2].text || ''}`"
@@ -179,7 +184,7 @@
                                                     :filterable="true" :clearable="false" :remote="true"
                                                     :disabled="detailData.seeDisabled || item.disabled || showLock"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
-                                                    :placeholder="`${item.text || ''}`"
+                                                    :joinData="item.joinData" :placeholder="`${item.text || ''}`"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
                                                     @corpChange="corpChange($event, item.prop)"
                                                     @corpFocus="remoteMethod($event, item.prop)"
@@ -190,8 +195,8 @@
                                                     <bcorpstypedefine v-show="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 || showLock"
                                                     :placeholder="item.text || ''"></el-input>
                                             </el-form-item>
@@ -234,8 +239,8 @@
                             </el-tabs>
                         </basic-container>
                         <basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'third'">
-                            <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse" :disabled="showLock"
-                                :detailData="detailData"></formbottom>
+                            <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse"
+                                :disabled="showLock" :detailData="detailData"></formbottom>
                         </basic-container>
                     </div>
                 </el-tab-pane>
@@ -251,8 +256,8 @@
                         :disabled="showLock"></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" :disabled="showLock"
-                        @billsListAllfun="billsListAllfun(form.id)"></Split-list>
+                    <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"
+                        :disabled="showLock" @billsListAllfun="billsListAllfun(form.id)"></Split-list>
                 </el-tab-pane>
             </el-tabs>
         </div>
@@ -372,16 +377,16 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[],
-                placeReceiptName:'',
-                placeReceiptNamePrint:'',
-                polEnName:'',
-                polNamePrint:'',
-                podEnName:'',
-                podNamePrint:'',
-                destinationName:'',
-                destinationNamePrint:'',
-                detail:{}
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                detail: {}
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -405,16 +410,16 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[],
-                placeReceiptName:'',
-                placeReceiptNamePrint:'',
-                polEnName:'',
-                polNamePrint:'',
-                podEnName:'',
-                podNamePrint:'',
-                destinationName:'',
-                destinationNamePrint:'',
-                detail:{}
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                detail: {}
             },
             // 循环的配置
             basicData: {
@@ -427,11 +432,13 @@ export default {
                         dicData: [],
                         disabled: false,
                         buttonIf: true,
+                        joinData: true,
                         slot: 'bcorps',
                         forParameter: {
                             key: 'id',
                             label: 'cnName',
                             value: 'cnName',
+                            short: 'shortName'
                         },
                         rules: [{
                             required: true,
@@ -897,10 +904,7 @@ export default {
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
             getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
-                this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.shortName
-                    return item
-                })
+                this.columnforfun('corpCnName').dicData = res.data.data.records
             })
         },
         // 获取客户联系人 客户OP
@@ -1092,6 +1096,7 @@ export default {
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
+                    this.form.shortName=''
                     // 清空 客户OP
                     this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
@@ -1110,6 +1115,7 @@ export default {
                         this.form.corpEnName = item.enName
                         this.form.corpId = item.id
                         this.form.corpCode = item.code
+                        this.form.shortName = item.shortName
                         // 获取 客户op数据
                         this.getBcorpsattnListfun()
                         // 业务来源参数带出
@@ -1781,142 +1787,16 @@ export default {
             })
         },
 
-
-        // 下拉 把拼接的拆分
-        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]
-            }
-            // 船公司
-            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.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
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                let corpTypeName = '船公司'
-                getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, status: 0, corpTypeName }).then(res => {
-                    // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
-                    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 + ' - ' + 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.vesselCnName) {
-                getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.vesselCnName == e.cnName)
-                            this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
-                    })
-                    // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].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
-                    })
-                })
-            }
-
-
-        },
-
-
     },
 }
 
 </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 +1824,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/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -103,7 +103,7 @@ import BillofLadingDetails
     from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetails.vue";
 import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
-
+import {dateFormat} from "@/util/date";
     export default {
         components: {
             businessReports,
@@ -472,12 +472,29 @@ import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
                     obj.reportsCode = this.businesstypeData.reportsType
                     obj.groupCode = this.businesstypeData.groupCode
                     obj.reportsType = this.businesstypeData.reportsType
-
                 }
                 obj.printContent = JSON.stringify({
-                    data:this.documentForm,
+                    data:{
+                        ...this.documentForm,
+                        to:this.documentForm.corpCnName,
+                        attn:this.documentForm.corpAttnName,
+                        fm:this.documentForm.createUserName,
+                        fax:this.documentForm.fax,
+                        cc:this.documentForm.cc,
+                        email:this.documentForm.ematl,
+                        department:this.documentForm.corpAttnName,
+                        operate:this.documentForm.operatorName,
+                        mobilePhone:this.documentForm.mobilePhone,
+                        remarks:this.documentForm.cyRemarks,
+                        contacts:this.documentForm.cyContacts,
+                        deliverylocation:this.documentForm.cyCnName,
+                        shippingAgency:this.documentForm.bookingAgentCnName,
+                        Telephone:this.documentForm.cyTel,
+                        datetime:dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss')
+                    }
                     // url:this.documenturl
                 })
+                console.log(obj)
                 // 保存
                 reportslogSubmit(obj).then(res=>{
                     if (type) {
@@ -554,6 +571,9 @@ import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
             },
             // 左侧筛选
             nodeClick(data) {
+                this.editData={}
+                this.documentForm={}
+                this.businesstypeData={}
                 this.businesstypeData = data
                 this.reportslogListfun(this.documentPage, {reportsType:data.reportsType});
             },
@@ -570,8 +590,10 @@ import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
             // },
             // 类别弹窗关闭
             corpTypeClose(done) {
+                console.log(1111)
                 this.editData={}
                 this.documentForm={}
+                this.businesstypeData={}
                done();
             },
             // 点击搜索触发

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

@@ -10,27 +10,30 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <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="请选择发货人"
-                                        @addJump="addJump('hshipper')" @remoteMethod="remoteMethod($event, 'hshipper')"
+                                    <search-query :datalist="hshipperData"
+                                        :selectValue="assemblyForm.detail.hshipperCnName" :filterable="true"
+                                        :clearable="true" :remote="true" :addIf="true" :tableIf="false"
+                                        :disabled="detailData.seeDisabled" :joinData="true"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
+                                        placeholder="请选择发货人" @addJump="addJump('hshipper')"
+                                        @remoteMethod="remoteMethod($event, 'hshipper')"
                                         @corpChange="corpChange($event, 'hshipper')"
                                         @corpFocus="remoteMethod($event, 'hshipper')">
                                     </search-query>
                                 </el-col>
                                 <el-col :span="8">
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hshipperCntyName"
-                                        size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="发货人"></el-input>
+                                    <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>
                             </div>
                         </el-form-item>
                         <div style="margin-top: 4px">
                             <el-form-item label="" prop="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-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>
                         </div>
                         <el-form-item label="收货人" prop="hconsigneeCnName">
@@ -39,20 +42,23 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hconsigneeData" :selectValue="assemblyForm.detail.hconsigneeCnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="hconsigneeData"
+                                        :selectValue="assemblyForm.detail.hconsigneeCnName" :filterable="true"
+                                        :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
-                                        placeholder="请选择收货人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                        @addJump="addJump('hconsignee')" @remoteMethod="remoteMethod($event, 'hconsignee')"
+                                        placeholder="请选择收货人" 
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
+                                        @addJump="addJump('hconsignee')"
+                                        @remoteMethod="remoteMethod($event, 'hconsignee')"
                                         @corpChange="corpChange($event, 'hconsignee')"
                                         @corpFocus="remoteMethod($event, 'hconsignee')">
                                     </search-query>
                                 </el-col>
                                 <el-col :span="4">
                                     <span style="padding-left: 10px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.hconsigneeCntyName"
-                                        size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="收货人"></el-input>
+                                    <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>
                                 <el-col :span="4">
                                     <span style="margin-left: 20px"></span>
@@ -63,9 +69,10 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="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-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>
                         </div>
                         <el-form-item label="通知人" prop="hnotifyCnName">
@@ -74,10 +81,12 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hnotifyData" :selectValue="assemblyForm.detail.hnotifyCnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="hnotifyData"
+                                        :selectValue="assemblyForm.detail.hnotifyCnName" :filterable="true"
+                                        :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
-                                        placeholder="请选择通知人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        placeholder="请选择通知人"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                                         @addJump="addJump('hconsignee')" @remoteMethod="remoteMethod($event, 'hnotify')"
                                         @corpChange="corpChange($event, 'hnotify')"
                                         @corpFocus="remoteMethod($event, 'hnotify')">
@@ -87,12 +96,14 @@
                                     <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.detail.hnotifyCntyName"
-                                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                            <el-input type="age" style="width: 100%;"
+                                                v-model="assemblyForm.detail.hnotifyCntyName" size="small"
+                                                autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                                 placeholder="通知人"></el-input>
                                         </div>
                                         <div style="flex: 1;margin-left: 10px">
-                                            <el-button type="primary" icon="el-icon-plus" size="mini" @click="hnotifyClick"></el-button>
+                                            <el-button type="primary" icon="el-icon-plus" size="mini"
+                                                @click="hnotifyClick"></el-button>
                                             <!-- <div class="addbuttonClass" @click="hnotifyClick">+</div> -->
                                         </div>
                                     </div>
@@ -101,9 +112,10 @@
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="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-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>
                         </div>
                     </el-row>
@@ -121,10 +133,11 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="placeReceiptData" :selectValue="assemblyForm.placeReceiptName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="placeReceiptData"
+                                        :selectValue="assemblyForm.placeReceiptCode" :filterable="true"
+                                        :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择收货地"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'placeReceipt')"
                                         @corpChange="corpChange($event, 'placeReceipt')"
                                         @corpFocus="remoteMethod($event, 'placeReceipt')">
@@ -132,9 +145,9 @@
                                 </el-col>
                                 <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeReceiptNamePrint"
-                                        size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="收货地"></el-input>
+                                    <el-input type="age" style="width: 100%;"
+                                        v-model="assemblyForm.placeReceiptNamePrint" size="small" autocomplete="off"
+                                        :disabled="detailData.seeDisabled" clearable placeholder="收货地"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -151,11 +164,13 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="polData" :selectValue="assemblyForm.polCode"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        placeholder="请选择装货港" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
-                                        @remoteMethod="remoteMethod($event, 'pol')" @corpChange="corpChange($event, 'pol')"
+                                        placeholder="请选择装货港"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        @remoteMethod="remoteMethod($event, 'pol')"
+                                        @corpChange="corpChange($event, 'pol')"
                                         @corpFocus="remoteMethod($event, 'pol')">
                                     </search-query>
                                 </el-col>
@@ -181,11 +196,12 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="podData" :selectValue="assemblyForm.podCode"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择卸货港"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
-                                        @remoteMethod="remoteMethod($event, 'pod')" @corpChange="corpChange($event, 'pod')"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        @remoteMethod="remoteMethod($event, 'pod')"
+                                        @corpChange="corpChange($event, 'pod')"
                                         @corpFocus="remoteMethod($event, 'pod')">
                                     </search-query>
                                 </el-col>
@@ -210,10 +226,12 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="destinationData" :selectValue="assemblyForm.destinationName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="destinationData"
+                                        :selectValue="assemblyForm.destinationCode" :filterable="true" :clearable="true"
+                                        :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        placeholder="请选择目的地" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        placeholder="请选择目的地"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'destination')"
                                         @corpChange="corpChange($event, 'destination')"
                                         @corpFocus="remoteMethod($event, 'destination')">
@@ -221,8 +239,8 @@
                                 </el-col>
                                 <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.destinationNamePrint"
-                                        size="small" autocomplete="off"
+                                    <el-input type="age" style="width: 100%;"
+                                        v-model="assemblyForm.destinationNamePrint" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="目的地"></el-input>
                                 </el-col>
@@ -241,10 +259,11 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="placeDeliveryData"
-                                        :selectValue="assemblyForm.placeDeliveryName" :filterable="true" :clearable="true"
-                                        :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
-                                        placeholder="请选择交货地" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                    <search-query :datalist="placeDeliveryData" :joinData="true"
+                                        :selectValue="assemblyForm.placeDeliveryCode" :filterable="true"
+                                        :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                                        :buttonIf="false" placeholder="请选择交货地"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'placeDelivery')"
                                         @corpChange="corpChange($event, 'placeDelivery')"
                                         @corpFocus="remoteMethod($event, 'placeDelivery')">
@@ -252,9 +271,9 @@
                                 </el-col>
                                 <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeDeliveryNamePrint"
-                                        size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="交货地"></el-input>
+                                    <el-input type="age" style="width: 100%;"
+                                        v-model="assemblyForm.placeDeliveryNamePrint" size="small" autocomplete="off"
+                                        :disabled="detailData.seeDisabled" clearable placeholder="交货地"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -271,11 +290,12 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                    <search-query :datalist="potData" :selectValue="assemblyForm.potCode"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
-                                        @remoteMethod="remoteMethod($event, 'pot')" @corpChange="corpChange($event, 'pot')"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        @remoteMethod="remoteMethod($event, 'pot')"
+                                        @corpChange="corpChange($event, 'pot')"
                                         @corpFocus="remoteMethod($event, 'pot')">
                                     </search-query>
                                 </el-col>
@@ -367,8 +387,9 @@
                             </div>
                             <div>
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.commodityDescr"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
-                                    placeholder="请输入提单上货物描述" @blur="textareaBlur('commodityDescr')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
+                                    clearable placeholder="请输入提单上货物描述"
+                                    @blur="textareaBlur('commodityDescr')"></el-input>
                             </div>
                         </el-row>
                     </el-col>
@@ -389,7 +410,8 @@
                                 <span slot="label">
                                     <el-popover placement="right" width="400" trigger="hover"
                                         @show="delShow(assemblyForm.vesselId, 3)">
-                                        <avue-crud :data="delData" :option="delOption" :table-loading="loading"></avue-crud>
+                                        <avue-crud :data="delData" :option="delOption"
+                                            :table-loading="loading"></avue-crud>
                                         <!-- <el-button slot="reference">click 激活</el-button> -->
                                         <span style="color:rgb(76, 158, 68);text-decoration: underline;"
                                             slot="reference">船名</span>
@@ -401,7 +423,8 @@
                                     :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                     placeholder="请选择船名" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                     @remoteMethod="remoteMethod($event, 'vessel')"
-                                    @corpChange="corpChange($event, 'vessel')" @corpFocus="remoteMethod($event, 'vessel')">
+                                    @corpChange="corpChange($event, 'vessel')"
+                                    @corpFocus="remoteMethod($event, 'vessel')">
                                 </search-query>
                             </el-form-item>
                             <el-form-item label="航次" prop="voyageNo" label-width="90px">
@@ -409,16 +432,16 @@
                                     <span style="color: #1e9fff">航次</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
-                                    placeholder="请输入航次"></el-input>
+                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                    clearable placeholder="请输入航次"></el-input>
                             </el-form-item>
                         </div>
                         <el-form-item label="客户约号" prop="corpArgreementNo" label-width="90px">
                             <span slot="label">
                                 <span style="color: #1e9fff">客户约号</span>
                             </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo" size="small"
-                                autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo"
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                 placeholder="请输入客户约号"></el-input>
                         </el-form-item>
                         <el-form-item label="船公司" prop="carrierCnName">
@@ -427,10 +450,12 @@
                                     @click="emailJump('carrier')">船公司</span>
                             </span>
                             <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
-                                :filterable="true" :clearable="true" :remote="true"
+                                :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                placeholder="请选择船公司" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                @remoteMethod="remoteMethod($event, 'carrier')" @corpChange="corpChange($event, 'carrier')"
+                                placeholder="请选择船公司"
+                                :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }"
+                                @remoteMethod="remoteMethod($event, 'carrier')"
+                                @corpChange="corpChange($event, 'carrier')"
                                 @corpFocus="remoteMethod($event, 'carrier')">
                             </search-query>
                         </el-form-item>
@@ -447,9 +472,10 @@
                                 <span style="color: #1e9fff">订舱代理</span>
                             </span>
                             <el-col :span="9" style="margin-left: -10px">
-                                <search-query :datalist="bookingAgentData" :selectValue="assemblyForm.bookingAgentCnName"
-                                    :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
-                                    :buttonIf="false" placeholder="请选择订舱代理"
+                                <search-query :datalist="bookingAgentData"
+                                    :selectValue="assemblyForm.bookingAgentCnName" :filterable="true" :clearable="true"
+                                    :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    placeholder="请选择订舱代理"
                                     :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                     @remoteMethod="remoteMethod($event, 'bookingAgent')"
                                     @corpChange="corpChange($event, 'bookingAgent')"
@@ -596,8 +622,8 @@
                         </span>
                         <search-query :datalist="coloaderCnNameData" :selectValue="assemblyForm.coloaderCnName"
                             :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
-                            :buttonIf="true" :addIf="true" placeholder="请选择COLOADER" @addJump="addJump"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            :buttonIf="true" :addIf="true" placeholder="请选择COLOADER" @addJump="addJump" :joinData="true"
+                            :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }"
                             @remoteMethod="remoteMethod($event, 'coloaderCnName')"
                             @corpChange="corpChange($event, 'coloaderCnName')"
                             @corpFocus="remoteMethod($event, 'coloaderCnName')">
@@ -612,8 +638,8 @@
                             <span slot="label">
                                 <span style="color: #1e9fff;">FORWARDING</span>
                             </span>
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.forwarding" size="small"
-                                autocomplete="off" :disabled="detailData.seeDisabled" rows="2" clearable
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.forwarding"
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="2" clearable
                                 placeholder="请输入FORWARDING" @blur="textareaBlur('FORWARDING')"></el-input>
                         </el-form-item>
                     </el-col>
@@ -623,8 +649,8 @@
                                 <span style="color: #1e9fff">备注</span>
                             </span>
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks" size="small"
-                                autocomplete="off" :disabled="detailData.seeDisabled" rows="2" clearable placeholder="请输入备注"
-                                @blur="textareaBlur('remarks')"></el-input>
+                                autocomplete="off" :disabled="detailData.seeDisabled" rows="2" clearable
+                                placeholder="请输入备注" @blur="textareaBlur('remarks')"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-col>
@@ -639,10 +665,11 @@
                                     @click="emailJump('cy')">场站</span>
                             </span>
                             <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
-                                :clearable="true" :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                placeholder="请选择场站" @remoteMethod="remoteMethod($event, 'cy')"
-                                @corpChange="corpChange($event, 'cy')" @corpFocus="remoteMethod($event, 'cy')">
+                                :clearable="true" :remote="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
+                                @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
+                                @corpFocus="remoteMethod($event, 'cy')">
                             </search-query>
                         </el-form-item>
                     </el-col>
@@ -696,8 +723,9 @@
                         <el-col :span="12">
                             <el-form-item label="通知人" prop="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' }"
+                                    :joinData="true" :filterable="true" :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                                     placeholder="请选择通知人" @remoteMethod="remoteMethod($event, 'hnotify2')"
                                     @corpChange="corpChange($event, 'hnotify2')"
                                     @corpFocus="remoteMethod($event, 'hnotify2')">
@@ -713,9 +741,10 @@
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="提单描述" prop="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-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>
                         </el-col>
 
@@ -759,9 +788,9 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="易燃易爆品闪点" prop="dgFlashPoint">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled" @input="dgFlashPointInput"
-                                    clearable placeholder="请输入易燃易爆品闪点"></el-input>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint"
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled"
+                                    @input="dgFlashPointInput" clearable placeholder="请输入易燃易爆品闪点"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -787,8 +816,8 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="危险品净重" prop="dgTel">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgNetWeight" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgNetWeight"
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="请输入危险品净重"></el-input>
                             </el-form-item>
                         </el-col>
@@ -1157,7 +1186,7 @@ export default {
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
-                        console.log(item.cntyCode,1231231)
+                        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)
@@ -1188,7 +1217,7 @@ export default {
                         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 + 'NamePrint', item.enName.split('-')[1])
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
@@ -1217,7 +1246,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                     }
                 }
             }
@@ -1415,7 +1444,7 @@ export default {
         },
         // 通知人
         hnotify2HandleClose(done) {
-  done();
+            done();
         },
         // 危险品弹窗开启
         DangerousGoodsAdd() {
@@ -1566,104 +1595,71 @@ export default {
         hshipperBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hshipperData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hshipperData = res.data.data.records
             })
         },
         // 获取收货人数据 （往来单位 前四个代理）
         hconsigneeBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hconsigneeData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hconsigneeData = res.data.data.records
             })
         },
         // 获取通知人数据 （往来单位 前四个代理）
         hnotifyBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hnotifyData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hnotifyData = res.data.data.records
             })
         },
         // 获取第二通知人数据 （往来单位 前四个代理）
         hnotify2BcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.hnotify2Data = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.hnotify2Data = res.data.data.records
             })
         },
         // 收货地数据 （港口表）
         placeReceiptBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.placeReceiptData = res.data.data.records.map(item => {
-                    item.enName =item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.placeReceiptData = res.data.data.records
             })
         },
         // 装货港数据
         polBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.polData = res.data.data.records.map(item => {
-                    item.enName = item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.polData = res.data.data.records
             })
         },
         // 卸货港数据
         podBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.podData = res.data.data.records.map(item => {
-                    item.enName = item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.podData = res.data.data.records
             })
         },
         // 目的地
         destinationBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.destinationData = res.data.data.records.map(item => {
-                    item.enName = item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.destinationData = res.data.data.records
             })
         },
         // 交货地
         placeDeliveryBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.placeDeliveryData = res.data.data.records.map(item => {
-                    item.enName = item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.placeDeliveryData = res.data.data.records
             })
         },
         // 中转港
         potBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
-                this.potData = res.data.data.records.map(item => {
-                    item.enName = item.code  + ' - ' + item.enName
-                    return item
-                })
+                this.potData = res.data.data.records
             })
         },
         // 获取类别 COLOADER 数据
         bcorpstypedefineListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.coloaderCnNameData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.coloaderCnNameData = res.data.data.records
             })
         },
         // 包装数据
@@ -1713,19 +1709,13 @@ export default {
         carrierBcorpslistByTypefun(cnName) {
             let corpTypeName = '船公司'
             getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
-                this.carrierData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.carrierData = res.data.data.records
             })
         },
         // 船名
         vesselBvesselsListfun(cnName) {
             getBvesselsList(1, 10, { cnName, status: 0 }).then(res => {
-                this.vesselData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.code
-                    return item
-                })
+                this.vesselData = res.data.data.records
             })
         },
         // 订舱代理

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

@@ -2125,6 +2125,7 @@ export default {
                     }
                 }
             } else if (name == 'unitNo') {
+                console.log(value, name, row)
                 // 计量单位
                 this.$set(row, name, value)
                 for (let item of this.unitNoData) {
@@ -2315,7 +2316,6 @@ export default {
             } else {
                 srcBillId = this.assemblyForm.id
             }
-            console.log(srcBillId)
             const res = await getBunitsPage({ srcBillId })
             this.unitNoData = []
             let boxarr40 = ['40HC', '40GP']
@@ -2500,7 +2500,7 @@ export default {
                 row.billNo = this.assemblyForm.billNo // 单据编号
                 row.billDate = this.assemblyForm.billDate // 单据日期
                 row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpCnName = this.assemblyForm.corpCnName.split('-')[0] // 主表客户中文名称
                 row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
                 row.lineId = this.assemblyForm.lineId // 航线 id
                 row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -1,201 +1,186 @@
 <template>
     <div>
         <el-form :model="documentForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
-            <el-form-item label="TO:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName"
-                          size="small" autocomplete="off" clearable placeholder="TO" >
+            <el-form-item label="TO:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName" size="small"
+                    autocomplete="off" clearable placeholder="TO">
                 </el-input>
             </el-form-item>
-            <el-form-item label="CC:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.cc"
-                          size="small" autocomplete="off" clearable placeholder="CC" >
+            <el-form-item label="CC:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.cc" size="small" autocomplete="off"
+                    clearable placeholder="CC">
                 </el-input>
             </el-form-item>
-            <el-form-item label="FM:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.createUserName"
-                          size="small" autocomplete="off" clearable placeholder="FM" >
+            <el-form-item label="FM:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.createUserName" size="small"
+                    autocomplete="off" clearable placeholder="FM">
                 </el-input>
             </el-form-item>
-            <el-form-item label="提单号码:" prop="corpCnName" >
+            <el-form-item label="提单号码:" prop="corpCnName">
                 <el-row>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.mblno"
-                                  size="small" autocomplete="off" clearable placeholder="MBL NO" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.mblno" size="small"
+                            autocomplete="off" clearable placeholder="MBL NO">
                         </el-input>
                     </el-col>
                     <el-col :span="11">
                         <span style="margin-left: 15px"></span>
-                        <el-date-picker v-model="documentForm.billDate" clearable style="width: 100%"
-                                        type="date" size="small"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="请选择时间">
+                        <el-date-picker v-model="documentForm.billDate" clearable style="width: 100%" type="datetime"
+                            size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                         </el-date-picker>
                     </el-col>
                 </el-row>
             </el-form-item>
-            <el-form-item label="船名/航次:" prop="corpCnName" >
+            <el-form-item label="船名/航次:" prop="corpCnName">
                 <el-row>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName"
-                                  size="small" autocomplete="off" clearable placeholder="船名/航次" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName" size="small"
+                            autocomplete="off" clearable placeholder="船名/航次">
                         </el-input>
                     </el-col>
                     <el-col :span="11">
                         <span style="margin-left: 15px"></span>
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.billNo"
-                                  size="small" autocomplete="off" clearable placeholder="业务编号" >
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.billNo" size="small"
+                            autocomplete="off" clearable placeholder="业务编号">
                         </el-input>
                     </el-col>
                 </el-row>
             </el-form-item>
-            <el-form-item label="箱量:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr"
-                          size="small" autocomplete="off" clearable placeholder="箱量" >
+            <el-form-item label="箱量:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr" size="small"
+                    autocomplete="off" clearable placeholder="箱量">
                 </el-input>
             </el-form-item>
 
-            <el-form-item label="场站:" prop="corpCnName" >
-                <search-query :datalist="cyData"
-                              :selectValue="documentForm.cyCnName"
-                              :filterable="true"
-                              :clearable="true"
-                              :remote="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              placeholder="请选择场站"
-                              @remoteMethod="cyBcorpslistByType"
-                              @corpChange="corpChange($event,'cy')"
-                              @corpFocus="cyBcorpslistByType" >
+            <el-form-item label="场站:" prop="corpCnName">
+                <search-query :datalist="cyData" :selectValue="documentForm.cyCnName" :filterable="true"
+                    :clearable="true" :remote="true" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
+                    @remoteMethod="cyBcorpslistByType" @corpChange="corpChange($event, 'cy')"
+                    @corpFocus="cyBcorpslistByType">
                 </search-query>
             </el-form-item>
             <el-row>
                 <el-col :span="12">
-                    <el-form-item label="联系人:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts"
-                                  size="small" autocomplete="off" clearable placeholder="场站联系人" >
+                    <el-form-item label="联系人:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyContacts" size="small"
+                            autocomplete="off" clearable placeholder="场站联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="联系电话:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel"
-                                  size="small" autocomplete="off" clearable placeholder="场站联系电话" >
+                    <el-form-item label="联系电话:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel" size="small"
+                            autocomplete="off" clearable placeholder="场站联系电话">
                         </el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-form-item label="工厂名称:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryName"
-                          size="small" autocomplete="off" clearable placeholder="工厂名称" >
+            <el-form-item label="工厂名称:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryName" size="small"
+                    autocomplete="off" clearable placeholder="工厂名称">
                 </el-input>
             </el-form-item>
-            <el-form-item label="工厂地址:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryAddress"
-                          size="small" autocomplete="off" clearable placeholder="工厂地址" >
+            <el-form-item label="工厂地址:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.factoryAddress" size="small"
+                    autocomplete="off" clearable placeholder="工厂地址">
                 </el-input>
             </el-form-item>
             <el-row>
                 <el-col :span="12">
-                    <el-form-item label="联系人:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系人" >
+                    <el-form-item label="联系人:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts" size="small"
+                            autocomplete="off" clearable placeholder="工厂联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="联系电话:" prop="corpCnName" >
-                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryTel"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系电话" >
+                    <el-form-item label="联系电话:" prop="corpCnName">
+                        <el-input type="age" style="width: 100%;" v-model="documentForm.factoryTel" size="small"
+                            autocomplete="off" clearable placeholder="工厂联系电话">
                         </el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-form-item label="派车时间:" prop="corpCnName" >
-                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择派车时间">
+            <el-form-item label="派车时间:" prop="corpCnName">
+                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
+                    size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择派车时间">
                 </el-date-picker>
             </el-form-item>
-            <el-form-item label="费用确认:" prop="corpCnName" >
-                <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation"
-                          size="small" autocomplete="off" clearable placeholder="费用确认" >
+            <el-form-item label="费用确认:" prop="corpCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation" size="small"
+                    autocomplete="off" clearable placeholder="费用确认">
                 </el-input>
             </el-form-item>
             <div style="display: flex;align-items: center;margin-left: 25px">
                 <span style="width: 60px;text-align: right;">请于</span>
-                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择时间">
+                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                 </el-date-picker>
                 <span>前到达指定工厂,并于</span>
-                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%"
-                                type="date" size="small"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择时间">
+                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                 </el-date-picker>
                 <span>前回场站</span>
             </div>
-            <el-form-item label="备注:" prop="remarks" >
-                <el-input type="textarea" style="width: 100%;" v-model="documentForm.bookingRemarks"
-                          size="small" autocomplete="off" rows="3"
-                          clearable placeholder="备注"></el-input>
+            <el-form-item label="备注:" prop="remarks">
+                <el-input type="textarea" style="width: 100%;" v-model="documentForm.bookingRemarks" size="small"
+                    autocomplete="off" rows="3" clearable placeholder="备注"></el-input>
             </el-form-item>
         </el-form>
     </div>
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 
-    export default {
-        components: {SearchQuery},
-        data() {
-            return {
-                cyData:[], // 场站
+export default {
+    components: { SearchQuery },
+    data() {
+        return {
+            cyData: [], // 场站
+        }
+    },
+    props: {
+        documentForm: {
+            type: Object,
+            default: {}
+        }
+    },
+    methods: {
+        corpChange(value, name) {
+            if (name == 'cy') {
+                if (!value) {
+                    this.$set(this.documentForm, 'cyId', '')
+                    this.$set(this.documentForm, 'cyCode', '')
+                    this.$set(this.documentForm, 'cyCnName', '')
+                    this.$set(this.documentForm, 'cyEnName', '')
+                    this.$set(this.documentForm, 'cyContacts', '')
+                    this.$set(this.documentForm, 'cyTel', '')
+                }
+                for (let item of this.cyData) {
+                    if (item.cnName == value) {
+                        this.$set(this.documentForm, 'cyId', item.id)
+                        this.$set(this.documentForm, 'cyCode', item.code)
+                        this.$set(this.documentForm, 'cyCnName', item.cnName)
+                        this.$set(this.documentForm, 'cyEnName', item.enName)
+                        this.$set(this.documentForm, 'cyContacts', item.contacts)
+                        this.$set(this.documentForm, 'cyTel', item.tel)
+                    }
+                }
             }
         },
-        props:{
-            documentForm:{
-                type:Object,
-                default:{}
-            }
+        // 获取场站数据
+        cyBcorpslistByType(cnName) {
+            let corpTypeName = '场站'
+            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
+                this.cyData = res.data.data.records
+            })
         },
-        methods:{
-            corpChange(value,name) {
-                if (name == 'cy') {
-                    if (!value) {
-                        this.$set(this.documentForm,'cyId','')
-                        this.$set(this.documentForm,'cyCode','')
-                        this.$set(this.documentForm,'cyCnName','')
-                        this.$set(this.documentForm,'cyEnName','')
-                        this.$set(this.documentForm,'cyContacts','')
-                        this.$set(this.documentForm,'cyTel','')
-                    }
-                    for(let item of this.cyData) {
-                        if (item.cnName == value) {
-                            this.$set(this.documentForm,'cyId',item.id)
-                            this.$set(this.documentForm,'cyCode',item.code)
-                            this.$set(this.documentForm,'cyCnName',item.cnName)
-                            this.$set(this.documentForm,'cyEnName',item.enName)
-                            this.$set(this.documentForm,'cyContacts',item.contacts)
-                            this.$set(this.documentForm,'cyTel',item.tel)
-                        }
-                    }
-                }
-            },
-            // 获取场站数据
-            cyBcorpslistByType(cnName){
-                let corpTypeName = '场站'
-                getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
-                    this.cyData = res.data.data.records
-                })
-            },
-        }
-
     }
+
+}
 </script>
 
 <style scoped>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -87,8 +87,8 @@
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName" >
                     <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 30%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
+                                    type="datetime" size="small"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="请选择时间">
                     </el-date-picker>
                     <span style="margin-left: 10px">前将货物送至指定位置</span>
@@ -97,8 +97,8 @@
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName" >
                     <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 30%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
+                                    type="datetime" size="small"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="请选择时间">
                     </el-date-picker>
                     <span style="margin-left: 10px">前通关</span>
@@ -107,8 +107,8 @@
             <el-col :span="24">
                 <el-form-item label="截单和VGM截止时间:" prop="corpCnName" label-width="130px">
                     <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%"
-                                    type="date" size="small"
-                                    value-format="yyyy-MM-dd"
+                                      type="datetime" size="small"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="请选择截单和VGM截止时间">
                     </el-date-picker>
                 </el-form-item>

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

@@ -190,7 +190,7 @@
                                                     :filterable="true" :clearable="false" :remote="true"
                                                     :disabled="detailData.seeDisabled || item.disabled"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
-                                                    :placeholder="`${item.text || ''}`"
+                                                    :placeholder="`${item.text || ''}`" :joinData="item.joinData"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
                                                     @corpChange="corpChange($event, item.prop)"
                                                     @corpFocus="remoteMethod($event, item.prop)"
@@ -460,11 +460,13 @@ export default {
                         dicData: [],
                         disabled: false,
                         buttonIf: true,
+                        joinData: true,
                         slot: 'bcorps',
                         forParameter: {
                             key: 'id',
                             label: 'cnName',
                             value: 'cnName',
+                            short: 'shortName'
                         },
                         rules: [{
                             required: true,
@@ -1048,10 +1050,7 @@ export default {
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
             getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
-                this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.shortName
-                    return item
-                })
+                this.columnforfun('corpCnName').dicData = res.data.data.records
             })
         },
         // 获取客户联系人 客户OP
@@ -1286,6 +1285,7 @@ export default {
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
+                    this.form.shortName = ''
                     // 清空 客户OP
                     this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
@@ -1305,6 +1305,7 @@ export default {
                         this.form.corpEnName = item.enName
                         this.form.corpId = item.id
                         this.form.corpCode = item.code
+                        this.form.shortName = item.shortName
                         // 获取 客户op数据
                         this.getBcorpsattnListfun()
                         // 业务来源参数带出
@@ -1365,7 +1366,7 @@ export default {
                     this.columnforfun('srcCnName').forParameter = { key: 'id', label: 'name', value: 'name' }
                     this.columnforfun('srcCnName').disabled = false
                     this.salesUserGetListfun()
-                } else { }
+                }
             }
             else if (name == 'srcCnName') {
                 for (let item of this.columnforfun('srcCnName').dicData) {
@@ -1382,7 +1383,7 @@ export default {
                             this.$set(this.form, 'srcId', item.id)
                             this.$set(this.form, 'srcCnName', item.cnName)
                             this.$set(this.form, 'srcEnName', item.enName)
-                        } else { }
+                        }
                     }
                 }
             }
@@ -1700,6 +1701,7 @@ export default {
             // this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             // 费用 收 赋值数据
+            // this.form.shortName=this.form.corpCnName.split('-')[1]
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = 'D'
                 row.sort = Number(index) + 1

src/views/system/lock/config/mainList.json

@@ -10,10 +10,12 @@
   "align": "center",
   "menuWidth": "120",
   "menu": true,
+  "menuFixed":false,
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
   "selection": true,
+  "indexFixed":false,
   "tip":false,
   "expand": false,
   "expandWidth": 38,

src/views/system/lock/indexF.vue

@@ -20,7 +20,7 @@
           <el-button type="text" icon="el-icon-unlock" size="small" @click="rowUnlock(row, index)">解锁</el-button>
         </template>
         <template slot="menuLeft">
-          <el-button type="primary" size="small" @click="allClick" :disabled="selectionList.length==0">一键解锁
+          <el-button type="primary" size="small" @click="allClick" :disabled="selectionList.length == 0">一键解锁
           </el-button>
         </template>
       </avue-crud>
@@ -125,6 +125,9 @@ export default {
             this.$set(item, "insideList", []);
             this.$set(item, "loading", true);
           });
+          this.$nextTick(() => {
+            this.$refs.crud.refreshTable()
+          });
         })
         .finally(() => {
           this.loading = false;

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -88,30 +88,30 @@ export default {
           search: true,
           overHidden: true,
         }, 
-        {
-          label: "客户",
-          prop: "corpId",
-          search: true,
-          // remote: true,
-          filterable:true,
-          searchOrder: 1,
-          type: 'select',
-          overHidden: true,
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          showColumn: false,
-          hide: true,
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
-        }, 
+        // {
+        //   label: "客户",
+        //   prop: "corpId",
+        //   search: true,
+        //   // remote: true,
+        //   filterable:true,
+        //   searchOrder: 1,
+        //   type: 'select',
+        //   overHidden: true,
+        //   props: {
+        //     label: 'cname',
+        //     value: 'id'
+        //   },
+        //   showColumn: false,
+        //   hide: true,
+        //   dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
+        // }, 
         {
           label: "客户",
           prop: "corpName",
           search: true,
           // remote: true,
           // filterable:true,
-          // searchOrder: 1,
+          searchOrder: 1,
           // type: 'select',
           overHidden: true,
           // props: {

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -20,7 +20,7 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.sysNo }}
           </span>
         </template>
-        <template slot-scope="{ row, index }" slot="corpId">
+        <template slot-scope="{ row, index }" slot="corpName">
           <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.corpName }}
           </span>
         </template>
@@ -28,9 +28,9 @@
           <!-- <el-button  :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :disabled="row.financeStatus == '已付款' || item>=1" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
-        <template slot="corpNameSearch">
+        <!-- <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
-        </template>
+        </template> -->
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
@@ -96,17 +96,17 @@ export default {
           overHidden: true,
         }, {
           label: "供应商",
-          prop: "corpId",
+          prop: "corpName",
             searchOrder:1,
           search: true,
-          type: "select",
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
+          // type: "select",
+          // filterable: true,
+          // remote: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'id'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
         },{
             label: '结算日期',
             prop: "settlementDate",

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -13,13 +13,13 @@
                         show-overflow-tooltip :label="item.label" />
                 </el-table>
             </template>
-            <template slot="customerNameSearch">
+            <!-- <template slot="customerNameSearch">
                 <search-query :datalist="customerData" :selectValue="query.customerName" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择客户名称"
                     @remoteMethod="KHgetListfun" @corpFocus="KHgetListfun" @corpChange="corpChange($event, 'customerName')">
                 </search-query>
-            </template>
+            </template> -->
             <template slot="brandNameSearch">
                 <search-query :datalist="brandData" :selectValue="query.brandName" :clearable="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌"

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -13,13 +13,13 @@
                         show-overflow-tooltip :label="item.label" />
                 </el-table>
             </template>
-            <template slot="customerNameSearch">
+            <!-- <template slot="customerNameSearch">
                 <search-query :datalist="customerData" :selectValue="query.customerName" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择客户名称"
                     @remoteMethod="KHgetListfun" @corpFocus="KHgetListfun" @corpChange="corpChange($event, 'customerName')">
                 </search-query>
-            </template>
+            </template> -->
             <template slot="brandNameSearch">
                 <search-query :datalist="brandData" :selectValue="query.brandName" :clearable="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌"

src/views/tirePartsMall/financialManagement/salesAnalysis/index.vue

@@ -14,13 +14,13 @@
                         show-overflow-tooltip :label="item.label" />
                 </el-table>
             </template>
-            <template slot="customerNameSearch">
+            <!-- <template slot="customerNameSearch">
                 <search-query :datalist="customerData" :selectValue="query.customerName" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择客户名称"
                     @remoteMethod="KHgetListfun" @corpFocus="KHgetListfun" @corpChange="corpChange($event, 'customerName')">
                 </search-query>
-            </template>
+            </template> -->
             <template slot="storageIdSearch">
                 <search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择仓库" @corpFocus="storageIdfun"