From 460cca785b373d96795f9ee485d2370fff4adfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Wed, 28 Jun 2023 14:21:52 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/zh-CN.js | 30 +- .../modules/basic/components/control-add.vue | 27 +- src/views/modules/basic/components/radio.vue | 14 +- .../basic/components/teamMember-add.vue | 218 +++++++++++ src/views/modules/basic/qmsControlMode.vue | 2 +- src/views/modules/basic/qmsCustomerType.vue | 2 +- src/views/modules/basic/qmsTeam.vue | 113 +++++- src/views/modules/basic/qmsTeamMember.vue | 59 +-- .../modules/gage/components/gageGrs-add.vue | 353 ++++++++++++++---- .../modules/gage/components/report-show.vue | 218 +++++++++++ src/views/modules/gage/qmsGageGrr.vue | 66 +++- src/views/modules/sys/user.vue | 36 +- 12 files changed, 923 insertions(+), 215 deletions(-) create mode 100644 src/views/modules/basic/components/teamMember-add.vue create mode 100644 src/views/modules/gage/components/report-show.vue diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 9e7c6b1..7e5bb35 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -293,6 +293,15 @@ t.basic.InspectionPlan = '检验计划' t.basic.customerTypeName = '客户类型' t.basic.productTypeName = '产品类型名称' t.basic.client = '服务对象' +t.basic.stock = '进货检验' +t.basic.finishedProduct = '成品检验' +t.basic.course = '过程检验' +t.basic.shipment = '出货检验' +t.basic.userName = '用户名' +t.basic.departName = '部门名' + + + t.quality = {} @@ -524,16 +533,17 @@ t.gage.outsideVerify = '外部校验' t.gage.verificationFee = '校验费用' t.gage.report = '量具重复性及再现性分析报告' t.gage.model = '型号' - - - - - - - - - - +t.gage.meanRange = '极差均值' +t.gage.meanDifference = '均值差' +t.gage.partAverageMean = 'Rp 零件均值极差' +t.gage.measuringUnit = '测量单元分析' +t.gage.totalVariation = '%总变查(TV)' +t.gage.reproducibility = '再现性-实验人员变差(AV)' +t.gage.repeatability = '重复性-设备变差(EV)' +t.gage.repeatabilityAndReproducibility = '重复性和再现性(R&R)' +t.gage.partVariation = '零件变差(TV)' +t.gage.decide = '综合判定' +t.gage.tabularComputations = '表格计算' diff --git a/src/views/modules/basic/components/control-add.vue b/src/views/modules/basic/components/control-add.vue index 6e56661..5bfd3e3 100644 --- a/src/views/modules/basic/components/control-add.vue +++ b/src/views/modules/basic/components/control-add.vue @@ -1,7 +1,7 @@ @@ -16,14 +16,21 @@ - - + + + - - + + + - - + + + + + + + @@ -59,7 +66,11 @@ export default { id: "", controlCode:null, controlName:null, - customerTypeStatus:null + customerTypeStatus: null, + finishInspection: null, + incomingInspection: null, + outInspection: null, + processInspection: null, }, }; }, diff --git a/src/views/modules/basic/components/radio.vue b/src/views/modules/basic/components/radio.vue index aaf9937..ffc6ea6 100644 --- a/src/views/modules/basic/components/radio.vue +++ b/src/views/modules/basic/components/radio.vue @@ -7,16 +7,10 @@ --> diff --git a/src/views/modules/basic/components/teamMember-add.vue b/src/views/modules/basic/components/teamMember-add.vue new file mode 100644 index 0000000..ac36b72 --- /dev/null +++ b/src/views/modules/basic/components/teamMember-add.vue @@ -0,0 +1,218 @@ + + + + diff --git a/src/views/modules/basic/qmsControlMode.vue b/src/views/modules/basic/qmsControlMode.vue index 0a851a0..ab8fa43 100644 --- a/src/views/modules/basic/qmsControlMode.vue +++ b/src/views/modules/basic/qmsControlMode.vue @@ -223,7 +223,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrUpdateVisible = true + this.addOrUpdateVisible = true this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/basic/qmsCustomerType.vue b/src/views/modules/basic/qmsCustomerType.vue index a3765c1..779c264 100644 --- a/src/views/modules/basic/qmsCustomerType.vue +++ b/src/views/modules/basic/qmsCustomerType.vue @@ -16,7 +16,7 @@ - + @@ -15,8 +15,8 @@ {{ $t("conditionSearch")}}} - + @@ -49,23 +49,18 @@
- + - - + - - - + +
- "" + "" @@ -74,12 +69,12 @@ import basicPage from "@/mixins/basic-page"; import basicSearch from "@/mixins/basic-search"; import teamAdd from "./components/team-add"; +import teamMemberAdd from './components/teamMember-add' import teamSearch from "./components/teamSearch.vue"; import Cookies from 'js-cookie' import qs from 'qs' // import radio from "./components/radio.vue"; import i18n from "@/i18n"; -// import i18n from "@/i18n"; const tableProps = [ { prop: "teamCode", @@ -98,6 +93,16 @@ const tableProps = [ label: i18n.t('basic.remark') }, ]; +const depProps = [ + { + prop: "departName", + label: i18n.t('basic.departName') + }, + { + prop: "userName", + label: i18n.t('basic.userName') + } +]; const tableBtn = [ { type: "edit", @@ -116,11 +121,17 @@ export default { getDataListURL: "/basic/qmsTeam/page", deleteURL: "/basic/qmsTeam", exportURL: "/basic/qmsTeam/export", + teamMemberURL: '/basic/qmsTeamMember/page' }, tableProps, + depProps, + teamId:null, + teamMemberData: [], + teamMemberOrEditTitle:'', tableBtn, productData: {}, addOrUpdateVisible: false, + teamMemberOrUpdateVisible:false, searchOrEditTitle: "", addOrEditTitle: '', searchOrUpdateVisible: false, @@ -156,7 +167,14 @@ export default { name: i18n.t('export'), color: "primary", // plain: true, - } + }, + { + type: "button", + btnName: "取消选中", + name: "cancel", + color: "primary", + // plain: true, + }, ], formConfigMember: [ // { @@ -180,14 +198,37 @@ export default { }, components: { teamAdd, + teamMemberAdd, teamSearch }, + // mounted() { + // this.getDepData() + // }, methods: { //search-bar点击 handleProductCancel() { this.productOrUpdateVisible = false; this.productOrEditTitle = ""; }, + setCurrent(index) { + this.$refs.palletTable1.setCurrent("palletTable", index) + console.log(index) + }, + handleCurrentChange(val) { + this.teamId = val.newVal.id + this.$http.get(this.urlOptions.teamMemberURL, { + params: { + limit: 999, + page: 1, + teamId:val.newVal.id + } + }).then(({ data: res } ) => { + console.log(res) + if (res && res.code === 0) { + this.teamMemberData = res.data.list + } + }) + }, // handleSearchCancel() { // this.searchOrEditTitle = ""; // this.searchOrUpdateVisible = false; @@ -268,7 +309,7 @@ export default { } else { this.$message.error(data.msg); } - }); + }) }) .catch(() => { }); } else if (val.type === 'edit') { @@ -279,6 +320,41 @@ export default { }); } }, + successTeamMemberSubmit() { + this.handleTeamMemberCancel() + this.$http.get(this.urlOptions.teamMemberURL, { + params: { + limit: 999, + page: 1, + teamId: this.teamId + } + }).then(({ data: res } ) => { + if (res && res.code === 0) { + this.teamMemberData = res.data.list + } + }); + }, + handleTeamMemberCancel() { + this.teamMemberOrUpdateVisible = false + this.teamMemberOrEditTitle = '' + }, + teamMemberButtonClick(val) { + console.log(val); + switch (val.btnName) { + case "change": + this.teamMemberOrEditTitle = '修改团队成员' + this.teamMemberOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.teamMemberOrUpdate.init(this.teamId) + }); + break; + default: + console.log(val); + } + }, + handleTeamMemberConfirm() { + this.$refs.teamMemberOrUpdate.dataFormSubmit() + }, buttonClick(val) { console.log(val); switch (val.btnName) { @@ -301,6 +377,9 @@ export default { this.$refs.addOrUpdate.init(); }); break; + case "cancel": + this.$refs.palletTable1.setCurrent("palletTable", -1); + break; // case "correlation": // this.productOrEditTitle = "产品"; // this.productOrUpdateVisible = true; diff --git a/src/views/modules/basic/qmsTeamMember.vue b/src/views/modules/basic/qmsTeamMember.vue index 2d2901b..fa70b2b 100644 --- a/src/views/modules/basic/qmsTeamMember.vue +++ b/src/views/modules/basic/qmsTeamMember.vue @@ -1,50 +1,26 @@ @@ -60,6 +49,7 @@ + diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index c54fd99..214ca1a 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -2,36 +2,16 @@
- - + + - + - - + +
From 6a03ac5a9e87c816bab4c024c2588e6ee8ad82d5 Mon Sep 17 00:00:00 2001 From: zwq Date: Wed, 28 Jun 2023 15:42:16 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2=E9=83=A8=E5=88=86=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.js | 2 +- src/i18n/{en => eng}/basicData.js | 0 src/i18n/{en => eng}/index.js | 0 .../spc-basic/components/unitList-add.vue | 76 -------- src/views/spc-basic/unitList.vue | 177 ------------------ 5 files changed, 1 insertion(+), 254 deletions(-) rename src/i18n/{en => eng}/basicData.js (100%) rename src/i18n/{en => eng}/index.js (100%) delete mode 100644 src/views/spc-basic/components/unitList-add.vue delete mode 100644 src/views/spc-basic/unitList.vue diff --git a/src/i18n/en.js b/src/i18n/en.js index 9dc894e..55bf0bf 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -1,4 +1,4 @@ -import module from './en' +import module from './eng' const t = {} t.module = module diff --git a/src/i18n/en/basicData.js b/src/i18n/eng/basicData.js similarity index 100% rename from src/i18n/en/basicData.js rename to src/i18n/eng/basicData.js diff --git a/src/i18n/en/index.js b/src/i18n/eng/index.js similarity index 100% rename from src/i18n/en/index.js rename to src/i18n/eng/index.js diff --git a/src/views/spc-basic/components/unitList-add.vue b/src/views/spc-basic/components/unitList-add.vue deleted file mode 100644 index 0d9b477..0000000 --- a/src/views/spc-basic/components/unitList-add.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - diff --git a/src/views/spc-basic/unitList.vue b/src/views/spc-basic/unitList.vue deleted file mode 100644 index dbddcbe..0000000 --- a/src/views/spc-basic/unitList.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - From 0405ccfa251256222a570cd3dc6b4f48d0124c50 Mon Sep 17 00:00:00 2001 From: zwq Date: Wed, 28 Jun 2023 16:54:46 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/filters/code-filter.js | 31 ++ src/i18n/zh-CN.js | 3 +- .../modules/code/components/available.vue | 2 +- .../code/components/eightDiscipline-add.vue | 14 +- .../components/startEightDiscipline-add.vue | 332 ++++++++++-------- src/views/modules/code/eightDiscipline.vue | 8 +- .../modules/code/startEightDiscipline.vue | 17 +- src/views/modules/incoming/controlChart.vue | 6 +- 8 files changed, 256 insertions(+), 157 deletions(-) create mode 100644 src/filters/code-filter.js diff --git a/src/filters/code-filter.js b/src/filters/code-filter.js new file mode 100644 index 0000000..6803696 --- /dev/null +++ b/src/filters/code-filter.js @@ -0,0 +1,31 @@ + +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: zwq + * @LastEditTime: 2023-01-05 15:49:17 + * @FilePath: \basic-admin\src\filters\basicData\index.js + * @Description: + */ +import moment from 'moment' + +const table = { + eightDisciplineType: { + 1: '客诉问题', + 2: '重大质量问题', + 0: '重复发生问题', + } +} + +export function timeFormatter(timeObj) { + if (timeObj) { + return moment(timeObj).format('YYYY-MM-DD HH:mm:ss') + } else { + return '-' + } +} + +export default function(dictTable) { + return function(val) { + return table?.[dictTable]?.[val] + } +} \ No newline at end of file diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index d4dcc55..ee88d1a 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -573,13 +573,12 @@ t.code.code = '编码' t.code.description = '描述' t.code.eightDisciplineType = '8D类型' t.code.problemStatus = '状态' -t.code.eightDisciplineStatus = '状态' t.code.actualResponsePeriod = '实际响应周期' t.code.batchNumber = '批次数' t.code.customName = '客户' t.code.defectSource = '缺陷来源' t.code.eightDisciplineId = '8D来源id' -t.code.eightDisciplineStatus = '8D类型' +t.code.eightDisciplineStatus = '8D状态' t.code.productName = '产品名' t.code.orderNo = '订单号' t.code.productType = '产品类型' diff --git a/src/views/modules/code/components/available.vue b/src/views/modules/code/components/available.vue index eabbfa0..4188044 100644 --- a/src/views/modules/code/components/available.vue +++ b/src/views/modules/code/components/available.vue @@ -7,7 +7,7 @@ --> diff --git a/src/views/modules/code/components/eightDiscipline-add.vue b/src/views/modules/code/components/eightDiscipline-add.vue index 0a40e39..8ab83a1 100644 --- a/src/views/modules/code/components/eightDiscipline-add.vue +++ b/src/views/modules/code/components/eightDiscipline-add.vue @@ -1,8 +1,8 @@