Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/order/warehousing/index.vue

@@ -170,8 +170,8 @@
       </div>
     </el-dialog>
     <el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol">
-      <el-form label-position="top" label-width="200">
-        <el-form-item :label="$t('原因类型')">
+      <el-form label-position="top" label-width="200" ref="exceptionForm" :model="form" :rules="exceptionRules">
+        <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>
         </el-form-item>
         <el-form-item :label="$t('附件')">
@@ -182,7 +182,7 @@
         </el-form-item>
       </el-form>
       <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>
       </span>
     </el-dialog>
@@ -258,7 +258,7 @@ export default {
         orderLocationCreateReqVOList: [],
         exceptionUrls:[],
         descZh:'',
-        manualExceptionType:'',
+        manualExceptionType:[],
         urls: [],
         sumVolume: '',
         sumWeight: '',
@@ -281,6 +281,19 @@ export default {
             "start": 0
           }
         ]
+      },
+      exceptionRules: {
+        manualExceptionType: [
+          { required: true, message: '请勾选原因类型', trigger: 'change' },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length <= 0) {
+                callback(new Error('请勾选原因类型'))
+              }
+              callback()
+            }, trigger: 'change'
+          }
+        ]
       }
     }
   },
@@ -365,6 +378,15 @@ export default {
       })
       return result
     },
+    handleException() {
+      this.$refs.exceptionForm.validate((valid) => {
+        if (valid) {
+          this.handleSubmit()
+        } else {
+          this.$message.warning('请勾选原因类型')
+        }
+      })
+    },
     async handleSubmit() {
       if (this.specialHas0()) {
         const confirm = await this.$confirm(this.$t('有特需费用为0或未填写，请问是否继续？'), this.$t('注意'), {