From e397206bc2e005a71eafcf6fcaf6b61ce6f9bd24 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Jul 2024 09:07:16 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshRequestMain.data.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 006c658d2..3fe21b653 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -629,6 +629,20 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ } } }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortSearchDefault:1000, + isSearch: true, + sortTableDefault:1100, + // isTableForm: false, + + }, // { // label: '包装号', @@ -784,7 +798,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ sortTableDefault:2, isTable:false, }, - + { label: '从货主代码', field: 'fromOwnerCode', From a21caf1a85828574a004c88f24afb7d2bd268416 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Jul 2024 10:28:34 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=201.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=88=B0=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87=E8=AF=86=E3=80=822.?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E4=B8=8D=E7=BE=8E=E8=A7=82?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 4 ++-- .../repleinshRequestMain/repleinshRequestMain.data.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index af8cab620..ccb16064c 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -62,8 +62,8 @@ :prop="headerItem.field" :align="headerItem?.tableForm?.align || 'center'" :sortable="headerItem?.tableForm?.sortable || false" - :width="headerItem?.tableForm?.width || '200px'" - :min-width="headerItem?.tableForm?.minWidth || 'auto'" + :width="headerItem?.tableForm?.width" + :min-width="headerItem?.tableForm?.minWidth || '200px'" > ([ }, tableForm:{ isInpuFocusShow: true, - multiple:true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '物料基础信息', // 查询弹窗标题 From 418390738f304a185a16e68e9ed7b63397ab2612 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 8 Jul 2024 10:29:19 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E5=AD=97=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validator.ts | 13 +++++++++++++ src/views/qms/aql/aql.data.ts | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/utils/validator.ts b/src/utils/validator.ts index 8a9d70261..b040b2ddf 100644 --- a/src/utils/validator.ts +++ b/src/utils/validator.ts @@ -788,6 +788,19 @@ export function validatePercent(rule, value, callback){ } } +export function validateSampleCode(rule, value, callback){ + if (value) { + const orgReg =/[A-Z]/ + if (orgReg.test(value)) { + callback() + } else { + callback(new Error('样本字码错误')) + } + } else { + callback() + } +} + export default { validateCode, validateEmail, diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index a9beb51be..4c9fa28fc 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -1,13 +1,13 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import { getSamplingScheme } from "@/api/qms/aql"; -import { validateNum } from "@/utils/validator"; +import {validateNum, validateSampleCode} from "@/utils/validator"; // 表单校验 export const AqlRules = reactive({ code: [required], inspectionQualification: [required], - sampleCharacterCode: [required, {max: 1, message: '长度不得超过1个字符', trigger: 'blur' }], + sampleCharacterCode: [required, {max: 1, message: '长度不得超过1个字符', trigger: 'blur' }, {validator: validateSampleCode, message: '请输入1个大写字母', trigger: 'blur' }], sampleQty: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], a0separator010: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], r0separator010: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], From 74402ee4347f47bef4f934972f03090596ae4c3d Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Mon, 8 Jul 2024 10:40:52 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=AD=97=E5=85=B8=E9=98=88=E5=80=BC?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E3=80=81=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AF=B9=E5=BA=94PC=E7=AB=AF?= =?UTF-8?q?=E5=8F=8A=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countJobMain/countJobMain.data.ts | 27 ++++++++++++++ .../count/countPlanMain/countPlanMain.data.ts | 32 ++++++++--------- .../countRecordMain/countRecordMain.data.ts | 35 ++++++++++++++----- .../countRequestMain/countRequestMain.data.ts | 25 ++++++++----- .../countadjustRecordMain.data.ts | 34 +++++++++++------- .../countadjustRequestMain.data.ts | 27 ++++++++++++++ 6 files changed, 135 insertions(+), 45 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index c81addf77..4774927d0 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -27,6 +27,33 @@ export const CountJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, + { + label: '任务拆分值', + field: 'countSplitCode', + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true + }, { label: '计划单号', field: 'planNumber', diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 64f38a54f..402a2964e 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -48,6 +48,22 @@ export const CountPlanMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, { label: '',//执行周期 field: 'crontab', @@ -76,22 +92,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ } } }, - { - label: '任务拆分方式', - field: 'countSplitType', - dictType: DICT_TYPE.COUNT_SPLIT_TYPE, - dictClass: 'string', - sort: 'custom', - table: { - width: 150 - }, - isTable:true, - isForm: true, - form: { - value: 'locationCode' - } - - }, { label: '维度', field: 'dimension', diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts index 8b5029d6d..5e19bb62e 100644 --- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts +++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts @@ -40,14 +40,33 @@ export const CountRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '仓库代码', - // field: 'warehouseCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, + { + label: '任务拆分值', + field: 'countSplitCode', + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true + }, { label: '阶段', field: 'stage', diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 53a9b2930..ccb01037a 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -90,15 +90,22 @@ export const CountRequestMain = useCrudSchemas(([ }, isSearch: true, }, - // { - // label: '仓库代码', - // field: 'warehouseCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isSearch: true, - // }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, { label: '申请时间', field: 'requestTime', diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index 32950081e..b79fd418e 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -24,22 +24,32 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - // { - // label: '盘点记录单号', - // field: 'countRecordNumber', - // sort: 'custom', - // table: { - // width: 180 - // }, - // isSearch: true - // }, { - label: '仓库代码', - field: 'warehouseCode', + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', sort: 'custom', table: { width: 150 }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, + { + label: '任务拆分值', + field: 'countSplitCode', + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true }, { label: '出库事务类型', @@ -532,4 +542,4 @@ export const CountadjustRecordDetailRules =reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 490dfe82c..a88081343 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -55,6 +55,33 @@ export const CountadjustRequestMain = useCrudSchemas(([ }, }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, + { + label: '任务拆分值', + field: 'countSplitCode', + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true + }, // { // label: '申请单号', // field: 'requestNumber', From 4808ead460bb5add33a3e53109206061b5e505ef Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Jul 2024 10:59:51 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E4=BB=A3=E7=A0=81=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87=E8=AF=86=EF=BC=8C=E8=A1=A5?= =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E5=BA=94=E8=AF=A5=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9D=A1=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueManage/repleinsh/repleinshRequestMain/index.vue | 9 ++++++--- .../productrepairRequestMain.data.ts | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index 74040ff72..d1a83f67e 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['itemCode'] = item['code'] newRow['uom'] = item['uom'] newRow['id'] = item['id'] + newRow['toLocationCode'] = formRef.formModel['toLocationCode'] tableData.value.push(newRow) }) } else { @@ -359,6 +360,7 @@ const tableData = ref([]) // 添加明细 const handleAddTable = () => { tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys))) + } // 删除明细 const handleDeleteTable = (item, index) => { @@ -376,10 +378,11 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - tableData.value.forEach(item=>{ - item.toLocationCode = data.toLocationCode - }) data.subList = tableData.value // 拼接子表数据参数 + if( data.subList.length>1){ + message.warning('明细只能选择一条数据') + return; + } if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') formRef.value.formLoading = false diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 45a183c70..309e89bc0 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -118,7 +118,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ sortTableDefault:4, tableForm:{ isInpuFocusShow: true, - searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 + searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '生产线信息', // 查询弹窗标题 searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 @@ -138,7 +138,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 + searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '生产线信息', // 查询弹窗标题 searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 @@ -501,6 +501,9 @@ export const ProductrepairRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], + productionLineCode: [ + { required: true, message: '请选择返修生产线', trigger: 'change' } + ], // dueTime: [ // { required: true, message: '请选择截止时间', trigger: 'change' } // ], From f48cbf6529686b943c55d4a89c00cfe29179bb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 8 Jul 2024 11:04:49 +0800 Subject: [PATCH 06/17] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentMainPart.data.ts | 274 +++++++++--------- src/views/eam/itemAccounts/index.vue | 44 ++- .../SparePartsApply.data.ts | 3 +- src/views/eam/sparePartsApplyMain/index.vue | 10 +- 4 files changed, 176 insertions(+), 155 deletions(-) diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts index ed90c0233..04decb155 100644 --- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts +++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts @@ -5,148 +5,150 @@ import { dateFormatter } from '@/utils/formatTime' export const EquipmentMainPartRules = reactive({ name: [required], code: [required], - type: [required], + type: [required] }) -export const EquipmentMainPart = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - }, - { - label: '编码', - field: 'code', - sort: 'custom', - isSearch: true, - }, - { - label: '名称', - field: 'name', - sort: 'custom', - isSearch: true, - }, - { - label: '类型', - field: 'type', - sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'Select' - } - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } +export const EquipmentMainPart = useCrudSchemas( + reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false + }, + { + label: '编码', + field: 'code', + sort: 'custom', + isSearch: true }, - isForm: false, - }, - { - label: '部门id', - field: 'departmentCode', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: false, - }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - }, - { - label: '是否启用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isTable: true, - isDetail: false, - isSearch: false, - isTableForm: false, - isForm: false, - }, - { - label: '删除时间', - field: 'deletionTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + { + label: '名称', + field: 'name', + sort: 'custom', + isSearch: true + }, + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' } }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false + }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } } }, - }, - { - label: '删除人id', - field: 'deleterId', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, - form: { - component: 'InputNumber', - value: 0 + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false }, - }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - width: 150, - fixed: 'right' + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } } - } -])) + ]) +) diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue index 2369ba9cb..3e8f617a3 100644 --- a/src/views/eam/itemAccounts/index.vue +++ b/src/views/eam/itemAccounts/index.vue @@ -31,9 +31,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > - - + @@ -138,16 +138,34 @@ const buttonBaseClick = (val, item) => { console.log('其他按钮', item) } } - -// 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:packageover-job-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageover-job-main:delete'}), // 删除 -] - +const butttondata = (row,$index) => { + const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 + if(findIndex>-1&&findIndex<$index){ + return [] + } + return [ + // defaultButtons.mainListEditBtn({hasPermi:'wms:packageover-job-main:update'}), // 编辑 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:packageover-job-main:close'}), // 关闭 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageover-job-main:delete'}), // 删除 + ] +} +// 根据状态返回该按钮是否显示 +const isShowMainButton = (row, val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { // 编辑 + if (val == 'mainClose') { // 关闭 + // 发起关闭 + await message.confirm('确认要关闭吗？') + await PackageoverJobMainApi.closePackageoverJobMain(row.masterId) + // 刷新列表 + await getList() + }else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index 6ba16b567..6a0c13ec8 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -523,15 +523,15 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ }, isTable: false }, - // { - // label: '操作', - // field: 'action', - // isForm: false, - // table: { - // width: 150, - // fixed: 'right' - // } - // } + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } ])) // 表单校验 From 19cbb1faec1b1eec515a5ac802533f005c71a7b2 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Mon, 8 Jul 2024 11:18:28 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=AD=97=E5=85=B8=E9=98=88=E5=80=BC?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E3=80=81=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AF=B9=E5=BA=94PC=E7=AB=AF?= =?UTF-8?q?=E5=8F=8A=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countPlanMain/countPlanMain.data.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 402a2964e..64f38a54f 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -48,22 +48,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '任务拆分方式', - field: 'countSplitType', - dictType: DICT_TYPE.COUNT_SPLIT_TYPE, - dictClass: 'string', - sort: 'custom', - table: { - width: 150 - }, - isTable:true, - isForm: true, - form: { - value: 'locationCode' - } - - }, { label: '',//执行周期 field: 'crontab', @@ -92,6 +76,22 @@ export const CountPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + isForm: true, + form: { + value: 'locationCode' + } + + }, { label: '维度', field: 'dimension', From f072712276cb9ce8d9117b72cbc63d62ac8713ad Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 8 Jul 2024 11:24:06 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 378a2ba07..5fa0fbd9a 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -615,12 +615,14 @@ const submitForm = async () => { formLoading.value = true if (formType.value == 'create') { const validateForm = await tableFormRef.value.validateForm() - if (props.tableFormDataLength) { + if (!validateForm && props.tableFormDataLength) { if (props.tableData.length == 0) { message.warning('请填写明细信息！') formLoading.value = false return } + formLoading.value = false + return } // 主子表——提交请求 try { From 1783ce55eff5a31442e31b77c76de4d1a9bca88e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Jul 2024 11:43:05 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=BA0=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index ccb16064c..5db0a2b76 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -607,6 +607,9 @@ const TableBaseForm_Ref = ref() const validateForm = () => { console.log(TableBaseForm_Ref.value) let _lists = TableBaseForm_Ref.value?.map((v) => v.validate()) + if(!_lists ||_lists.length == 0){ + return false + } return Promise.all(_lists) .then(() => { return true From ac5f51510de5574ccaf4f4c9e949b7fb6b4c25bb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 8 Jul 2024 12:17:17 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueRequestMain/index.vue | 32 ++++++++++++- .../issueRequestMain/issueRequestMain.data.ts | 47 ++++++++++--------- 2 files changed, 55 insertions(+), 24 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index b70b6f50c..cac4c9dcd 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -42,6 +42,8 @@ @@ -104,14 +107,39 @@ const updataTableColumns = (val) => { tableColumns.value = val } +const onEnter = async (field,value) => { + if (field == 'productionLineCode') { + //生产线 + let res = await WorkstationApi.getWorkstationPage({ + productionLineCode:value, + pageSize: 20, + pageNo: 1 + }) + if(res&&res.list&&res.list.length>0){ + const setV = {} + setV['workStationCode'] = res.list[0].code + formRef.value.formRef.setValues(setV) + } + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async() => { if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { - row['itemCode'] = val[0]['code'] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + let tableForm = JSON.parse(JSON.stringify(tableFormKeys)) + if (tableData.value.length > 0) { + tableForm.productionLineCode = tableData.value[0].productionLineCode + tableForm.workStationCode = tableData.value[0].workStationCode + } + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return + const newRow = JSON.parse(JSON.stringify({...tableForm,...item})) + newRow['itemCode'] = item['code'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 4b131b1bb..38245d0f1 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -112,6 +112,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -161,6 +162,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -766,6 +768,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ sortSearchDefault:2, sortTableDefault:3, tableForm:{ + multiple: true, enterSearch:true, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 @@ -809,7 +812,27 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ } } }, - + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + } + }, { label: '计量单位', @@ -991,27 +1014,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - } - } - }, + { label: '从货主代码', field: 'fromOwnerCode', From 293b4f9b209feb94085afbf3cfaedb53da8ed150 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 8 Jul 2024 13:36:10 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 44b6e5f7a..361595667 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -90,7 +90,7 @@ - + From 8b3ae7d8a24b7b6b07b40a55b95907dcfce1a83a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 8 Jul 2024 14:05:36 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index c65bc1f1b..820e72c4a 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -195,7 +195,7 @@ - + @@ -444,8 +444,8 @@ inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: '', //合格数量 - unqualifiedQuantity: '' //不合格数量 + qualifiedQuantity: allSamplePieceSize.value, //合格数量 + unqualifiedQuantity: '0' //不合格数量 } ) } From c46c883768223913c19272bab7788e218b1d3467 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 8 Jul 2024 14:31:56 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 820e72c4a..9889e083e 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -444,7 +444,7 @@ inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: allSamplePieceSize.value, //合格数量 + qualifiedQuantity: parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(6)), //合格数量 unqualifiedQuantity: '0' //不合格数量 } ) From 9f5379ab3c241c5892dc3c760e919924693f118d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Jul 2024 16:36:58 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=96=B9=E6=A1=88=E5=8A=A0=E5=A4=8D=E5=88=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 15 +++- src/views/qms/inspectionScheme/addForm.vue | 79 +++++++++++++++++++- src/views/qms/inspectionScheme/index.vue | 3 + src/views/qms/inspectionTemplate/addForm.vue | 3 +- 4 files changed, 95 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 9889e083e..7bdea4cda 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -2,7 +2,8 @@
-
+
+
包装列表
@@ -1031,6 +1032,12 @@ cur.defectLevel = obj.defectLevel cur.estimateCode = obj.estimateCode } + const mianscroll =ref() + const topScrollClick=()=> { + nextTick(() => { + mianscroll.value.scrollTo({ top: 550, behavior: 'smooth' }); + }) + } diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index e0c398eb2..80b2c576c 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -819,7 +819,77 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段 if (row) { data.value = JSON.parse(JSON.stringify(row)) - let list = [] + // 如果点击复制进入 + if(formType.value == 'create'){ + data.value.id = '' + data.value.code = '' + data.value.itemCode = '' + data.value.process= [] + let list =[] + if (row.content) { + list = JSON.parse(row.content) + } else { + list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode) + } + let arr = [] + list.forEach((item, index) => { + editableTabsValue.value = index + 1 + item.name = index + 1 + console.log(item.inspectionCharacteristicsBaseVO) + + let obj = { + inspectionCode:item.inspectionCode, + description:item.description, + inspectionCharCode:item.inspectionCharCode, + sequenceCode:item.sequenceCode, + name : index + 1, + inspectionCharacteristicsBaseVO:{ + description:item.inspectionCharacteristicsBaseVO.description, + featureType:item.inspectionCharacteristicsBaseVO.featureType, + inspectionMethodCode:item.inspectionCharacteristicsBaseVO.inspectionMethodCode, + inspectionMethodName:item.inspectionCharacteristicsBaseVO.inspectionMethodName, + samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode, + + isCanUpdate:item.inspectionCharacteristicsBaseVO.isCanUpdate, + isDestructionInspection:item.inspectionCharacteristicsBaseVO.isDestructionInspection, + quantifyCapping:item.inspectionCharacteristicsBaseVO.quantifyCapping, + quantifyDecimal:item.inspectionCharacteristicsBaseVO.quantifyDecimal, + quantifyIsCapping:item.inspectionCharacteristicsBaseVO.quantifyIsCapping, + quantifyIsLowlimit:item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit, + quantifyIsTarget:item.inspectionCharacteristicsBaseVO.quantifyIsTarget, + quantifyLowlimit:item.inspectionCharacteristicsBaseVO.quantifyLowlimit, + quantifyQuantifyCode:item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode, + quantifyQuantifyName:item.inspectionCharacteristicsBaseVO.quantifyQuantifyName, + quantifyTarget:item.inspectionCharacteristicsBaseVO.quantifyTarget, + quantifyUom:item.inspectionCharacteristicsBaseVO.quantifyUom, + resultEntryMethod:item.inspectionCharacteristicsBaseVO.resultEntryMethod, + samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode, + samplingProcessName:item.inspectionCharacteristicsBaseVO.samplingProcessName, + } + } + + // 编辑判断上限下限目标值是否必填 + if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) { + rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false + } + if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) { + rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false + } + if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) { + rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false + } + arr.push(obj) + }) + data.value.process = arr + console.log(111, data.value) + }else{ + let list = [] if (row.content) { list = JSON.parse(row.content) } else { @@ -858,6 +928,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any rules.value.aql[0].required = false } data.value.process = list + } + + + } else { data.value = { code: '', @@ -1323,7 +1397,8 @@ const changeIsTarget = (e, item) => {