From e1658f8239a681731ed6639728085d2b0cf6dacf Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 11 Apr 2024 10:44:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/aql/aql.data.ts | 7 ------- src/views/qms/inspectionMethod/inspectionMethod.data.ts | 8 -------- src/views/qms/sampleCode/sampleCode.data.ts | 7 ------- src/views/qms/samplingProcess/samplingProcess.data.ts | 8 -------- src/views/qms/samplingScheme/samplingScheme.data.ts | 8 -------- 5 files changed, 38 deletions(-) diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index 8b04deda5..1a6d29a40 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -64,13 +64,6 @@ export const AqlRules = reactive({ }) const samplingSchemeList = await getSamplingScheme() export const Aql = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isForm: false, - }, { label: '采样方案编码', field: 'code', diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts index efb10478a..c5859f165 100644 --- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts +++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts @@ -3,18 +3,10 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const InspectionMethodRules = reactive({ - // available: [required], description: [required], }) export const InspectionMethod = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isForm: false, - }, { label: '编码', field: 'code', diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts index cfdc96795..986c7848f 100644 --- a/src/views/qms/sampleCode/sampleCode.data.ts +++ b/src/views/qms/sampleCode/sampleCode.data.ts @@ -13,13 +13,6 @@ export const SampleCodeRules = reactive({ }) const samplingSchemeList = await getSamplingScheme() export const SampleCode = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isForm: false, - }, { label: '采样方案编码', field: 'code', diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 5440362ac..02c4b6b32 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -5,18 +5,10 @@ import { dateFormatter } from '@/utils/formatTime' export const SamplingProcessRules = reactive({ sampleType: [required], evaluationMode: [required], - // available: [required], description: [required], }) export const SamplingProcess = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isForm: false, - }, { label: '编码', field: 'code', diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts index 22150b72b..abd0f5b53 100644 --- a/src/views/qms/samplingScheme/samplingScheme.data.ts +++ b/src/views/qms/samplingScheme/samplingScheme.data.ts @@ -3,18 +3,10 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const SamplingSchemeRules = reactive({ - // available: [required], description: [required], }) export const SamplingScheme = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isForm: false, - }, { label: '编码', field: 'code', From 3570210bafd6faa8a11f4b90ca5fe5bbd35bc527 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 11 Apr 2024 10:54:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=A2=E8=AF=A6=E6=83=85=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E6=97=B6=E5=80=99=E5=A4=87=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 5f7a5e26c..9e52eb979 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -110,16 +110,18 @@ :annexData="annexData" @handleAnnexSuccess="handleAnnexSuccess" @deleteAnnexSuccess="deleteAnnexSuccess" - :upData="remarksData.data" + :upData="remarksData.data" + :key="count" /> - + @@ -362,7 +364,6 @@ const otherList = [...props.annexTable,{ label:'变更记录', prop:'ChangeRecord' }] - tabsList.value = [...tabsList?.value,...otherList] if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) { @@ -498,6 +499,7 @@ const searchTableFormType = ref('') // 表单的类型：create - 新增；updat const formRef = ref() const titleNameRef = ref() const titleValueRef = ref() +const count =ref(0) const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => { titleNameRef.value = titleName titleValueRef.value = titleValue @@ -505,6 +507,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: tableId: row.id, tableName: tableName } + count.value++ // 加载明细列表 if (!props.isBasic) { // 设置主表id