批量录入备注拼接
This commit is contained in:
parent
c82402fd56
commit
4d23f8b0fd
@ -107,12 +107,8 @@
|
|||||||
<el-table-column :label="$t('支付类型')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" />
|
<el-table-column :label="$t('支付类型')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" />
|
||||||
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
|
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
|
||||||
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
|
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column :label="$t('货值')" align="center" prop="realValue" min-width="80" />
|
||||||
{{scope.row.remark }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单,对应虚拟单为{{ scope.row.virtualRemark }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column> <el-table-column :label="$t('货值')" align="center" prop="realValue" min-width="80" />
|
|
||||||
<el-table-column :label="$t('附加信息')" align="center" prop="extInfo" min-width="80" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('附加信息')" align="center" prop="extInfo" min-width="80" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('是否虚拟单')" align="center" prop="blVirtual" min-width="80" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('是否虚拟单')" align="center" prop="blVirtual" min-width="80" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('关联主单')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('关联主单')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
|
||||||
@ -566,6 +562,14 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.orderList = this.orderList.concat(this.tmpDataList);
|
this.orderList = this.orderList.concat(this.tmpDataList);
|
||||||
|
//拼接remark 和virtualRemark
|
||||||
|
this.orderList.forEach((item,index)=>{
|
||||||
|
console.log('----1',item.remark)
|
||||||
|
console.log('----2',item.blVirtual)
|
||||||
|
if(item.blVirtual ==='是'){
|
||||||
|
item.remark = `${item.remark},此单为虚拟单,对应主单为:${item.masterBillCode}`
|
||||||
|
}
|
||||||
|
})
|
||||||
this.tmpDataList=[];
|
this.tmpDataList=[];
|
||||||
|
|
||||||
this.openUploadForm = false;
|
this.openUploadForm = false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user