Commit b268570a authored by dragondean@qq.com's avatar dragondean@qq.com

未拆单的不做拆单数据和主单校验

parent a9ab9fc5
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label2="$t('剩余箱数')" v-if="mainOrderItem.orderItemId"> <el-form-item :label2="$t('剩余箱数')" v-if="mainOrderItem.orderItemId">
剩余箱数{{ shopForm.sum || 0 }}<!--,可放入箱数:{{ mainOrderItem.num - 1 }}--> {{$t('剩余箱数')}}{{ shopForm.sum || 0 }}<!--,可放入箱数:{{ mainOrderItem.num - 1 }}-->
</el-form-item> </el-form-item>
<el-form-item :label="$t('放入箱数')"> <el-form-item :label="$t('放入箱数')">
<el-input-number v-model="shopForm.num" @change="numChange" controls-position="right" :min="1" :max="mainOrderItem.num"></el-input-number> <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right" :min="1" :max="mainOrderItem.num"></el-input-number>
...@@ -544,8 +544,9 @@ export default { ...@@ -544,8 +544,9 @@ export default {
if(!item.warehouseInInfoVO){ if(!item.warehouseInInfoVO){
return return
} }
// 没拆单的不检查
if(!item.splitSum){ if(!item.splitSum){
prods.push(this.$l(item, 'prodTitle')) // prods.push(this.$l(item, 'prodTitle'))
return return
} }
if(item.splitSum.volume.toNumber() != item.warehouseInInfoVO.volume || item.splitSum.weight.toNumber() != item.warehouseInInfoVO.weight){ if(item.splitSum.volume.toNumber() != item.warehouseInInfoVO.volume || item.splitSum.weight.toNumber() != item.warehouseInInfoVO.weight){
......
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