Merge remote-tracking branch 'origin/master'

src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts

@@ -107,6 +107,7 @@ export const DeviceInspection = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isDetail: false,
     table: {
       width: 150,
       fixed: 'right'
@@ -181,6 +182,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true,
       }
+    },
+    tableForm: {
+      type:'Select',
+      disabled:true,
     }
   },
   {
@@ -197,6 +202,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    tableForm: {
+      type:'Select',
+      disabled:true,
+    }
   },
 
   {
@@ -204,8 +213,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'equipmentParts',
     sort: 'custom',
     isSearch: true,
+    tableForm: {
+      disabled:true,
+    }
   },
-
   {
     label: '记录是否必填',
     field: 'numberNeedSwitch',
@@ -217,6 +228,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Switch',
       value: false,
+    },
+    tableForm: {
+      disabled:true,
     }
   },
 
@@ -231,6 +245,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Switch',
       value: false,
+    },
+    tableForm: {
+      disabled:true,
     }
   },
   {
@@ -242,11 +259,15 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 170
     },
+    tableForm: {
+      disabled:true,
+    },
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'

src/views/eam/basic/moldInspection/moldInspection.data.ts

@@ -72,41 +72,41 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '模具编号',
-    field: 'deviceNumber',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '单号信息', // 查询弹窗标题
-        searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
-        searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: "TRUE",
-            isMainValue: false
-          }, {
-            key: 'type',
-            value: 'type',
-            isMainValue: true
-          }
-        ]
-      }
-    }
-  },
-  {
-    label: '模具名称',
-    field: 'deviceName',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-  },
+  // {
+  //   label: '模具编号',
+  //   field: 'deviceNumber',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择单号', // 输入框占位文本
+  //       searchField: 'number', // 查询弹窗赋值字段
+  //       searchTitle: '单号信息', // 查询弹窗标题
+  //       searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
+  //       searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
+  //       searchCondition: [
+  //         {
+  //           key: 'available',
+  //           value: "TRUE",
+  //           isMainValue: false
+  //         }, {
+  //           key: 'type',
+  //           value: 'type',
+  //           isMainValue: true
+  //         }
+  //       ]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '模具名称',
+  //   field: 'deviceName',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isForm: false,
+  // },
   {
     label: '项类型',
     field: 'status',

src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts

@@ -107,6 +107,7 @@ export const DeviceInspection = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isDetail: false,
     table: {
       width: 150,
       fixed: 'right'
@@ -181,6 +182,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true,
       }
+    },
+    tableForm: {
+      type:'Select',
+      disabled:true,
     }
   },
   {
@@ -197,6 +202,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    tableForm: {
+      type:'Select',
+      disabled:true,
+    }
   },
 
   {
@@ -204,6 +213,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'equipmentParts',
     sort: 'custom',
     isSearch: true,
+    tableForm: {
+      disabled:true,
+    }
   },
 
   {
@@ -217,6 +229,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Switch',
       value: false,
+    },
+    tableForm: {
+      disabled:true,
     }
   },
 
@@ -231,6 +246,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Switch',
       value: false,
+    },
+    tableForm: {
+      disabled:true,
     }
   },
   {
@@ -242,11 +260,15 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 170
     },
+    tableForm: {
+      disabled:true,
+    }
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'