From 6a03ac5a9e87c816bab4c024c2588e6ee8ad82d5 Mon Sep 17 00:00:00 2001 From: zwq Date: Wed, 28 Jun 2023 15:42:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2=E9=83=A8=E5=88=86=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.js | 2 +- src/i18n/{en => eng}/basicData.js | 0 src/i18n/{en => eng}/index.js | 0 .../spc-basic/components/unitList-add.vue | 76 -------- src/views/spc-basic/unitList.vue | 177 ------------------ 5 files changed, 1 insertion(+), 254 deletions(-) rename src/i18n/{en => eng}/basicData.js (100%) rename src/i18n/{en => eng}/index.js (100%) delete mode 100644 src/views/spc-basic/components/unitList-add.vue delete mode 100644 src/views/spc-basic/unitList.vue diff --git a/src/i18n/en.js b/src/i18n/en.js index 9dc894e..55bf0bf 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -1,4 +1,4 @@ -import module from './en' +import module from './eng' const t = {} t.module = module diff --git a/src/i18n/en/basicData.js b/src/i18n/eng/basicData.js similarity index 100% rename from src/i18n/en/basicData.js rename to src/i18n/eng/basicData.js diff --git a/src/i18n/en/index.js b/src/i18n/eng/index.js similarity index 100% rename from src/i18n/en/index.js rename to src/i18n/eng/index.js diff --git a/src/views/spc-basic/components/unitList-add.vue b/src/views/spc-basic/components/unitList-add.vue deleted file mode 100644 index 0d9b477..0000000 --- a/src/views/spc-basic/components/unitList-add.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - diff --git a/src/views/spc-basic/unitList.vue b/src/views/spc-basic/unitList.vue deleted file mode 100644 index dbddcbe..0000000 --- a/src/views/spc-basic/unitList.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - From 0405ccfa251256222a570cd3dc6b4f48d0124c50 Mon Sep 17 00:00:00 2001 From: zwq Date: Wed, 28 Jun 2023 16:54:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/filters/code-filter.js | 31 ++ src/i18n/zh-CN.js | 3 +- .../modules/code/components/available.vue | 2 +- .../code/components/eightDiscipline-add.vue | 14 +- .../components/startEightDiscipline-add.vue | 332 ++++++++++-------- src/views/modules/code/eightDiscipline.vue | 8 +- .../modules/code/startEightDiscipline.vue | 17 +- src/views/modules/incoming/controlChart.vue | 6 +- 8 files changed, 256 insertions(+), 157 deletions(-) create mode 100644 src/filters/code-filter.js diff --git a/src/filters/code-filter.js b/src/filters/code-filter.js new file mode 100644 index 0000000..6803696 --- /dev/null +++ b/src/filters/code-filter.js @@ -0,0 +1,31 @@ + +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: zwq + * @LastEditTime: 2023-01-05 15:49:17 + * @FilePath: \basic-admin\src\filters\basicData\index.js + * @Description: + */ +import moment from 'moment' + +const table = { + eightDisciplineType: { + 1: '客诉问题', + 2: '重大质量问题', + 0: '重复发生问题', + } +} + +export function timeFormatter(timeObj) { + if (timeObj) { + return moment(timeObj).format('YYYY-MM-DD HH:mm:ss') + } else { + return '-' + } +} + +export default function(dictTable) { + return function(val) { + return table?.[dictTable]?.[val] + } +} \ No newline at end of file diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index d4dcc55..ee88d1a 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -573,13 +573,12 @@ 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.eightDisciplineStatus = '8D状态' t.code.productName = '产品名' t.code.orderNo = '订单号' t.code.productType = '产品类型' diff --git a/src/views/modules/code/components/available.vue b/src/views/modules/code/components/available.vue index eabbfa0..4188044 100644 --- a/src/views/modules/code/components/available.vue +++ b/src/views/modules/code/components/available.vue @@ -7,7 +7,7 @@ --> diff --git a/src/views/modules/code/components/eightDiscipline-add.vue b/src/views/modules/code/components/eightDiscipline-add.vue index 0a40e39..8ab83a1 100644 --- a/src/views/modules/code/components/eightDiscipline-add.vue +++ b/src/views/modules/code/components/eightDiscipline-add.vue @@ -1,8 +1,8 @@