Commit 33dd36ae authored by huhaiqing's avatar huhaiqing

增加多规格显示

parent e5d04426
...@@ -45,7 +45,16 @@ ...@@ -45,7 +45,16 @@
<dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" /> <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" /> <el-table-column :label="$t('箱数')" align="center" prop="num">
<template slot-scope="scope">
<div>
{{scope.row.num}}
</div>
<div style="color:blue;fontWeight:bold;">
{{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge"> <el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge">
</el-table-column> </el-table-column>
<el-table-column :label="$t('体积')" align="center" prop="volume"> <el-table-column :label="$t('体积')" align="center" prop="volume">
...@@ -138,6 +147,7 @@ export default { ...@@ -138,6 +147,7 @@ export default {
list.push({ list.push({
...oItem, ...oItem,
warehouseInInfo, warehouseInInfo,
multiSpecification: item.multiSpecification,
positionNo: item.positionNo, positionNo: item.positionNo,
tallyStatus: item.tallyStatus, tallyStatus: item.tallyStatus,
tallyTime: item.tallyTime, tallyTime: item.tallyTime,
...@@ -181,9 +191,9 @@ export default { ...@@ -181,9 +191,9 @@ export default {
orderIds = [data.orderId]; orderIds = [data.orderId];
} }
let msgTitle = this.$t('您确定要将 {no} 移出 {selfNo} 吗?', { let msgTitle = this.$t("您确定要将 {no} 移出 {selfNo} 吗?", {
no: orderNos.join(""), no: orderNos.join(""),
selfNo: this.shipmentObj.selfNo selfNo: this.shipmentObj.selfNo,
}); });
this.$confirm(msgTitle, this.$t("提示"), { this.$confirm(msgTitle, this.$t("提示"), {
...@@ -241,7 +251,7 @@ export default { ...@@ -241,7 +251,7 @@ export default {
getCityName() { getCityName() {
return (id) => { return (id) => {
let arr = this.$attrs.warehouseList.filter((item) => item.id == id); let arr = this.$attrs.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t(""); return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("");
}; };
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment