From c63ba68cd9310d748bc0c31ac97cdd3fa980a2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 9 Apr 2024 15:53:26 +0800 Subject: [PATCH 1/2] =?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 --- src/api/qms/inspectionPlan/index.ts | 23 ------------------ src/api/qms/inspectionScheme/index.ts | 23 ++++++++++++++++++ .../addForm.vue | 0 .../index.vue | 24 +++++++++---------- .../inspectionScheme.data.ts} | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 src/api/qms/inspectionPlan/index.ts create mode 100644 src/api/qms/inspectionScheme/index.ts rename src/views/qms/basicDataManage/{inspectionPlan => inspectionScheme}/addForm.vue (100%) rename src/views/qms/basicDataManage/{inspectionPlan => inspectionScheme}/index.vue (88%) rename src/views/qms/basicDataManage/{inspectionPlan/inspectionPlan.data.ts => inspectionScheme/inspectionScheme.data.ts} (98%) diff --git a/src/api/qms/inspectionPlan/index.ts b/src/api/qms/inspectionPlan/index.ts deleted file mode 100644 index 78d729cb7..000000000 --- a/src/api/qms/inspectionPlan/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -import request from '@/config/axios' -// 新增 -export const inspectionPlanCreat = async (data) => { - return await request.post({ url: `/qms/type-template/create`,data}) -} -// 编辑 -export const inspectionPlanUpdate = async (data) => { - return await request.put({ url: `/qms/type-template/update`,data}) -} -// 删除 -export const inspectionPlanDelete = async (id) => { - return await request.delete({ url: `/qms/type-template/delete?id=`+id}) -} -// 列表 -export const inspectionPlanPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return request.post({ url: '/qms/type-template/senior', data }) - } else { - return await request.get({ url: `/qms/type-template/page`, params }) - } -} \ No newline at end of file diff --git a/src/api/qms/inspectionScheme/index.ts b/src/api/qms/inspectionScheme/index.ts new file mode 100644 index 000000000..c54e11372 --- /dev/null +++ b/src/api/qms/inspectionScheme/index.ts @@ -0,0 +1,23 @@ +import request from '@/config/axios' +// 新增 +export const InspectionSchemeCreat = async (data) => { + return await request.post({ url: `/qms/inspection-scheme/create`,data}) +} +// 编辑 +export const InspectionSchemeUpdate = async (data) => { + return await request.put({ url: `/qms/inspection-scheme/update`,data}) +} +// 删除 +export const InspectionSchemeDelete = async (id) => { + return await request.delete({ url: `/qms/inspection-scheme/delete?id=`+id}) +} +// 列表 +export const InspectionSchemePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/qms/inspection-scheme/senior', data }) + } else { + return await request.get({ url: `/qms/inspection-scheme/page`, params }) + } +} diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionPlan/addForm.vue rename to src/views/qms/basicDataManage/inspectionScheme/addForm.vue diff --git a/src/views/qms/basicDataManage/inspectionPlan/index.vue b/src/views/qms/basicDataManage/inspectionScheme/index.vue similarity index 88% rename from src/views/qms/basicDataManage/inspectionPlan/index.vue rename to src/views/qms/basicDataManage/inspectionScheme/index.vue index 6976a0ca5..787d11d4f 100644 --- a/src/views/qms/basicDataManage/inspectionPlan/index.vue +++ b/src/views/qms/basicDataManage/inspectionScheme/index.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts b/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts similarity index 98% rename from src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts rename to src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts index ef9822546..fff1c0e44 100644 --- a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts +++ b/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts @@ -68,7 +68,7 @@ export const InspectionTemplateRules = reactive({ { required: true, message: '请输入选择集编码', trigger: 'blur' } ], }) -export const InspectionPlanMain = useCrudSchemas(reactive([ +export const InspectionSchemeMain = useCrudSchemas(reactive([ { label: '编码', field: 'code', From 34d9f6c7fd9336aa062f77e967e73b42cb70949d Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 9 Apr 2024 15:56:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E6=A0=B7=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/samplingProcess/index.ts | 4 ++ src/views/qms/samplingProcess/index.vue | 57 +++++++++++++++++++ .../samplingProcess/samplingProcess.data.ts | 9 ++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/api/qms/samplingProcess/index.ts b/src/api/qms/samplingProcess/index.ts index 96404d545..9f3f57dca 100644 --- a/src/api/qms/samplingProcess/index.ts +++ b/src/api/qms/samplingProcess/index.ts @@ -51,3 +51,7 @@ export const exportSamplingProcess = async (params) => { export const importTemplate = () => { return request.download({ url: '/qms/sampling-process/get-import-template' }) } + +export const getSamplingScheme = async () => { + return await request.get({ url: `/qms/sampling-scheme/get-available-list`}) +} diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue index 0d7add0be..cc083c0e4 100644 --- a/src/views/qms/samplingProcess/index.vue +++ b/src/views/qms/samplingProcess/index.vue @@ -48,6 +48,7 @@ :apiCreate="SamplingProcessApi.createSamplingProcess" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onChange="onChange" /> @@ -65,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import {getSamplingScheme} from "@/api/qms/samplingProcess"; defineOptions({ name: 'SamplingProcess' }) @@ -226,6 +228,61 @@ const importSuccess = () => { getList() } +const onChange =async (field,value)=>{ + if(field == 'sampleType'&& value == '1'){ + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field == "sampleSize"){ + item.label='样品量' + item.component = 'Input' + item.componentProps.disabled = true + } + if(item.field == "sampleProgCode"){ + item.componentProps.disabled = true + } + }) + }else if(field == 'sampleType'&& value == '2'){ + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field == "sampleSize"){ + item.label='样品量(%)' + item.component = 'Input' + item.componentProps.disabled = false + } + if(item.field == "sampleProgCode"){ + item.componentProps.disabled = true + } + }) + }else if(field == 'sampleType'&& value == '3'){ + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field == "sampleSize"){ + item.label='样品量' + item.component = 'Input' + item.componentProps.disabled = false + } + if(item.field == "sampleProgCode"){ + item.componentProps.disabled = true + } + }) + }else if(field == 'sampleType'&& value == '4'){ + const data = await SamplingProcessApi.getSamplingScheme() + const options = data.map(item=>{ + return{ + value:item.code, + label:item.description, + } + }) + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field == "sampleSize"){ + item.componentProps.disabled = true + } + if(item.field == "sampleProgCode"){ + item.component = 'Select' + item.componentProps.disabled = false + item.componentProps.options = options + } + }) + } +} + // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 8fecb505f..dac6c5e60 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -38,7 +38,7 @@ export const SamplingProcess = useCrudSchemas(reactive([ dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -48,7 +48,7 @@ export const SamplingProcess = useCrudSchemas(reactive([ dictType: DICT_TYPE.EVALUATION_MODE, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -60,6 +60,9 @@ export const SamplingProcess = useCrudSchemas(reactive([ label: '采样方案编码', field: 'sampleProgCode', sort: 'custom', + form: { + component: 'Select' + }, }, { label: '是否可用', @@ -68,7 +71,7 @@ export const SamplingProcess = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 form: { - component: 'SelectV2' + component: 'Select' }, }, {