Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/regError.vue

 <template>
   <div class="shippingSea-dialog">
     <el-form ref="errorForm" :model="errorObj" label-width="140px">
-      <el-form-item :label="$t('操作步骤')">
+      <el-form-item :label="$t('操作步骤')" :rules="[{required: true,message: this.$t('操作步骤必填'),trigger: 'blur'}]" prop="opStep">
         <el-select v-model="errorObj.opStep" :placeholder="$t('请选择操作步骤')">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE[this.process])" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>
@@ -9,7 +9,7 @@
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>-->
       </el-form-item>
-      <el-form-item :label="$t('票异常')">
+      <el-form-item :label="$t('票异常')" :rules="[{required: true,message: this.$t('票异常必填'),trigger: 'blur'}]" prop="billAbnId">
         <el-select v-model="errorObj.billAbnId" :placeholder="$t('请选择票异常')">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>
@@ -91,12 +91,13 @@ export default {
     }
   },
   created() {
-    const { currNode } = this.$attrs;
-    this.errorObj = { opStep: currNode?.dataKey ?? undefined };
-    console.log(currNode, this.errorObj.opStep)
-    if (this.$attrs.shipmentObj.bosType == "seaAir") {
-      this.flag = "seaAir";
-    }
+    // console.log(this.$attrs,'this.$attrs');
+    // const { currNode } = this.$attrs;
+    // this.errorObj = { opStep: currNode?.dataKey ?? undefined };
+    // console.log(currNode, this.errorObj.opStep)
+    // if (this.$attrs.shipmentObj.bosType == "seaAir") {
+    //   this.flag = "seaAir";
+    // }
   },
   watch: {
     // 异常开始时间
@@ -123,6 +124,7 @@ export default {
     /** 提交 */
     onSubmit() {
       this.$refs["errorForm"].validate((valid) => {
+        console.log(valid,'valid')
         if (valid) {
           abnormalCreate({
             ...this.errorObj,