From 0b5767d552baa3c72fd36ca916491419f90089f3 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 18 Apr 2024 07:45:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/qualityNotice/components/notaicType.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/qualityNotice/components/notaicType.vue b/src/views/qms/qualityNotice/components/notaicType.vue index 0b33c796c..463f78828 100644 --- a/src/views/qms/qualityNotice/components/notaicType.vue +++ b/src/views/qms/qualityNotice/components/notaicType.vue @@ -175,7 +175,7 @@ nextTick(()=>{ type.value = parseInt(props.data.type) q1.value = props.data?.q1 ? props.data?.q1 :{} q2.value = props.data?.q2 ? props.data?.q2 :{} - q3.value = props.data?.q3 ? props.data?.q3 :{}, + q3.value = props.data?.q3 ? props.data?.q3 :{} }) // 质量通知校验 From 91d19a67ff1d0bd38328e5e706c0dc3a2b03ad02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Thu, 18 Apr 2024 08:46:08 +0800 Subject: [PATCH 2/3] =?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/views/qms/aql/aql.data.ts | 122 +++++++++--------- .../dynamicRule/dynamicRule.data.ts | 20 +-- .../qms/basicDataManage/selectedSet/index.vue | 1 + 3 files changed, 72 insertions(+), 71 deletions(-) diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index 58e6df6c2..d16783a9f 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -1,66 +1,66 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -import {getSamplingScheme} from "@/api/qms/aql"; -import {validateNum} from "@/utils/validator"; +import { getSamplingScheme } from "@/api/qms/aql"; +import { validateNum } from "@/utils/validator"; // 表单校验 export const AqlRules = reactive({ code: [required], inspectionQualification: [required], - sampleCharacterCode: [required], + sampleCharacterCode: [{ required, max: 1, message: '长度不得超过1个字符', trigger: 'blur' }], sampleSize: [required], - a0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - a1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], - r1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], + a0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + a1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], + r1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }], }) const samplingSchemeList = await getSamplingScheme() export const Aql = useCrudSchemas(reactive([ @@ -88,12 +88,12 @@ export const Aql = useCrudSchemas(reactive([ label: '检验严格性', field: 'inspectionQualification', sort: 'custom', - dictType: DICT_TYPE.INSPECTION_SEVERITY, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + dictType: DICT_TYPE.INSPECTION_SEVERITY, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, - form: { - component: 'Select' - }, + form: { + component: 'Select' + }, table: { width: 130 } @@ -543,7 +543,7 @@ export const Aql = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width: '100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts index fbe16c839..2ce60aa0e 100644 --- a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts +++ b/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts @@ -33,14 +33,14 @@ export const DynamicRule = useCrudSchemas(reactive([ sort: 'custom', isSearch: true }, - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 150, - fixed: 'right' - } - } + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 330, + fixed: 'right' + }, + } ])) diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/basicDataManage/selectedSet/index.vue index b8a3a29cd..42fde7870 100644 --- a/src/views/qms/basicDataManage/selectedSet/index.vue +++ b/src/views/qms/basicDataManage/selectedSet/index.vue @@ -77,6 +77,7 @@ :detailButtonIsShowDelete=true @detailOpenForm="detailOpenForm" @detailBasicFormOnChange="detailBasiFormOnChange" + :detailButtonIsShowFilter="false" /> From 198ddd8c35fb921ad855f21f6807c994881df616 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 18 Apr 2024 09:06:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRequestMain/index.ts | 4 ++-- .../supplierinvoiceRequestMain/index.vue | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 7a5d2122b..f396d5c73 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -68,11 +68,11 @@ export const cloSupplierinvoiceRequestMain = async (id: number) => { export const subSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id }) } -// 供应商--审批通过供应商发货申请主 +// 采购--审批通过供应商发货申请主 export const appSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id }) } -// 供应商--驳回供应商发货申请主 +// 采购--驳回供应商发货申请主 export const rejSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id }) } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index f7b9dc57c..69f0b1d09 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -254,8 +254,8 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1']) }), // 打开 - defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 + defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) }), // 打开 + defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']) }), // 提交审批 { label: '采购通过', name: 'purchase_mainPlanSub', @@ -303,8 +303,8 @@ }, // defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 //defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 - defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8'])}), // 编辑 - defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8']) }), // 关闭 + defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 + defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 // 生成记录 // { // label: '处理', @@ -440,7 +440,7 @@ const handleImport = () => { } } - /** 审批通过按钮操作 */ + /** 采购审批通过按钮操作 */ const handleApp = async (id : number) => { try { // 审批通过的二次确认