Commit 0e7fbddf authored by 黄卓's avatar 黄卓

后台订单转异,类型不填,可以提交,但异常未生产成功

https://zentao.test.jdshangmen.com/bug-view-3074.html
parent aa613ad6
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol"> <el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol">
<el-form label-position="top" label-width="200"> <el-form label-position="top" label-width="200" ref="exceptionForm" :model="form" :rules="exceptionRules">
<el-form-item :label="$t('原因类型')"> <el-form-item :label="$t('原因类型')" prop="manualExceptionType">
<dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector> <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('附件')"> <el-form-item :label="$t('附件')">
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit">{{$t('确认并完成入仓')}}</el-button> <el-button type="primary" @click="handleException">{{$t('确认并完成入仓')}}</el-button>
<el-button @click="escapeBol = false">{{$t('取消')}}</el-button> <el-button @click="escapeBol = false">{{$t('取消')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -286,7 +286,7 @@ export default { ...@@ -286,7 +286,7 @@ export default {
orderLocationCreateReqVOList: [], orderLocationCreateReqVOList: [],
exceptionUrls:[], exceptionUrls:[],
descZh:'', descZh:'',
manualExceptionType:'', manualExceptionType:[],
urls: [], urls: [],
sumVolume: '', sumVolume: '',
sumWeight: '', sumWeight: '',
...@@ -309,6 +309,19 @@ export default { ...@@ -309,6 +309,19 @@ export default {
"start": 0 "start": 0
} }
] ]
},
exceptionRules: {
manualExceptionType: [
{ required: true, message: '请勾选原因类型', trigger: 'change' },
{
validator: (rule, value, callback) => {
if (value.length <= 0) {
callback(new Error('请勾选原因类型'))
}
callback()
}, trigger: 'change'
}
]
} }
} }
}, },
...@@ -401,6 +414,13 @@ export default { ...@@ -401,6 +414,13 @@ export default {
}) })
return result return result
}, },
handleException() {
this.$refs.exceptionForm.validate((valid) => {
if (valid) {
this.handleSubmit()
}
})
},
async handleSubmit() { async handleSubmit() {
if (this.specialHas0()) { if (this.specialHas0()) {
const confirm = await this.$confirm(this.$t('有特需费用为0或未填写,请问是否继续?'), this.$t('注意'), { const confirm = await this.$confirm(this.$t('有特需费用为0或未填写,请问是否继续?'), 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