修改bug

src/components/ImportForm/src/DetecImportForm.vue

@@ -30,10 +30,10 @@
             <el-option v-for=" (item) in itemList" :key="item" :label="item.code" :value="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="检测类型" style="width: calc(22%)">
+        <el-form-item label="检测模版类型" style="width: calc(22%)">
           <el-select
             v-model="queryParams.detectionType"
-            placeholder="请选择检测类型"
+            placeholder="请选择检测模版类型"
             clearable
             style="width: 100%"
             @change="detectionTypeChange"

src/layout/components/ToolHeader.vue

@@ -64,15 +64,15 @@ export default defineComponent({
           {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
           ) : undefined}
-          {locale.value ? (
+          {/* {locale.value ? (
             <LocaleDropdown
               class="custom-hover"
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
-          ) : undefined}
+          ) : undefined} */}
-          {message.value ? (
+          {/* {message.value ? (
             <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
-          ) : undefined}
+          ) : undefined} */}
           <UserInfo></UserInfo>
         </div>
       </div>

src/views/detection/records/records.data.ts

@@ -38,7 +38,7 @@ export const Records = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料编码',
+    label: '检测模版类型',
     field: 'itemCode',
     isSearch: true,
     search: {

src/views/spc/detectiontemplate/detectionTemplate.data.ts

@@ -71,13 +71,39 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '检测模版类型',
+    field: 'itemType',
+    dictType: DICT_TYPE.ITEMBASIC_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch:true,
+    // table: {
+    //   width: 100
+    // } ,
+    search:{
+      componentProps: {
+        // inactiveValue: 'DISABLE',
+        // activeValue: 'ENABLE',
+        filterable:true
+      }
+      
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        // inactiveValue: 'DISABLE',
+        // activeValue: 'ENABLE',
+      }
+    },
+  },
   
   {
     label: '模版名称',
     field: 'name',
   },
   {
-    label: '色差行数',
+    label: '色差检测点位数',
     field: 'lineNumber',
     sort: 'custom',
     isSearch: false,
@@ -142,32 +168,7 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm:false
   },
-  {
+
-    label: '物料类型',
-    field: 'itemType',
-    dictType: DICT_TYPE.ITEMBASIC_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch:true,
-    // table: {
-    //   width: 100
-    // } ,
-    search:{
-      componentProps: {
-        // inactiveValue: 'DISABLE',
-        // activeValue: 'ENABLE',
-        filterable:true
-      }
-      
-    },
-    form: {
-      component: 'Select',
-      componentProps: {
-        // inactiveValue: 'DISABLE',
-        // activeValue: 'ENABLE',
-      }
-    },
-  },
   {
     label: '操作',
     field: 'action',

src/views/spc/detectiontemplate/index.vue

@@ -193,6 +193,7 @@ const searchTableSuccess = (formField, searchField, val, formRef,type,row) => {
       setV[formField] = val[0][searchField]
       setV['itemName'] = val[0]['name']
       setV['projectName'] = val[0]['projectName']
+      setV['isShow'] = true
       formRef.setValues(setV)
     }
   })

src/views/spc/detectiontemplate/templateItemDetails.data.ts

@@ -52,20 +52,20 @@ export const TemplateItemDetails = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+  // {
-    label: '级别',
+  //   label: '级别',
-    field: 'ranks',
+  //   field: 'ranks',
-    sort: 'custom',
+  //   sort: 'custom',
-    dictType: DICT_TYPE.ITEMBASIC_RANK,
+  //   dictType: DICT_TYPE.ITEMBASIC_RANK,
-    isSearch: false,
+  //   isSearch: false,
-    form: {
+  //   form: {
-      component: 'Select',
+  //     component: 'Select',
-      componentProps: {
+  //     componentProps: {
-        // inactiveValue: 'DISABLE',
+  //       // inactiveValue: 'DISABLE',
-        // activeValue: 'ENABLE',
+  //       // activeValue: 'ENABLE',
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
 
   {
     label: '上限',

src/views/spc/itembasic/itembasic.data.ts

@@ -74,25 +74,25 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTable:true,
   },
-  {
+  // {
-    label: '颜色',
+  //   label: '颜色',
-    field: 'color',
+  //   field: 'color',
-    sort: 'custom',
+  //   sort: 'custom',
-    dictType: DICT_TYPE.ITEM_COLOR,
+  //   dictType: DICT_TYPE.ITEM_COLOR,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isTable: true,
+  //   isTable: true,
-    table: {
+  //   table: {
-      width: 100
+  //     width: 100
-    } ,
+  //   } ,
     
-    // form: {
+  //   // form: {
-    //   component: 'Select',
+  //   //   component: 'Select',
-    //   componentProps: {
+  //   //   componentProps: {
-    //     // inactiveValue: 'DISABLE',
+  //   //     // inactiveValue: 'DISABLE',
-    //     // activeValue: 'ENABLE',
+  //   //     // activeValue: 'ENABLE',
-    //   }
+  //   //   }
-    // },
+  //   // },
-  },
+  // },
 
    {
     label: '创建时间',

src/views/tjanalysis/zlanalysis/index.vue

@@ -30,10 +30,10 @@
             <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="物料类型" style="width: calc(20% - 32px)">
+        <el-form-item label="检测模版类型" style="width: calc(20% - 32px)">
           <el-select
             v-model="queryParams.detectionType"
-            placeholder="请选择检测类型"
+            placeholder="请选择检测模版类型"
             clearable
             style="width: 100%"
             @change="detectionItemChange"
@@ -53,7 +53,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="行号" style="width: calc(20% - 32px)" v-if="isShow">
+        <el-form-item label="检测点位" style="width: calc(20% - 32px)" v-if="isShow">
           <el-select
             v-model="queryParams.lineNumber"
             placeholder="请选择行号类型"