货代 报关 空运 轮胎 库存查询 陆运 新字段

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

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div>
-            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
+            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px"
+                class="demo-ruleForm">
                 <el-row :gutter="10">
                     <el-col :span="6">
                         <el-form-item label="客户名称" prop="corpCnName">
@@ -49,31 +50,35 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -88,8 +93,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'D')"
@@ -98,11 +103,12 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'D')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'D')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -126,16 +132,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'D')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -148,8 +155,8 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1" placeholder="请输入"
-                        @blur="quantityinputfun(row)"></el-input>
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -182,33 +189,38 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('C')">生成应收
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                        @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -224,8 +236,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'C')"
@@ -234,11 +246,12 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'C')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'C')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -262,16 +275,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'C')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -284,8 +298,8 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1" placeholder="请输入"
-                        @blur="quantityinputfun(row)"></el-input>
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -304,8 +318,12 @@
                 </template>
             </avue-crud>
         </el-card>
-        <avue-crud v-show="assemblyForm.feeCenterAmendList.length>0" id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
-        <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption" :data="sumData"></avue-crud>
+        <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
+            :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
+            :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
+        <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
+            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
+            :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
         <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
@@ -402,7 +420,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取 消</el-button>
+                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                    消</el-button>
                 <el-button type="primary" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
@@ -415,8 +434,8 @@
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table :data="corpDialog" border show-summary size="mini"
-                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }" :cell-style="{ padding: '0px', fontSize: '12px' }"
-                    style="width: 100%">
+                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                    :cell-style="{ padding: '0px', fontSize: '12px' }" style="width: 100%">
                     <el-table-column prop="corpCnName" label="客户名称" width="140px">
                         <template slot-scope="{ row }">
                             <span class="textoverflow">{{ row.corpCnName }}</span>
@@ -445,14 +464,16 @@
             <div>
                 <el-row :gutter="10">
                     <el-col :span="4">
-                        <avue-tree :option="reportOption" :data="reportTypeData" @node-click="reportNodeClick"></avue-tree>
+                        <avue-tree :option="reportOption" :data="reportTypeData"
+                            @node-click="reportNodeClick"></avue-tree>
                     </el-col>
                     <el-col :span="20">
                         <avue-crud :option="optionPrinting" :table-loading="printingLoading" :data="PrintingData"
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -463,8 +484,8 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :before-close="handleClose">
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :before-close="handleClose">
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -509,7 +530,8 @@ export default {
 
         },
         assemblyForm: {
-            type: Object
+            type: Object,
+            default: {}
         },
         detailData: {},
         // 请核之后禁用
@@ -522,6 +544,10 @@ export default {
             type: Object,
             default: {}
         },
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -1311,6 +1337,10 @@ export default {
                 })
             })
         },
+        getKeyName(key) {
+            const item = this.corpCnNameData.find(item => item.cnName === key);
+            return item ? item.shortName : key;
+        },
         // 弹窗导出
         exportfun() {
             const routeData = this.$router.resolve({
@@ -1366,7 +1396,7 @@ export default {
                 groupCode = '应收,应收-账单'
                 selectionArr = this.selectionDList
             } else {
-                groupCode =  '应付,应付-账单'
+                groupCode = '应付,应付-账单'
                 selectionArr = this.selectionCList
             }
             if (selectionArr.length > 0) {
@@ -1585,39 +1615,13 @@ export default {
                 obj.corpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpCnName
                 obj.corpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpEnName
                 obj.shortName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].shortName
-                // 费用简称
-                obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
-                obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
-                obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
-                obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
-                // 核算要素
-                obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
-                obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
-                obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
-                obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
-                // 预付/到付
                 obj.paymode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].paymode
-                // 计量单位
-                obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
-                // 币种
-                obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
-                obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
-                // 汇率
-                obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
-                // 单价
-                obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
-                // 数量
-                obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
-                // 金额
-                obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
-                obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
-                obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
-                obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
                 this.assemblyForm.feeCenterListD.push(obj)
             } else {
+                console.log(this.assemblyForm)
                 // 往来单位拿主表客户名称
                 obj.corpId = this.assemblyForm.corpId
-                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpCnName = this.assemblyForm.corpCnName
                 obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
@@ -1664,34 +1668,35 @@ export default {
                 obj.corpCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpCnName
                 obj.corpEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpEnName
                 obj.shortName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].shortName
+                obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
                 // 费用简称
-                obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
-                obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
-                obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
-                obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
+                // obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
+                // obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
+                // obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
+                // obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
                 // 核算要素
-                obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
-                obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
-                obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
-                obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
-                // 预付/到付
-                obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
-                // 计量单位
-                obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
-                // 币种
-                obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
-                obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
-                // 汇率
-                obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
-                // 单价
-                obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
-                // 数量
-                obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
-                // 金额
-                obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
-                obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
-                obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
-                obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
+                // obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
+                // obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
+                // obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
+                // obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
+                // // 预付/到付
+                // obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
+                // // 计量单位
+                // obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
+                // // 币种
+                // obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
+                // obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
+                // // 汇率
+                // obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
+                // // 单价
+                // obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
+                // // 数量
+                // obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
+                // // 金额
+                // obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
+                // obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
+                // obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
+                // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
                 this.assemblyForm.feeCenterListC.push(obj)
             } else {
                 // 往来单位拿主表客户名称
@@ -1946,12 +1951,15 @@ export default {
         async corpChange(value, name, row, dc) {
             if (name == 'corpCnName') {
                 if (!value) {
+                    this.$set(row, 'shortName', '')
                     this.$set(row, 'corpCnName', '')
                     this.$set(row, 'corpEnName', '')
                     this.$set(row, 'corpId', '')
                 }
                 for (let item of this.corpCnNameData) {
-                    if (item.cnName == value) {
+                    if (item.shortName == value) {
+                        console.log(item)
+                        this.$set(row, 'shortName', item.shortName)
                         this.$set(row, 'corpCnName', item.cnName)
                         this.$set(row, 'corpEnName', item.enName)
                         this.$set(row, 'corpId', item.id)
@@ -2383,31 +2391,13 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId) {
-                    sum += ` 应收序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应收序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应收序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId) {
-                    sum += ` 应付序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应付序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应付序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应付序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {

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

@@ -156,20 +156,20 @@
                                                 <span slot="label" v-if="item.label">
                                                     <span style="color: #1e9fff">{{ item.label }}</span>
                                                 </span>
-                                                <search-query v-if="item.type == 'select'" :datalist="item.dicData"
-                                                    ref="searchQueryRef" :selectValue="form[item.prop]"
+                                                <search-query v-if="item.type == 'select'" ref="searchQueryRef"
+                                                    :datalist="item.dicData" :selectValue="form[item.prop]"
                                                     :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)"
                                                     @eldialogConfirm="eldialogConfirm(item.slot)">
-                                                    <bcorps v-if="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
+                                                    <bcorps v-show="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
                                                         @selectionChange="eldialogMultipleChoice($event, item.slot)">
                                                     </bcorps>
-                                                    <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'">
+                                                    <bcorpstypedefine v-show="item.slot == 'bcorpstypedefine'">
                                                     </bcorpstypedefine>
                                                 </search-query>
                                                 <el-input v-else type="age" style="width: 100%;"
@@ -218,7 +218,8 @@
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
-                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                        :disabled="detailData.seeDisabled" :pleasereviewType="pleasereviewType"
+                        :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
@@ -352,7 +353,20 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList: []
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                placeDeliveryName: '',
+                placeDeliveryNamePrint: '',
+                potEnName: '',
+                potNamePrint: '',
+                detail: {}
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -376,7 +390,20 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList: []
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                placeDeliveryName: '',
+                placeDeliveryNamePrint: '',
+                potEnName: '',
+                potNamePrint: '',
+                detail: {}
             },
             // 循环的配置
             basicData: {
@@ -389,11 +416,13 @@ export default {
                         dicData: [],
                         disabled: false,
                         buttonIf: true,
+                        joinData: true,
                         slot: 'bcorps',
                         forParameter: {
                             key: 'id',
                             label: 'cnName',
                             value: 'cnName',
+                            short: 'shortName'
                         },
                         rules: [{
                             required: true,
@@ -801,6 +830,8 @@ export default {
                         if (item.name == this.form.operatorName) {
                             this.$set(this.form, 'accDeptName', item.deptName)
                             this.$set(this.form, 'accDept', item.deptId)
+                            this.$set(this.form, 'operatorDept', item.deptId.split(',').pop())
+                            this.$set(this.form, 'operatorDeptName', item.deptId)
                         }
                     }
                 }
@@ -822,11 +853,8 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName: cnName }).then(res => {
-                this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.shortName
-                    return item
-                })
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
+                this.columnforfun('corpCnName').dicData = res.data.data.records
             })
         },
         // 获取委托人数据 往来单位数据
@@ -982,8 +1010,6 @@ export default {
                     arr = list
                 }
                 this.$refs.bcorps[0].selectionList = arr
-            } else {
-
             }
         },
         // 下拉多选弹窗的确认
@@ -1057,6 +1083,7 @@ export default {
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
+                    this.form.shortName = ''
                     // 清空 客户OP
                     this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
@@ -1075,6 +1102,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()
                         // 业务来源参数带出
@@ -1082,6 +1110,8 @@ export default {
                         this.$set(this.form, 'srcId', item.srcId)
                         this.$set(this.form, 'srcCnName', item.srcCnName)
                         this.$set(this.form, 'srcEnName', item.srcEnName)
+                        this.$set(this.form, 'srcDeptId', item.deptId.split(',').pop())
+                        this.$set(this.form, 'srcDeptName', item.deptName)
                         this.columnforfun('srcType').disabled = false
                         this.columnforfun('srcCnName').disabled = false
                         // 航线带出往来单位的优势航线
@@ -1164,10 +1194,20 @@ export default {
             else if (name == 'mpaymode') {
                 // 主单付费方式
                 this.form[name] = value
+                if (value == 'PP') {
+                    this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName.split(' - ')[0] : '')
+                } else {
+                    this.$set(this.form, 'mpayplace', this.form.podEnName ? this.form.podEnName.split(' - ')[0] : '')
+                }
             }
             else if (name == 'hpaymode') {
                 // 分单付费方式
                 this.form[name] = value
+                if (value == 'PP') {
+                    this.$set(this.form, 'hpayplace', this.form.polEnName.split(' - ')[0])
+                } else {
+                    this.$set(this.form, 'hpayplace', this.form.podEnName.split(' - ')[0])
+                }
             }
             else if (name == 'clientName') {
                 for (let item of this.columnforfun('clientName').dicData) {
@@ -1507,7 +1547,7 @@ export default {
             }
             this.form.businessTypeCode = 'KYCK'
             // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
-            this.searchSplit()
+            // this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             let multiArr = []
             for (let i in this.comprehensiveForm) {
@@ -1518,7 +1558,6 @@ 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
@@ -1631,7 +1670,7 @@ export default {
             aeabillsCopyBills({ id }).then(res => {
                 this.form = res.data.data;
                 this.pageLoading = false
-                this.searchMontage() // 下拉 中文名称和编号拼接
+                // this.searchMontage() // 下拉 中文名称和编号拼接
                 // 配箱最上面可以编辑
                 for (let item of this.form.containersList) {
                     item.edit = false
@@ -1696,7 +1735,8 @@ export default {
         // 详情接口
         async billsDetailfun(id, status) {
             const res = await aeabillsDetail(id)
-            this.form = res.data.data;
+            // this.form = res.data.data;
+            this.$set(this, 'form', res.data.data)
             this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
             // 如果已经请核就禁用按钮
             // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
@@ -1742,7 +1782,7 @@ export default {
                 this.pleasereviewType = false
             }
             this.pageLoading = false
-            this.searchMontage() // 下拉 中文名称和编号拼接
+            // this.searchMontage() // 下拉 中文名称和编号拼接
             // 配箱最上面可以编辑
             // for(let item of this.form.containersList) {
             //     item.edit = false
@@ -1803,12 +1843,15 @@ export default {
                 item.edit = false
             }
             // 文件中心
+            this.$refs.filescenter.getData(res.data.data)
+            // 文件中心
             for (let item of this.form.filesList) {
                 this.$set(item, 'edit', false)
             }
             if (status == 'toAddEdit') {
                 this.$emit(status)
             }
+            this.oldForm = this.deepClone(this.form);
         },
         // tbas切换
         handleClick(tba, event) {
@@ -1834,164 +1877,6 @@ 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]
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                this.form.coloaderCnName = this.form.coloaderCnName.split(' - ')[0]
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                this.form.carrierCnName = this.form.carrierCnName.split(' - ')[0]
-            }
-            // 收货地
-            if (this.form.placeReceiptName) {
-                this.form.placeReceiptName = this.form.placeReceiptName.split(' - ')[0]
-                this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint.split(' - ')[0]
-            }
-            // 起运港
-            if (this.form.departureEnName) {
-                this.form.departureEnName = this.form.departureEnName.split(' - ')[0]
-                this.form.departureNamePrint = this.form.departureNamePrint.split(' - ')[0]
-            }
-            // 起运地
-            if (this.form.departureAddrEnName) {
-                this.form.departureAddrEnName = this.form.departureAddrEnName.split(' - ')[0]
-                this.form.departureAddrNamePrint = this.form.departureAddrNamePrint.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.finalDestinationName) {
-                this.form.finalDestinationName = this.form.finalDestinationName.split(' - ')[0]
-                this.form.finalDestinationNamePrint = this.form.finalDestinationNamePrint.split(' - ')[0]
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName.split(' - ')[0]
-                this.form.potNamePrint = this.form.potNamePrint.split(' - ')[0]
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
-            }
-            // 客户名称
-            if (this.form.corpCnName) {
-                this.form.corpCnName = this.form.corpCnName.split(' - ')[0]
-            }
-
-        },
-        // 下拉 中文名称和编号拼接
-        searchMontage() {
-            // 发货人
-            if (this.form.hshipperCnName) {
-                this.form.hshipperCnName = this.form.hshipperCnName + ' - ' + this.form.hshipperCode
-            }
-            // 收货人
-            if (this.form.hconsigneeCnName) {
-                this.form.hconsigneeCnName = this.form.hconsigneeCnName + ' - ' + this.form.hconsigneeCode
-            }
-            // 通知人
-            if (this.form.hnotifyCnName) {
-                this.form.hnotifyCnName = this.form.hnotifyCnName + ' - ' + this.form.hnotifyCode
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1, 10, { cnName: this.form.coloaderCnName, corpTypeName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.coloaderCnName == e.cnName) {
-                            this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + e.code
-                        }
-                    })
-                    // this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
-                })
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                let corpTypeName = '船公司'
-                getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, corpTypeName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.carrierCnName == e.cnName) {
-                            this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
-                        }
-                    })
-                    // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
-                })
-                // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
-            }
-            // 收货地
-            if (this.form.placeReceiptName) {
-                this.form.placeReceiptName = this.form.placeReceiptName + ' - ' + this.form.placeReceiptCode
-                this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint + ' - ' + this.form.placeReceiptCode
-            }
-            // 起运港
-            if (this.form.departureEnName) {
-                this.form.departureEnName = this.form.departureEnName + ' - ' + this.form.departureCode
-                this.form.departureNamePrint = this.form.departureNamePrint + ' - ' + this.form.departureCode
-            }
-            // 起运地
-            if (this.form.departureAddrEnName) {
-                this.form.departureAddrEnName = this.form.departureAddrEnName + ' - ' + this.form.departureAddrCode
-                this.form.departureAddrNamePrint = this.form.departureAddrNamePrint + ' - ' + this.form.departureAddrCode
-            }
-            // 目的地
-            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.finalDestinationName) {
-                this.form.finalDestinationName = this.form.finalDestinationName + ' - ' + this.form.finalDestinationCode
-                this.form.finalDestinationNamePrint = this.form.finalDestinationNamePrint + ' - ' + this.form.finalDestinationCode
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName + ' - ' + this.form.potCode
-                this.form.potNamePrint = this.form.potNamePrint + ' - ' + this.form.potCode
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    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
-                        }
-                    })
-                    this.oldForm = this.deepClone(this.form);
-                    // this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
-                })
-            }
-        },
-
-
     },
 }
 

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

@@ -10,8 +10,8 @@
                             </span>
                             <search-query :datalist="hshipperData" :selectValue="assemblyForm.hshipperCnName"
                                 :filterable="true" :clearable="true" :remote="true" :addIf="true" :tableIf="false"
-                                :disabled="detailData.seeDisabled"
-                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择发货人"
+                                :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')">
@@ -34,8 +34,8 @@
                                     <search-query :datalist="hconsigneeData"
                                         :selectValue="assemblyForm.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')"
@@ -63,8 +63,8 @@
                             </span>
                             <search-query :datalist="hnotifyData" :selectValue="assemblyForm.hnotifyCnName"
                                 :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
-                                :addIf="true" :tableIf="false"
-                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
+                                :addIf="true" :tableIf="false" :joinData="true"
+                                :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
                                 @addJump="addJump('hconsignee')" @remoteMethod="remoteMethod($event, 'hnotify')"
                                 @corpChange="corpChange($event, 'hnotify')"
                                 @corpFocus="remoteMethod($event, 'hnotify')">
@@ -87,9 +87,9 @@
                             <el-row>
                                 <el-col :span="16">
                                     <search-query :datalist="departureData" :selectValue="assemblyForm.departureEnName"
-                                        :filterable="true" :clearable="true" :remote="true"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择起运港" @remoteMethod="remoteMethod($event, 'departure')"
                                         @corpChange="corpChange($event, 'departure')"
                                         @corpFocus="remoteMethod($event, 'departure')">
@@ -112,9 +112,9 @@
                                 <el-col :span="16">
                                     <search-query :datalist="departureAddrData"
                                         :selectValue="assemblyForm.departureAddrEnName" :filterable="true"
-                                        :clearable="true" :remote="true"
+                                        :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
                                         placeholder="请选择起运地" @remoteMethod="remoteMethod($event, 'departureAddr')"
                                         @corpChange="corpChange($event, 'departureAddr')"
                                         @corpFocus="remoteMethod($event, 'departureAddr')">
@@ -140,9 +140,9 @@
                                 </span>
                                 <search-query :datalist="finalDestinationData"
                                     :selectValue="assemblyForm.finalDestinationName" :filterable="true"
-                                    :clearable="true" :remote="true"
+                                    :clearable="true" :remote="true" :joinData="true"
                                     :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                    :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择目的港"
+                                    :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }" placeholder="请选择目的港"
                                     @remoteMethod="remoteMethod($event, 'finalDestination')"
                                     @corpChange="corpChange($event, 'finalDestination')"
                                     @corpFocus="remoteMethod($event, 'finalDestination')">
@@ -153,9 +153,9 @@
                                     <span style="color: #1e9fff">目的地</span>
                                 </span>
                                 <search-query :datalist="destinationData" :selectValue="assemblyForm.destinationName"
-                                    :filterable="true" :clearable="true" :remote="true"
+                                    :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                     :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                    :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择目的地"
+                                    :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }" placeholder="请选择目的地"
                                     @remoteMethod="remoteMethod($event, 'destination')"
                                     @corpChange="corpChange($event, 'destination')"
                                     @corpFocus="remoteMethod($event, 'destination')">
@@ -958,6 +958,11 @@ export default {
                     this.$set(this.assemblyForm, 'vesselCnName', '')
                     this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
+                if (this[name + 'Data'].length == 0) {
+                    this.$set(this.assemblyForm, 'vesselId', null)
+                    this.$set(this.assemblyForm, 'vesselCnName', value)
+                    this.$set(this.assemblyForm, 'vesselEnName', value)
+                }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
                         this.$set(this.assemblyForm, 'vesselId', item.id)

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

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div>
-            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
+            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px"
+                class="demo-ruleForm">
                 <el-row :gutter="10">
                     <el-col :span="6">
                         <el-form-item label="客户名称" prop="corpCnName">
@@ -21,6 +22,17 @@
                                 autocomplete="off" disabled clearable placeholder="提单号"></el-input>
                         </el-form-item>
                     </el-col>
+                    <!--<el-col :span="6">-->
+                    <!--    <el-form-item label="箱型箱量" prop="containers" >-->
+                    <!--        <span slot="label">-->
+                    <!--            <span style="color: #1e9fff">箱型箱量</span>-->
+                    <!--        </span>-->
+                    <!--        <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"-->
+                    <!--                  size="small" autocomplete="off"-->
+                    <!--                  disabled-->
+                    <!--                  clearable placeholder="箱型箱量" ></el-input>-->
+                    <!--    </el-form-item>-->
+                    <!--</el-col>-->
                 </el-row>
             </el-form>
         </div>
@@ -38,31 +50,35 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -77,8 +93,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'D')"
@@ -87,8 +103,8 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
                         @corpChange="corpChange($event, 'feeCnName', row, 'D')"
@@ -139,8 +155,8 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1" placeholder="请输入"
-                        @blur="quantityinputfun(row)"></el-input>
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -173,33 +189,38 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small"
+                        :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success"
+                        plain size="small"
+                        :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('C')">生成应收
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                        @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -215,8 +236,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'C')"
@@ -225,8 +246,8 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
                         @corpChange="corpChange($event, 'feeCnName', row, 'C')"
@@ -277,8 +298,8 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1" placeholder="请输入"
-                        @blur="quantityinputfun(row)"></el-input>
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -297,8 +318,12 @@
                 </template>
             </avue-crud>
         </el-card>
-        <avue-crud v-show="assemblyForm.feeCenterAmendList.length>0" id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
-        <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption" :data="sumData"></avue-crud>
+        <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
+            :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
+            :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
+        <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
+            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
+            :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
         <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
@@ -395,7 +420,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取 消</el-button>
+                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                    消</el-button>
                 <el-button type="primary" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
@@ -438,14 +464,16 @@
             <div>
                 <el-row :gutter="10">
                     <el-col :span="4">
-                        <avue-tree :option="reportOption" :data="reportTypeData" @node-click="reportNodeClick"></avue-tree>
+                        <avue-tree :option="reportOption" :data="reportTypeData"
+                            @node-click="reportNodeClick"></avue-tree>
                     </el-col>
                     <el-col :span="20">
                         <avue-crud :option="optionPrinting" :table-loading="printingLoading" :data="PrintingData"
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -456,8 +484,8 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :before-close="handleClose">
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :before-close="handleClose">
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -466,7 +494,6 @@
             </span>
         </el-dialog>
 
-
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -485,17 +512,13 @@ import {
     finaccbillsGenerateBill, finaccbillsRevokeBill, getFeeCenterCorpIds
 } from "@/api/iosBasicData/feecenter";
 import { getWorkDicts } from "@/api/system/dictbiz";
-import {
-    feecenterTemplateImport,
-    listFeeCountByCorp,
-    losbfeestemplateGetListTemplate
-} from "@/api/iosBasicData/bills";
+import { feecenterTemplateImport, listFeeCountByCorp, losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import { popupReminder, requiredMessage } from "@/util/messageReminder";
 import { getBaccelementsList } from "@/api/iosBasicData/baccelements";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import { reportsGetReportData } from "@/api/iosBasicData/reports";
-import reportformsList from "@/views/iosBasicData/AirtransportImport/bills/assembly/reportformsList.vue";
+import reportformsList from "@/views/iosBasicData/AirtransportExport/bills/assembly/reportformsList.vue";
 import { getList as reportsList } from "@/api/iosBasicData/reports";
 import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
@@ -507,7 +530,8 @@ export default {
 
         },
         assemblyForm: {
-            type: Object
+            type: Object,
+            default: {}
         },
         detailData: {},
         // 请核之后禁用
@@ -520,6 +544,10 @@ export default {
             type: Object,
             default: {}
         },
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -746,7 +774,6 @@ export default {
             reportTypeData: [], // 打印选择的数据
             reportformsObj: {}, // 打印选择的数据
             selectPrintingDialog: false, // 打印弹窗
-
             printingDialog: false, // 打印弹窗开关
             printingDC: '', // 打印弹窗选择是应收还是应付
             PrintingData: [], // 打印弹窗列表数据
@@ -800,7 +827,7 @@ export default {
                 ]
             },
             corpVisible: false, // 往来单位弹窗
-            corpDialog: [], // 往来单位弹窗数据
+            corpDialog: [], // 往来单位数据
             dcDialogType: '', // 往来单位弹窗dc判断
             corpRow: {}, // 往来单位弹窗数据
             optionD: {},
@@ -831,6 +858,7 @@ export default {
                         label: "账单",
                         prop: "accStatus",
                         width: "60",
+                        overHidden: true,
                     },
                     {
                         label: "往来单位",
@@ -848,51 +876,61 @@ export default {
                         label: "预付/到付",
                         prop: "paymode",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "计量单位",
                         prop: "unitNo",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
                         width: "100",
+                        overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "CNY(含税)",
                         prop: "rmbAmount",
                         width: "100",
+                        overHidden: true,
                     },
                     {
                         label: "USD(含税)",
                         prop: "usdAmount",
                         width: "100",
+                        overHidden: true,
                     },
                     {
                         label: "CNY(净额)",
                         prop: "rmbAmountNet",
                         width: "100",
+                        overHidden: true,
                     },
                     {
                         label: "USD(净额)",
                         prop: "usdAmountNet",
                         width: "100",
+                        overHidden: true,
                     },
                     {
                         label: "核算要素",
@@ -904,26 +942,31 @@ export default {
                         label: "付费申请金额",
                         prop: "appliedAmount",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
                         width: "120",
+                        overHidden: true,
                     },
                     {
                         label: "备注",
                         prop: "remarks",
                         width: "100",
+                        overHidden: true,
                     },
                     // {
                     //     label: "税率",
@@ -939,6 +982,7 @@ export default {
                         label: "单价是否含税",
                         prop: "isTax",
                         width: "120",
+                        overHidden: true,
                     },
                 ]
             },
@@ -1293,6 +1337,10 @@ export default {
                 })
             })
         },
+        getKeyName(key) {
+            const item = this.corpCnNameData.find(item => item.cnName === key);
+            return item ? item.shortName : key;
+        },
         // 弹窗导出
         exportfun() {
             const routeData = this.$router.resolve({
@@ -1317,7 +1365,7 @@ export default {
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
                 curCode: row.curCode,
-                type: 'KYJK'
+                type: 'KYCK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
             })
@@ -1334,7 +1382,7 @@ export default {
                 reportCode: val.classifyCode,
                 groupCode: val.groupCode,
                 itemIds: idArr.join(','),
-                type: 'KYJK'
+                type: 'KYCK'
             }).then(res => {
                 this.handleReportPreview(val.url, res.data.data.data)
             })
@@ -1361,7 +1409,7 @@ export default {
                 }
                 this.$nextTick(() => {
                     this.$refs.reportformsList.onLoad(page, {
-                        businessType: 'KYJK',
+                        businessType: 'KYCK',
                         classifyCode: '费用',
                         groupCode: groupCode
                     })
@@ -1372,7 +1420,7 @@ export default {
                 getFeeCenterCorpIds({
                     billId: this.assemblyForm.id,
                     dc: dc,
-                    type: 'KYJK',
+                    type: 'KYCK',
                 }).then(res => {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
@@ -1382,7 +1430,7 @@ export default {
                     this.PrintingData = res.data.data
                 })
                 this.reportsListfun({
-                    businessType: 'KYJK',
+                    businessType: 'KYCK',
                     classifyCode: '费用',
                     groupCode: groupCode
                 })
@@ -1511,7 +1559,7 @@ export default {
             losbfeestemplateGetListTemplate(1, 50, {
                 dc: dc,
                 status: 0,
-                type: 'KYJK'
+                type: 'KYCK'
             }).then(res => {
                 this.templateData = res.data.data.records
                 // 查第一条的明细
@@ -1567,39 +1615,13 @@ export default {
                 obj.corpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpCnName
                 obj.corpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpEnName
                 obj.shortName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].shortName
-                // 费用简称
-                obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
-                obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
-                obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
-                obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
-                // 核算要素
-                obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
-                obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
-                obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
-                obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
-                // 预付/到付
                 obj.paymode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].paymode
-                // 计量单位
-                obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
-                // 币种
-                obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
-                obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
-                // 汇率
-                obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
-                // 单价
-                obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
-                // 数量
-                obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
-                // 金额
-                obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
-                obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
-                obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
-                obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
                 this.assemblyForm.feeCenterListD.push(obj)
             } else {
+                console.log(this.assemblyForm)
                 // 往来单位拿主表客户名称
                 obj.corpId = this.assemblyForm.corpId
-                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpCnName = this.assemblyForm.corpCnName
                 obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
@@ -1646,34 +1668,35 @@ export default {
                 obj.corpCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpCnName
                 obj.corpEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpEnName
                 obj.shortName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].shortName
+                obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
                 // 费用简称
-                obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
-                obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
-                obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
-                obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
+                // obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
+                // obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
+                // obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
+                // obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
                 // 核算要素
-                obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
-                obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
-                obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
-                obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
-                // 预付/到付
-                obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
-                // 计量单位
-                obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
-                // 币种
-                obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
-                obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
-                // 汇率
-                obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
-                // 单价
-                obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
-                // 数量
-                obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
-                // 金额
-                obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
-                obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
-                obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
-                obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
+                // obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
+                // obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
+                // obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
+                // obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
+                // // 预付/到付
+                // obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
+                // // 计量单位
+                // obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
+                // // 币种
+                // obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
+                // obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
+                // // 汇率
+                // obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
+                // // 单价
+                // obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
+                // // 数量
+                // obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
+                // // 金额
+                // obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
+                // obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
+                // obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
+                // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
                 this.assemblyForm.feeCenterListC.push(obj)
             } else {
                 // 往来单位拿主表客户名称
@@ -1928,12 +1951,15 @@ export default {
         async corpChange(value, name, row, dc) {
             if (name == 'corpCnName') {
                 if (!value) {
+                    this.$set(row, 'shortName', '')
                     this.$set(row, 'corpCnName', '')
                     this.$set(row, 'corpEnName', '')
                     this.$set(row, 'corpId', '')
                 }
                 for (let item of this.corpCnNameData) {
-                    if (item.cnName == value) {
+                    if (item.shortName == value) {
+                        console.log(item)
+                        this.$set(row, 'shortName', item.shortName)
                         this.$set(row, 'corpCnName', item.cnName)
                         this.$set(row, 'corpEnName', item.enName)
                         this.$set(row, 'corpId', item.id)
@@ -2023,14 +2049,14 @@ export default {
                         // 计算金额
                         this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
                         if (row.curCode == 'CNY') {
-                            this.$set(row, 'rmbAmount', row.amount)
+                            this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                             this.$set(row, 'usdAmount', '')
-                            this.$set(row, 'rmbAmountNet', row.amount)
+                            this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
                             this.$set(row, 'usdAmountNet', '')
                         } else {
-                            this.$set(row, 'usdAmount', row.amount)
+                            this.$set(row, 'usdAmount', row.amount.toFixed(2))
                             this.$set(row, 'rmbAmount', '')
-                            this.$set(row, 'usdAmountNet', row.amount)
+                            this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
                             this.$set(row, 'rmbAmountNet', '')
                         }
                     }
@@ -2071,14 +2097,14 @@ export default {
                 }
                 this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
                 if (row.curCode == 'CNY') {
-                    this.$set(row, 'rmbAmount', row.amount)
+                    this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                     this.$set(row, 'usdAmount', '')
-                    this.$set(row, 'rmbAmountNet', row.amount)
+                    this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
                     this.$set(row, 'usdAmountNet', '')
                 } else {
-                    this.$set(row, 'usdAmount', row.amount)
+                    this.$set(row, 'usdAmount', row.amount.toFixed(2))
                     this.$set(row, 'rmbAmount', '')
-                    this.$set(row, 'usdAmountNet', row.amount)
+                    this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
                     this.$set(row, 'rmbAmountNet', '')
                 }
             } else if (name == 'elementsCnName') {
@@ -2119,14 +2145,14 @@ export default {
                         this.$set(row, 'exrate', item.exrate)
                         this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
                         if (row.curCode == 'CNY') {
-                            this.$set(row, 'rmbAmount', row.amount)
+                            this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                             this.$set(row, 'usdAmount', '')
-                            this.$set(row, 'rmbAmountNet', row.amount)
+                            this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
                             this.$set(row, 'usdAmountNet', '')
                         } else {
-                            this.$set(row, 'usdAmount', row.amount)
+                            this.$set(row, 'usdAmount', row.amount.toFixed(2))
                             this.$set(row, 'rmbAmount', '')
-                            this.$set(row, 'usdAmountNet', row.amount)
+                            this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
                             this.$set(row, 'rmbAmountNet', '')
                         }
                     }
@@ -2151,14 +2177,14 @@ export default {
                 return;
             }
             if (row.curCode == 'CNY') {
-                this.$set(row, 'rmbAmount', row.amount)
+                this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                 this.$set(row, 'usdAmount', '')
-                this.$set(row, 'rmbAmountNet', row.amount)
+                this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
                 this.$set(row, 'usdAmountNet', '')
             } else {
-                this.$set(row, 'usdAmount', row.amount)
+                this.$set(row, 'usdAmount', row.amount.toFixed(2))
                 this.$set(row, 'rmbAmount', '')
-                this.$set(row, 'usdAmountNet', row.amount)
+                this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
                 this.$set(row, 'rmbAmountNet', '')
             }
         },
@@ -2178,10 +2204,10 @@ export default {
                 return;
             }
             if (row.curCode == 'CNY') {
-                this.$set(row, 'rmbAmount', row.amount)
+                this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                 this.$set(row, 'usdAmount', '')
             } else {
-                this.$set(row, 'usdAmount', row.amount)
+                this.$set(row, 'usdAmount', row.amount.toFixed(2))
                 this.$set(row, 'rmbAmount', '')
             }
         },
@@ -2312,9 +2338,7 @@ export default {
                 polNamePrint: this.assemblyForm.polNamePrint,
                 podNamePrint: this.assemblyForm.podNamePrint,
                 teamId: this.assemblyForm.teamId,
-                teamName: this.assemblyForm.teamName,
-                warehousingDate: this.assemblyForm.warehousingDate, // 入库日期
-                outboundDate: this.assemblyForm.outboundDate, // 出库日期
+                teamName: this.assemblyForm.teamName
             }
             finaccbillsGenerateBill(obj).then(res => {
                 this.$message({
@@ -2367,31 +2391,13 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId) {
-                    sum += ` 应收序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应收序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应收序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId) {
-                    sum += ` 应付序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应付序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应付序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应付序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {
@@ -2723,8 +2729,6 @@ export default {
         },
         // 关闭弹窗
         handleClose(done) {
-            this.feesselectionList = [] // 清空多选
-            this.templateRightData = [] // 清空数据
             done();
         },
         //自定义列保存

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

@@ -59,7 +59,8 @@
                                                                 style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
                                                                 @click="applyforfun(item[0].label)">{{ item[0].label }}
                                                             </span>
-                                                            <span v-else style="color: #1e9fff">{{ item[0].label }}</span>
+                                                            <span v-else style="color: #1e9fff">{{ item[0].label
+                                                                }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -67,8 +68,9 @@
                                                         <!--           @click="applyforfun(item[0].label)" >-->
                                                         <!--</el-button>-->
                                                         <search-query v-else-if="item[0].type == 'select'"
-                                                            :datalist="item[0].dicData" :selectValue="form[item[0].prop]"
-                                                            :filterable="true" :allowCreate="item[0].allowCreate || false"
+                                                            :datalist="item[0].dicData"
+                                                            :selectValue="form[item[0].prop]" :filterable="true"
+                                                            :allowCreate="item[0].allowCreate || false"
                                                             :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[0].disabled"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
@@ -96,8 +98,9 @@
                                                             value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
                                                         </el-date-picker>
                                                         <search-query v-else-if="item[1].type == 'select'"
-                                                            :datalist="item[1].dicData" :selectValue="form[item[1].prop]"
-                                                            :filterable="true" :clearable="false" :remote="true"
+                                                            :datalist="item[1].dicData"
+                                                            :selectValue="form[item[1].prop]" :filterable="true"
+                                                            :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
@@ -107,8 +110,9 @@
                                                         </search-query>
 
                                                         <tree-select v-else-if="item[1].type == 'tree'"
-                                                            v-model="form[item[1].prop]" filterable :data="item[1].dicData"
-                                                            :props="item[1].forParameter" nodeKey="title" size="small"
+                                                            v-model="form[item[1].prop]" filterable
+                                                            :data="item[1].dicData" :props="item[1].forParameter"
+                                                            nodeKey="title" size="small"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :multiple="false" :clearable="false"
                                                             :placeholder="`${item[1].text || ''}`"
@@ -128,8 +132,9 @@
                                                             <span style="color: #1e9fff">{{ item[2].label }}</span>
                                                         </span>
                                                         <search-query v-if="item[2].type == 'select'"
-                                                            :datalist="item[2].dicData" :selectValue="form[item[2].prop]"
-                                                            :filterable="true" :clearable="false" :remote="true"
+                                                            :datalist="item[2].dicData"
+                                                            :selectValue="form[item[2].prop]" :filterable="true"
+                                                            :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[2].disabled"
                                                             :buttonIf="false" :forParameter="item[2].forParameter"
                                                             :placeholder="`${item[2].text || ''}`"
@@ -151,24 +156,24 @@
                                                 <span slot="label" v-if="item.label">
                                                     <span style="color: #1e9fff">{{ item.label }}</span>
                                                 </span>
-                                                <search-query v-if="item.type == 'select'" :datalist="item.dicData"
-                                                    ref="searchQueryRef" :selectValue="form[item.prop]"
+                                                <search-query v-if="item.type == 'select'" ref="searchQueryRef"
+                                                    :datalist="item.dicData" :selectValue="form[item.prop]"
                                                     :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)"
                                                     @eldialogConfirm="eldialogConfirm(item.slot)">
-                                                    <bcorps v-if="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
+                                                    <bcorps v-show="item.slot == 'bcorps'" ref="bcorps" :eldialog="true"
                                                         @selectionChange="eldialogMultipleChoice($event, item.slot)">
                                                     </bcorps>
-                                                    <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'">
+                                                    <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"
                                                     :placeholder="item.text || ''"></el-input>
                                             </el-form-item>
@@ -213,11 +218,13 @@
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
-                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                        :disabled="detailData.seeDisabled" :pleasereviewType="pleasereviewType" :pid="form.id"
+                        @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
-                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData"
+                        :assemblyForm="form"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" class="scrollable-container" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"
@@ -347,7 +354,7 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[],
+                feeCenterAmendList: [],
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -371,7 +378,7 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList: []
             },
             // 循环的配置
             basicData: {
@@ -384,11 +391,13 @@ export default {
                         dicData: [],
                         disabled: false,
                         buttonIf: true,
+                        joinData: true,
                         slot: 'bcorps',
                         forParameter: {
                             key: 'id',
                             label: 'cnName',
                             value: 'cnName',
+                            short: 'shortName'
                         },
                         rules: [{
                             required: true,
@@ -785,7 +794,7 @@ export default {
         },
         // 获取用户管理数据
         userGetListfun(account = undefined, type = false,) {
-            userGetList(1, 10, { account }).then(res => {
+            userGetList(1, 10, { account }, this.saberUserInfo.dept_pid.split(',')[0]).then(res => {
                 // this.columnforfun('operatorName').dicData = res.data.data.records
                 if (type) {
                     // 核算部门 默认登录人的部门
@@ -793,6 +802,8 @@ export default {
                         if (item.name == this.form.operatorName) {
                             this.$set(this.form, 'accDeptName', item.deptName)
                             this.$set(this.form, 'accDept', item.deptId)
+                            this.$set(this.form, 'operatorDept', item.deptId.split(',').pop())
+                            this.$set(this.form, 'operatorDeptName', item.deptId)
                         }
                     }
                 }
@@ -816,11 +827,8 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName }).then(res => {
-                this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
-                    item.cnName = item.cnName + ' - ' + item.shortName
-                    return item
-                })
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
+                this.columnforfun('corpCnName').dicData = res.data.data.records
             })
         },
         // 获取委托人数据 往来单位数据
@@ -962,8 +970,7 @@ export default {
             }
 
         },
-              // 下拉多选弹窗数据多选回调
-              eldialogMultipleChoice(list, name) {
+        eldialogMultipleChoice(list, name) {
             if (name == 'bcorps') {
                 let arr = []
                 if (list.length > 1) {
@@ -974,8 +981,6 @@ export default {
                     arr = list
                 }
                 this.$refs.bcorps[0].selectionList = arr
-            } else {
-
             }
         },
         // 下拉多选弹窗的确认
@@ -1049,6 +1054,7 @@ export default {
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
+                    this.form.shortName = ''
                     // 清空 客户OP
                     this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
@@ -1067,6 +1073,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()
                         // 业务来源参数带出
@@ -1074,6 +1081,8 @@ export default {
                         this.$set(this.form, 'srcId', item.srcId)
                         this.$set(this.form, 'srcCnName', item.srcCnName)
                         this.$set(this.form, 'srcEnName', item.srcEnName)
+                        this.$set(this.form, 'srcDeptId', item.deptId.split(',').pop())
+                        this.$set(this.form, 'srcDeptName', item.deptName)
                         this.columnforfun('srcType').disabled = false
                         this.columnforfun('srcCnName').disabled = false
                         // 航线带出往来单位的优势航线
@@ -1156,10 +1165,20 @@ export default {
             else if (name == 'mpaymode') {
                 // 主单付费方式
                 this.form[name] = value
+                if (value == 'PP') {
+                    this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName.split(' - ')[0] : '')
+                } else {
+                    this.$set(this.form, 'mpayplace', this.form.podEnName ? this.form.podEnName.split(' - ')[0] : '')
+                }
             }
             else if (name == 'hpaymode') {
                 // 分单付费方式
                 this.form[name] = value
+                if (value == 'PP') {
+                    this.$set(this.form, 'hpayplace', this.form.polEnName.split(' - ')[0])
+                } else {
+                    this.$set(this.form, 'hpayplace', this.form.podEnName.split(' - ')[0])
+                }
             }
             else if (name == 'clientName') {
                 for (let item of this.columnforfun('clientName').dicData) {
@@ -1494,9 +1513,6 @@ export default {
                 this.form.billNoFormat = 'KYJK'
             }
             this.form.businessTypeCode = 'KYJK'
-            // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
-            this.searchSplit()
-            // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             let multiArr = []
             for (let i in this.comprehensiveForm) {
                 if (this.comprehensiveForm[i]) {
@@ -1506,7 +1522,7 @@ export default {
             // 多选集合转换成字符串赋值
             this.form.comprehensive = multiArr.join(',')
             // 费用 收 赋值数据
-            this.form.shortName=this.form.corpCnName.split('-')[1]
+            this.form.shortName = this.form.corpCnName.split('-')[1]
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = 'D'
                 row.sort = Number(index) + 1
@@ -1619,7 +1635,6 @@ export default {
             aeabillsCopyBills({ id }).then(res => {
                 this.form = res.data.data;
                 this.pageLoading = false
-                this.searchMontage() // 下拉 中文名称和编号拼接
                 // 配箱最上面可以编辑
                 for (let item of this.form.containersList) {
                     item.edit = false
@@ -1684,7 +1699,8 @@ export default {
         // 详情接口
         async billsDetailfun(id, status) {
             const res = await aeabillsDetail(id)
-            this.form = res.data.data;
+            // this.form = res.data.data;
+            this.$set(this, 'form', res.data.data)
             this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
             // 如果已经请核就禁用按钮
             // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
@@ -1730,7 +1746,6 @@ export default {
                 this.pleasereviewType = false
             }
             this.pageLoading = false
-            this.searchMontage() // 下拉 中文名称和编号拼接
             // // 配箱最上面可以编辑
             // for(let item of this.form.containersList) {
             //     item.edit = false
@@ -1791,12 +1806,15 @@ export default {
                 item.edit = false
             }
             // 文件中心
+            this.$refs.filescenter.getData(res.data.data)
+            // 文件中心
             for (let item of this.form.filesList) {
                 this.$set(item, 'edit', false)
             }
             if (status == 'toAddEdit') {
                 this.$emit(status)
             }
+            this.oldForm = this.deepClone(this.form);
 
         },
         // tbas切换
@@ -1822,176 +1840,16 @@ export default {
                 this.billsListAllData = res.data.data
             })
         },
-
-
-        // 下拉 把拼接的拆分
-        searchSplit() {
-            // 发货人
-            if (this.form.hshipperCnName) {
-                this.form.hshipperCnName = this.form.hshipperCnName.split(' - ')[0]
-            }
-            // 收货人
-            if (this.form.hconsigneeCnName) {
-                this.form.hconsigneeCnName = this.form.hconsigneeCnName.split(' - ')[0]
-            }
-            // 通知人
-            if (this.form.hnotifyCnName) {
-                this.form.hnotifyCnName = this.form.hnotifyCnName.split(' - ')[0]
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                this.form.coloaderCnName = this.form.coloaderCnName.split(' - ')[0]
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                this.form.carrierCnName = this.form.carrierCnName.split(' - ')[0]
-            }
-            // 收货地
-            if (this.form.placeReceiptName) {
-                this.form.placeReceiptName = this.form.placeReceiptName.split(' - ')[0]
-                this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint.split(' - ')[0]
-            }
-            // 起运港
-            if (this.form.departureEnName) {
-                this.form.departureEnName = this.form.departureEnName.split(' - ')[0]
-                this.form.departureNamePrint = this.form.departureNamePrint.split(' - ')[0]
-            }
-            // 起运地
-            if (this.form.departureAddrEnName) {
-                this.form.departureAddrEnName = this.form.departureAddrEnName.split(' - ')[0]
-                this.form.departureAddrNamePrint = this.form.departureAddrNamePrint.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.finalDestinationName) {
-                this.form.finalDestinationName = this.form.finalDestinationName.split(' - ')[0]
-                this.form.finalDestinationNamePrint = this.form.finalDestinationNamePrint.split(' - ')[0]
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName.split(' - ')[0]
-                this.form.potNamePrint = this.form.potNamePrint.split(' - ')[0]
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
-            }
-            // 客户名称
-            if (this.form.corpCnName) {
-                this.form.corpCnName = this.form.corpCnName.split(' - ')[0]
-            }
-
-        },
-        // 下拉 中文名称和编号拼接
-        searchMontage() {
-            // 发货人
-            if (this.form.hshipperCnName) {
-                this.form.hshipperCnName = this.form.hshipperCnName + ' - ' + this.form.hshipperCode
-            }
-            // 收货人
-            if (this.form.hconsigneeCnName) {
-                this.form.hconsigneeCnName = this.form.hconsigneeCnName + ' - ' + this.form.hconsigneeCode
-            }
-            // 通知人
-            if (this.form.hnotifyCnName) {
-                this.form.hnotifyCnName = this.form.hnotifyCnName + ' - ' + this.form.hnotifyCode
-            }
-            // COLOADER
-            if (this.form.coloaderCnName) {
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1, 10, { cnName: this.form.coloaderCnName, corpTypeName }).then(res => {
-                    // this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
-                    res.data.data.records.forEach(e => {
-                        if (this.form.coloaderCnName == e.cnName) {
-                            this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + e.code
-                        }
-                    })
-                })
-            }
-            // 船公司
-            if (this.form.carrierCnName) {
-                let corpTypeName = '船公司'
-                getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, 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.departureEnName) {
-                this.form.departureEnName = this.form.departureEnName + ' - ' + this.form.departureCode
-                this.form.departureNamePrint = this.form.departureNamePrint + ' - ' + this.form.departureCode
-            }
-            // 起运地
-            if (this.form.departureAddrEnName) {
-                this.form.departureAddrEnName = this.form.departureAddrEnName + ' - ' + this.form.departureAddrCode
-                this.form.departureAddrNamePrint = this.form.departureAddrNamePrint + ' - ' + this.form.departureAddrCode
-            }
-            // 目的地
-            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.finalDestinationName) {
-                this.form.finalDestinationName = this.form.finalDestinationName + ' - ' + this.form.finalDestinationCode
-                this.form.finalDestinationNamePrint = this.form.finalDestinationNamePrint + ' - ' + this.form.finalDestinationCode
-            }
-            // 中转港
-            if (this.form.potEnName) {
-                this.form.potEnName = this.form.potEnName + ' - ' + this.form.potCode
-                this.form.potNamePrint = this.form.potNamePrint + ' - ' + this.form.potCode
-            }
-            // 船名
-            if (this.form.vesselCnName) {
-                getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
-                    res.data.data.records.forEach(e => {
-                        if (this.form.vesselCnName == e.cnName) {
-                            this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
-                        }
-                    })
-                })
-            }
-            // 客户名称
-            if (this.form.corpCnName) {
-                getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
-                    res.data.data.records.forEach(e => {
-                        if (this.form.corpCnName == e.cnName) {
-                            this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
-                        }
-                    })
-                    this.oldForm = this.deepClone(this.form);
-                    // this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].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;
     /* 设置容器高度 */
@@ -2019,12 +1877,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/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -938,7 +938,7 @@ export default {
                     this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
                 if (this[name + 'Data'].length == 0) {
-                    this.$set(this.assemblyForm, 'vesselId', value)
+                    this.$set(this.assemblyForm, 'vesselId',null)
                     this.$set(this.assemblyForm, 'vesselCnName', value)
                     this.$set(this.assemblyForm, 'vesselEnName', value)
                 }

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

@@ -1182,7 +1182,7 @@ export default {
             let cnPorArr = ['pol', 'pod', 'pot']
             if (arr.indexOf(name) != -1) {
                 if (!value) {
-                    this.$set(this.assemblyForm.detail, name + 'Id', '')
+                    // this.$set(this.assemblyForm.detail, name + 'Id', '')
                     this.$set(this.assemblyForm.detail, name + 'Id', '')
                     this.$set(this.assemblyForm.detail, name + 'CnName', '')
                     this.$set(this.assemblyForm.detail, name + 'EnName', '')
@@ -1281,7 +1281,7 @@ export default {
                     this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
                 if (this[name + 'Data'].length == 0) {
-                    this.$set(this.assemblyForm, 'vesselId', value)
+                    this.$set(this.assemblyForm, 'vesselId', null)
                     this.$set(this.assemblyForm, 'vesselCnName', value)
                     this.$set(this.assemblyForm, 'vesselEnName', value)
                 }

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

@@ -527,7 +527,8 @@ export default {
 
         },
         assemblyForm: {
-            type: Object
+            type: Object,
+            default: {}
         },
         detailData: {},
         // 请核之后禁用
@@ -1303,7 +1304,6 @@ export default {
         this.templateOption = await this.getColumnData(this.getColumnName(309.5), this.templateOptionBack);
         this.getBcorpsListfun() // 获取客户数据
         this.paymodeWorkDictsfun() // 获取预付/到付数据
-        console.log()
     },
     methods: {
         getSum() {

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

@@ -82,6 +82,7 @@
         methods:{
             // 点击打印
             handleCurrentRowChange(val){
+                console.log(val,1211111)
                 this.$emit('reportRadio',val)
             },
             searchChange(params, done) {

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

@@ -1035,7 +1035,6 @@ export default {
                         if (item.name == this.form.operatorName) {
                             this.$set(this.form, 'accDeptName', item.deptName)
                             this.$set(this.form, 'accDept', item.deptId)
-                            console.log(item.deptId.split(',').pop())
                             this.$set(this.form, 'operatorDept', item.deptId.split(',').pop())
                             this.$set(this.form, 'operatorDeptName', item.deptId)
                         }
@@ -1233,7 +1232,7 @@ export default {
                     arr = list
                 }
                 this.$refs.bcorps[0].selectionList = arr
-            } else { }
+            }
         },
         /* 远程模糊查询操作用户 */
         remoteMethod(value, name) {
@@ -1321,7 +1320,6 @@ export default {
                 // 往来单位
                 for (let item of this.columnforfun('corpCnName').dicData) {
                     if (item.cnName == value) {
-                        console.log(1111)
                         this.form.corpCnName = item.cnName
                         this.form.corpEnName = item.enName
                         this.form.corpId = item.id

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -1103,6 +1103,7 @@
                 ],
                 roleName:[], // 当前登录人的角色权限
                 corpRow:{}, // 往来单位弹窗数据
+                idArr:[]
             }
         },
         async created() {
@@ -1146,15 +1147,12 @@
             // 打印弹窗里回调
             reportRadio(val){
                 // 多选打印
-                let idArr = this.selectionDList.map(item=>{
-                    return item.id
-                })
                 // 获取报表数据
                 reportsGetReportData({
                     billId:this.assemblyForm.id,
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
-                    itemIds:idArr.join(','),
+                    itemIds:this.idArr.join(','),
                     type:'BGAE'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
@@ -1166,12 +1164,18 @@
                 let groupCode = ''
                 let selectionArr = []
                 if (dc == 'D') {
-                    groupCode = '应收'
-                    selectionArr = this.selectionDList
-                }else {
-                    groupCode = '应付'
-                    selectionArr = this.selectionCList
-                }
+                groupCode = '应收,应收-账单'
+                selectionArr = this.selectionDList
+                this.idArr = this.selectionDList.map(item => {
+                    return item.id
+                })
+            } else {
+                groupCode = '应付,应付-账单'
+                selectionArr = this.selectionCList
+                this.idArr = this.selectionCList.map(item => {
+                    return item.id
+                })
+            }
                 if(selectionArr.length > 0) {
                     // 打开选择弹窗
                     this.selectPrintingDialog = true

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

@@ -782,10 +782,11 @@
         methods:{
             // 报表预览
             previewreportfun(){
+                if(this.form.feeCenterListD.length==0&&this.form.feeCenterListC.length==0)  return this.$message.error('此订单没有费用明细')
                 getreportsList(1,10,{
                     businessType:'BGAE',
-                    classifyCode:'BGAE',
-                    groupCode:'AE'
+                      classifyCode:'业务',
+                    groupCode:'销售报告'
                 }).then(res=>{
                     if (res.data.data.records.length == 1) {
                         this.reportRadio(res.data.data.records[0])
@@ -801,8 +802,8 @@
                         this.$nextTick(()=>{
                             this.$refs.reportformsList.onLoad(page,{
                                 businessType:'BGAE',
-                                classifyCode:'BGAE',
-                                groupCode:'AE'
+                                 classifyCode:'业务',
+                    groupCode:'销售报告'
                             })
                         })
                     }

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

@@ -1103,6 +1103,7 @@
                 ],
                 roleName:[], // 当前登录人的角色权限
                 corpRow:{}, // 往来单位弹窗数据
+                idArr:[]
             }
         },
         async created() {
@@ -1146,15 +1147,12 @@
             // 打印弹窗里回调
             reportRadio(val){
                 // 多选打印
-                let idArr = this.selectionDList.map(item=>{
-                    return item.id
-                })
                 // 获取报表数据
                 reportsGetReportData({
                     billId:this.assemblyForm.id,
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
-                    itemIds:idArr.join(','),
+                    itemIds:this.idArr.join(','),
                     type:'BGAI'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
@@ -1166,12 +1164,18 @@
                 let groupCode = ''
                 let selectionArr = []
                 if (dc == 'D') {
-                    groupCode = '应收'
-                    selectionArr = this.selectionDList
-                }else {
-                    groupCode = '应付'
-                    selectionArr = this.selectionCList
-                }
+                groupCode = '应收,应收-账单'
+                selectionArr = this.selectionDList
+                this.idArr = this.selectionDList.map(item => {
+                    return item.id
+                })
+            } else {
+                groupCode = '应付,应付-账单'
+                selectionArr = this.selectionCList
+                this.idArr = this.selectionCList.map(item => {
+                    return item.id
+                })
+            }
                 if(selectionArr.length > 0) {
                     // 打开选择弹窗
                     this.selectPrintingDialog = true

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

@@ -782,10 +782,11 @@
         methods:{
             // 报表预览
             previewreportfun(){
+                if(this.form.feeCenterListD.length==0&&this.form.feeCenterListC.length==0)  return this.$message.error('此订单没有费用明细')
                 getreportsList(1,10,{
                     businessType:'BGAI',
-                    classifyCode:'BGAI',
-                    groupCode:'AI'
+                      classifyCode:'业务',
+                    groupCode:'销售报告'
                 }).then(res=>{
                     if (res.data.data.records.length == 1) {
                         this.reportRadio(res.data.data.records[0])
@@ -801,8 +802,8 @@
                         this.$nextTick(()=>{
                             this.$refs.reportformsList.onLoad(page,{
                                 businessType:'BGAI',
-                                classifyCode:'BGAI',
-                                groupCode:'AI'
+                                 classifyCode:'业务',
+                                groupCode:'销售报告'
                             })
                         })
                     }

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

@@ -787,10 +787,11 @@
         methods:{
             // 报表预览
             previewreportfun(){
+                if(this.form.feeCenterListD.length==0&&this.form.feeCenterListC.length==0)  return this.$message.error('此订单没有费用明细')
                 getreportsList(1,10,{
                     businessType:'BGSE',
-                    classifyCode:'BGSE',
-                    groupCode:'SE'
+                    classifyCode:'业务',
+                    groupCode:'销售报告'
                 }).then(res=>{
                     if (res.data.data.records.length == 1) {
                         this.reportRadio(res.data.data.records[0])
@@ -806,8 +807,8 @@
                         this.$nextTick(()=>{
                             this.$refs.reportformsList.onLoad(page,{
                                 businessType:'BGSE',
-                                classifyCode:'BGSE',
-                                groupCode:'SE'
+                                 classifyCode:'业务',
+                                 groupCode:'销售报告'
                             })
                         })
                     }

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

@@ -785,10 +785,11 @@
         methods:{
             // 报表预览
             previewreportfun(){
+                if(this.form.feeCenterListD.length==0&&this.form.feeCenterListC.length==0)  return this.$message.error('此订单没有费用明细')
                 getreportsList(1,10,{
                     businessType:'BGSI',
-                    classifyCode:'BGSI',
-                    groupCode:'SI'
+                    classifyCode:'业务',
+                    groupCode:'销售报告'
                 }).then(res=>{
                     if (res.data.data.records.length == 1) {
                         this.reportRadio(res.data.data.records[0])
@@ -804,8 +805,8 @@
                         this.$nextTick(()=>{
                             this.$refs.reportformsList.onLoad(page,{
                                 businessType:'BGSI',
-                                classifyCode:'BGSI',
-                                groupCode:'SI'
+                                classifyCode:'业务',
+                                 groupCode:'销售报告'
                             })
                         })
                     }

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -441,7 +441,14 @@ export default {
           precision: 2,
           controls: false,
           type: 'number',
-        }]
+        },
+        {
+          label: '箱号',
+          prop: 'ctnNo',
+        }, {
+          label: '铅封号',
+          prop: 'sealNo',
+        },]
       },
       form: {},
       dataRecord: [],
@@ -742,11 +749,26 @@ export default {
           label: '单柜运费',
           index: 14,
           prop: 'landAmountD'
+        }, 
+        {
+          label: '箱号',
+          width: 100,
+          overHidden: true,
+          cell: true,
+          index: 15,
+          prop: 'ctnNo',
+        }, {
+          label: '铅封号',
+          width: 100,
+          overHidden: true,
+          cell: true,
+          index: 16,
+          prop: 'sealNo',
         },
         {
           label: '状态',
           width: 100,
-          index: 15,
+          index: 17,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {
@@ -758,17 +780,17 @@ export default {
         }, {
           label: '委托备注',
           width: 245,
-          index: 17,
+          index: 18,
           prop: 'remarks'
         }, {
           label: '车队备注',
           width: 245,
-          index: 18,
+          index: 19,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           width: 245,
-          index: 19,
+          index: 20,
           prop: 'driverRemarks'
         },
           // {
@@ -1605,7 +1627,9 @@ export default {
         ...this.formData,
         id: this.formDataList.id,
         orderId: this.goodsForm.id,
-        originalFleetName: this.formDataList.fleetName
+        originalFleetName: this.formDataList.fleetName,
+        ctnNo: this.formDataList.ctnNo,
+        sealNo: this.formDataList.sealNo,
       }).then(res => {
         this.$refs.saveForm.resetForm()
         this.entrustList = res.data.data
@@ -1965,6 +1989,7 @@ export default {
     },
     //选择客户信息触发
     getfleetId(data, row) {
+      console.log(data, row,1111)
       this.$set(row, 'corpName', data.cname)
     },
     //收款信息移除

src/views/landTransportation/motorcadeDriver/index.vue

@@ -305,6 +305,12 @@ export default {
         }, {
           label: "电话",
           prop: "tel",
+        },{
+          label: '箱号',
+          prop: 'ctnNo',
+        }, {
+          label: "铅封号",
+          prop: "sealNo",
         }]
       },
       dialogRecord: false,
@@ -542,6 +548,13 @@ export default {
             search: true,
             prop: 'ctnNo'
           },{
+            label: '铅封号',
+            overHidden: true,
+            width: 140,
+            index: 12.1,
+            search: true,
+            prop: 'sealNo'
+          },{
             label: '实际到厂时间',
             prop: 'realArrivalTime',
             overHidden: true,
@@ -799,7 +812,9 @@ export default {
         id: this.formDataList.id,
         originalPlateNo: this.formDataList.vehicleId,
         originalDriverName: this.formDataList.driverName,
-        originalTel: this.formDataList.tel
+        originalTel: this.formDataList.tel,
+        ctnNo: this.formDataList.ctnNo,
+        sealNo: this.formDataList.sealNo
       }).then(res => {
         this.dialogChange = false
         this.onLoad(this.page)

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -393,8 +393,8 @@
       :enumerationValue="85.6"></c-upload>
 
     <el-dialog title="附件" :visible.sync="enclosure" append-to-body width="70%">
-      <c-upload typeUpload="GZ" :basic="true" deleteUrl="/api/blade-client/common-file/remove" :data="orderList" disabled
-        :enumerationValue="76"></c-upload>
+      <c-upload typeUpload="GZ" :basic="true" deleteUrl="/api/blade-client/common-file/remove" :data="orderList"
+        disabled :enumerationValue="76"></c-upload>
       <span slot="footer" class="dialog-footer">
         <el-button @click="enclosure = false" size="small">取 消</el-button>
       </span>
@@ -837,7 +837,7 @@ export default {
         }, {
           label: '备注',
           width: 200,
-          index: 10,
+          index: 12,
           prop: 'remarks'
         }]
       },
@@ -1186,9 +1186,23 @@ export default {
           cell: true,
           prop: 'goods',
         }, {
-          label: '备注',
+          label: '箱号',
+          width: 100,
+          overHidden: true,
           cell: true,
           index: 10,
+          prop: 'ctnNo',
+        }, {
+          label: '铅封号',
+          width: 100,
+          overHidden: true,
+          cell: true,
+          index: 11,
+          prop: 'sealNo',
+        }, {
+          label: '备注',
+          cell: true,
+          index: 12,
           width: 200,
           prop: 'remarks'
         }]
@@ -1537,7 +1551,6 @@ export default {
       this.findObject(this.entrustOptionTwo.column, "landAmountD").hide = true
       this.findObject(this.entrustOptionTwo.column, "landAmountD").showColumn = false
     }
-    this.$refs.other.show = false
   },
   methods: {
     openTrack(row) {

src/views/tirePartsMall/inventory/index.vue

@@ -138,6 +138,14 @@ export default {
             name: 'inventoryAmount',
             type: 'sum',
           },
+          {
+            name: 'balanceQuantityFinancing',
+            type: 'sum',
+          },
+          {
+            name: 'balanceQuantityHave',
+            type: 'sum',
+          },
         ],
         column: [
           {
@@ -217,6 +225,18 @@ export default {
             prop: "balanceQuantity",
             overHidden: true,
             width: 100
+          },
+          {
+            label: '结余数量(融资)',
+            prop: "balanceQuantityFinancing",
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: '结余数量(自有)',
+            prop: "balanceQuantityHave",
+            overHidden: true,
+            width: 120
           }, {
             label: '库存单价',
             prop: "inventoryCostPrice",