1

src/views/work/recoveryModal.vue

@@ -146,13 +146,14 @@
                 return !val.children;
               },
               onChange: (keys, args) => {
-                let isSn = keys.some((item) => item && item[0] == 6);
+                let isSn = keys.some((item) => item && (item[0] == 6 || item[1] == 12));
                 updateSchema([
                   {
                     field: 'cameraSnCode',
                     required: isSn,
                   },
                 ]);
+                clearValidate('cameraSnCode');
                 console.log('onChange', keys, args, isSn);
               }
             };
@@ -436,7 +437,7 @@
         //     },
         //   },
       ];
-      const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
+      const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, clearValidate }] = useForm({
         labelWidth: 100,
         schemas: schemas,
         showActionButtonGroup: false,

src/views/work/takingOrdersModel.vue

@@ -248,6 +248,16 @@
           {
             field: 'repairManId',
             label: data.cameraType == 4 ? '经手人' : '维修工程师',
+            componentProps: {
+              api: getByRoleType,
+              numberToString: true,
+              labelField: 'nickName',
+              valueField: 'id',
+              immediate: true,
+              params: {
+                roleType: data.cameraType == 4 ? 2 : 3,
+              },
+            },
           },
           {
             field: 'supplyAdminId',