diff --git a/public/index.html b/public/index.html index 57e2576..01f0c36 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-06-21 13:55:38 + * @LastEditTime: 2023-07-11 10:23:31 * @Description: --> diff --git a/src/filters/supplier/index.js b/src/filters/supplier/index.js index 9ec1133..1b54837 100644 --- a/src/filters/supplier/index.js +++ b/src/filters/supplier/index.js @@ -1,7 +1,7 @@ /* * @Date: 2020-12-29 16:49:28 * @LastEditors: zhp - * @LastEditTime: 2023-04-18 16:12:04 + * @LastEditTime: 2023-07-11 14:23:27 * @FilePath: \basic-admin\src\filters\DataDict\index.js * @Description: 部分常量的数据字典定义 */ @@ -14,7 +14,12 @@ const table = { available: { 0: '不可用', 1:'不可用', - } + }, + supplierStatus:{ + 0: '合格', + 1: '不合格', + 2:'黑名单', + }, } export default function (dictTable) { diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index b15bdd7..a39636d 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -286,7 +286,7 @@ t.basic.name = '名称' t.basic.code = '编码' t.basic.status = '状态' t.basic.available = '可用' -t.basic.remark = '描述' +t.basic.remark = '备注' t.basic.specification = '规格' t.basic.InspectionStage = '检验阶段' t.basic.InspectionPlan = '检验计划' @@ -407,7 +407,7 @@ t.supplier.supplierRelevance = '供应商关联产品' t.supplier.abbreviation = '简称' t.supplier.grade = '重要等级' t.supplier.address = '地址' -t.supplier.ment = '供应商状态' +t.supplier.ment = '状态' t.supplier.contact = '联系人' t.supplier.contactEmail = '联系人邮箱' t.supplier.contactPhone = '联系人电话' @@ -451,6 +451,9 @@ t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段' t.supplier.estimatedNextStartTime = '预计下次启动时间' t.supplier.offline = '下限' t.supplier.online = '上限' +t.supplier.supplierStatus = '供应商状态' + + t.gage = {} t.gage.name = '名称' diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js index 192e1ae..79f78d8 100644 --- a/src/mixins/basic-page.js +++ b/src/mixins/basic-page.js @@ -1,8 +1,8 @@ /* * @Author: zwq * @Date: 2022-08-24 11:19:43 - * @LastEditors: zwq - * @LastEditTime: 2023-06-30 15:00:20 + * @LastEditors: zhp + * @LastEditTime: 2023-07-11 11:03:11 * @Description: */ export default { @@ -30,7 +30,7 @@ export default { }, created() { }, - activated() { + mounted() { this.getDataList() }, methods: { diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 0ab04d4..26be890 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -22,9 +22,9 @@ - + - + diff --git a/src/views/modules/basic/components/customerSearch.vue b/src/views/modules/basic/components/customerSearch.vue index f96d874..833acde 100644 --- a/src/views/modules/basic/components/customerSearch.vue +++ b/src/views/modules/basic/components/customerSearch.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-01-04 10:29:40 * @LastEditors: zhp - * @LastEditTime: 2023-06-29 16:59:18 + * @LastEditTime: 2023-07-11 09:50:29 * @Description: --> diff --git a/src/views/modules/supplier/components/evaluationItemList-add.vue b/src/views/modules/supplier/components/evaluationItemList-add.vue index b65c8cd..e46afbf 100644 --- a/src/views/modules/supplier/components/evaluationItemList-add.vue +++ b/src/views/modules/supplier/components/evaluationItemList-add.vue @@ -1,7 +1,7 @@ @@ -26,8 +26,8 @@ - - + + diff --git a/src/views/modules/supplier/components/evaluationTask-add.vue b/src/views/modules/supplier/components/evaluationTask-add.vue index 3c50e23..112385d 100644 --- a/src/views/modules/supplier/components/evaluationTask-add.vue +++ b/src/views/modules/supplier/components/evaluationTask-add.vue @@ -1,7 +1,7 @@ @@ -10,7 +10,7 @@ - + diff --git a/src/views/modules/supplier/components/levelSetting-add.vue b/src/views/modules/supplier/components/levelSetting-add.vue index a23c3b3..1bbb3bf 100644 --- a/src/views/modules/supplier/components/levelSetting-add.vue +++ b/src/views/modules/supplier/components/levelSetting-add.vue @@ -1,7 +1,7 @@ @@ -138,6 +138,38 @@ export default { .catch(() => {}); }, // 表单提交 + dataFormSubmit() { + this.$refs["dataForm"].validate((valid) => { + if (Number(this.dataForm.online) <= Number(this.dataForm.offline)) { + this.$message({ + message: "上限要大于下限", + type: "warning", + duration: 500, + onClose: () => { + }, + }); + } + if (!valid) { + return false; + } + 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) => { diff --git a/src/views/modules/supplier/components/projectType-add.vue b/src/views/modules/supplier/components/projectType-add.vue index cc02208..1eedf1b 100644 --- a/src/views/modules/supplier/components/projectType-add.vue +++ b/src/views/modules/supplier/components/projectType-add.vue @@ -1,15 +1,7 @@ - - @@ -93,12 +85,12 @@ export default { }, }, methods: { - init(id, ) { + init(id) { this.dataForm.id = id || "" // this.dataForm.dictTypeId = dictTypeId || ""; this.visible = true; this.$nextTick(() => { - this.$refs["dataForm"].resetFields(); + this.$refs["dataForm"].resetFields() if (this.dataForm.id) { this.getInfo(); } else { diff --git a/src/views/modules/supplier/components/supplier-add.vue b/src/views/modules/supplier/components/supplier-add.vue index 222cbbf..2b997a8 100644 --- a/src/views/modules/supplier/components/supplier-add.vue +++ b/src/views/modules/supplier/components/supplier-add.vue @@ -1,7 +1,7 @@ @@ -18,6 +18,10 @@ + + + + @@ -34,6 +38,12 @@ + + + + + + @@ -91,7 +101,21 @@ export default { { value: 1, label: '可用' - }], + } + ], + supplierStatus: [{ + value: 0, + label: '合格' + }, + { + value: 1, + label: '不合格' + }, + { + value: 2, + label: '黑名单' + } + ], enterpriseNatureList: [ { value: 0, diff --git a/src/views/modules/supplier/components/supplierProduct.vue b/src/views/modules/supplier/components/supplierProduct.vue index 597486d..df609eb 100644 --- a/src/views/modules/supplier/components/supplierProduct.vue +++ b/src/views/modules/supplier/components/supplierProduct.vue @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@ - + @@ -36,8 +36,8 @@ export default { data() { return { urlOptions: { - submitURL: "/supplier/qmsSupplierType", - infoURL: "/supplier/qmsSupplierType/{id}", + submitURL: "/supplier/qmsSupplierProduct", + infoURL: "/supplier/qmsSupplierProduct/{id}", getProductListURL: '/basic/qmsProduct/page', // getCodeURL: '/supplier/qmsSupplierType/getCode', getSupplierListURL: '/supplier/qmsSupplier/page' @@ -130,7 +130,7 @@ export default { // 获取信息 getInfo() { this.$http - .get(`/supplier/qmsSupplierType/${this.dataForm.id}`) + .get(`/supplier/qmsSupplierProduct/${this.dataForm.id}`) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/supplier/qmsEvaluationItemList.vue b/src/views/modules/supplier/qmsEvaluationItemList.vue index 873c5a5..d9bc802 100644 --- a/src/views/modules/supplier/qmsEvaluationItemList.vue +++ b/src/views/modules/supplier/qmsEvaluationItemList.vue @@ -1,14 +1,14 @@