diff --git a/src/filters/code-filter.js b/src/filters/code-filter.js index 6803696..5237ca7 100644 --- a/src/filters/code-filter.js +++ b/src/filters/code-filter.js @@ -13,6 +13,10 @@ const table = { 1: '客诉问题', 2: '重大质量问题', 0: '重复发生问题', + }, + examineStatus: { + 1: '需要审批', + 0: '不需要审批', } } diff --git a/src/views/modules/code/components/inputArea.vue b/src/views/modules/code/components/inputArea.vue new file mode 100644 index 0000000..a3be00c --- /dev/null +++ b/src/views/modules/code/components/inputArea.vue @@ -0,0 +1,37 @@ + + + diff --git a/src/views/modules/code/components/selectMember.vue b/src/views/modules/code/components/selectMember.vue new file mode 100644 index 0000000..847f7de --- /dev/null +++ b/src/views/modules/code/components/selectMember.vue @@ -0,0 +1,45 @@ + + + diff --git a/src/views/modules/code/components/selectTime.vue b/src/views/modules/code/components/selectTime.vue new file mode 100644 index 0000000..f085517 --- /dev/null +++ b/src/views/modules/code/components/selectTime.vue @@ -0,0 +1,47 @@ + + + diff --git a/src/views/modules/code/components/startEightDiscipline-add.vue b/src/views/modules/code/components/startEightDiscipline-add.vue index 12d978a..bf791c0 100644 --- a/src/views/modules/code/components/startEightDiscipline-add.vue +++ b/src/views/modules/code/components/startEightDiscipline-add.vue @@ -1,7 +1,7 @@ @@ -136,6 +136,19 @@ + + + + + + - - - - - - + + + + + diff --git a/src/views/modules/code/components/startEightDisciplineDescriptionCorrectiveAction-add.vue b/src/views/modules/code/components/startEightDisciplineDescriptionCorrectiveAction-add.vue new file mode 100644 index 0000000..16d6dc4 --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplineDescriptionCorrectiveAction-add.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/modules/code/components/startEightDisciplinePreliminaryAnalysis-add.vue.vue b/src/views/modules/code/components/startEightDisciplinePreliminaryAnalysis-add.vue.vue new file mode 100644 index 0000000..b32a9ff --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplinePreliminaryAnalysis-add.vue.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/modules/code/components/startEightDisciplinePreventRecurrence-add.vue b/src/views/modules/code/components/startEightDisciplinePreventRecurrence-add.vue new file mode 100644 index 0000000..c989fcb --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplinePreventRecurrence-add.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/modules/code/components/startEightDisciplineRootCauseAnalysis-add.vue b/src/views/modules/code/components/startEightDisciplineRootCauseAnalysis-add.vue new file mode 100644 index 0000000..2eb21f7 --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplineRootCauseAnalysis-add.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/modules/code/components/startEightDisciplineSummaryExperience-add.vue b/src/views/modules/code/components/startEightDisciplineSummaryExperience-add.vue new file mode 100644 index 0000000..87bb20c --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplineSummaryExperience-add.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/modules/code/components/startEightDisciplineTemporaryTreatmentMeasures-add.vue b/src/views/modules/code/components/startEightDisciplineTemporaryTreatmentMeasures-add.vue new file mode 100644 index 0000000..3c0eb3b --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplineTemporaryTreatmentMeasures-add.vue @@ -0,0 +1,225 @@ + + + + + + + diff --git a/src/views/modules/code/components/startEightDisciplineValidation-add.vue b/src/views/modules/code/components/startEightDisciplineValidation-add.vue new file mode 100644 index 0000000..2c191df --- /dev/null +++ b/src/views/modules/code/components/startEightDisciplineValidation-add.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/modules/code/components/startEightGrade-add.vue b/src/views/modules/code/components/startEightGrade-add.vue new file mode 100644 index 0000000..f0e7cbe --- /dev/null +++ b/src/views/modules/code/components/startEightGrade-add.vue @@ -0,0 +1,208 @@ + + + + + + diff --git a/src/views/modules/code/examineAndApprove.vue b/src/views/modules/code/examineAndApprove.vue index acd9001..fc00540 100644 --- a/src/views/modules/code/examineAndApprove.vue +++ b/src/views/modules/code/examineAndApprove.vue @@ -1,8 +1,8 @@ diff --git a/src/views/modules/code/startEightDisciplineCreateTeam.vue b/src/views/modules/code/startEightDisciplineCreateTeam.vue index 6c3838e..5d155ed 100644 --- a/src/views/modules/code/startEightDisciplineCreateTeam.vue +++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue @@ -1,8 +1,8 @@ diff --git a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue index d7dd481..4d2b9f7 100644 --- a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue +++ b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue @@ -1,8 +1,8 @@ @@ -31,7 +40,10 @@ import basicPage from "@/mixins/basic-page" // import AddOrUpdate from './params-add-or-update' // import transferSchemeSearch from "./components/transferSchemeSearch.vue" // import available from "./components/available.vue" +import AddOrUpdate from './components/startEightDisciplineDescriptionCorrectiveAction-add.vue' import basicSearch from "@/mixins/basic-search" +import codeFilter from '@/filters/code-filter' +import { timeFormatter } from "@/filters/code-filter" import i18n from "@/i18n" const tableProps = [ { @@ -47,12 +59,14 @@ const tableProps = [ { prop: 'eightDisciplineType', label: i18n.t("code.eightDisciplineType"), - align: 'center' + align: 'center', + filter: codeFilter('eightDisciplineType'), }, { prop: 'occurrenceDate', label: i18n.t("code.occurrenceDate"), - align: 'center' + align: 'center', + filter: timeFormatter, }, // { // prop: 'productName', @@ -84,12 +98,15 @@ const tableBtn = [ type: "delete", btnName: "删除", }, + { + type: "corrective", + btnName: "纠正", + }, ]; export default { mixins: [basicPage, basicSearch], components: { - // transferSchemeSearch, - // transferSchemeAdd + AddOrUpdate, }, data() { return { @@ -102,7 +119,8 @@ export default { listQuery: { limit: 10, page: 1, - eightDisciplineStatus: 5 + eightDisciplineStatus: 5, + examineStatus: 0 }, searchOrEditTitle: '', searchOrUpdateVisible: false, @@ -180,6 +198,12 @@ export default { this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); }); + } else if (val.type === "corrective") { + this.addOrUpdateVisible = true + this.addOrEditTitle = "纠正措施描述" + this.$nextTick(() => { + this.$refs.addOrUpdate.init(val.data.id); + }); } }, buttonClick(val) { diff --git a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue index 74b0aeb..3f4d48d 100644 --- a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue +++ b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue @@ -1,8 +1,8 @@ @@ -27,11 +36,13 @@ diff --git a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue index 099b793..63d3e74 100644 --- a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue +++ b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue @@ -1,8 +1,8 @@ @@ -30,7 +39,10 @@ import basicPage from "@/mixins/basic-page" // import AddOrUpdate from './params-add-or-update' // import transferSchemeSearch from "./components/transferSchemeSearch.vue" // import available from "./components/available.vue" +import AddOrUpdate from './components/startEightDisciplineRootCauseAnalysis-add.vue' import basicSearch from "@/mixins/basic-search" +import { timeFormatter } from "@/filters/code-filter" +import codeFilter from '@/filters/code-filter' import i18n from "@/i18n" const tableProps = [ { @@ -46,12 +58,14 @@ const tableProps = [ { prop: 'eightDisciplineType', label: i18n.t("code.eightDisciplineType"), - align: 'center' + align: 'center', + filter: codeFilter('eightDisciplineType'), }, { prop: 'occurrenceDate', label: i18n.t("code.occurrenceDate"), - align: 'center' + align: 'center', + filter: timeFormatter, }, // { // prop: 'productName', @@ -83,12 +97,15 @@ const tableBtn = [ type: "delete", btnName: "删除", }, + { + type: "analysis", + btnName: "分析", + }, ]; export default { mixins: [basicPage, basicSearch], components: { - // transferSchemeSearch, - // transferSchemeAdd + AddOrUpdate, }, data() { return { @@ -101,7 +118,8 @@ export default { listQuery: { limit: 10, page: 1, - eightDisciplineStatus: 4 + eightDisciplineStatus: 4, + examineStatus: 0 }, searchOrEditTitle: '', searchOrUpdateVisible: false, @@ -179,6 +197,12 @@ export default { this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); }); + } else if (val.type === "analysis") { + this.addOrUpdateVisible = true + this.addOrEditTitle = "根本原因分析" + this.$nextTick(() => { + this.$refs.addOrUpdate.init(val.data); + }); } }, buttonClick(val) { diff --git a/src/views/modules/code/startEightDisciplineSummaryExperience.vue b/src/views/modules/code/startEightDisciplineSummaryExperience.vue index aab6ee3..cba689a 100644 --- a/src/views/modules/code/startEightDisciplineSummaryExperience.vue +++ b/src/views/modules/code/startEightDisciplineSummaryExperience.vue @@ -2,8 +2,8 @@ @@ -31,7 +40,10 @@ import basicPage from "@/mixins/basic-page" // import AddOrUpdate from './params-add-or-update' // import transferSchemeSearch from "./components/transferSchemeSearch.vue" // import available from "./components/available.vue" +import AddOrUpdate from './components/startEightDisciplineSummaryExperience-add.vue' import basicSearch from "@/mixins/basic-search" +import { timeFormatter } from "@/filters/code-filter" +import codeFilter from '@/filters/code-filter' import i18n from "@/i18n" const tableProps = [ { @@ -47,12 +59,14 @@ const tableProps = [ { prop: 'eightDisciplineType', label: i18n.t("code.eightDisciplineType"), - align: 'center' + align: 'center', + filter: codeFilter('eightDisciplineType'), }, { prop: 'occurrenceDate', label: i18n.t("code.occurrenceDate"), - align: 'center' + align: 'center', + filter: timeFormatter, }, // { // prop: 'productName', @@ -84,12 +98,15 @@ const tableBtn = [ type: "delete", btnName: "删除", }, + { + type: "summary", + btnName: "总结", + }, ]; export default { mixins: [basicPage, basicSearch], components: { - // transferSchemeSearch, - // transferSchemeAdd + AddOrUpdate, }, data() { return { @@ -102,7 +119,8 @@ export default { listQuery: { limit: 10, page: 1, - eightDisciplineStatus: 8 + eightDisciplineStatus: 8, + examineStatus: 0 }, searchOrEditTitle: '', searchOrUpdateVisible: false, @@ -180,6 +198,12 @@ export default { this.$nextTick(() => { this.$refs.addOrUpdate.init(val.data.id); }); + } else if (val.type === "summary") { + this.addOrUpdateVisible = true + this.addOrEditTitle = "总结与经验分享" + this.$nextTick(() => { + this.$refs.addOrUpdate.init(val.data.id); + }); } }, buttonClick(val) { diff --git a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue index 5bba2ce..dd8dd2c 100644 --- a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue +++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue @@ -1,8 +1,8 @@