Merge remote-tracking branch 'origin/master'

src/views/wms/issueManage/issue/issueRequestMain/index.vue

@@ -104,7 +104,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -120,7 +125,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -693,6 +693,12 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {