From 9289aa81fa46955d3acd6d7bf915e68f1602084f Mon Sep 17 00:00:00 2001 From: gaojs Date: Thu, 11 Apr 2024 09:11:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=BB=E5=AD=90=E5=B7=A5=E5=8D=95=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 3 ++- .../dismantlingMain/dismantlingMain.data.ts | 14 ++++++++++--- src/views/mes/dismantlingMain/index.vue | 21 +++++++++++++++++++ src/views/mes/qualityform/index.vue | 13 +++++------- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 5f7a5e26c..a19b01b04 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -713,7 +713,6 @@ const opensearchTable = ( // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - debugger if (val == 'edit') { // 编辑 if(props.isOpenSearchTable){ @@ -759,6 +758,7 @@ const submitForm = async (formType, data) => { await props.apiUpdate(data) message.success(t('common.updateSuccess')) } + emit('handleMainFefresh') formRef.value.dialogVisible = false // 刷新当前列表 await getList() @@ -802,6 +802,7 @@ const handleDelete = async (id: number) => { await props.apiDelete(id) tableObject.loading = false message.success(t('common.delSuccess')) + emit('handleMainFefresh') // 刷新列表 await getList() updateKey.value += 1 diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts index 7de151710..0df99a562 100644 --- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts +++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts @@ -143,13 +143,21 @@ export const DismantlingMain = useCrudSchemas(reactive([ }, { label: '工单状态', + field: 'workbillStatus', + sort: 'custom', + dictType: DICT_TYPE.DISMANTLING_MATERIAL_HANDLE_STATUS, + dictClass: 'string', + isSearch: true, + }, + { + label: '是否可用', field: 'status', sort: 'custom', dictType: DICT_TYPE.QUALIFY_STATUS, dictClass: 'string', - isForm: true, - isSearch: true, - isTable: true, + isForm: false, + isSearch: false, + isTable: false, form: { component: 'Switch', value: '2', diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue index d617b45e1..b41931c64 100644 --- a/src/views/mes/dismantlingMain/index.vue +++ b/src/views/mes/dismantlingMain/index.vue @@ -63,6 +63,7 @@ :detailButtonIsShowAdd="true" :detailButtonIsShowEdit="true" :detailButtonIsShowDelete="true" + @handleMainFefresh="handleMainFefresh" @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" /> @@ -170,9 +171,29 @@ const buttonTableClick = async (val, row) => { } } +let count = ref(0) +const handleMainFefresh = async()=>{ + count.value++; + await getList() +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "create"){ + DismantlingMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'workbillStatus'){ + item.value = '2'; + item.componentProps.disabled = true + } + }) + }else{ + DismantlingMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'workbillStatus'){ + item.componentProps.disabled = true + } + }) + } basicFormRef.value.open(type, row) } diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue index fafd85101..d8b5c40dd 100644 --- a/src/views/mes/qualityform/index.vue +++ b/src/views/mes/qualityform/index.vue @@ -63,8 +63,7 @@ :detailButtonIsShowAdd="true" :detailButtonIsShowEdit="true" :detailButtonIsShowDelete="true" - @handleDeleteDetail="handleDeleteDetail" - @handleCreateDetail="handleCreateDetail" + @handleMainFefresh="handleMainFefresh" @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" /> @@ -188,15 +187,13 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } } -const handleDeleteDetail = async()=>{ - getList() - -} +// const handleDeleteDetail = async()=>{ +// getList() +// } let count = ref(0) -const handleCreateDetail = async()=>{ +const handleMainFefresh = async()=>{ count.value++ getList() - } /** 添加/修改操作 */ const basicFormRef = ref() From 718ae644a78e7994f2301eaf076089314e90ac0d Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 11 Apr 2024 09:26:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=BB=98=E8=AE=A4=E7=AD=96=E7=95=A5=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E4=BA=BA=E5=90=8D=E7=A7=B0=E8=B7=9F=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index c1aba1df6..9e86245c7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -125,8 +125,6 @@ if(formField == 'supplierCode'){ setV['supplierCode'] = val[0]['code'] - setV['contacts'] = val[0]['contacts'] - setV['phone'] = val[0]['phone'] await PurchasePlanMainApi.queryPurchasePlan(val[0]['code']).then(res => { let beginTime = res.beginTime var ms = beginTime.substring(0, 2) @@ -136,6 +134,8 @@ var ms = endTime.substring(0, 2) var me = endTime.substring(3) setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me)) + setV['contacts'] = res.contacts + setV['phone'] = res.phone }) tableData.value = [] } From e1658f8239a681731ed6639728085d2b0cf6dacf Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 11 Apr 2024 10:44:52 +0800 Subject: [PATCH 3/3] =?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',