From 2d4f65c431a26f37b96101f3e1509146366ba6c9 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 11 Dec 2023 16:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ImportForm/src/DetecImportForm.vue | 4 +-
src/layout/components/ToolHeader.vue | 8 +--
src/views/detection/records/records.data.ts | 2 +-
.../detectionTemplate.data.ts | 55 ++++++++++---------
src/views/spc/detectiontemplate/index.vue | 1 +
.../templateItemDetails.data.ts | 28 +++++-----
src/views/spc/itembasic/itembasic.data.ts | 36 ++++++------
src/views/tjanalysis/zlanalysis/index.vue | 6 +-
8 files changed, 71 insertions(+), 69 deletions(-)
diff --git a/src/components/ImportForm/src/DetecImportForm.vue b/src/components/ImportForm/src/DetecImportForm.vue
index 814d8ef..c8790ff 100644
--- a/src/components/ImportForm/src/DetecImportForm.vue
+++ b/src/components/ImportForm/src/DetecImportForm.vue
@@ -30,10 +30,10 @@
-
+
) : undefined}
- {locale.value ? (
+ {/* {locale.value ? (
- ) : undefined}
- {message.value ? (
+ ) : undefined} */}
+ {/* {message.value ? (
- ) : undefined}
+ ) : undefined} */}
diff --git a/src/views/detection/records/records.data.ts b/src/views/detection/records/records.data.ts
index 28cab44..8ab984c 100644
--- a/src/views/detection/records/records.data.ts
+++ b/src/views/detection/records/records.data.ts
@@ -38,7 +38,7 @@ export const Records = useCrudSchemas(reactive([
},
},
{
- label: '物料编码',
+ label: '检测模版类型',
field: 'itemCode',
isSearch: true,
search: {
diff --git a/src/views/spc/detectiontemplate/detectionTemplate.data.ts b/src/views/spc/detectiontemplate/detectionTemplate.data.ts
index 90b46b2..7fd57d3 100644
--- a/src/views/spc/detectiontemplate/detectionTemplate.data.ts
+++ b/src/views/spc/detectiontemplate/detectionTemplate.data.ts
@@ -71,13 +71,39 @@ export const DetectionTemplate = useCrudSchemas(reactive([
}
}
},
+ {
+ 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([
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',
diff --git a/src/views/spc/detectiontemplate/index.vue b/src/views/spc/detectiontemplate/index.vue
index 75a8742..584df85 100644
--- a/src/views/spc/detectiontemplate/index.vue
+++ b/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)
}
})
diff --git a/src/views/spc/detectiontemplate/templateItemDetails.data.ts b/src/views/spc/detectiontemplate/templateItemDetails.data.ts
index c56e0b5..172171e 100644
--- a/src/views/spc/detectiontemplate/templateItemDetails.data.ts
+++ b/src/views/spc/detectiontemplate/templateItemDetails.data.ts
@@ -52,20 +52,20 @@ export const TemplateItemDetails = useCrudSchemas(reactive([
}
},
},
- {
- label: '级别',
- field: 'ranks',
- sort: 'custom',
- dictType: DICT_TYPE.ITEMBASIC_RANK,
- isSearch: false,
- form: {
- component: 'Select',
- componentProps: {
- // inactiveValue: 'DISABLE',
- // activeValue: 'ENABLE',
- }
- },
- },
+ // {
+ // label: '级别',
+ // field: 'ranks',
+ // sort: 'custom',
+ // dictType: DICT_TYPE.ITEMBASIC_RANK,
+ // isSearch: false,
+ // form: {
+ // component: 'Select',
+ // componentProps: {
+ // // inactiveValue: 'DISABLE',
+ // // activeValue: 'ENABLE',
+ // }
+ // },
+ // },
{
label: '上限',
diff --git a/src/views/spc/itembasic/itembasic.data.ts b/src/views/spc/itembasic/itembasic.data.ts
index bf06ef9..2d0c6db 100644
--- a/src/views/spc/itembasic/itembasic.data.ts
+++ b/src/views/spc/itembasic/itembasic.data.ts
@@ -74,25 +74,25 @@ export const Itembasic = useCrudSchemas(reactive([
isSearch: true,
isTable:true,
},
- {
- label: '颜色',
- field: 'color',
- sort: 'custom',
- dictType: DICT_TYPE.ITEM_COLOR,
- dictClass: 'string',
- isTable: true,
- table: {
- width: 100
- } ,
+ // {
+ // label: '颜色',
+ // field: 'color',
+ // sort: 'custom',
+ // dictType: DICT_TYPE.ITEM_COLOR,
+ // dictClass: 'string',
+ // isTable: true,
+ // table: {
+ // width: 100
+ // } ,
- // form: {
- // component: 'Select',
- // componentProps: {
- // // inactiveValue: 'DISABLE',
- // // activeValue: 'ENABLE',
- // }
- // },
- },
+ // // form: {
+ // // component: 'Select',
+ // // componentProps: {
+ // // // inactiveValue: 'DISABLE',
+ // // // activeValue: 'ENABLE',
+ // // }
+ // // },
+ // },
{
label: '创建时间',
diff --git a/src/views/tjanalysis/zlanalysis/index.vue b/src/views/tjanalysis/zlanalysis/index.vue
index c4c364b..51014ce 100644
--- a/src/views/tjanalysis/zlanalysis/index.vue
+++ b/src/views/tjanalysis/zlanalysis/index.vue
@@ -30,10 +30,10 @@
-
+
-
+