diff --git a/public/index.html b/public/index.html index a5dca03..7ed765a 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-22 14:57:50 * @LastEditors: DY - * @LastEditTime: 2023-07-21 16:45:57 + * @LastEditTime: 2023-08-01 14:42:59 * @Description: --> @@ -40,6 +40,7 @@ <% } %> diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index ad89c51..4a0d97a 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -13,6 +13,7 @@ t.brand.mini = 'qms' t.public = {} t.public.operation = '操作' +t.public.activate = '启动' t.add = '新增' t.delete = '删除' @@ -45,7 +46,10 @@ t.parameter = '台差参数' t.configuration = '配置' t.uploadFile = '上传' t.detail = '查看详情' - +t.preview = '预览' +t.edit = '编辑' +t.finished = '已完成' +t.implementation = '实施中' @@ -53,9 +57,11 @@ t.detail = '查看详情' t.prompt = {} t.prompt.title = '提示' t.prompt.info = '确定进行[{handle}]操作?' +t.prompt.delete = '是否对[{object}]进行删除操作？' t.prompt.success = '操作成功' t.prompt.failed = '操作失败' t.prompt.deleteBatch = '请选择删除项' +t.prompt.chooseGroup = '请选择要求分组' t.validate = {} t.validate.required = '必填项不能为空' @@ -346,7 +352,7 @@ t.quality.judgmentMark = '判断标识' t.quality.disposalMethodStatus = '状态' t.quality.inspectionPositionNumber = '序号' t.quality.productName = '检验产品' -t.quality.supplierName = '供应商名称' +t.quality.suppliername = '供应商名称' t.quality.transferOutName = '转出' t.quality.transferInName = '转入' t.quality.dataSources = '数据来源' @@ -354,6 +360,8 @@ t.quality.remark = '备注' t.quality.userName = '创建人' t.quality.inspectionStage = '检验阶段' t.quality.supplierName = '供应商' +t.quality.supplierList = '供应商列表' +t.quality.principal = '负责人列表' t.quality.normalToRelaxed = '正常转放宽' t.quality.normalToTightened = '正常转加严' t.quality.relaxedToNormal = '放宽转正常' @@ -469,13 +477,17 @@ t.supplier.projectName = '评估项目' 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.supplier.supplierStatus = '供应商状态' +t.supplier.year = '年度' +t.supplier.quarter = '季度' +t.supplier.month = '月度' +t.supplier.materiel = '物料' +t.supplier.requiredGrouping = '要求分组' diff --git a/src/views/modules/supplier/qmsEvaluationItemList.vue b/src/views/modules/supplier/qmsEvaluationItemList.vue index 2a16687..a650bdd 100644 --- a/src/views/modules/supplier/qmsEvaluationItemList.vue +++ b/src/views/modules/supplier/qmsEvaluationItemList.vue @@ -1,7 +1,7 @@ @@ -13,7 +13,7 @@ - { this.$refs.searchOrUpdate.init(); @@ -226,16 +226,19 @@ export default { }, handleClick(val) { if (val.type === "delete") { - this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) + this.$confirm( + this.$t("prompt.delete", { object: val.data.customerTypeName }), + this.$t("prompt.title"), + { + confirmButtonText: this.$t("confirm"), + cancelButtonText: this.$t("cancel"), + type: "warning" + }) .then(() => { this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => { if (data && data.code === 0) { this.$message({ - message: "操作成功", + message: this.$t("prompt.success"), type: "success", duration: 1500, onClose: () => { @@ -282,7 +285,7 @@ export default { this.getDataList(); break; case "add": - this.addOrEditTitle = '新增' + this.addOrEditTitle = this.$t('add') this.addOrUpdateVisible = true this.addOrUpdateHandle() break; diff --git a/src/views/modules/supplier/qmsEvaluationItemListLabel.vue b/src/views/modules/supplier/qmsEvaluationItemListLabel.vue index cccbb51..ccbc17d 100644 --- a/src/views/modules/supplier/qmsEvaluationItemListLabel.vue +++ b/src/views/modules/supplier/qmsEvaluationItemListLabel.vue @@ -1,7 +1,7 @@ @@ -114,19 +114,20 @@ export default { }, editHandle(label) { label.disabled = false - console.log('nihc', label) }, handleClose(tag) { - console.log('你好', tag) - this.$confirm(`确定对[名称=${tag.name}]进行删除操作?`, "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + this.$confirm( + this.$t("prompt.delete", { object: tag.name }), + this.$t("prompt.title"), + { + confirmButtonText: this.$t("confirm"), + cancelButtonText: this.$t("cancel"), + type: "warning" }).then(()=> { this.$http.delete(this.urlOptions.deleteLabelInfoURL, { data: [tag.id] }).then(({ data }) => { if (data && data.code === 0) { this.$message({ - message: "操作成功", + message: this.$t("prompt.success"), type: "success", duration: 1500, onClose: () => { @@ -149,16 +150,19 @@ export default { // }); // }, deleteHandle(id, name) { - this.$confirm(`确定对[名称=${name}]进行删除操作?`, "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + this.$confirm( + this.$t("prompt.delete", { object: name }), + this.$t("prompt.title"), + { + confirmButtonText: this.$t("confirm"), + cancelButtonText: this.$t("cancel"), + type: "warning" }) .then(() => { this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { if (data && data.code === 0) { this.$message({ - message: "操作成功", + message: this.$t("prompt.success"), type: "success", duration: 1500, onClose: () => { @@ -279,38 +283,6 @@ export default { // console.log(11111); // this.conditionSearchSubmit(); }, - handleClick(val) { - if (val.type === "delete") { - this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => { - if (data && data.code === 0) { - this.$message({ - message: "操作成功", - type: "success", - duration: 1500, - onClose: () => { - this.getDataList(); - }, - }); - } else { - this.$message.error(data.msg); - } - }); - }) - .catch(() => { }); - } else if (val.type === 'edit') { - this.addOrEditTitle = '修改' - this.addOrUpdateVisible = true; - this.$nextTick(() => { - this.$refs.addOrUpdate.init(val.data.id); - }); - } - }, buttonClick(val) { console.log(val) switch (val.btnName) { diff --git a/src/views/modules/supplier/qmsEvaluationPlan.vue b/src/views/modules/supplier/qmsEvaluationPlan.vue index bb3b00c..d4f8fbe 100644 --- a/src/views/modules/supplier/qmsEvaluationPlan.vue +++ b/src/views/modules/supplier/qmsEvaluationPlan.vue @@ -1,7 +1,7 @@ @@ -9,11 +9,11 @@
- - + + - - + + - - + + - 查询 + {{ $t('query') }}
@@ -45,60 +45,60 @@ @@ -118,6 +118,7 @@