Commit 3d24664d authored by zhoutong's avatar zhoutong

【理货】后台+PDA,未完成理货订单,需要提示具体未完成理货的订单

 后台-合包装箱界面,订单号与箱号点击优化
parent 5ff6e2cc
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
<el-table-column align="center" :label="$t('序号')" width="50" type="index" /> <el-table-column align="center" :label="$t('序号')" width="50" type="index" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" @click.native="orderClick(scope.row)"> <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
{{ scope.row.orderNo }} <span>{{ scope.row.orderNo }}</span>
</el-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center"> <el-table-column :label="$t('商品信息')" width="250px" align="center">
...@@ -41,7 +42,9 @@ ...@@ -41,7 +42,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('计划/已装')" align="center" prop="sumNum"> <el-table-column :label="$t('计划/已装')" align="center" prop="sumNum">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" @click.native="orderClick(scope.row)">
{{ scope.row.sumNum }}/{{ scope.row.installNum }} {{ scope.row.sumNum }}/{{ scope.row.installNum }}
</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('纸箱尺寸')" align="center"> <el-table-column :label="$t('纸箱尺寸')" align="center">
...@@ -51,7 +54,6 @@ ...@@ -51,7 +54,6 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('合包箱号')" align="center" prop="pkg" />
<el-table-column :label="$t('体积')" align="center" prop="sumVolume" /> <el-table-column :label="$t('体积')" align="center" prop="sumVolume" />
<el-table-column :label="$t('重量')" align="center" prop="sumWeight" /> <el-table-column :label="$t('重量')" align="center" prop="sumWeight" />
<el-table-column :label="$t('数量(个)')" align="center" prop="sumQuantity" /> <el-table-column :label="$t('数量(个)')" align="center" prop="sumQuantity" />
......
...@@ -476,13 +476,15 @@ export default { ...@@ -476,13 +476,15 @@ export default {
// 理货完成 // 理货完成
tallyFinish() { tallyFinish() {
let flag = false let flag = false
let orderNo = ''
this.checkOrderList.forEach(item=>{ this.checkOrderList.forEach(item=>{
if(item.installNum != item.num){ if(item.installNum != item.num){
flag = true flag = true
orderNo = orderNo + '' + item.orderNo + ''
} }
}) })
if(flag){ if(flag){
this.$message.error(this.$t("仍有订单未理货,请完成所有订单箱号标签扫码后完成理货")); this.$message.error(this.$t(`订单号${orderNo}未完成理货,请完成全部订单理货后重试`));
return; return;
} }
tallyCommit({ shipmentId: this.shipmentObj.id }).then((res) => { tallyCommit({ shipmentId: this.shipmentObj.id }).then((res) => {
......
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