From 9289aa81fa46955d3acd6d7bf915e68f1602084f Mon Sep 17 00:00:00 2001 From: gaojs Date: Thu, 11 Apr 2024 09:11:08 +0800 Subject: [PATCH 1/8] =?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/8] =?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/8] =?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 4/8] =?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 From 9790098f30908e2a5acd8698d191bd8a3140af2e Mon Sep 17 00:00:00 2001 From: gaojs Date: Thu, 11 Apr 2024 11:28:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/qualityform/index.ts | 5 ----- src/api/mes/qualityformdetail/index.ts | 5 ----- src/api/mes/qualityformlog/index.ts | 5 ----- src/views/mes/qualityform/index.vue | 4 ---- src/views/mes/qualityformlog/index.vue | 7 +++---- src/views/mes/qualityformlog/qualityformlog.data.ts | 4 ++-- 6 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/api/mes/qualityform/index.ts b/src/api/mes/qualityform/index.ts index df55b949a..40041b661 100644 --- a/src/api/mes/qualityform/index.ts +++ b/src/api/mes/qualityform/index.ts @@ -48,8 +48,3 @@ export const deleteQualityform = async (id: number) => { export const exportQualityform = async (params) => { return await request.download({ url: `/mes/qualityform/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityform/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/mes/qualityformdetail/index.ts b/src/api/mes/qualityformdetail/index.ts index dea2b85a0..8526e446e 100644 --- a/src/api/mes/qualityformdetail/index.ts +++ b/src/api/mes/qualityformdetail/index.ts @@ -54,8 +54,3 @@ export const deleteQualityformdetail = async (id: number) => { export const exportQualityformdetail = async (params) => { return await request.download({ url: `/mes/qualityformdetail/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityformdetail/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/mes/qualityformlog/index.ts b/src/api/mes/qualityformlog/index.ts index bc19550b6..31b7d2f3b 100644 --- a/src/api/mes/qualityformlog/index.ts +++ b/src/api/mes/qualityformlog/index.ts @@ -51,8 +51,3 @@ export const deleteQualityformlog = async (id: number) => { export const exportQualityformlog = async (params) => { return await request.download({ url: `/mes/qualityformlog/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/qualityformlog/get-import-template' }) -} \ No newline at end of file diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue index d8b5c40dd..f744d72e2 100644 --- a/src/views/mes/qualityform/index.vue +++ b/src/views/mes/qualityform/index.vue @@ -68,8 +68,6 @@ :key="count" /> - - diff --git a/src/views/mes/qualityformlog/qualityformlog.data.ts b/src/views/mes/qualityformlog/qualityformlog.data.ts index 039f5c5e3..a5c14843a 100644 --- a/src/views/mes/qualityformlog/qualityformlog.data.ts +++ b/src/views/mes/qualityformlog/qualityformlog.data.ts @@ -177,8 +177,8 @@ export const Qualityformlog = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - type: 'datetime', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', } }, }, From 417a382745ec73ce569c631151a5f33cd160710f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 11 Apr 2024 11:35:38 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/samplingProcess/index.vue | 59 +++++++++++++++---- .../samplingProcess/samplingProcess.data.ts | 22 ++++--- 2 files changed, 59 insertions(+), 22 deletions(-) diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue index cc083c0e4..185dab487 100644 --- a/src/views/qms/samplingProcess/index.vue +++ b/src/views/qms/samplingProcess/index.vue @@ -66,7 +66,6 @@ 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' }) @@ -150,8 +149,56 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() -const openForm = (type: string, row?: any) => { +const openForm = async (type: string, row?: any) => { basicFormRef.value.open(type, row) + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field =="sampleType"){ + if(row.sampleType == "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(row.sampleType == "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(row.sampleType == "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(row.sampleType == "4"){ + SamplingProcess.allSchemas.formSchema.forEach(item=>{ + if(item.field == "sampleSize"){ + item.componentProps.disabled = true + } + if(item.field == "sampleProgCode"){ + item.component = 'Select' + item.componentProps.disabled = false + } + }) + } + } + }) } // form表单提交 @@ -263,13 +310,6 @@ const onChange =async (field,value)=>{ } }) }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 @@ -277,7 +317,6 @@ const onChange =async (field,value)=>{ if(item.field == "sampleProgCode"){ item.component = 'Select' item.componentProps.disabled = false - item.componentProps.options = options } }) } diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 02c4b6b32..eed4addcb 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -1,5 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import {getSamplingScheme} from "@/api/qms/samplingProcess"; // 表单校验 export const SamplingProcessRules = reactive({ @@ -7,7 +8,7 @@ export const SamplingProcessRules = reactive({ evaluationMode: [required], description: [required], }) - +const samplingSchemeList = await getSamplingScheme() export const SamplingProcess = useCrudSchemas(reactive([ { label: '编码', @@ -56,19 +57,16 @@ export const SamplingProcess = useCrudSchemas(reactive([ field: 'sampleProgCode', sort: 'custom', form: { - component: 'Select' + component: 'Select', + componentProps: { + options: samplingSchemeList, + optionsAlias: { + labelField: 'description', + valueField: 'code' + }, + } }, }, - // { - // label: '是否可用', - // field: 'available', - // sort: 'custom', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - // form: { - // component: 'Select' - // }, - // }, { label: '创建时间', field: 'createTime', From d3a0efb6646dd394359d0dd746b4bb298690a17d Mon Sep 17 00:00:00 2001 From: gaojs Date: Thu, 11 Apr 2024 11:46:49 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/qualityform/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue index f744d72e2..27052503c 100644 --- a/src/views/mes/qualityform/index.vue +++ b/src/views/mes/qualityform/index.vue @@ -284,7 +284,6 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { getList() - importTemplateData.templateUrl = await QualityformApi.importTemplate() }) From 144904d97fe1a12bced287e63d9e3438816f3453 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 11 Apr 2024 11:51:37 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E8=B4=A8=E6=A3=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverInspectionDetail/index.ts | 54 ++++ .../supplierdeliverInspectionDetail/index.vue | 244 ++++++++++++++++++ .../supplierdeliverInspectionDetail.data.ts | 89 +++++++ .../supplierdeliverRequestMain/index.vue | 30 +-- 4 files changed, 399 insertions(+), 18 deletions(-) create mode 100644 src/api/wms/supplierdeliverInspectionDetail/index.ts create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts diff --git a/src/api/wms/supplierdeliverInspectionDetail/index.ts b/src/api/wms/supplierdeliverInspectionDetail/index.ts new file mode 100644 index 000000000..cd689c6f7 --- /dev/null +++ b/src/api/wms/supplierdeliverInspectionDetail/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface SupplierdeliverInspectionDetailVO { + id: number + itemCode: string + uom: string + batch: string + planQty: number + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询供应商发货申请质检信息子列表 +export const getSupplierdeliverInspectionDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierdeliver-inspection-detail/senior', data }) + } else { + return await request.get({ url: `/wms/supplierdeliver-inspection-detail/page`, params }) + } +} + +// 查询供应商发货申请质检信息子详情 +export const getSupplierdeliverInspectionDetail = async (id: number) => { + return await request.get({ url: `/wms/supplierdeliver-inspection-detail/get?id=` + id }) +} + +// 新增供应商发货申请质检信息子 +export const createSupplierdeliverInspectionDetail = async (data: SupplierdeliverInspectionDetailVO) => { + return await request.post({ url: `/wms/supplierdeliver-inspection-detail/create`, data }) +} + +// 修改供应商发货申请质检信息子 +export const updateSupplierdeliverInspectionDetail = async (data: SupplierdeliverInspectionDetailVO) => { + return await request.put({ url: `/wms/supplierdeliver-inspection-detail/update`, data }) +} + +// 删除供应商发货申请质检信息子 +export const deleteSupplierdeliverInspectionDetail = async (id: number) => { + return await request.delete({ url: `/wms/supplierdeliver-inspection-detail/delete?id=` + id }) +} + +// 导出供应商发货申请质检信息子 Excel +export const exportSupplierdeliverInspectionDetail = async (params) => { + return await request.download({ url: `/wms/supplierdeliver-inspection-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplierdeliver-inspection-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue new file mode 100644 index 000000000..522f05e2b --- /dev/null +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts new file mode 100644 index 000000000..0f5cf23aa --- /dev/null +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -0,0 +1,89 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const SupplierdeliverInspectionDetailRules = reactive({ + itemCode: [required], + uom: [required], + concurrencyStamp: [required], +}) + +export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive([ + { + label: '代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + isSearch: true, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + }, + { + label: '计划数量', + field: 'planQty', + sort: 'custom', + isSearch: true, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + 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: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isSearch: true, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 4b63f0065..729446ffb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -116,8 +116,8 @@ :formAllSchemas="UploadQualityReport.allSchemas" :tableAllSchemas="UploadQualityReport.allSchemas" :tableData="ploadQualityReportTableData" - @handleAddTable="handleAddTableUploadQualityReport" - @handleDeleteTable="handleDeleteTableUploadQualityReport" + @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail" + @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail" @submitForm="submitFormUploadQualityReport" :isShowReduceButton="true" /> @@ -142,6 +142,7 @@ import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverReque import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail' import * as ItembasicApi from '@/api/wms/itembasic' +import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail' import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data' import { addDay } from '@/utils/formatTime' @@ -577,24 +578,17 @@ const handleUploadQualityReport = async (id: number) => { }) ploadQualityReportTableData.value = [tableFormKeys] } -const handleAddTableUploadQualityReport = ()=>{ - const tableFormKeys = {} - UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => { - tableFormKeys[item.field] = item.default ? item.default : '' - }) - ploadQualityReportTableData.value.push(tableFormKeys) -} -const handleDeleteTableUploadQualityReport = (item, index) => { - ploadQualityReportTableData.value.splice(index, 1) -} -const submitFormUploadQualityReport = (formType, data) => { - console.log("formType==",formType) - console.log("data==",data) +const submitFormUploadQualityReport = async (formType, data) => { + if (formType === 'create') { + await SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail(data) + message.success(t('common.createSuccess')) + } else { + await SupplierdeliverInspectionDetailApi.updateSupplierdeliverInspectionDetail(data) + message.success(t('common.updateSuccess')) + } ploadQualityReportRef.value.dialogVisible = false - // formLabelRef.value.formLoading = false - // formLabelRef.value.dialogVisible = false - + getList() } /** 提交审批按钮操作 */