From f8dd086cf9bfdd4fd3d8521423cba0b2bd58f238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 14 Jul 2023 16:01:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/qualityChange-add.vue | 47 +++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/views/modules/researchquality/components/qualityChange-add.vue b/src/views/modules/researchquality/components/qualityChange-add.vue index e7b50ab..f1a98f1 100644 --- a/src/views/modules/researchquality/components/qualityChange-add.vue +++ b/src/views/modules/researchquality/components/qualityChange-add.vue @@ -1,7 +1,7 @@ @@ -34,7 +34,7 @@ - + @@ -250,7 +250,7 @@ export default { this.$nextTick(() => { this.$refs["dataForm"].resetFields(); if (this.dataForm.id) { - this.getInfo(); + this.getInfo() } else { } }); @@ -305,9 +305,6 @@ export default { .catch(() => { }) }, - getProcessList(val) { - console.log(val); - }, // 获取信息 getInfo() { this.$http @@ -324,6 +321,41 @@ export default { .catch(() => {}); }, // 表单提交 + dataFormSubmit() { + this.$refs["dataForm"].validate((valid) => { + if (!valid) { + return false; + } + const processArr = this.dataForm.processList.map((item) => { + return { + id:item + } + }) + this.dataForm.processList = processArr + const productTypeArr = this.dataForm.productTypeList.map((item) => { + return { + id: item + } + }) + this.dataForm.productTypeList = productTypeArr + this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } + this.$message({ + message: this.$t("prompt.success"), + type: "success", + duration: 500, + onClose: () => { + this.visible = false; + this.$emit("refreshDataList"); + }, + }); + }) + .catch(() => { }); + }); + }, dataFormSubmitHandle: debounce( function () { this.$refs["dataForm"].validate((valid) => { @@ -340,9 +372,8 @@ export default { type: "success", duration: 500, onClose: () => { - console.log(1111); this.visible = false; - this.$emit("successSubmit"); + this.$emit("refreshDataList"); }, }); }) From bc6ae3a005fdf314f3672a966099ad2c56cc9fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Mon, 17 Jul 2023 17:00:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/filters/incoming/index.js | 29 ++ src/filters/index.js | 18 +- src/i18n/zh-CN.js | 7 + .../components/deliveryInspection-add.vue | 64 ++-- .../code/components/productInspection-add.vue | 41 ++- .../components/productRegistration-add.vue | 101 +++--- .../components/shipmentRegistration-add.vue | 101 +++--- src/views/modules/code/deliveryInspection.vue | 10 +- src/views/modules/code/productInspection.vue | 10 +- .../modules/code/productRegistration.vue | 53 +-- .../modules/code/shipmentRegistration.vue | 15 +- .../components/baseConfig-add.vue | 173 +++++++++ .../customerquality/components/baseConfig.vue | 128 ++++++- .../components/baseConfigFile-add.vue | 173 +++++++++ .../customerquality/components/innerTable.vue | 164 +++++++++ .../components/publicDocuments-add.vue | 6 +- .../components/qualityChange-add.vue | 336 ------------------ .../customerquality/qmsQualityChange.vue | 281 --------------- .../components/incomingInspection-add.vue | 39 +- .../components/purchaseRegistration-add.vue | 100 +++--- .../modules/incoming/incomingInspection.vue | 9 +- .../modules/incoming/purchaseRegistration.vue | 26 +- .../components/employeeResumeDetail.vue | 6 +- .../components/experienceDetail.vue | 6 +- .../components/inspectionDetail.vue | 4 +- .../components/laboratoryTester-add.vue | 67 +--- ...atoryTesterInspectionQualification-add.vue | 3 +- .../laboratory/qmsLaboratoryTester.vue | 17 +- .../approvalProcessConfiguration-add.vue | 34 +- .../qmsApprovalProcessConfiguration.vue | 30 +- .../researchquality/components/innerTable.vue | 63 ++-- .../components/qualityChange-add.vue | 69 ++-- .../researchquality/qmsQualityChange.vue | 30 +- 34 files changed, 1147 insertions(+), 1068 deletions(-) create mode 100644 src/filters/incoming/index.js create mode 100644 src/views/modules/customerquality/components/baseConfig-add.vue create mode 100644 src/views/modules/customerquality/components/baseConfigFile-add.vue create mode 100644 src/views/modules/customerquality/components/innerTable.vue delete mode 100644 src/views/modules/customerquality/components/qualityChange-add.vue delete mode 100644 src/views/modules/customerquality/qmsQualityChange.vue diff --git a/public/index.html b/public/index.html index 01f0c36..e99bd01 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-22 14:57:50 * @LastEditors: zhp - * @LastEditTime: 2023-07-11 10:23:31 + * @LastEditTime: 2023-07-17 10:36:32 * @Description: --> diff --git a/src/filters/incoming/index.js b/src/filters/incoming/index.js new file mode 100644 index 0000000..2ca7694 --- /dev/null +++ b/src/filters/incoming/index.js @@ -0,0 +1,29 @@ +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: zhp + * @LastEditTime: 2023-07-17 09:36:52 + * @FilePath: \basic-admin\src\filters\DataDict\index.js + * @Description: 部分常量的数据字典定义 + */ +import i18n from "@/i18n" +const table = { + upload: { + 0: '未上传', + 1:' 已上传', + }, + VerifyType: { + 0: i18n.t('gage.insideVerify'), + 1: i18n.t('gage.outsideVerify') + }, + judgmentResult: { + 0: '未判定 ', + 1: '合格', + 2: '不合格' + }, +} + +export default function (dictTable) { + return function (val) { + return table?.[dictTable]?.[val] + } +} diff --git a/src/filters/index.js b/src/filters/index.js index e507410..3f29663 100644 --- a/src/filters/index.js +++ b/src/filters/index.js @@ -1,7 +1,7 @@ /* * @Date: 2020-12-14 09:07:03 * @LastEditors: zhp - * @LastEditTime: 2023-04-18 15:14:26 + * @LastEditTime: 2023-07-17 14:34:42 * @FilePath: \basic-admin\src\filters\index.js * @Description: 过滤器定义、多语言过滤器修改 */ @@ -146,6 +146,22 @@ export function handleLimit(string) { } } +export function handleProductType(Array) { + let arr = [] + Array.forEach(ele => { + arr.push(ele.productTypeName) + }) + return arr.join(',') +} + +export function handleProcess(Array) { + let arr = [] + Array.forEach(ele => { + arr.push(ele.processName) + }) + return arr.join(',') +} + export function getSimpleText(html) { var re1 = new RegExp('<.+?>', 'g') var msg = html.replace(re1, '') diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index c5d1e03..c6a0112 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -43,6 +43,9 @@ t.notAvailable = '不可用' t.time = '时间段' t.parameter = '台差参数' t.configuration = '配置' +t.uploadFile = '上传' +t.detail = '查看详情' + @@ -694,6 +697,9 @@ t.researchquality.stageTwoDate = '阶段2时间' t.researchquality.stageThreeDate = '阶段3时间' t.researchquality.stageFourDate = '阶段4时间' t.researchquality.approvedMemo = '审核记录' +t.researchquality.phase = '阶段' +t.researchquality.realTime = '实际完成时间' + @@ -718,6 +724,7 @@ t.customerquality.qualityAcceptanceDate = '质量接收日期' t.customerquality.confirmDeliveryDate = '确认交付日期' t.customerquality.deliveryRequiredDate = '要求交付日期' t.customerquality.status = '状态' +t.customerquality.file = '清单文件' diff --git a/src/views/modules/code/components/deliveryInspection-add.vue b/src/views/modules/code/components/deliveryInspection-add.vue index 97279a4..bdcdedc 100644 --- a/src/views/modules/code/components/deliveryInspection-add.vue +++ b/src/views/modules/code/components/deliveryInspection-add.vue @@ -1,8 +1,8 @@