diff --git a/src/filters/code-filter.js b/src/filters/code-filter.js index 5237ca7..c5b4383 100644 --- a/src/filters/code-filter.js +++ b/src/filters/code-filter.js @@ -2,14 +2,14 @@ /* * @Date: 2020-12-29 16:49:28 * @LastEditors: zwq - * @LastEditTime: 2023-01-05 15:49:17 + * @LastEditTime: 2023-07-03 10:40:31 * @FilePath: \basic-admin\src\filters\basicData\index.js * @Description: */ import moment from 'moment' const table = { - eightDisciplineType: { + eightDisciplineType: { 1: '客诉问题', 2: '重大质量问题', 0: '重复发生问题', @@ -17,7 +17,34 @@ const table = { examineStatus: { 1: '需要审批', 0: '不需要审批', - } + }, + step: { + 0: 'D0', + 1: 'D1', + 2: 'D2', + 3: 'D3', + 4: 'D4', + 5: 'D5', + 6: 'D6', + 7: 'D7', + 8: 'D8', + }, + containmentLocaleName: + { + 1: "装配线", + 2: "生产线", + 3: "实验室", + 4: "成品在途", + 5: "第三方中间商", + }, + developCountermeasuresName: + { + 1: "让步接收", + 2: "分选返工", + 3: "隔离", + 4: "退换货", + 5: "通知供应商", + }, } export function timeFormatter(timeObj) { @@ -28,8 +55,8 @@ export function timeFormatter(timeObj) { } } -export default function(dictTable) { - return function(val) { +export default function (dictTable) { + return function (val) { return table?.[dictTable]?.[val] } } \ No newline at end of file diff --git a/src/views/modules/code/components/startEightDiscipline-add.vue b/src/views/modules/code/components/startEightDiscipline-add.vue index bf791c0..e9c9f5a 100644 --- a/src/views/modules/code/components/startEightDiscipline-add.vue +++ b/src/views/modules/code/components/startEightDiscipline-add.vue @@ -1,7 +1,7 @@ @@ -183,6 +183,34 @@ + + + + + + + + + + + + + + + + + + @@ -200,18 +228,22 @@ export default { data() { return { urlOptions: { + getOption: true, submitURL: "/code/startEightDiscipline", infoURL: "/code/startEightDiscipline/{id}", getDictURL: "/sys/dict/data/page", customerListURL: "/basic/qmsCustomer/page", productListURL: "/basic/qmsProduct/page", teamListURL: "/basic/qmsTeam/page", + optionArrUrl: ["/basic/qmsCustomer/page", "/basic/qmsProduct/page"], }, defectList: [], teamList: [], customerList: [], productList: [], dutyList: [], + productList: [], + customList: [], examineStatusList: [ { id: 0, @@ -256,6 +288,8 @@ export default { batchNumber: null, code: null, customId: null, + custom: null, + customName: null, defectSourceId: null, description: null, eightDisciplineId: null, @@ -267,6 +301,8 @@ export default { occurrenceDate: null, orderNo: null, productId: null, + product: null, + productName: null, productTypeId: null, teamList: undefined, requestResponseCycle: null, @@ -314,6 +350,9 @@ export default { // console.log(11111) // this.dataForm.dictTypeId = dictTypeId || ""; this.visible = true; + if (this.urlOptions.getOption) { + this.getArr() + } this.$nextTick(() => { this.$refs["dataForm"].resetFields(); if (this.dataForm.id) { @@ -383,6 +422,22 @@ export default { }) .catch(() => {}); }, + changeCustom(){ + this.dataForm.customId = this.dataForm.custom + ? this.dataForm.custom.split("+")[0] + : ""; + this.dataForm.customName = this.dataForm.custom + ? this.dataForm.custom.split("+")[1] + : ""; + }, + changeProduct(){ + this.dataForm.productId = this.dataForm.product + ? this.dataForm.product.split("+")[0] + : ""; + this.dataForm.productName = this.dataForm.product + ? this.dataForm.product.split("+")[1] + : ""; + }, // 表单提交 dataFormSubmitHandle: debounce( function () { diff --git a/src/views/modules/code/eightDiscipline.vue b/src/views/modules/code/eightDiscipline.vue index 207da35..f81679a 100644 --- a/src/views/modules/code/eightDiscipline.vue +++ b/src/views/modules/code/eightDiscipline.vue @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@
- + 条件搜索 diff --git a/src/views/modules/managementCenter/bestPractices.vue b/src/views/modules/managementCenter/bestPractices.vue new file mode 100644 index 0000000..436820c --- /dev/null +++ b/src/views/modules/managementCenter/bestPractices.vue @@ -0,0 +1,169 @@ + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D0.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D0.vue index 57e8f37..cafca96 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D0.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D0.vue @@ -2,18 +2,24 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: zwq - * @LastEditTime: 2023-06-30 16:23:19 + * @LastEditTime: 2023-07-03 09:02:50 * @Description: --> diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D1.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D1.vue index e69de29..188eb7c 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D1.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D1.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D2.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D2.vue index e69de29..bccc4e4 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D2.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D2.vue @@ -0,0 +1,76 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D3.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D3.vue index e69de29..b243830 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D3.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D3.vue @@ -0,0 +1,89 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D4.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D4.vue index e69de29..1fcbfcd 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D4.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D4.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D5.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D5.vue index e69de29..ffafe19 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D5.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D5.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D6.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D6.vue index e69de29..b19847e 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D6.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D6.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D7.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D7.vue index e69de29..519b9d5 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D7.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D7.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-D8.vue b/src/views/modules/managementCenter/components/eightDisciplineList-D8.vue index e69de29..d8c70a3 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-D8.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-D8.vue @@ -0,0 +1,46 @@ + + + + diff --git a/src/views/modules/managementCenter/components/eightDisciplineList-detail.vue b/src/views/modules/managementCenter/components/eightDisciplineList-detail.vue index a520531..0c03231 100644 --- a/src/views/modules/managementCenter/components/eightDisciplineList-detail.vue +++ b/src/views/modules/managementCenter/components/eightDisciplineList-detail.vue @@ -105,6 +105,7 @@ export default { methods: { init(id) { this.id = id + this.activeName = 'D0' this.visible = true; this.D0Visible = true this.oldTab = 'D0Visible' diff --git a/src/views/modules/managementCenter/components/line-chart.vue b/src/views/modules/managementCenter/components/line-chart.vue new file mode 100644 index 0000000..625e678 --- /dev/null +++ b/src/views/modules/managementCenter/components/line-chart.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/views/modules/managementCenter/components/pie-chart.vue b/src/views/modules/managementCenter/components/pie-chart.vue new file mode 100644 index 0000000..3c4d783 --- /dev/null +++ b/src/views/modules/managementCenter/components/pie-chart.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/modules/managementCenter/components/searchs.vue b/src/views/modules/managementCenter/components/searchs.vue index 64341d6..d1df866 100644 --- a/src/views/modules/managementCenter/components/searchs.vue +++ b/src/views/modules/managementCenter/components/searchs.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-01-04 10:29:40 * @LastEditors: zwq - * @LastEditTime: 2023-06-30 14:53:49 + * @LastEditTime: 2023-07-03 16:13:18 * @Description: --> + + diff --git a/src/views/modules/managementCenter/joinEightDiscipline.vue b/src/views/modules/managementCenter/joinEightDiscipline.vue new file mode 100644 index 0000000..17d0bb3 --- /dev/null +++ b/src/views/modules/managementCenter/joinEightDiscipline.vue @@ -0,0 +1,178 @@ + + + diff --git a/src/views/modules/managementCenter/productDistribution.vue b/src/views/modules/managementCenter/productDistribution.vue new file mode 100644 index 0000000..dc3bd1e --- /dev/null +++ b/src/views/modules/managementCenter/productDistribution.vue @@ -0,0 +1,191 @@ + + + + +