Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-ui/src/views/wms/coil/typing.vue

@@ -230,7 +230,7 @@
 </template>
 
 <script>
-import { getMaterialCoil, updateMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil';
+import { getMaterialCoil, updateMaterialCoil, getMaterialCoilTrace, checkCoilNo } from '@/api/wms/coil';
 import { completeAction } from '@/api/wms/pendingAction';
 import { listWarehouse } from '@/api/wms/warehouse';
 import { listRawMaterialWithBom } from '@/api/wms/rawMaterial';
@@ -292,7 +292,22 @@ export default {
       },
       rules: {
         currentCoilNo: [
-          { required: true, message: '请输入当前钢卷号', trigger: 'blur' }
+          { required: true, message: '请输入当前钢卷号', trigger: 'blur' },
+           // 仅在新增的时候校验
+          {
+            validator: (rule, value, callback) => {
+              // 没有coilId则为新增 触发校验
+              checkCoilNo({ currentCoilNo: value, coilId: this.updateForm.coilId }).then(res => {
+                const { duplicateType } = res.data;
+                if (duplicateType === 'current' || duplicateType === 'both') {
+                  // alert('当前钢卷号重复，请重新输入');
+                  callback(new Error('当前钢卷号重复，请重新输入'));
+                } else {
+                  callback();
+                }
+              })
+            }, trigger: 'blur'
+          }
         ],
         team: [
           { required: true, message: '请输入班组', trigger: 'blur' }