货代 2024-1-13

src/api/iosBasicData/finstlbills.js

@@ -57,6 +57,14 @@ export const finstlbillslistAccBillV1 = (params) => {
     params: params
   })
 }
+// 有对账走的检索
+export const finstlbillsGetByDetail = (params) => {
+  return request({
+    url: '/api/blade-los/finstlbills/getByDetail',
+    method: 'get',
+    params: params
+  })
+}
 // 确认签收
 export const finstlbillsConfirmSignFor = (row) => {
   return request({

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -235,7 +235,7 @@
                               clearable placeholder="开票金额" >
                         <span style="line-height: 32px;" slot="suffix" >USD</span>
                     </el-input>
-                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoiceMatchingfun()" >开票匹配</el-button>
+                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoiceMatchingfun()" >匹配金额</el-button>
                 </div>
                 <finstlbillsitems ref="finstlbillsitems" :tableData="tableData"
                                   :editSave="editSave"
@@ -325,7 +325,7 @@ import {bcorpsbankList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 import {
     finstlbillsDetail, finstlbillsitemsRemove,
     finstlbillslistAccBillV1,
-    finstlbillsSubmit, finstlbillsConfirmSettlement,finstlbillsRevokeSettlement
+    finstlbillsSubmit, finstlbillsConfirmSettlement, finstlbillsRevokeSettlement, finstlbillsGetByDetail
 
 } from '@/api/iosBasicData/finstlbills'
 import expand from "@/components/basic-container/expand.vue";
@@ -731,12 +731,10 @@ export default {
             }
             let obj = {}
             obj.type = '2'
-            obj.corpCnName = this.form.corpId // 结算单位
             obj.curCode = this.form.curCode // 币别
             obj.dc = this.form.dc // 收付 D=收 C=付
             obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
             obj.billNo = this.form.businessNo // 单据编号  JOB NO
-            obj.checkBillNo = this.form.checkNo // CHK NO
             obj.mblno = this.form.mblno // MB/L NO
             obj.hblno = this.form.hblno // HB/L NO
             obj.queryAmount = this.form.queryAmount // 查询金额
@@ -750,61 +748,94 @@ export default {
             if (this.form.accountDate) {
                 obj.billDateList = this.form.accountDate
             }
-            finstlbillslistAccBillV1(obj).then(res=>{
-                let arr = res.data.data.map((item,index)=>{
-                    item.accBillId = item.id
-                    delete item.id
-                    // 账单编号
-                    item.accBillNo = item.billNo
-                    item.currentStlCurCode = item.curCode // 币别
-                    item.lineNo = Number(index) + 1
-                    item.pType = item.businessType
-                    item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
-                    item.accDate = item.billDate
-                    item.dc = item.accountDc // 收付
-                    if(item.curCode == 'CNY') {
-                        // 发票
-                        this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
-                        // 应结算金额
-                        this.$set(item,'amountRMB',item.amount)
-                        // 已结算金额
-                        this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
-                        // 本次金额
-                        this.$set(item,'currentStlAmountRMB',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+            // 判断是否有对账单号
+            if (this.form.checkNo) {
+                obj.corpId = this.form.corpId // 结算单位
+                obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                finstlbillsGetByDetail(obj).then(res=>{
+                    let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                        delete item.id
+                        return item
+                    })
+                    if (type == '追加') {
+                        let a = [...this.tableData,...arr,]
+                        this.tableData = a.filter((obj, index) => {
+                            return a.findIndex((elem) => {
+                                return elem.accBillNo === obj.accBillNo
+                            }) === index;
+                        });
                     }else {
-                        // 发票
-                        this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
-                        // 应结算金额
-                        this.$set(item,'amountUSD',item.amount)
-                        // 已结算金额
-                        this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
-                        // 本次金额
-                        this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                        // 获取有id 的数据
+                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                        // 有id 的处理
+                        if(itemsWithId.length != 0) {
+                            finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
+                                this.$message.success('操作成功')
+                            })
+                        }
+                        this.tableData = arr
                     }
-                    return item
                 })
+            }else {
+                obj.corpCnName = this.form.corpId // 结算单位
+                obj.checkBillNo = this.form.checkNo // CHK NO 对账单号
+                finstlbillslistAccBillV1(obj).then(res=>{
+                    let arr = res.data.data.map((item,index)=>{
+                        item.accBillId = item.id
+                        delete item.id
+                        // 账单编号
+                        item.accBillNo = item.billNo
+                        item.currentStlCurCode = item.curCode // 币别
+                        item.lineNo = Number(index) + 1
+                        item.pType = item.businessType
+                        item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
+                        item.accDate = item.billDate
+                        item.dc = item.accountDc // 收付
+                        if(item.curCode == 'CNY') {
+                            // 发票
+                            this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
+                            // 应结算金额
+                            this.$set(item,'amountRMB',item.amount)
+                            // 已结算金额
+                            this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
+                            // 本次金额
+                            this.$set(item,'currentStlAmountRMB',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                        }else {
+                            // 发票
+                            this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
+                            // 应结算金额
+                            this.$set(item,'amountUSD',item.amount)
+                            // 已结算金额
+                            this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
+                            // 本次金额
+                            this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                        }
+                        return item
+                    })
 
-                if (type == '追加') {
-                    let a = [...this.tableData,...arr,]
-                    this.tableData = a.filter((obj, index) => {
-                        return a.findIndex((elem) => {
-                            return elem.accBillNo === obj.accBillNo
-                        }) === index;
-                    });
-                }else {
-                    // 获取有id 的数据
-                    const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
-                    let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
-                    // 有id 的处理
-                    if(itemsWithId.length != 0) {
-                        finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
-                            this.$message.success('操作成功')
-                        })
+                    if (type == '追加') {
+                        let a = [...this.tableData,...arr,]
+                        this.tableData = a.filter((obj, index) => {
+                            return a.findIndex((elem) => {
+                                return elem.accBillNo === obj.accBillNo
+                            }) === index;
+                        });
+                    }else {
+                        // 获取有id 的数据
+                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                        // 有id 的处理
+                        if(itemsWithId.length != 0) {
+                            finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
+                                this.$message.success('操作成功')
+                            })
+                        }
+                        this.tableData = arr
                     }
-                    this.tableData = arr
-                }
 
-            })
+                })
+            }
         },
         // 结算确认
         finstlbillsConfirmSettlementfun(){

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -288,7 +288,7 @@
                               clearable placeholder="开票金额" >
                         <span style="line-height: 32px;" slot="suffix" >USD</span>
                     </el-input>
-                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoiceMatchingfun()" >开票匹配</el-button>
+                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoiceMatchingfun()" >匹配金额</el-button>
                 </div>
                 <finstlbillsitems ref="finstlbillsitems"
                                   :tableData="tableData"
@@ -377,7 +377,7 @@
     import {bcorpsbankList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
     import {
         finstlbillsConfirmSignFor,
-        finstlbillsDetail, finstlbillsitemsRemove,
+        finstlbillsDetail, finstlbillsGetByDetail, finstlbillsitemsRemove,
         finstlbillslistAccBillV1,
         finstlbillsRevokeSignFor,
         finstlbillsSubmit, revokeSettlementApprove, settlementApprove
@@ -767,12 +767,10 @@
                 }
                 let obj = {}
                 obj.type = '2'
-                obj.corpCnName = this.form.corpId // 结算单位
                 obj.curCode = this.form.curCode // 币别
                 obj.dc = this.form.dc // 收付 D=收 C=付
                 obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
                 obj.billNo = this.form.businessNo // 单据编号  JOB NO
-                obj.checkBillNo = this.form.checkNo // CHK NO
                 obj.mblno = this.form.mblno // MB/L NO
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.queryAmount = this.form.queryAmount // 查询金额
@@ -786,64 +784,97 @@
                 if (this.form.accountDate) {
                     obj.billDateList = this.form.accountDate
                 }
-                finstlbillslistAccBillV1(obj).then(res=>{
-                    let arr = res.data.data.map((item,index)=>{
-                        item.accBillId = item.id
-                        delete item.id
-                        // 账单编号
-                        item.accBillNo = item.billNo
-                        item.currentStlCurCode = item.curCode // 币别
-                        item.currentStlExrate = item.exrate // 汇率
-                        // quantity
-                        // quantityCntrTypesDescr
-                        item.lineNo = Number(index) + 1
-                        item.pType = item.businessType
-                        item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
-                        item.accDate = item.billDate
-                        item.dc = item.accountDc // 收付
-                        if(item.curCode == 'CNY') {
-                            // 发票
-                            this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
-                            // 应结算金额
-                            this.$set(item,'amountRMB',item.amount)
-                            // 已结算金额
-                            this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
-                            // 本次金额
-                            this.$set(item,'currentStlAmountRMB',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                // 判断是否有对账单号
+                if (this.form.checkNo) {
+                    obj.corpId = this.form.corpId // 结算单位
+                    obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                    finstlbillsGetByDetail(obj).then(res=>{
+                        let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                            delete item.id
+                            return item
+                        })
+                        if (type == '追加') {
+                            let a = [...this.tableData,...arr,]
+                            this.tableData = a.filter((obj, index) => {
+                                return a.findIndex((elem) => {
+                                    return elem.accBillNo === obj.accBillNo
+                                }) === index;
+                            });
                         }else {
-                            // 发票
-                            this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
-                            // 应结算金额
-                            this.$set(item,'amountUSD',item.amount)
-                            // 已结算金额
-                            this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
-                            // 本次金额
-                            this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                            // 获取有id 的数据
+                            const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                            let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                            // 有id 的处理
+                            if(itemsWithId.length != 0) {
+                                finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
+                                    this.$message.success('操作成功')
+                                })
+                            }
+                            this.tableData = arr
                         }
-                        return item
                     })
+                }else {
+                    obj.corpCnName = this.form.corpId // 结算单位
+                    obj.checkBillNo = this.form.checkNo // CHK NO 对账单号
+                    finstlbillslistAccBillV1(obj).then(res=>{
+                        let arr = res.data.data.map((item,index)=>{
+                            item.accBillId = item.id
+                            delete item.id
+                            // 账单编号
+                            item.accBillNo = item.billNo
+                            item.currentStlCurCode = item.curCode // 币别
+                            item.currentStlExrate = item.exrate // 汇率
+                            // quantity
+                            // quantityCntrTypesDescr
+                            item.lineNo = Number(index) + 1
+                            item.pType = item.businessType
+                            item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
+                            item.accDate = item.billDate
+                            item.dc = item.accountDc // 收付
+                            if(item.curCode == 'CNY') {
+                                // 发票
+                                this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
+                                // 应结算金额
+                                this.$set(item,'amountRMB',item.amount)
+                                // 已结算金额
+                                this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
+                                // 本次金额
+                                this.$set(item,'currentStlAmountRMB',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                            }else {
+                                // 发票
+                                this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
+                                // 应结算金额
+                                this.$set(item,'amountUSD',item.amount)
+                                // 已结算金额
+                                this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
+                                // 本次金额
+                                this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount) - Number(item.appliedAmount)).toFixed(2))
+                            }
+                            return item
+                        })
 
-                    if (type == '追加') {
-                        let a = [...this.tableData,...arr,]
-                        this.tableData = a.filter((obj, index) => {
-                            return a.findIndex((elem) => {
-                                return elem.accBillNo === obj.accBillNo
-                            }) === index;
-                        });
-                    }else {
-                        // 获取有id 的数据
-                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
-                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
-                        // 有id 的处理
-                        if(itemsWithId.length != 0) {
-                            finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
-                                this.$message.success('操作成功')
-                            })
+                        if (type == '追加') {
+                            let a = [...this.tableData,...arr,]
+                            this.tableData = a.filter((obj, index) => {
+                                return a.findIndex((elem) => {
+                                    return elem.accBillNo === obj.accBillNo
+                                }) === index;
+                            });
+                        }else {
+                            // 获取有id 的数据
+                            const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                            let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                            // 有id 的处理
+                            if(itemsWithId.length != 0) {
+                                finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
+                                    this.$message.success('操作成功')
+                                })
+                            }
+                            this.tableData = arr
                         }
-                        this.tableData = arr
-                    }
 
-                })
+                    })
+                }
             },
             // 结算确认
             settlementApprovefun(){

src/views/iosBasicData/PaymentApplication/index.vue

@@ -54,7 +54,6 @@
               <template slot="billNo" slot-scope="{row}">
                   <span class="pointerClick" @click="editFun(row)" >{{row.billNo}}</span>
               </template>
-
           </avue-crud>
       </basic-container>
 

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -51,7 +51,7 @@
                     </template>
                 </avue-crud>
             </el-tab-pane>
-            <el-tab-pane label="装箱" name="first">
+            <el-tab-pane label="已装箱" name="first">
                 <div class="tbasTop">
                     <el-table
                         :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"

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

@@ -493,9 +493,10 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
-                                    <el-input type="number" style="width: 100%;" v-model="assemblyForm.quantity"
+                                    <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
                                               size="small" autocomplete="off" min="1"
                                               :disabled="detailData.seeDisabled" @input="quantityInput"
+                                              @focus="quantityFocus"
                                               clearable placeholder="件数" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -968,6 +969,19 @@ import {NdayDate} from "@/util/date";
             // this.lineBlinesListfun()
         },
         methods:{
+            // 件数聚焦
+            quantityFocus(){
+                if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].editQuantity)) {
+                    this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
+                        confirmButtonText: '确定',
+                    });
+                    this.$nextTick(() => {
+                        this.$refs.quantityRef.blur()
+                    })
+                    return
+                }
+            },
+            // 件数监听
             quantityInput(value){
                 this.$set(this.assemblyForm,'quantity',value.replace(/^0+(\d)|[^\d]+/g,''))
             },

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

@@ -30,7 +30,7 @@
                             <span slot="label">
                                 <span style="color: #1e9fff">箱型箱量</span>
                             </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.containers"
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
                                       size="small" autocomplete="off"
                                       disabled
                                       clearable placeholder="箱型箱量" ></el-input>
@@ -105,7 +105,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="getBcorpsListfun($event,'corpCnName')"
-                                  @corpChange="corpChange($event,'corpCnName',row)"
+                                  @corpChange="corpChange($event,'corpCnName',row,'D')"
                                   @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                     </search-query>
                     <span v-else style="color: #1e9fff" @click="corpClick">{{row.corpCnName}}</span>
@@ -120,7 +120,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="bfeesListfun($event,'feeCnName')"
-                                  @corpChange="corpChange($event,'feeCnName',row)"
+                                  @corpChange="corpChange($event,'feeCnName',row,'D')"
                                   @corpFocus="bfeesListfun($event,'feeCnName')" >
                     </search-query>
                     <span v-else >{{row.feeCnName}}</span>
@@ -135,7 +135,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="getBaccelementsListfun($event,'elementsCnName')"
-                                  @corpChange="corpChange($event,'elementsCnName',row)"
+                                  @corpChange="corpChange($event,'elementsCnName',row,'D')"
                                   @corpFocus="getBaccelementsListfun($event,'elementsCnName')" >
                     </search-query>
                     <span v-else >{{row.elementsCnName}}</span>
@@ -147,7 +147,7 @@
                                   :clearable="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                                  @corpChange="corpChange($event,'paymode',row)"
+                                  @corpChange="corpChange($event,'paymode',row,'D')"
                                   @corpFocus="paymodeWorkDictsfun" >
                     </search-query>
                     <span v-else>{{row.paymode}}</span>
@@ -162,7 +162,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
                                   @corpFocus="getBunitsPagefun"
-                                  @corpChange="corpChange($event,'unitNo',row)" >
+                                  @corpChange="corpChange($event,'unitNo',row,'D')" >
                     </search-query>
                     <span v-else>{{row.unitNo}}</span>
                 </template>
@@ -272,7 +272,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="getBcorpsListfun($event,'corpCnName')"
-                                  @corpChange="corpChange($event,'corpCnName',row)"
+                                  @corpChange="corpChange($event,'corpCnName',row,'C')"
                                   @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                     </search-query>
                     <span v-else >{{row.corpCnName}}</span>
@@ -287,7 +287,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="bfeesListfun($event,'feeCnName')"
-                                  @corpChange="corpChange($event,'feeCnName',row)"
+                                  @corpChange="corpChange($event,'feeCnName',row,'C')"
                                   @corpFocus="bfeesListfun($event,'feeCnName')" >
                     </search-query>
                     <span v-else>{{row.feeCnName}}</span>
@@ -302,7 +302,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                   @remoteMethod="getBaccelementsListfun($event,'elementsCnName')"
-                                  @corpChange="corpChange($event,'elementsCnName',row)"
+                                  @corpChange="corpChange($event,'elementsCnName',row,'C')"
                                   @corpFocus="getBaccelementsListfun($event,'elementsCnName')" >
                     </search-query>
                     <span v-else >{{row.elementsCnName}}</span>
@@ -314,7 +314,7 @@
                                   :clearable="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                                  @corpChange="corpChange($event,'paymode',row)"
+                                  @corpChange="corpChange($event,'paymode',row,'C')"
                                   @corpFocus="paymodeWorkDictsfun" >
                     </search-query>
                     <span v-else>{{row.paymode}}</span>
@@ -329,7 +329,7 @@
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
                                   @corpFocus="getBunitsPagefun"
-                                  @corpChange="corpChange($event,'unitNo',row)">
+                                  @corpChange="corpChange($event,'unitNo',row,'C')">
                     </search-query>
                     <span v-else>{{row.unitNo}}</span>
                 </template>
@@ -1724,8 +1724,19 @@
                                     }
                                 }
                             })
-
-
+                            // 计算金额
+                            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,'usdAmount','')
+                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet','')
+                            }else {
+                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'rmbAmount','')
+                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet','')
+                            }
                         }
                     }
                 }else if (name == 'unitNo') {
@@ -1794,12 +1805,17 @@
                             }
                             this.$set(row,'curCode',item.code)
                             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,'usdAmount','')
+                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet','')
                             }else {
                                 this.$set(row,'usdAmount',row.amount)
                                 this.$set(row,'rmbAmount','')
+                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet','')
                             }
                         }
                     }
@@ -1825,9 +1841,13 @@
                 if (row.curCode == 'CNY') {
                     this.$set(row,'rmbAmount',row.amount)
                     this.$set(row,'usdAmount','')
+                    this.$set(row,'rmbAmountNet',row.amount)
+                    this.$set(row,'usdAmountNet','')
                 }else {
                     this.$set(row,'usdAmount',row.amount)
                     this.$set(row,'rmbAmount','')
+                    this.$set(row,'usdAmountNet',row.amount)
+                    this.$set(row,'rmbAmountNet','')
                 }
             },
             // 数量

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

@@ -64,7 +64,7 @@
             <el-input
                 v-if="scope.row.edit"
                 v-model="scope.row.url"
-                style="width: 80%"
+                style="width: 80%;"
                 size="small"
             >
             </el-input>
@@ -76,7 +76,9 @@
             >
                 附件
             </el-button>
-            <span v-else>{{ scope.row.url }}</span>
+            <span v-else style="color: #1e9fff;" @click="rowDownload(scope.row, scope.index)" >
+                {{ scope.row.url }}
+            </span>
 
         </template>
         <template slot-scope="scope" slot="isImage">
@@ -139,6 +141,8 @@
   import {filescenterList, filescenterDetail, filescenterSubmit, filescenterRemove} from "@/api/iosBasicData/filescenter";
   import {mapGetters} from "vuex";
   import {requiredMessage} from "@/util/messageReminder";
+  import website from "@/config/website";
+  import {getToken} from "@/util/auth";
 
   export default {
       props:{
@@ -331,6 +335,24 @@
             loading = false;
             done();
         },
+        // 下载
+        rowDownload(row){
+            console.log(row,340)
+            // window.open(row.url)
+            window.open(`${row.url}?${this.website.tokenHeader}=${getToken()}`);
+            // this.$axios.get(row.url,{
+            //     responseType:'blob',
+            // }).then((response)=>{
+            //     console.log(response,346)
+            //     const blob = new Blob([response.data],{type:'application/;charset=utf-8'})
+            //     const a = document.createElement("a");
+            //     a.href = URL.createObjectURL(blob)
+            //     a.download = 'fileName123132123'
+            //     document.body.appendChild(a)
+            //     a.click()
+            //     document.body.removeChild(a)
+            // })
+        },
         // 预览
         rowPreview(row,index){
             this.imgUrl = row.url

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -477,7 +477,7 @@
                                           clearable placeholder="开票金额" >
                                     <span style="line-height: 32px;" slot="suffix" >USD</span>
                                 </el-input>
-                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()" >开票匹配</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()" >匹配金额</el-button>
                             </div>
                             <fininvoicesitems ref="fininvoicesitems"
                                               :tableData="tableData"
@@ -541,7 +541,7 @@
 import fininvoicesitems from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue";
 import fininvoiceitemdetail from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoiceitemdetail.vue";
 import {getRateList} from "@/api/iosBasicData/rateManagement";
-import {finstlbillsitemsRemove, finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
+import {finstlbillsGetByDetail, finstlbillsitemsRemove, finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
 import {bcorpsbankList, corpsinvoiceheaderList, getBcorpsList} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
@@ -1033,57 +1033,104 @@ export default {
                     obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
                 }
                 obj.type = '3'
-                obj.corpCnName = this.form.corpId // 结算单位
                 obj.billNo = this.form.businessNo // 业务编号
                 obj.businessBillNo = this.form.billNo // 业务编号
                 obj.mblno = this.form.mblno // 主单编号
                 obj.hblno = this.form.hblno // 分单编号
-                obj.checkBillNo = this.form.checkNo // 对账单号
                 obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
                 obj.curCode = this.form.curCode // 币种
                 obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                finstlbillslistAccBillV1(obj).then(res=>{
-                    let arr = res.data.data.map((item,index)=>{
-                        item.lineNo = Number(index) + 1 // 行号
-                        item.accBillId = item.id
-                        item.accBillNo = item.billNo // JOB NO
-                        item.billNo = item.businessBillNo // 账单编号
-                        item.accDate = item.createTime
-                        item.currentCurCode = item.curCode
-                        item.currentExrate = item.exrate
-                        item.dc = item.accountDc
-                        let amountdata = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
-                        if (item.currentCurCode == 'CNY') {
-                            // 本次发票金额
-                            this.$set(item,'currentAmountCNY',amountdata)
+                // 判断是否有对账单号
+                if (this.form.checkNo) {
+                    obj.corpId = this.form.corpId // 结算单位
+                    obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                    finstlbillsGetByDetail(obj).then(res=>{
+                        let arr = res.data.data.map((item,index)=>{
+                            item.lineNo = Number(index) + 1 // 行号
+                            item.accBillId = item.id
+                            item.accBillNo = item.billNo // JOB NO
+                            item.billNo = item.businessBillNo // 账单编号
+                            item.accDate = item.createTime
+                            item.currentCurCode = item.curCode
+                            item.currentExrate = item.exrate
+                            item.dc = item.accountDc
+                            let amountdata = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                            if (item.currentCurCode == 'CNY') {
+                                // 本次发票金额
+                                this.$set(item,'currentAmountCNY',amountdata)
+                            }else {
+                                // 本次发票金额
+                                this.$set(item,'currentAmountUSD',amountdata)
+                            }
+                            delete item.id
+                            return item
+                        })
+                        if (type == '追加') {
+                            let a = [...this.tableData,...arr,]
+                            this.tableData = a.filter((obj, index) => {
+                                return a.findIndex((elem) => {
+                                    return elem.accBillNo === obj.accBillNo
+                                }) === index;
+                            });
                         }else {
-                            // 本次发票金额
-                            this.$set(item,'currentAmountUSD',amountdata)
+                            // 获取有id 的数据
+                            const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                            let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                            // 有id 的处理
+                            if(itemsWithId.length != 0) {
+                                fininvoicesitemsRemove(arrIds.join(',')).then(res=>{
+                                    this.$message.success('操作成功')
+                                })
+                            }
+                            this.tableData = arr
                         }
-                        delete item.id
-                        return item
                     })
-                    if (type == '追加') {
-                        let a = [...this.tableData,...arr,]
-                        this.tableData = a.filter((obj, index) => {
-                            return a.findIndex((elem) => {
-                                return elem.accBillNo === obj.accBillNo
-                            }) === index;
-                        });
-                    }else {
-                        // 获取有id 的数据
-                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
-                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
-                        // 有id 的处理
-                        if(itemsWithId.length != 0) {
-                            fininvoicesitemsRemove(arrIds.join(',')).then(res=>{
-                                this.$message.success('操作成功')
-                            })
+                }else {
+                    obj.corpCnName = this.form.corpId // 结算单位
+                    obj.checkBillNo = this.form.checkNo // 对账单号
+                    finstlbillslistAccBillV1(obj).then(res=>{
+                        let arr = res.data.data.map((item,index)=>{
+                            item.lineNo = Number(index) + 1 // 行号
+                            item.accBillId = item.id
+                            item.accBillNo = item.billNo // JOB NO
+                            item.billNo = item.businessBillNo // 账单编号
+                            item.accDate = item.createTime
+                            item.currentCurCode = item.curCode
+                            item.currentExrate = item.exrate
+                            item.dc = item.accountDc
+                            let amountdata = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                            if (item.currentCurCode == 'CNY') {
+                                // 本次发票金额
+                                this.$set(item,'currentAmountCNY',amountdata)
+                            }else {
+                                // 本次发票金额
+                                this.$set(item,'currentAmountUSD',amountdata)
+                            }
+                            delete item.id
+                            return item
+                        })
+                        if (type == '追加') {
+                            let a = [...this.tableData,...arr,]
+                            this.tableData = a.filter((obj, index) => {
+                                return a.findIndex((elem) => {
+                                    return elem.accBillNo === obj.accBillNo
+                                }) === index;
+                            });
+                        }else {
+                            // 获取有id 的数据
+                            const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                            let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                            // 有id 的处理
+                            if(itemsWithId.length != 0) {
+                                fininvoicesitemsRemove(arrIds.join(',')).then(res=>{
+                                    this.$message.success('操作成功')
+                                })
+                            }
+                            this.tableData = arr
                         }
-                        this.tableData = arr
-                    }
 
-                })
+                    })
+                }
             },
             // 保存接口
             fininvoicesSubmitfun(obj){

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -495,7 +495,7 @@
                                           clearable placeholder="开票金额" >
                                     <span style="line-height: 32px;" slot="suffix" >USD</span>
                                 </el-input>
-                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()" >开票匹配</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()" >匹配金额</el-button>
                             </div>
                             <fininvoicesitems ref="fininvoicesitems" :tableData="tableData"
                                               :handleSelectionData="handleSelectionData"
@@ -561,7 +561,7 @@
 import fininvoicesitems from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue";
 import fininvoiceitemdetail from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoiceitemdetail.vue";
 import {getRateList} from "@/api/iosBasicData/rateManagement";
-import {finstlbillsitemsRemove, finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
+import {finstlbillsGetByDetail, finstlbillsitemsRemove, finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
 import {bcorpsbankList, corpsinvoiceheaderList, getBcorpsList} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
@@ -1056,54 +1056,98 @@ export default {
             }
 
             obj.type = '3'
-            obj.corpCnName = this.form.corpId // 结算单位
             obj.billNo = this.form.bookingNo // 账单号
             obj.businessBillNo = this.form.billNo // 业务编号
             obj.mblno = this.form.mblno // 主单编号
             obj.hblno = this.form.hblno // 分单编号
-            obj.checkBillNo = this.form.checkNo // 对账单号
             obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
             obj.curCode = this.form.curCode // 币种
             obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-            finstlbillslistAccBillV1(obj).then(res=>{
-                let arr = res.data.data.map((item,index)=>{
-                    item.lineNo = Number(index) + 1 // 行号
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.createTime
-                    item.currentCurCode = item.curCode
-                    item.currentExrate = item.exrate
-                    if (item.currentCurCode == 'CNY') {
-                        // 本次发票金额
-                        item.currentAmountCNY = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+            // 判断是否有对账单号
+            if (this.form.checkNo) {
+                obj.corpId = this.form.corpId // 结算单位
+                obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                finstlbillsGetByDetail(obj).then(res=>{
+                    let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                        item.lineNo = Number(index) + 1 // 行号
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.createTime
+                        item.currentCurCode = item.curCode
+                        item.currentExrate = item.exrate
+                        if (item.currentCurCode == 'CNY') {
+                            // 本次发票金额
+                            item.currentAmountCNY = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                        }else {
+                            // 本次发票金额
+                            item.currentAmountUSD = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                        }
+                        delete item.id
+                        return item
+                    })
+                    if (type == '追加') {
+                        let a = [...this.tableData,...arr,]
+                        this.tableData = a.filter((obj, index) => {
+                            return a.findIndex((elem) => {
+                                return elem.accBillNo === obj.accBillNo
+                            }) === index;
+                        });
                     }else {
-                        // 本次发票金额
-                        item.currentAmountUSD = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                        // 获取有id 的数据
+                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                        // 有id 的处理
+                        if(itemsWithId.length != 0) {
+                            finstlbillsitemsRemove(arrIds.join(',')).then(res=>{
+                                this.$message.success('操作成功')
+                            })
+                        }
+                        this.tableData = arr
                     }
-                    delete item.id
-                    return item
                 })
-                if (type == '追加') {
-                    let a = [...this.tableData,...arr,]
-                    this.tableData = a.filter((obj, index) => {
-                        return a.findIndex((elem) => {
-                            return elem.accBillNo === obj.accBillNo
-                        }) === index;
-                    });
-                }else {
-                    // 获取有id 的数据
-                    const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
-                    let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
-                    // 有id 的处理
-                    if(itemsWithId.length != 0) {
-                        fininvoicesitemsRemove(arrIds.join(',')).then(res=>{
-                            this.$message.success('操作成功')
-                        })
+            }else {
+                obj.corpCnName = this.form.corpId // 结算单位
+                obj.checkBillNo = this.form.checkNo // 对账单号
+                finstlbillslistAccBillV1(obj).then(res=>{
+                    let arr = res.data.data.map((item,index)=>{
+                        item.lineNo = Number(index) + 1 // 行号
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.createTime
+                        item.currentCurCode = item.curCode
+                        item.currentExrate = item.exrate
+                        if (item.currentCurCode == 'CNY') {
+                            // 本次发票金额
+                            item.currentAmountCNY = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                        }else {
+                            // 本次发票金额
+                            item.currentAmountUSD = (Number(item.amount) - Number(item.appliedInvoiceAmount)).toFixed(2)
+                        }
+                        delete item.id
+                        return item
+                    })
+                    if (type == '追加') {
+                        let a = [...this.tableData,...arr,]
+                        this.tableData = a.filter((obj, index) => {
+                            return a.findIndex((elem) => {
+                                return elem.accBillNo === obj.accBillNo
+                            }) === index;
+                        });
+                    }else {
+                        // 获取有id 的数据
+                        const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));
+                        let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                        // 有id 的处理
+                        if(itemsWithId.length != 0) {
+                            fininvoicesitemsRemove(arrIds.join(',')).then(res=>{
+                                this.$message.success('操作成功')
+                            })
+                        }
+                        this.tableData = arr
                     }
-                    this.tableData = arr
-                }
 
-            })
+                })
+            }
         },
         // 保存接口
         fininvoicesSubmitfun(obj){

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -70,19 +70,16 @@
                     </avue-text-ellipsis>
                 </template>
             </el-table-column>
-            <el-table-column label="本币金额">
-                <!--amount-->
-                <el-table-column
-                    prop="amountRMB"
-                    label="CNY">
-                </el-table-column>
-                <el-table-column
-                    prop="amountUSD"
-                    label="USD">
-                </el-table-column>
-            </el-table-column>
-            <el-table-column
-                label="本次币种"
+            <el-table-column
+                prop="amountRMB"
+                label="本次CNY">
+            </el-table-column>
+            <el-table-column
+                prop="amountUSD"
+                label="本次USD">
+            </el-table-column>
+            <el-table-column
+                label="币种"
                 prop="currentStlCurCode" width="100">
                 <template slot-scope="{row}">
                     <!--<search-query v-if="!editSave"-->
@@ -101,33 +98,29 @@
                     <span>{{row.currentStlCurCode}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="本次结算金额">
-                <!--默认应结算 可以修改-->
-                <!--currentStlAmount-->
-                <el-table-column
-                    prop="currentStlAmountRMB"
-                    label="CNY" width="80">
-                    <template slot-scope="scope">
-                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"-->
-                        <!--          size="mini" autocomplete="off"-->
-                        <!--          clearable placeholder="请输入USD" >-->
-                        <!--</el-input>-->
-                        <!--<span v-else>{{scope.row.currentStlAmountRMB}}</span>-->
-                        <span>{{scope.row.currentStlAmountRMB}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="currentStlAmountUSD"
-                    label="USD" width="80">
-                    <template slot-scope="scope">
-                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"-->
-                        <!--          size="mini" autocomplete="off"-->
-                        <!--          clearable placeholder="请输入USD" >-->
-                        <!--</el-input>-->
-                        <!--<span v-else>{{scope.row.currentStlAmountUSD}}</span>-->
-                        <span>{{scope.row.currentStlAmountUSD}}</span>
-                    </template>
-                </el-table-column>
+            <el-table-column
+                prop="currentStlAmountRMB"
+                label="本次对账CNY" width="100">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"
+                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'CNY'"
+                              clearable placeholder="请输入USD" >
+                    </el-input>
+                    <span v-else>{{scope.row.currentStlAmountRMB}}</span>
+                    <!--<span>{{scope.row.currentStlAmountRMB}}</span>-->
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="currentStlAmountUSD"
+                label="本次对账USD" width="100">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"
+                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'USD'"
+                              clearable placeholder="请输入USD" >
+                    </el-input>
+                    <span v-else>{{scope.row.currentStlAmountUSD}}</span>
+                    <!--<span>{{scope.row.currentStlAmountUSD}}</span>-->
+                </template>
             </el-table-column>
             <el-table-column
                 prop="currentStlExrate"
@@ -233,16 +226,13 @@
                     <span class="textHide" >{{row.voyageNo}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="发票">
-                <!--currentInvoiceAmount-->
-                <el-table-column
-                    prop="currentInvoiceAmountRMB"
-                    label="CNY">
-                </el-table-column>
-                <el-table-column
-                    prop="currentInvoiceAmountUSD"
-                    label="USD">
-                </el-table-column>
+            <el-table-column
+                prop="currentInvoiceAmountRMB"
+                label="发票CNY">
+            </el-table-column>
+            <el-table-column
+                prop="currentInvoiceAmountUSD"
+                label="发票USD">
             </el-table-column>
             <el-table-column
                 prop="quantityCntrTypesDescr"
@@ -264,27 +254,21 @@
                 prop="dc"
                 label="收/付">
             </el-table-column>
-            <el-table-column label="应对账金额">
-                <!--unsettledAmount-->
-                <el-table-column
-                    prop="unsettledAmountRMB"
-                    label="CNY">
-                </el-table-column>
-                <el-table-column
-                    prop="unsettledAmountUSD"
-                    label="USD">
-                </el-table-column>
-            </el-table-column>
-            <el-table-column label="已对账金额" width="140px">
-                <!--stlTtlAmount-->
-                <el-table-column
-                    prop="stlTtlAmountRMB"
-                    label="CNY">
-                </el-table-column>
-                <el-table-column
-                    prop="stlTtlAmountUSD"
-                    label="USD">
-                </el-table-column>
+            <el-table-column
+                prop="unsettledAmountRMB"
+                label="应对账CNY">
+            </el-table-column>
+            <el-table-column
+                prop="unsettledAmountUSD"
+                label="应对账USD">
+            </el-table-column>
+            <el-table-column
+                prop="stlTtlAmountRMB"
+                label="已对账CNY">
+            </el-table-column>
+            <el-table-column
+                prop="stlTtlAmountUSD"
+                label="已对账USD">
             </el-table-column>
             <!--<el-table-column-->
             <!--    prop="voyageNo"-->

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -254,7 +254,7 @@ export default {
             type: 'sum',
           }],
         column: [{
-          label: '轮胎名称',
+          label: '商品名称',
           prop: 'goodsId',
           // disabled: true,
           width: 200,
@@ -267,7 +267,7 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
         }, {
-          label: '轮胎编码',
+          label: '商品编码',
           disabled: true,
           prop: 'goodsNo',
           width: 100
@@ -317,7 +317,7 @@ export default {
           disabled: true,
           width: 100
         }, {
-          label: '轮胎描述',
+          label: '商品描述',
           prop: 'goodsDescription',
           disabled: true,
         },  {