diff --git a/public/index.html b/public/index.html index 0805fba..57e2576 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-05-12 14:03:44 + * @LastEditTime: 2023-06-21 13:55:38 * @Description: --> @@ -38,7 +38,8 @@ <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> <% } %> diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 11422a3..9e7c6b1 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -418,7 +418,26 @@ t.supplier.description = '说明' t.supplier.evaluationPeriod = '评估时间段' t.supplier.evaluationType = '评估类型' t.supplier.reminder = '提醒人' -t.supplier.title = '标题' +t.supplier.title = '标题' +t.supplier.projectTypeName = '类别' +t.supplier.requirement = '要求' +t.supplier.statisticalValue = '是否统计值' +t.supplier.evaluationTemplateName = '评估模板' +t.supplier.lastStartTime = '上次启动时间段' +t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段' +t.supplier.estimatedNextStartTime = '预计下次启动时间' +t.supplier.offline = '下限' +t.supplier.online = '上限' + + + + + + + + + + t.gage = {} t.gage.name = '名称' @@ -503,6 +522,10 @@ t.gage.verifyLog = '校验记录' t.gage.insideVerify = '内部校验' t.gage.outsideVerify = '外部校验' t.gage.verificationFee = '校验费用' +t.gage.report = '量具重复性及再现性分析报告' +t.gage.model = '型号' + + @@ -541,6 +564,84 @@ t.laboratory.trainDuration = '培训时长' t.laboratory.trainType = '培训类型' +t.code = {} +t.code.name = '名称' +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.productName = '产品名' +t.code.orderNo = '订单号' +t.code.productType = '产品类型' +t.code.requestResponseCycle = '要求响应周期' +t.code.responsibilityAttribution = '责任归属' +t.code.sampleAcceptanceTime = '样品接收时间' +t.code.supportProducts = '配套产品/系统' +t.code.title = '标题' +t.code.userId = '启动人' +t.code.examineStatus = '审核状态' +t.code.finalCompletionDate = '最终完成日期 ' +t.code.occurrenceDate = '发生日期' +t.code.eightDTeam = '通知8D小组' +t.code.inspectionStatus = '报检状态' +t.code.batchNo = '批号' +t.code.batchQuantity = '批次数量' +t.code.batchSize = '批规格' +t.code.checkoutTime = '检验时间' +t.code.companyName = '单位' +t.code.inspectionQuantity = '报检数量' +t.code.inspectionStatus = '报检状态' +t.code.inspectionType = '检验类型' +t.code.orderNumber = '订单号' +t.code.productCode = '产品编码' +t.code.productName = '产品' +t.code.recheck = '复检' +t.code.remark = '备注' +t.code.samplesQuantity = '抽样数' +t.code.source = '来源' +t.code.supplierName = '供应商' +t.code.username = '检验人员' +t.code.factoryName = '工厂' +t.code.inspectionPlan = '报检计划' +t.code.inspectionTime = '报检时间' +t.code.customSampling = '抽样方案' +t.code.task = '任务' +t.code.upload = '上传' +t.code.judgmentResult = '判断结果' +t.code.defectiveQuantity = '不良数量' +t.code.defectsNumber = '缺陷数量' +t.code.submit = '提交' +t.code.processingMethod = '处理方法' +t.code.processingResults = '处理结果' +t.code.characteristics = '特性' +t.code.sampleSize = '样本大小' +t.code.grouping = '分组' +t.code.grouping = '分组' +t.code.meanRange = '均值极差图' +t.code.meanStandard = '均值标准差图' +t.code.medianRange = '中位数极差图' +t.code.singleValueMovingRange = '单值移动极差图' +t.code.meanMovingRangeRange = '均值移动极差极差极' +t.code.meanMovingRangeStandardDeviation = '均值移动极差标准差图' +t.code.originalData = '原始数据' +t.code.inspectionNumber = '检验单号' +t.code.locationNo = ' 样品/位置号' +t.code.groupNo = '组号' +t.code.parsingTime = '分析时间' +t.code.assayValue = '分析值' +t.code.status = '状态' +t.code.approval = '审批中' +t.code.approvalComplete = '审批完成' +t.code.uploaded = '已上传' +t.code.notUploaded = '未上传' +t.code.Examiner = '检验人' @@ -550,6 +651,19 @@ t.laboratory.trainType = '培训类型' + + + + + + + + + + + + + diff --git a/src/utils/request.js b/src/utils/request.js index cd1dcdb..17a395b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,8 +1,8 @@ /* * @Author: zhp * @Date: 2023-01-06 10:13:07 - * @LastEditTime: 2023-05-12 12:42:15 - * @LastEditors: zwq + * @LastEditTime: 2023-05-31 10:11:32 + * @LastEditors: zhp * @Description: */ import axios from 'axios' diff --git a/src/views/modules/basic/qmsControlMode.vue b/src/views/modules/basic/qmsControlMode.vue index bf017bd..0a851a0 100644 --- a/src/views/modules/basic/qmsControlMode.vue +++ b/src/views/modules/basic/qmsControlMode.vue @@ -223,7 +223,8 @@ 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/qmsCustomer.vue b/src/views/modules/basic/qmsCustomer.vue index 9f48ec4..5747d1f 100644 --- a/src/views/modules/basic/qmsCustomer.vue +++ b/src/views/modules/basic/qmsCustomer.vue @@ -192,7 +192,8 @@ 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 63939cd..a3765c1 100644 --- a/src/views/modules/basic/qmsCustomerType.vue +++ b/src/views/modules/basic/qmsCustomerType.vue @@ -221,8 +221,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = "修改" - 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/qmsFailureType.vue b/src/views/modules/basic/qmsFailureType.vue index 2627be4..918f03b 100644 --- a/src/views/modules/basic/qmsFailureType.vue +++ b/src/views/modules/basic/qmsFailureType.vue @@ -1,7 +1,7 @@ @@ -178,8 +178,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = "修改" - 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/qmsProduct.vue b/src/views/modules/basic/qmsProduct.vue index b185ad6..02a74f2 100644 --- a/src/views/modules/basic/qmsProduct.vue +++ b/src/views/modules/basic/qmsProduct.vue @@ -201,8 +201,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = "修改" - 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/qmsProductType.vue b/src/views/modules/basic/qmsProductType.vue index eed5bf8..09c94c2 100644 --- a/src/views/modules/basic/qmsProductType.vue +++ b/src/views/modules/basic/qmsProductType.vue @@ -1,7 +1,7 @@ @@ -242,8 +242,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = "修改" - 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/qmsTeam.vue b/src/views/modules/basic/qmsTeam.vue index 5bb856d..47b3dc1 100644 --- a/src/views/modules/basic/qmsTeam.vue +++ b/src/views/modules/basic/qmsTeam.vue @@ -1,7 +1,7 @@ @@ -272,8 +272,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = "修改" - 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/code/components/available.vue b/src/views/modules/code/components/available.vue new file mode 100644 index 0000000..eabbfa0 --- /dev/null +++ b/src/views/modules/code/components/available.vue @@ -0,0 +1,41 @@ + + + + 可用 + 不可用 + + + + diff --git a/src/views/modules/code/components/deliveryInspection-add.vue b/src/views/modules/code/components/deliveryInspection-add.vue new file mode 100644 index 0000000..e7beea4 --- /dev/null +++ b/src/views/modules/code/components/deliveryInspection-add.vue @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/deliveryInspectionSearch.vue b/src/views/modules/code/components/deliveryInspectionSearch.vue new file mode 100644 index 0000000..2ab7fe0 --- /dev/null +++ b/src/views/modules/code/components/deliveryInspectionSearch.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/eightDiscipline-add.vue b/src/views/modules/code/components/eightDiscipline-add.vue new file mode 100644 index 0000000..0a40e39 --- /dev/null +++ b/src/views/modules/code/components/eightDiscipline-add.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/productInspection-add.vue b/src/views/modules/code/components/productInspection-add.vue new file mode 100644 index 0000000..04449bd --- /dev/null +++ b/src/views/modules/code/components/productInspection-add.vue @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/productInspectionSearch.vue b/src/views/modules/code/components/productInspectionSearch.vue new file mode 100644 index 0000000..c0c91e9 --- /dev/null +++ b/src/views/modules/code/components/productInspectionSearch.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/productRegistration-add.vue b/src/views/modules/code/components/productRegistration-add.vue new file mode 100644 index 0000000..076dc95 --- /dev/null +++ b/src/views/modules/code/components/productRegistration-add.vue @@ -0,0 +1,634 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GBT2828.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/productRegistrationSearch.vue b/src/views/modules/code/components/productRegistrationSearch.vue new file mode 100644 index 0000000..540330d --- /dev/null +++ b/src/views/modules/code/components/productRegistrationSearch.vue @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.approval') }} + {{ $t('code.approvalComplete') }} + + + + + {{ $t('code.notUploaded') }} + {{ $t('code.uploaded') }} + + + + + + + + + + + + diff --git a/src/views/modules/code/components/radio.vue b/src/views/modules/code/components/radio.vue new file mode 100644 index 0000000..aaf9937 --- /dev/null +++ b/src/views/modules/code/components/radio.vue @@ -0,0 +1,49 @@ + + + + 进货检验 + 过程检验 + 成品检验 + 出货检验 + + + + diff --git a/src/views/modules/code/components/shipmentRegistration-add.vue b/src/views/modules/code/components/shipmentRegistration-add.vue new file mode 100644 index 0000000..4bb8b91 --- /dev/null +++ b/src/views/modules/code/components/shipmentRegistration-add.vue @@ -0,0 +1,634 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GBT2828.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/components/shipmentRegistrationSearch.vue b/src/views/modules/code/components/shipmentRegistrationSearch.vue new file mode 100644 index 0000000..19b1dd1 --- /dev/null +++ b/src/views/modules/code/components/shipmentRegistrationSearch.vue @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.approval') }} + {{ $t('code.approvalComplete') }} + + + + + {{ $t('code.notUploaded') }} + {{ $t('code.uploaded') }} + + + + + + + + + + + + diff --git a/src/views/modules/code/components/startEightDiscipline-add.vue b/src/views/modules/code/components/startEightDiscipline-add.vue new file mode 100644 index 0000000..c8ca5fb --- /dev/null +++ b/src/views/modules/code/components/startEightDiscipline-add.vue @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/deliveryInspection.vue b/src/views/modules/code/deliveryInspection.vue new file mode 100644 index 0000000..60310f6 --- /dev/null +++ b/src/views/modules/code/deliveryInspection.vue @@ -0,0 +1,322 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/code/eightDiscipline.vue b/src/views/modules/code/eightDiscipline.vue new file mode 100644 index 0000000..ef8de8f --- /dev/null +++ b/src/views/modules/code/eightDiscipline.vue @@ -0,0 +1,197 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/examineAndApprove.vue b/src/views/modules/code/examineAndApprove.vue new file mode 100644 index 0000000..acd9001 --- /dev/null +++ b/src/views/modules/code/examineAndApprove.vue @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/productInspection.vue b/src/views/modules/code/productInspection.vue new file mode 100644 index 0000000..11f0dc5 --- /dev/null +++ b/src/views/modules/code/productInspection.vue @@ -0,0 +1,321 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/code/productRegistration.vue b/src/views/modules/code/productRegistration.vue new file mode 100644 index 0000000..71d5a8a --- /dev/null +++ b/src/views/modules/code/productRegistration.vue @@ -0,0 +1,338 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/code/shipmentRegistration.vue b/src/views/modules/code/shipmentRegistration.vue new file mode 100644 index 0000000..c914c42 --- /dev/null +++ b/src/views/modules/code/shipmentRegistration.vue @@ -0,0 +1,338 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/code/startEightDiscipline.vue b/src/views/modules/code/startEightDiscipline.vue new file mode 100644 index 0000000..9c04286 --- /dev/null +++ b/src/views/modules/code/startEightDiscipline.vue @@ -0,0 +1,221 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineCreateTeam.vue b/src/views/modules/code/startEightDisciplineCreateTeam.vue new file mode 100644 index 0000000..6c3838e --- /dev/null +++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue new file mode 100644 index 0000000..d7dd481 --- /dev/null +++ b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue new file mode 100644 index 0000000..74b0aeb --- /dev/null +++ b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplinePreventRecurrence.vue b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue new file mode 100644 index 0000000..ac8000c --- /dev/null +++ b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue new file mode 100644 index 0000000..099b793 --- /dev/null +++ b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineSummaryExperience.vue b/src/views/modules/code/startEightDisciplineSummaryExperience.vue new file mode 100644 index 0000000..aab6ee3 --- /dev/null +++ b/src/views/modules/code/startEightDisciplineSummaryExperience.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue new file mode 100644 index 0000000..5bba2ce --- /dev/null +++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/code/startEightDisciplineValidation.vue b/src/views/modules/code/startEightDisciplineValidation.vue new file mode 100644 index 0000000..96c92a4 --- /dev/null +++ b/src/views/modules/code/startEightDisciplineValidation.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/CDiagram.vue b/src/views/modules/finishproduct/CDiagram.vue new file mode 100644 index 0000000..657d838 --- /dev/null +++ b/src/views/modules/finishproduct/CDiagram.vue @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/NPDiagram.vue b/src/views/modules/finishproduct/NPDiagram.vue new file mode 100644 index 0000000..c4c6dc4 --- /dev/null +++ b/src/views/modules/finishproduct/NPDiagram.vue @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/UDiagram.vue b/src/views/modules/finishproduct/UDiagram.vue new file mode 100644 index 0000000..0dd6ed0 --- /dev/null +++ b/src/views/modules/finishproduct/UDiagram.vue @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/boxplot.vue b/src/views/modules/finishproduct/boxplot.vue new file mode 100644 index 0000000..843852c --- /dev/null +++ b/src/views/modules/finishproduct/boxplot.vue @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/components/meanMovingRangeRange.vue b/src/views/modules/finishproduct/components/meanMovingRangeRange.vue new file mode 100644 index 0000000..27c7061 --- /dev/null +++ b/src/views/modules/finishproduct/components/meanMovingRangeRange.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue new file mode 100644 index 0000000..e651ab3 --- /dev/null +++ b/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/components/meanRange.vue b/src/views/modules/finishproduct/components/meanRange.vue new file mode 100644 index 0000000..f6f6271 --- /dev/null +++ b/src/views/modules/finishproduct/components/meanRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/components/meanStandard.vue b/src/views/modules/finishproduct/components/meanStandard.vue new file mode 100644 index 0000000..7f8b0fb --- /dev/null +++ b/src/views/modules/finishproduct/components/meanStandard.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/components/medianRange.vue b/src/views/modules/finishproduct/components/medianRange.vue new file mode 100644 index 0000000..d7ea42c --- /dev/null +++ b/src/views/modules/finishproduct/components/medianRange.vue @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/components/singleValueMovingRange.vue b/src/views/modules/finishproduct/components/singleValueMovingRange.vue new file mode 100644 index 0000000..1eb3291 --- /dev/null +++ b/src/views/modules/finishproduct/components/singleValueMovingRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/controlDiagram.vue b/src/views/modules/finishproduct/controlDiagram.vue new file mode 100644 index 0000000..754f3fe --- /dev/null +++ b/src/views/modules/finishproduct/controlDiagram.vue @@ -0,0 +1,442 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.originalData') }}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/finishproduct/paretoDiagram.vue b/src/views/modules/finishproduct/paretoDiagram.vue new file mode 100644 index 0000000..4095380 --- /dev/null +++ b/src/views/modules/finishproduct/paretoDiagram.vue @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/scatterPlot.vue b/src/views/modules/finishproduct/scatterPlot.vue new file mode 100644 index 0000000..05fa59f --- /dev/null +++ b/src/views/modules/finishproduct/scatterPlot.vue @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/stageDiagram.vue b/src/views/modules/finishproduct/stageDiagram.vue new file mode 100644 index 0000000..5d9f0c9 --- /dev/null +++ b/src/views/modules/finishproduct/stageDiagram.vue @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/finishproduct/trendChart.vue b/src/views/modules/finishproduct/trendChart.vue new file mode 100644 index 0000000..197c7d8 --- /dev/null +++ b/src/views/modules/finishproduct/trendChart.vue @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/gage/components/gageType-add.vue b/src/views/modules/gage/components/gageType-add.vue index 7b44efe..c3e4491 100644 --- a/src/views/modules/gage/components/gageType-add.vue +++ b/src/views/modules/gage/components/gageType-add.vue @@ -1,7 +1,7 @@ @@ -52,7 +52,7 @@ export default { // teamList:[], listQuery: { limit: 999, - gape: 1 + page: 1 }, measurementTypeList: [{ id: 0, diff --git a/src/views/modules/gage/components/parameter-show.vue b/src/views/modules/gage/components/parameter-show.vue index d4285cc..bfc77c7 100644 --- a/src/views/modules/gage/components/parameter-show.vue +++ b/src/views/modules/gage/components/parameter-show.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zhp - * @LastEditTime: 2023-05-22 15:24:00 + * @LastEditTime: 2023-06-20 15:36:04 * @remark: 报废原因--新增 --> @@ -186,7 +186,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true - this.addOrEditTitle = ' 修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id) }); diff --git a/src/views/modules/gage/components/verify-show.vue b/src/views/modules/gage/components/verify-show.vue index 02c2de3..b6f8b93 100644 --- a/src/views/modules/gage/components/verify-show.vue +++ b/src/views/modules/gage/components/verify-show.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zhp - * @LastEditTime: 2023-05-23 14:21:48 + * @LastEditTime: 2023-06-20 15:35:58 * @remark: 报废原因--新增 --> @@ -235,7 +235,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true - this.addOrEditTitle = ' 修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id) }); diff --git a/src/views/modules/gage/qmsGage.vue b/src/views/modules/gage/qmsGage.vue index 404facd..7588bc0 100644 --- a/src/views/modules/gage/qmsGage.vue +++ b/src/views/modules/gage/qmsGage.vue @@ -1,7 +1,7 @@ @@ -265,7 +265,8 @@ 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/gage/qmsGageGrr.vue b/src/views/modules/gage/qmsGageGrr.vue index 94ec22a..e8c9bbf 100644 --- a/src/views/modules/gage/qmsGageGrr.vue +++ b/src/views/modules/gage/qmsGageGrr.vue @@ -1,7 +1,7 @@ @@ -41,6 +41,18 @@ + + + + + + + + + + + @@ -95,7 +107,10 @@ const tableBtn = [ { type: "delete", btnName: i18n.t("delete"), - + }, + { + type: "report", + btnName: i18n.t("gage.report"), }, { type: "parameter", @@ -108,6 +123,45 @@ export default { gageSearch, gapeGrsAdd }, + computed: { + //因为数据用到了dataform中的数据,所以写在了computed中 + data() { + return [ + { + name: i18n.t("gage.partName"), + amount1: this.dataForm.partName, + amount2: i18n.t("gage.gageName"), + amount3: this.dataForm.gageName, + amount4: i18n.t("gage.measurementTime"), + amount5: this.dataForm.measurementTime + }, + { + name: i18n.t("gage.itemNo"), + amount1: this.dataForm.itemNo, + amount2: i18n.t("gage.model"), + amount3: this.dataForm.model, + amount4: i18n.t("gage.measurementTime"), + amount5: this.dataForm.measurementTime + }, + { + name: i18n.t("gage.measuringToolSpecification"), + amount1: this.dataForm.measuringToolSpecification, + amount2: i18n.t("gage.measuringToolAccuracy"), + amount3: this.dataForm.measuringToolAccuracy, + amount4: i18n.t("gage.process"), + amount5: this.dataForm.process + }, + // { + // name: i18n.t("gage.partName"), + // amount1: this.dataForm.partName, + // amount2: i18n.t("gage.gageName"), + // amount3: this.dataForm.gageName, + // amount4: i18n.t("gage.measurementTime"), + // amount5: this.dataForm.measurementTime + // }, + ]; + } + }, data() { return { urlOptions: { @@ -115,7 +169,9 @@ export default { deleteURL: "/gage/qmsGageGrr", exportUrl: '/gage/qmsGageGrr/export' }, + dialogTableVisible:false, tableProps, + dataForm: {}, tableBtn, searchOrEditTitle: '', searchOrUpdateVisible: false, @@ -154,6 +210,31 @@ export default { // AddOrUpdate, // }, methods: { + columnStyle({ row, column, rowIndex, columnIndex }) { + console.log(rowIndex) + if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4) { + //第三第四列的背景色就改变了2和3都是列数的下标 + return "background:#f3f6fc;"; + } else { + return "background:#ffffff;"; + } + }, + // 和并列 + // objectSpanMethod({ row, column, rowIndex, columnIndex }) { + // if (columnIndex === 0) { + // if (rowIndex % 4 === 0) { + // return { + // rowspan: 4, + // colspan: 1 + // }; + // } else { + // return { + // rowspan: 0, + // colspan: 0 + // }; + // } + // } + // }, //search-bar点击 handleProductCancel() { this.productOrUpdateVisible = false; @@ -209,7 +290,8 @@ 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); }); @@ -220,29 +302,10 @@ export default { gageTypeId: val.data.gageTypeId } }) - } else if (val.type === 'change') { - const obj = { - id: val.data.id, - measurementType: val.data.measurementType, - name: val.data.name, - code: val.data.code, - gageTypeStatus: val.data.gageTypeStatus === 0 ? 1: 0, - parentId: val.data.parentId - } - this.$http.put(this.urlOptions.submitURL, obj) - .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.getDataList() - }, - }); - }) + } else if (val.type === 'report') { + this.dialogTableVisible = true + this.dataForm = val.data + console.log(val.data) } }, buttonClick(val) { diff --git a/src/views/modules/gage/qmsGageResume.vue b/src/views/modules/gage/qmsGageResume.vue index 017c234..663c986 100644 --- a/src/views/modules/gage/qmsGageResume.vue +++ b/src/views/modules/gage/qmsGageResume.vue @@ -1,7 +1,7 @@ @@ -230,7 +230,8 @@ 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/gage/qmsGageType.vue b/src/views/modules/gage/qmsGageType.vue index b705e42..a8991fc 100644 --- a/src/views/modules/gage/qmsGageType.vue +++ b/src/views/modules/gage/qmsGageType.vue @@ -1,7 +1,7 @@ @@ -195,7 +195,8 @@ 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/gage/qmsGageTypeDifferenceParameter.vue b/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue index 264f2c1..430fd7d 100644 --- a/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue +++ b/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue @@ -1,7 +1,7 @@ @@ -206,7 +206,8 @@ 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/gage/qmsGageVerification.vue b/src/views/modules/gage/qmsGageVerification.vue index 4196da3..46cb27b 100644 --- a/src/views/modules/gage/qmsGageVerification.vue +++ b/src/views/modules/gage/qmsGageVerification.vue @@ -2,7 +2,7 @@ @@ -263,7 +263,8 @@ 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/gage/qmsStationDeviationAnalysis.vue b/src/views/modules/gage/qmsStationDeviationAnalysis.vue index a92c5c6..760fd2e 100644 --- a/src/views/modules/gage/qmsStationDeviationAnalysis.vue +++ b/src/views/modules/gage/qmsStationDeviationAnalysis.vue @@ -1,7 +1,7 @@ @@ -106,12 +106,6 @@ export default { param: 'timeSlot', width: 350 }, - { - type: "button", - btnName: i18n.t('add'), - name: "add", - color: "primary", - }, { type: "button", btnName: i18n.t('export'), diff --git a/src/views/modules/incoming/CDiagram.vue b/src/views/modules/incoming/CDiagram.vue new file mode 100644 index 0000000..b4aaf46 --- /dev/null +++ b/src/views/modules/incoming/CDiagram.vue @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/NPDiagram.vue b/src/views/modules/incoming/NPDiagram.vue new file mode 100644 index 0000000..d8ea40d --- /dev/null +++ b/src/views/modules/incoming/NPDiagram.vue @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/UDiagram.vue b/src/views/modules/incoming/UDiagram.vue new file mode 100644 index 0000000..d6dd0c0 --- /dev/null +++ b/src/views/modules/incoming/UDiagram.vue @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/boxplot.vue b/src/views/modules/incoming/boxplot.vue new file mode 100644 index 0000000..4f8d570 --- /dev/null +++ b/src/views/modules/incoming/boxplot.vue @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/components/available.vue b/src/views/modules/incoming/components/available.vue new file mode 100644 index 0000000..6448570 --- /dev/null +++ b/src/views/modules/incoming/components/available.vue @@ -0,0 +1,43 @@ + + + + 可用 + 不可用 + + + + diff --git a/src/views/modules/incoming/components/incomingInspection-add.vue b/src/views/modules/incoming/components/incomingInspection-add.vue new file mode 100644 index 0000000..568235f --- /dev/null +++ b/src/views/modules/incoming/components/incomingInspection-add.vue @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/incomingInspectionSearch.vue b/src/views/modules/incoming/components/incomingInspectionSearch.vue new file mode 100644 index 0000000..1c2afeb --- /dev/null +++ b/src/views/modules/incoming/components/incomingInspectionSearch.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/meanMovingRangeRange.vue b/src/views/modules/incoming/components/meanMovingRangeRange.vue new file mode 100644 index 0000000..66092f7 --- /dev/null +++ b/src/views/modules/incoming/components/meanMovingRangeRange.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue new file mode 100644 index 0000000..dd8c6b8 --- /dev/null +++ b/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/meanRange.vue b/src/views/modules/incoming/components/meanRange.vue new file mode 100644 index 0000000..829fbfe --- /dev/null +++ b/src/views/modules/incoming/components/meanRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/meanStandard.vue b/src/views/modules/incoming/components/meanStandard.vue new file mode 100644 index 0000000..28b95bb --- /dev/null +++ b/src/views/modules/incoming/components/meanStandard.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/medianRange.vue b/src/views/modules/incoming/components/medianRange.vue new file mode 100644 index 0000000..acafd23 --- /dev/null +++ b/src/views/modules/incoming/components/medianRange.vue @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/planBtn.vue b/src/views/modules/incoming/components/planBtn.vue new file mode 100644 index 0000000..60fe5df --- /dev/null +++ b/src/views/modules/incoming/components/planBtn.vue @@ -0,0 +1,68 @@ + + + + 同步所有关联产品 + + + + diff --git a/src/views/modules/incoming/components/purchaseRegistration-add.vue b/src/views/modules/incoming/components/purchaseRegistration-add.vue new file mode 100644 index 0000000..0dea683 --- /dev/null +++ b/src/views/modules/incoming/components/purchaseRegistration-add.vue @@ -0,0 +1,634 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GBT2828.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/purchaseRegistrationSearch.vue b/src/views/modules/incoming/components/purchaseRegistrationSearch.vue new file mode 100644 index 0000000..fb674bb --- /dev/null +++ b/src/views/modules/incoming/components/purchaseRegistrationSearch.vue @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.approval')}} + {{ $t('code.approvalComplete')}} + + + + + {{ $t('code.notUploaded')}} + {{ $t('code.uploaded')}} + + + + + + + + + + + + diff --git a/src/views/modules/incoming/components/radio.vue b/src/views/modules/incoming/components/radio.vue new file mode 100644 index 0000000..aaf9937 --- /dev/null +++ b/src/views/modules/incoming/components/radio.vue @@ -0,0 +1,49 @@ + + + + 进货检验 + 过程检验 + 成品检验 + 出货检验 + + + + diff --git a/src/views/modules/incoming/components/singleValueMovingRange.vue b/src/views/modules/incoming/components/singleValueMovingRange.vue new file mode 100644 index 0000000..c7590f7 --- /dev/null +++ b/src/views/modules/incoming/components/singleValueMovingRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/controlChart.vue b/src/views/modules/incoming/controlChart.vue new file mode 100644 index 0000000..2dbb41b --- /dev/null +++ b/src/views/modules/incoming/controlChart.vue @@ -0,0 +1,442 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.originalData') }}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/incoming/incomingInspection.vue b/src/views/modules/incoming/incomingInspection.vue new file mode 100644 index 0000000..447bbdf --- /dev/null +++ b/src/views/modules/incoming/incomingInspection.vue @@ -0,0 +1,312 @@ + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/incoming/paretoDiagram.vue b/src/views/modules/incoming/paretoDiagram.vue new file mode 100644 index 0000000..e82b7b5 --- /dev/null +++ b/src/views/modules/incoming/paretoDiagram.vue @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/purchaseRegistration.vue b/src/views/modules/incoming/purchaseRegistration.vue new file mode 100644 index 0000000..5e15a8d --- /dev/null +++ b/src/views/modules/incoming/purchaseRegistration.vue @@ -0,0 +1,337 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/incoming/scatterPlot.vue b/src/views/modules/incoming/scatterPlot.vue new file mode 100644 index 0000000..8808b11 --- /dev/null +++ b/src/views/modules/incoming/scatterPlot.vue @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/stageDiagram.vue b/src/views/modules/incoming/stageDiagram.vue new file mode 100644 index 0000000..48d5247 --- /dev/null +++ b/src/views/modules/incoming/stageDiagram.vue @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/incoming/trendChart.vue b/src/views/modules/incoming/trendChart.vue new file mode 100644 index 0000000..16e6c15 --- /dev/null +++ b/src/views/modules/incoming/trendChart.vue @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue b/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue index daae849..8162948 100644 --- a/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue +++ b/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue @@ -1,7 +1,7 @@ @@ -197,7 +197,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true - this.addOrEditTitle = '修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init({ laboratoryTesterId: this.$route.query.laboratoryTesterId }) }) diff --git a/src/views/modules/laboratory/qmsLaboratoryTester.vue b/src/views/modules/laboratory/qmsLaboratoryTester.vue index 4d1267d..46d8cf9 100644 --- a/src/views/modules/laboratory/qmsLaboratoryTester.vue +++ b/src/views/modules/laboratory/qmsLaboratoryTester.vue @@ -1,7 +1,7 @@ @@ -201,6 +201,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue b/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue index ef096bf..3307ce3 100644 --- a/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue +++ b/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue @@ -1,7 +1,7 @@ @@ -201,7 +201,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true - this.addOrEditTitle = '修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init({ id:val.data.id }) }); diff --git a/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue b/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue index e2ad5fc..fb496e0 100644 --- a/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue +++ b/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue @@ -1,7 +1,7 @@ @@ -206,7 +206,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true; - this.addOrEditTitle = '修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init({ id: val.data.id }) }) diff --git a/src/views/modules/mutual/qmsApprovalProcess.vue b/src/views/modules/mutual/qmsApprovalProcess.vue index c638607..4862563 100644 --- a/src/views/modules/mutual/qmsApprovalProcess.vue +++ b/src/views/modules/mutual/qmsApprovalProcess.vue @@ -1,7 +1,7 @@ @@ -193,6 +193,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue b/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue index 97565fc..08b9ab6 100644 --- a/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue +++ b/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue @@ -1,7 +1,7 @@ @@ -187,6 +187,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/mutual/qmsDataDictionary.vue b/src/views/modules/mutual/qmsDataDictionary.vue index 09deea7..313e995 100644 --- a/src/views/modules/mutual/qmsDataDictionary.vue +++ b/src/views/modules/mutual/qmsDataDictionary.vue @@ -1,7 +1,7 @@ @@ -194,6 +194,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id, this.listQuery.moduleDataDictionaryId); diff --git a/src/views/modules/mutual/qmsDataDictionaryDetail.vue b/src/views/modules/mutual/qmsDataDictionaryDetail.vue index 0bf90f6..8decbfd 100644 --- a/src/views/modules/mutual/qmsDataDictionaryDetail.vue +++ b/src/views/modules/mutual/qmsDataDictionaryDetail.vue @@ -1,7 +1,7 @@ @@ -190,7 +190,7 @@ export default { .catch(() => { }); } else if (val.type === 'edit') { this.addOrUpdateVisible = true - this.addOrEditTitle = '修改' + this.addOrEditTitle = this.$t('edit') this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id, this.listQuery.dataDictionaryId); }); diff --git a/src/views/modules/mutual/qmsModuleDataDictionary.vue b/src/views/modules/mutual/qmsModuleDataDictionary.vue index a345925..d2d375b 100644 --- a/src/views/modules/mutual/qmsModuleDataDictionary.vue +++ b/src/views/modules/mutual/qmsModuleDataDictionary.vue @@ -1,7 +1,7 @@ @@ -180,6 +180,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue b/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue index 520c3e3..be658ab 100644 --- a/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue +++ b/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue @@ -1,7 +1,7 @@ @@ -179,6 +179,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue b/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue index 5a18c19..d19b1e0 100644 --- a/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue +++ b/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue @@ -1,7 +1,7 @@ @@ -240,6 +240,7 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { + this.addOrEditTitle = this.$t('edit') this.addOrUpdateVisible = true; this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); diff --git a/src/views/modules/quality/components/transferScheme-add.vue b/src/views/modules/quality/components/transferScheme-add.vue index 61df82e..1d2fc2f 100644 --- a/src/views/modules/quality/components/transferScheme-add.vue +++ b/src/views/modules/quality/components/transferScheme-add.vue @@ -1,7 +1,7 @@ @@ -11,7 +11,8 @@ - + handlerShow(e)" v-model="dataForm.transferSchemeCode" + :placeholder="$t('quality.code')"> @@ -116,6 +117,27 @@ export default { // }, methods: { + handleShow(e) { + this.debounce(this.ajax(e),500) + }, + ajax(e) { + console.log(e) + }, + debounce(fn, delay) { + let timer + return function () { + console.log(timer) + if (timer) { + console.log('aaaaa') + clearTimeout(timer) + } + timer = setTimeout(() => { + console.log(arguments) + fn.apply(this, arguments) // 透传 this和参数 + timer = 0 + }, delay) + } + }, init(id, ) { this.dataForm.id = id || "" // console.log(11111) diff --git a/src/views/modules/quality/qmsCustomSampling.vue b/src/views/modules/quality/qmsCustomSampling.vue index 2103424..2c60844 100644 --- a/src/views/modules/quality/qmsCustomSampling.vue +++ b/src/views/modules/quality/qmsCustomSampling.vue @@ -1,7 +1,7 @@ @@ -267,8 +267,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/quality/qmsDisposalMethod.vue b/src/views/modules/quality/qmsDisposalMethod.vue index 5a106c6..f78f554 100644 --- a/src/views/modules/quality/qmsDisposalMethod.vue +++ b/src/views/modules/quality/qmsDisposalMethod.vue @@ -1,7 +1,7 @@ @@ -194,8 +194,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/quality/qmsInspectionPosition.vue b/src/views/modules/quality/qmsInspectionPosition.vue index 8032e77..1c54d8a 100644 --- a/src/views/modules/quality/qmsInspectionPosition.vue +++ b/src/views/modules/quality/qmsInspectionPosition.vue @@ -1,7 +1,7 @@ @@ -188,8 +188,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/quality/qmsSamplingPlan.vue b/src/views/modules/quality/qmsSamplingPlan.vue index 34ec972..5aaf7aa 100644 --- a/src/views/modules/quality/qmsSamplingPlan.vue +++ b/src/views/modules/quality/qmsSamplingPlan.vue @@ -1,7 +1,7 @@ @@ -258,8 +258,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/quality/qmsTransferRecords.vue b/src/views/modules/quality/qmsTransferRecords.vue index c112c75..36a2c0e 100644 --- a/src/views/modules/quality/qmsTransferRecords.vue +++ b/src/views/modules/quality/qmsTransferRecords.vue @@ -1,7 +1,7 @@ @@ -215,8 +215,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/quality/qmsTransferScheme.vue b/src/views/modules/quality/qmsTransferScheme.vue index 92c141f..285d834 100644 --- a/src/views/modules/quality/qmsTransferScheme.vue +++ b/src/views/modules/quality/qmsTransferScheme.vue @@ -1,7 +1,7 @@ @@ -215,8 +215,6 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.code = null - this.listQuery.name = null this.listQuery.failureTypeStatus = null this.getDataList(); break; diff --git a/src/views/modules/shipment/CDiagram.vue b/src/views/modules/shipment/CDiagram.vue new file mode 100644 index 0000000..7b9d5c0 --- /dev/null +++ b/src/views/modules/shipment/CDiagram.vue @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/NPDiagram.vue b/src/views/modules/shipment/NPDiagram.vue new file mode 100644 index 0000000..79f2b13 --- /dev/null +++ b/src/views/modules/shipment/NPDiagram.vue @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/UDiagram.vue b/src/views/modules/shipment/UDiagram.vue new file mode 100644 index 0000000..9d6bdba --- /dev/null +++ b/src/views/modules/shipment/UDiagram.vue @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批号 + 年 + 月 + 日 + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/boxplot.vue b/src/views/modules/shipment/boxplot.vue new file mode 100644 index 0000000..c8ddeed --- /dev/null +++ b/src/views/modules/shipment/boxplot.vue @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/components/meanMovingRangeRange.vue b/src/views/modules/shipment/components/meanMovingRangeRange.vue new file mode 100644 index 0000000..d571694 --- /dev/null +++ b/src/views/modules/shipment/components/meanMovingRangeRange.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue new file mode 100644 index 0000000..37968d7 --- /dev/null +++ b/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/components/meanRange.vue b/src/views/modules/shipment/components/meanRange.vue new file mode 100644 index 0000000..5c82159 --- /dev/null +++ b/src/views/modules/shipment/components/meanRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/components/meanStandard.vue b/src/views/modules/shipment/components/meanStandard.vue new file mode 100644 index 0000000..ce3b1e1 --- /dev/null +++ b/src/views/modules/shipment/components/meanStandard.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/components/medianRange.vue b/src/views/modules/shipment/components/medianRange.vue new file mode 100644 index 0000000..ac4f408 --- /dev/null +++ b/src/views/modules/shipment/components/medianRange.vue @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/components/singleValueMovingRange.vue b/src/views/modules/shipment/components/singleValueMovingRange.vue new file mode 100644 index 0000000..8726c03 --- /dev/null +++ b/src/views/modules/shipment/components/singleValueMovingRange.vue @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/controlDiagram.vue b/src/views/modules/shipment/controlDiagram.vue new file mode 100644 index 0000000..e2b182f --- /dev/null +++ b/src/views/modules/shipment/controlDiagram.vue @@ -0,0 +1,442 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('code.originalData') }}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/shipment/paretoDiagram.vue b/src/views/modules/shipment/paretoDiagram.vue new file mode 100644 index 0000000..408744a --- /dev/null +++ b/src/views/modules/shipment/paretoDiagram.vue @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/scatterPlot.vue b/src/views/modules/shipment/scatterPlot.vue new file mode 100644 index 0000000..84d7cc9 --- /dev/null +++ b/src/views/modules/shipment/scatterPlot.vue @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/stageDiagram.vue b/src/views/modules/shipment/stageDiagram.vue new file mode 100644 index 0000000..f507d0e --- /dev/null +++ b/src/views/modules/shipment/stageDiagram.vue @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/shipment/trendChart.vue b/src/views/modules/shipment/trendChart.vue new file mode 100644 index 0000000..04dd565 --- /dev/null +++ b/src/views/modules/shipment/trendChart.vue @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + diff --git a/src/views/modules/supplier/components/evaluationItemList-add.vue b/src/views/modules/supplier/components/evaluationItemList-add.vue new file mode 100644 index 0000000..b65c8cd --- /dev/null +++ b/src/views/modules/supplier/components/evaluationItemList-add.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/supplier/components/levelSetting-add.vue b/src/views/modules/supplier/components/levelSetting-add.vue new file mode 100644 index 0000000..a23c3b3 --- /dev/null +++ b/src/views/modules/supplier/components/levelSetting-add.vue @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/supplier/components/levelSettingSearch.vue b/src/views/modules/supplier/components/levelSettingSearch.vue new file mode 100644 index 0000000..2e53fd9 --- /dev/null +++ b/src/views/modules/supplier/components/levelSettingSearch.vue @@ -0,0 +1,129 @@ + + + + + + + + + + + + + diff --git a/src/views/modules/supplier/components/projectType-add.vue b/src/views/modules/supplier/components/projectType-add.vue new file mode 100644 index 0000000..cc02208 --- /dev/null +++ b/src/views/modules/supplier/components/projectType-add.vue @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + diff --git a/src/views/modules/supplier/components/projectTypeSearch.vue b/src/views/modules/supplier/components/projectTypeSearch.vue new file mode 100644 index 0000000..ce13293 --- /dev/null +++ b/src/views/modules/supplier/components/projectTypeSearch.vue @@ -0,0 +1,129 @@ + + + + + + + + + + + + + diff --git a/src/views/modules/supplier/qmsEvaluationItemList.vue b/src/views/modules/supplier/qmsEvaluationItemList.vue new file mode 100644 index 0000000..873c5a5 --- /dev/null +++ b/src/views/modules/supplier/qmsEvaluationItemList.vue @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/supplier/qmsEvaluationItemListTag.vue b/src/views/modules/supplier/qmsEvaluationItemListTag.vue index f5a819f..81ad192 100644 --- a/src/views/modules/supplier/qmsEvaluationItemListTag.vue +++ b/src/views/modules/supplier/qmsEvaluationItemListTag.vue @@ -1,7 +1,7 @@ @@ -219,8 +219,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsEvaluationPlan.vue b/src/views/modules/supplier/qmsEvaluationPlan.vue new file mode 100644 index 0000000..e0bfe75 --- /dev/null +++ b/src/views/modules/supplier/qmsEvaluationPlan.vue @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/supplier/qmsEvaluationTask.vue b/src/views/modules/supplier/qmsEvaluationTask.vue index 1ea898a..5facdf3 100644 --- a/src/views/modules/supplier/qmsEvaluationTask.vue +++ b/src/views/modules/supplier/qmsEvaluationTask.vue @@ -1,7 +1,7 @@ @@ -323,8 +323,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsLevelSetting.vue b/src/views/modules/supplier/qmsLevelSetting.vue new file mode 100644 index 0000000..db41b42 --- /dev/null +++ b/src/views/modules/supplier/qmsLevelSetting.vue @@ -0,0 +1,287 @@ + + + + + + + + + + + + {{item.name}} + + + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + + diff --git a/src/views/modules/supplier/qmsPoorLaunch.vue b/src/views/modules/supplier/qmsPoorLaunch.vue index 695d5bb..28fb99a 100644 --- a/src/views/modules/supplier/qmsPoorLaunch.vue +++ b/src/views/modules/supplier/qmsPoorLaunch.vue @@ -1,7 +1,7 @@ @@ -314,8 +314,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsProjectType.vue b/src/views/modules/supplier/qmsProjectType.vue new file mode 100644 index 0000000..dd8000d --- /dev/null +++ b/src/views/modules/supplier/qmsProjectType.vue @@ -0,0 +1,269 @@ + + + + + + + 条件搜索 + + + + + + + + + + + + + + + + + + + {{ $t("close") }} + + {{ + $t("reset") + }} + + {{ $t("search") }} + + + + + + + + + diff --git a/src/views/modules/supplier/qmsQualityAccident.vue b/src/views/modules/supplier/qmsQualityAccident.vue index 49c3c57..0090a71 100644 --- a/src/views/modules/supplier/qmsQualityAccident.vue +++ b/src/views/modules/supplier/qmsQualityAccident.vue @@ -1,7 +1,7 @@ @@ -350,8 +350,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsSupplier.vue b/src/views/modules/supplier/qmsSupplier.vue index 438b5fd..f07a6fd 100644 --- a/src/views/modules/supplier/qmsSupplier.vue +++ b/src/views/modules/supplier/qmsSupplier.vue @@ -1,7 +1,7 @@ @@ -294,8 +294,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsSupplierProduct.vue b/src/views/modules/supplier/qmsSupplierProduct.vue index ca0adfd..727bb50 100644 --- a/src/views/modules/supplier/qmsSupplierProduct.vue +++ b/src/views/modules/supplier/qmsSupplierProduct.vue @@ -1,7 +1,7 @@ @@ -202,8 +202,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/supplier/qmsSupplierType.vue b/src/views/modules/supplier/qmsSupplierType.vue index 289ede3..a20a5c5 100644 --- a/src/views/modules/supplier/qmsSupplierType.vue +++ b/src/views/modules/supplier/qmsSupplierType.vue @@ -235,8 +235,8 @@ export default { }) .catch(() => { }); } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - 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/sys/dict-data.vue b/src/views/modules/sys/dict-data.vue index 0d7c70c..764f225 100644 --- a/src/views/modules/sys/dict-data.vue +++ b/src/views/modules/sys/dict-data.vue @@ -1,44 +1,17 @@ - - - + + + - + - - + + diff --git a/src/views/modules/sys/dict-type.vue b/src/views/modules/sys/dict-type.vue index fb10e5d..a75d94b 100644 --- a/src/views/modules/sys/dict-type.vue +++ b/src/views/modules/sys/dict-type.vue @@ -2,36 +2,16 @@ - - + + - + - - + + diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index e500dca..a419b6c 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -22,7 +22,7 @@ - + {{ $t('login.title') }} @@ -81,14 +81,14 @@ export default { } }, created () { - // this.getCaptcha() + this.getCaptcha() }, methods: { // 获取验证码 - // getCaptcha () { - // // this.dataForm.uuid = getUUID() - // this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` - // }, + getCaptcha () { + // this.dataForm.uuid = getUUID() + this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` + }, // 表单提交 dataFormSubmitHandle: debounce(function () { // this.$refs['dataForm'].validate((valid) => { diff --git a/vue.config.js b/vue.config.js index 742e30e..d3b6242 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-01-06 10:13:07 - * @LastEditTime: 2023-04-07 09:56:13 + * @LastEditTime: 2023-05-31 10:43:18 * @LastEditors: zhp * @Description: */