Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -458,16 +458,25 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
  {
-   label: '计量单位',
-   field: 'uom',
-   sort: 'custom',
-   dictType: DICT_TYPE.UOM,
-   dictClass: 'string',
-   isTable: true,
-   isTableForm:false,
-   table: {
-     width: 150
-   },
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm:true,
+    form:{
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'Select',
+    },
+    table: {
+      width: 150
+    },
  },
   {
     label: '订单数量',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -910,6 +910,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
+      disabled: true,
       type: 'Select'
     }
   },