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 @@
- - + + - + - - + +