修改海运进出口 费用明细的简称 报表收发通处理 付费申请弹窗功能 发票新加分单号

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

@@ -103,12 +103,12 @@
                     <span v-else>{{ row.corpType }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row,index }">
-                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.corpCnName" placeholder="结算单位"
+                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
-                    <span v-else>{{ row.corpCnName }}</span>
+                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                    <span v-else>{{ row.shortName }}</span>
                 </template>
                 <!-- <template slot="corpCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
@@ -265,12 +265,12 @@
                     <span v-else>{{ row.corpType }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row,index }">
-                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.corpCnName" placeholder="结算单位"
+                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
-                    <span v-else>{{ row.corpCnName }}</span>
+                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                    <span v-else>{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
@@ -1583,11 +1583,12 @@ export default {
     },
     methods: {
         rowDicChange(name, row, el) {
-            if (name == 'corpCnName') {
+            if (name == 'shortName') {
                 if (row) {
                     el.corpId = row.id
                     el.shortName = row.shortName
                     el.corpEnName = row.enName
+                    el.corpCnName = row.cnName
                 } else {
                     el.corpId = null
                     el.shortName = null
@@ -1957,7 +1958,7 @@ export default {
             this.dc = dc
             this.templateVisible = true
             let obj = {
-                current: 1, 
+                current: 1,
                 size: 100,
                 status: 0,
                 type: 'HYJK',

src/views/iosBasicData/PaymentApplication/assembly/searchPopup.vue

@@ -1,10 +1,17 @@
 <!-- eslint-disable vue/require-valid-default-prop -->
 <template>
     <div>
-        <el-dialog title="选择数据" :visible.sync="dialogVisible" append-to-body width="80%" :before-close="handleClose">
+        <el-dialog title="选择数据" :visible.sync="dialogVisible" append-to-body width="80%" :before-close="handleClose"
+            :close-on-click-modal="false">
             <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" id="out-table"
                 :header-cell-class-name="headerClassName" @search-change="searchChange" @search-reset="searchReset"
                 @selection-change="selectionChange" :search.sync="query">
+                <template slot="menuLeft">
+                    <el-tabs v-model="activeName" @tab-click="handleClick">
+                        <el-tab-pane label="查看数据" name="query" />
+                        <el-tab-pane label="选择数据" name="pick" />
+                    </el-tabs>
+                </template>
                 <tempalte slot="currentStlAmountRMB" slot-scope="{ row }">
                     <el-input-number v-if="editSave" v-model="row.currentStlAmountRMB" @change="armbChange(row)"
                         :controls="false" placeholder="请输入 本次对账CNY" size="mini" style="width: 100%;"
@@ -17,6 +24,12 @@
                         :disabled="row.curCode == getLocalCurrency() || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"></el-input-number>
                     <span v-else>{{ row.currentStlAmountUSD }}</span>
                 </tempalte>
+                <template slot="menu" slot-scope="{ row, index }">
+                    <el-button v-if="activeName == 'query'" size="small" type="text" :disabled="row.disabled"
+                        @click="pick(row, index)">选择</el-button>
+                    <el-button v-if="activeName == 'pick'" size="small" type="text" :disabled="!row.disabled"
+                        @click="cancel(row, index)">取消</el-button>
+                </template>
             </avue-crud>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
@@ -48,9 +61,12 @@ export default {
     },
     data() {
         return {
+            activeName: 'query',
             editSave: true,
             selectionList: [],
             data: [],
+            pickData: [],
+            queryData: [],
             query: {
                 mblno: null,
                 hblno: null,
@@ -76,13 +92,14 @@ export default {
                 editBtn: false,
                 refreshBtn: false,
                 columnBtn: false,
-                menu: false,
+                menu: true,
+                menuWidth: 60,
                 // header: false,
-                tip: false,
-                selection: true,
-                selectable: (row, index) => {
-                    return !row.disabled
-                },
+                // tip: false,
+                // selection: true,
+                // selectable: (row, index) => {
+                //     return !row.disabled
+                // },
                 column: [
                     {
                         label: "MB/L NO",
@@ -239,6 +256,27 @@ export default {
         // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
     },
     methods: {
+        handleClick(val) {
+            if (this.activeName == 'query') {
+                this.data = this.queryData
+            }
+            if (this.activeName == 'pick') {
+                this.data = this.pickData
+            }
+        },
+        pick(row, index) {
+            this.$set(row, 'disabled', true)
+            this.data.splice(index, 1)
+            this.queryData.splice(index, 1)
+            this.pickData.push(row)
+        },
+        cancel(row, index) {
+            this.$set(row, 'disabled', false)
+            if (!this.queryData.find(item => item.accBillNo == row.accBillNo)) {
+                this.queryData.push(row)
+            }
+            this.pickData.splice(index, 1)
+        },
         armbChange(row) {
             if (row.dc == 'C') {
                 if (Number(row.amount - (row.appliedAmount - row.appliedAmountStl) - row.stlTtlAmount) > 0) {
@@ -337,6 +375,8 @@ export default {
         },
         openDialog() {
             this.data = []
+            this.queryData = []
+            this.pickData = []
             this.dialogVisible = true
             // this.query = this.deepClone(this.form)
 
@@ -354,6 +394,7 @@ export default {
             }, 200);
         },
         searchChange(params, done) {
+            this.activeName = 'query'
             this.finstlbillslistAccBillV1fun()
             done();
         },
@@ -428,6 +469,7 @@ export default {
                     if (arr.length == 0) {
                         this.$message.warning('当前检索暂无数据！')
                     }
+                    this.queryData = arr
                     this.data = arr
                 }).finally(() => {
                     this.loading = false;
@@ -483,6 +525,7 @@ export default {
                     if (arr.length == 0) {
                         this.$message.warning('当前检索暂无数据！')
                     }
+                    this.queryData = arr
                     this.data = arr
 
                 }).finally(() => {
@@ -492,10 +535,10 @@ export default {
         },
         //debounce为了防止重复点
         submit: _.debounce(function () {
-            if (this.selectionList.length == 0) {
+            if (this.pickData.length == 0) {
                 return this.$message.error('请选择数据')
             }
-            this.$emit('importData', this.selectionList)
+            this.$emit('importData', this.pickData)
             this.dialogVisible = false
         }, 300, {
             'leading': true,
@@ -548,6 +591,9 @@ export default {
                     if (this.tableData.some(item => item.accBillNo == row.accBillNo)) {
                         row.disabled = true
                     }
+                    if (this.pickData.some(item => item.accBillNo == row.accBillNo)) {
+                        row.disabled = true
+                    }
                 })
             },
             deep: true,

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -257,6 +257,10 @@
                                                 :disabled="editSave || (tableData.length > 0 && appendType == '检索')"
                                                 :loading="saveLoading" @click="retrievalfun">检 索
                                             </el-button>
+                                            <el-button size="small" type="primary"
+                                                :disabled="editSave || (tableData.length > 0 && appendType == '检索')"
+                                                :loading="saveLoading" @click="retrievalfun2">快捷检索
+                                            </el-button>
                                             <el-button size="small" :disabled="tableData.length > 0"
                                                 @click="ResetFilter">重置条件
                                             </el-button>
@@ -391,7 +395,7 @@
         </el-dialog>
         <!--报表组件-->
         <reportContainer ref="reportContainer"></reportContainer>
-        <search-popup ref="searchPopup" :form="form" @importData="importData"></search-popup>
+        <search-popup ref="searchPopup" :form="form" :tableData="tableData" @importData="importData"></search-popup>
     </div>
 </template>
 
@@ -575,6 +579,9 @@ export default {
         this.saveLocalCurrency()
     },
     methods: {
+        importData(list) {
+            this.tableData=this.tableData.concat(list)
+        },
         dicChange(name, row) {
             if (name == 'branchName') {
                 if (row) {
@@ -1011,6 +1018,24 @@ export default {
             })
 
         },
+        retrievalfun2(){
+            this.$refs.form.validate((valid) => {
+                if (!valid) return
+                // 判断是否有对账单位
+                if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form
+                    .mblno)) {
+                    console.log('新接口')
+                    this.finstlbillslistAccBillByCorpfun()
+                } else {
+                    if (!this.form.corpId) {
+                        return this.$message.warning('请填写对账单位')
+                    }
+                    console.log('原来的接口')
+                    // this.finstlbillslistAccBillV1fun(this.appendType)
+                    this.$refs.searchPopup.openDialog(this.appendType)
+                }
+            })
+        },
         // 检索弹窗数据
         finstlbillslistAccBillByCorpfun() {
             let obj = {}

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

@@ -465,8 +465,8 @@ export default {
                 res.data.data.data.vgmDeadline2 = res.data.data.data.cyReturnTime
                 res.data.data.data.hlclBoxenvoy = res.data.data.data.polFreeBoxUseDays
                 res.data.data.data.forwarding = res.data.data.data.foreignAgencyDetails
-                res.data.data.data.marks = res.data.data.data.marks?res.data.data.data.marks.replace(/<br\/>/g, '\n'):null
-                res.data.data.data.cntryString = res.data.data.data.cntryString?res.data.data.data.cntryString.replace(/<br\/>/g, '\n'):null
+                res.data.data.data.marks = res.data.data.data.marks ? res.data.data.data.marks.replace(/<br\/>/g, '\n') : null
+                res.data.data.data.cntryString = res.data.data.data.cntryString ? res.data.data.data.cntryString.replace(/<br\/>/g, '\n') : null
                 this.documentForm = res.data.data.data
                 // 联系人
                 this.documentForm.corpAttnName = this.documentForm.corpAttnName + '' + this.documentForm.corpAttnTel
@@ -513,6 +513,40 @@ export default {
                     this.documentForm.attached = 1
                 }
             }
+            // 处理超长数据
+            if (this.documentForm.hshipperDetails) {
+                let arrDeteil = []
+                arrDeteil = this.documentForm.hshipperDetails.split('\n')
+                if (arrDeteil.length > this.textareaNumber) {
+                    this.documentForm.hshipperDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '*'
+                    this.documentForm.commodityDescr += "\n*" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+                } else {
+                    this.documentForm.hshipperDetails = this.documentForm.hshipperDetails
+                }
+            }
+
+            if (this.documentForm.hconsigneeDetails) {
+                let arrDeteil = []
+                arrDeteil = this.documentForm.hconsigneeDetails.split('\n')
+                if (arrDeteil.length > this.textareaNumber) {
+                    this.documentForm.hconsigneeDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '**'
+                    this.documentForm.commodityDescr += "\n**" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+                } else {
+                    this.documentForm.hconsigneeDetails = this.documentForm.hconsigneeDetails
+                }
+            }
+
+            if (this.documentForm.hnotifyDetails) {
+                let arrDeteil = []
+                arrDeteil = this.documentForm.hnotifyDetails.split('\n')
+                if (arrDeteil.length > this.textareaNumber) {
+                    this.documentForm.hnotifyDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '***'
+                    this.documentForm.commodityDescr += "\n***" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+                } else {
+                    this.documentForm.hnotifyDetails = this.documentForm.hnotifyDetails
+                }
+            }
+
             if (this.documentForm.commodityDescr) {
                 if (this.documentForm.commodityDescr.split('\n').length > this.mttachedGoodsdesc) {
                     this.documentForm.attachedGoodsdesc = 1
@@ -755,39 +789,39 @@ export default {
             report.load(url)
 
             data.pageOne = 'Page : 1 of 1'
-            // 处理超长数据
-            if (data.hshipperDetails) {
-                let arrDeteil = []
-                arrDeteil = data.hshipperDetails.split('\n')
-                if (arrDeteil.length > this.textareaNumber) {
-                    data.hshipperDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '*'
-                    data.commodityDescr += "\n*" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
-                } else {
-                    data.hshipperDetails = data.hshipperDetails
-                }
-            }
+            // // 处理超长数据
+            // if (data.hshipperDetails) {
+            //     let arrDeteil = []
+            //     arrDeteil = data.hshipperDetails.split('\n')
+            //     if (arrDeteil.length > this.textareaNumber) {
+            //         data.hshipperDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '*'
+            //         data.commodityDescr += "\n*" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+            //     } else {
+            //         data.hshipperDetails = data.hshipperDetails
+            //     }
+            // }
 
-            if (data.hconsigneeDetails) {
-                let arrDeteil = []
-                arrDeteil = data.hconsigneeDetails.split('\n')
-                if (arrDeteil.length > this.textareaNumber) {
-                    data.hconsigneeDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '**'
-                    data.commodityDescr += "\n**" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
-                } else {
-                    data.hconsigneeDetails = data.hconsigneeDetails
-                }
-            }
+            // if (data.hconsigneeDetails) {
+            //     let arrDeteil = []
+            //     arrDeteil = data.hconsigneeDetails.split('\n')
+            //     if (arrDeteil.length > this.textareaNumber) {
+            //         data.hconsigneeDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '**'
+            //         data.commodityDescr += "\n**" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+            //     } else {
+            //         data.hconsigneeDetails = data.hconsigneeDetails
+            //     }
+            // }
 
-            if (data.hnotifyDetails) {
-                let arrDeteil = []
-                arrDeteil = data.hnotifyDetails.split('\n')
-                if (arrDeteil.length > this.textareaNumber) {
-                    data.hnotifyDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '***'
-                    data.commodityDescr += "\n***" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
-                } else {
-                    data.hnotifyDetails = data.hnotifyDetails
-                }
-            }
+            // if (data.hnotifyDetails) {
+            //     let arrDeteil = []
+            //     arrDeteil = data.hnotifyDetails.split('\n')
+            //     if (arrDeteil.length > this.textareaNumber) {
+            //         data.hnotifyDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '***'
+            //         data.commodityDescr += "\n***" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+            //     } else {
+            //         data.hnotifyDetails = data.hnotifyDetails
+            //     }
+            // }
 
             // 处理箱号
             if (this.isPrintTheBoxNumber) {

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

@@ -103,12 +103,12 @@
                     <span v-else>{{ row.corpType }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row,index }">
-                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.corpCnName" placeholder="结算单位"
+                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
-                    <span v-else>{{ row.corpCnName }}</span>
+                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                    <span v-else>{{ row.shortName }}</span>
                 </template>
                 <!-- <template slot="corpCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
@@ -266,12 +266,12 @@
                     <span v-else>{{ row.corpType }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row,index }">
-                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.corpCnName" placeholder="结算单位"
+                    <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
-                    <span v-else>{{ row.corpCnName }}</span>
+                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                    <span v-else>{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
@@ -1572,11 +1572,12 @@ export default {
             this.$refs.mailComponentRef.formData.fileContent = e.data
         },
         rowDicChange(name, row, el) {
-            if (name == 'corpCnName') {
+            if (name == 'shortName') {
                 if (row) {
                     el.corpId = row.id
                     el.shortName = row.shortName
                     el.corpEnName = row.enName
+                    el.corpCnName = row.cnName
                 } else {
                     el.corpId = null
                     el.shortName = null

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

@@ -205,8 +205,8 @@
             <el-col :span="12">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="QUANTITYCNTRDESCR" prop="quantityCntrDescr">
-                        <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.quantityCntrDescr"
-                            size="small" autocomplete="off" clearable>
+                        <el-input type="textarea" :rows="1" style="width: 100%;"
+                            v-model="documentForm.quantityCntrDescr" size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -229,7 +229,7 @@
                 rate will be charged.</span>
         </div>
         <el-row>
-            <el-col :span="2">
+            <el-col :span="4">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="FREIGHT" prop="hpaymode">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hpaymode"
@@ -265,7 +265,7 @@
                     </el-form-item>
                 </div>
             </el-col>
-            <el-col :span="3">
+            <el-col :span="4">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="COMMODITY CODE" prop="hscode">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hscode"
@@ -274,7 +274,7 @@
                     </el-form-item>
                 </div>
             </el-col>
-            <el-col :span="3">
+            <el-col :span="4">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="EXCHANGE RATE" prop="value7">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value7"
@@ -284,65 +284,64 @@
                 </div>
             </el-col>
         </el-row>
-
         <el-row>
-            <el-col :span="20">
-                <el-row>
-                    <el-col :span="4">
-                        <div style="border: 1px solid #000;">
-                            <el-form-item label="COOE TARIFF ITEM" prop="value8">
-                                <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value8"
-                                    size="small" autocomplete="off" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div style="border: 1px solid #000;">
-                            <el-form-item label="FREIGHTED AS" prop="value9">
-                                <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value9"
-                                    size="small" autocomplete="off" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div style="border: 1px solid #000;">
-                            <el-form-item label="RATE" prop="value10">
-                                <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value10"
-                                    size="small" autocomplete="off" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div style="border: 1px solid #000;">
-                            <el-form-item label="PREPAID" prop="value11">
-                                <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value11"
-                                    size="small" autocomplete="off" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                    <el-col :span="5">
-                        <div style="border: 1px solid #000;">
-                            <el-form-item label="COLLECT" prop="value12">
-                                <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value12"
-                                    size="small" autocomplete="off" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                </el-row>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="COOE TARIFF ITEM" prop="value8">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value8"
+                            size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="FREIGHTED AS" prop="value9">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value9"
+                            size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="RATE" prop="value10">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value10"
+                            size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="PREPAID" prop="value11">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value11"
+                            size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
+                    <el-form-item label="COLLECT" prop="value12">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value12"
+                            size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
                     <el-form-item label="DATE CARGO RECEIVED" prop="corpCnName">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value13"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
+            </el-col>
+            <el-col :span="6">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="DATE LADEN ON BOARD" prop="etd">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd" size="small"
@@ -350,6 +349,8 @@
                         </el-input>
                     </el-form-item>
                 </div>
+            </el-col>
+            <el-col :span="6">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="PLACE OF BILL(S)ISSUE" prop="issueAt">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.issueAt"
@@ -357,6 +358,8 @@
                         </el-input>
                     </el-form-item>
                 </div>
+            </el-col>
+            <el-col :span="6">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="DATED" prop="etd">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd" size="small"
@@ -366,7 +369,6 @@
                 </div>
             </el-col>
         </el-row>
-
         <el-row>
             <el-col :span="6">
                 <span>The printed terms and conditions on this Bill are available at its website at

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -119,6 +119,14 @@
                                                     </search-query>
                                                 </el-form-item>
                                             </el-col>
+                                            <el-col :span="12">
+                                                <el-form-item label="分单号" prop="hblno">
+                                                    <el-input style="width: 100%;" v-model="form.hblno" size="small"
+                                                        autocomplete="off" :disabled="editSave || tableData.length"
+                                                        clearable placeholder="请输入分单号">
+                                                    </el-input>
+                                                </el-form-item>
+                                            </el-col>
                                         </el-row>
                                         <el-row v-show="showForm">
                                             <el-col :span="12">

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -134,6 +134,14 @@
                                                     </search-query>
                                                 </el-form-item>
                                             </el-col>
+                                            <el-col :span="12">
+                                                <el-form-item label="分单号" prop="hblno">
+                                                    <el-input style="width: 100%;" v-model="form.hblno" size="small"
+                                                        autocomplete="off" :disabled="editSave || tableData.length"
+                                                        clearable placeholder="请输入分单号">
+                                                    </el-input>
+                                                </el-form-item>
+                                            </el-col>
                                         </el-row>
                                         <el-row v-show="showForm">
                                             <el-col :span="12">
@@ -532,8 +540,8 @@
                 </el-tab-pane>
                 <el-tab-pane label="文件中心">
                     <containerTitle title="上传附件"></containerTitle>
-                    <c-upload :data="form.fileList" :enumerationValue="76"
-                        deleteUrl="/api/blade-los/filescenter/remove" display :disabled="statusType"></c-upload>
+                    <c-upload :data="form.fileList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
+                        display :disabled="statusType"></c-upload>
                 </el-tab-pane>
             </el-tabs>
 

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -119,6 +119,14 @@
                                                     </search-query>
                                                 </el-form-item>
                                             </el-col>
+                                            <el-col :span="12">
+                                                <el-form-item label="分单号" prop="hblno">
+                                                    <el-input style="width: 100%;" v-model="form.hblno" size="small"
+                                                        autocomplete="off" :disabled="editSave || tableData.length"
+                                                        clearable placeholder="请输入分单号">
+                                                    </el-input>
+                                                </el-form-item>
+                                            </el-col>
                                         </el-row>
                                         <el-row v-show="showForm">
                                             <el-col :span="12">