Merge pull request '更新8D的bug' (#22) from zwq into master

Reviewed-on: #22
2023-07-17 15:50:23 +08:00 · 2023-07-17 15:50:23 +08:00 · 7cee18e20d
commit 7cee18e20d
parent 7acd83e501 675b716a32
18 changed files with 274 additions and 244 deletions
--- a/src/filters/code-filter.js
+++ b/src/filters/code-filter.js
@ -18,6 +18,10 @@ const table = {
    1: '需要审批',
    0: '不需要审批',
  },
+  gradeFinish: {
+    1: '已打分',
+    0: '未打分',
+  },
  step: {
    0: 'D0',
    1: 'D1',
--- a/src/views/modules/code/components/eightDiscipline-add.vue
+++ b/src/views/modules/code/components/eightDiscipline-add.vue
@ -1,15 +1,20 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-14 10:17:44
+ * @LastEditTime: 2023-07-17 10:21:47
 * @LastEditors: zwq
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form
+    :model="dataForm"
+    ref="dataForm"
+    :rules="dataRule"
+    @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="130px"
+  >
    <el-form-item prop="name" :label="$t('code.name')">
-      <el-input v-model="dataForm.name" :placeholder="$t('code.name')">
-      </el-input>
+      <el-input v-model="dataForm.name" :placeholder="$t('code.name')"> </el-input>
    </el-form-item>
    <el-form-item prop="code" :label="$t('code.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('code.code')"></el-input>
@ -19,8 +24,16 @@
      </el-switch>
    </el-form-item>
    <el-form-item prop="eightDisciplineType" :label="$t('code.eightDisciplineType')">
-      <el-select v-model="dataForm.eightDisciplineType" :placeholder="$t('code.eightDisciplineType')">
-        <el-option v-for="item in eightDisciplineTypeList" :key="item.value" :label="item.label" :value="item.value">
+      <el-select
+        v-model="dataForm.eightDisciplineType"
+        :placeholder="$t('code.eightDisciplineType')"
+      >
+        <el-option
+          v-for="item in eightDisciplineTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
        </el-option>
      </el-select>
    </el-form-item>
@ -36,36 +49,38 @@ export default {
    return {
      urlOptions: {
        submitURL: "/code/eightDiscipline",
-        infoURL: "/code/eightDiscipline"
+        infoURL: "/code/eightDiscipline",
      },
-      options: [{
+      options: [
+        {
          value: 0,
-        label: '不可用'
+          label: "不可用",
        },
        {
          value: 1,
-        label: '可用'
-        }],
+          label: "可用",
+        },
+      ],
      eightDisciplineTypeList: [
        {
-          value: '0',
-          label: '重复发生问题 '
+          value: "0",
+          label: "重复发生问题 ",
        },
        {
-          value: '1',
-          label: '客诉问题'
+          value: "1",
+          label: "客诉问题",
        },
        {
-          value: '2',
-          label: '重大质量问题'
-        }
+          value: "2",
+          label: "重大质量问题",
+        },
      ],
      visible: false,
      dataForm: {
        id: null,
        name: null,
-        code:null,	
-        eightDisciplineType:null,
+        code: null,
+        eightDisciplineType: null,
        eightDisciplineStatus: 0,
      },
    };
@ -73,40 +88,33 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        code: [
+          {
+            required: true,
+            message: "请输入编码",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: "请输入名称",
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
  methods: {
-    init(id, ) {
-      this.dataForm.id = id || ""
+    init(id) {
+      this.dataForm.id = id || "";
      // console.log(11111)
      // this.dataForm.dictTypeId = dictTypeId || "";
-      this.visible = true
+      this.visible = true;
      this.$nextTick(() => {
        this.$refs["dataForm"].resetFields();
        if (this.dataForm.id) {
-          this.getInfo()
+          this.getInfo();
        } else {
          // this.getCode()
        }
--- a/src/views/modules/code/components/problemType-add.vue
+++ b/src/views/modules/code/components/problemType-add.vue
@ -1,15 +1,20 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-14 13:41:37
+ * @LastEditTime: 2023-07-17 10:23:23
 * @LastEditors: zwq
 * @Description: 
 -->
 <template>
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form
+    :model="dataForm"
+    :rules="dataRule"
+    ref="dataForm"
+    @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="130px"
+  >
    <el-form-item prop="name" :label="$t('code.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('code.name')">
-        </el-input>
+      <el-input v-model="dataForm.name" :placeholder="$t('code.name')"> </el-input>
    </el-form-item>
    <el-form-item prop="code" :label="$t('code.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('code.code')"></el-input>
@ -22,24 +27,24 @@
      <el-input v-model="dataForm.description" placeholder="描述"></el-input>
    </el-form-item>
  </el-form>
-  </template>
+</template>

-  <script>
-  import basicAdd from "@/mixins/basic-add";
-  export default {
+<script>
+import basicAdd from "@/mixins/basic-add";
+export default {
  mixins: [basicAdd],
  data() {
    return {
      urlOptions: {
        submitURL: "/code/problemType",
-          infoURL: "/code/problemType"
+        infoURL: "/code/problemType",
      },
      visible: false,
      dataForm: {
        id: null,
        name: null,
-          code:null,	
-          description:null,
+        code: null,
+        description: null,
        problemStatus: 0,
      },
    };
@ -47,32 +52,23 @@
  computed: {
    dataRule() {
      return {
-          // dictLabel: [
-          //   {
-          //     required: true,
-          //     message: this.$t("validate.required"),
-          //     trigger: "blur",
-          //   },
-          // ],
-          // dictValue: [
-          //   {
-          //     required: true,
-          //     message: this.$t("validate.required"),
-          //     trigger: "blur",
-          //   },
-          // ],
-          // sort: [
-          //   {
-          //     required: true,
-          //     message: this.$t("validate.required"),
-          //     trigger: "blur",
-          //   },
-          // ],
+        code: [
+          {
+            required: true,
+            message: "请输入编码",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: "请输入名称",
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
-    methods: {
-    }
-  };
-  </script>
-  
+  methods: {},
+};
+</script>
--- a/src/views/modules/code/components/startEightDiscipline-add.vue
+++ b/src/views/modules/code/components/startEightDiscipline-add.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-17 10:00:53
+ * @LastEditTime: 2023-07-17 10:27:00
 * @LastEditors: zwq
 * @Description: 
 -->
@ -272,7 +272,7 @@ export default {
        },
        {
          value: '1',
-          label: "1客诉问题",
+          label: "客诉问题",
        },
        {
          value: '2',
--- a/src/views/modules/code/components/startEightGrade-add.vue
+++ b/src/views/modules/code/components/startEightGrade-add.vue
@ -2,11 +2,17 @@
 * @Author: zwq
 * @Date: 2023-06-29 14:12:48
 * @LastEditors: zwq
- * @LastEditTime: 2023-06-30 10:58:16
+ * @LastEditTime: 2023-07-17 13:30:04
 * @Description: 
 -->
 <template>
-  <base-table border show-summary :table-props="tableProps" :table-data="tableData" @emitFun="inputChange" />
+  <base-table
+    border
+    show-summary
+    :table-props="tableProps"
+    :table-data="tableData"
+    @emitFun="inputChange"
+  />
 </template>

 <script>
@ -134,7 +140,7 @@ export default {
          if (this.tableData[data._pageIndex - 1].gradeStatus) {
            this.$set(
              this.tableData[data._pageIndex - 1],
-              'grade',
+              "grade",
              this.score[this.tableData[data._pageIndex - 1].gradeStatus - 1]
            );
          }
@ -149,8 +155,17 @@ export default {
      this.tableData.forEach((item) => {
        item.startEightDisciplineId = this.id;
      });
-          this.$http.post("/code/startEightGrade/save/list", this.tableData)
-          .then(({ data: res }) => {
+      let putData = {
+        gradeFinish: 1,
+        id: this.id,
+      };
+      this.$http.put("/code/startEightDiscipline", putData).then(({ data }) => {
+        if (data && data.code === 0) {
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+      this.$http.post("/code/startEightGrade/save/list", this.tableData).then(({ data: res }) => {
        if (res.code !== 0) {
          return this.$message.error(res.msg);
        }
--- a/src/views/modules/code/examineAndApprove.vue
+++ b/src/views/modules/code/examineAndApprove.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:15:45
+ * @LastEditTime: 2023-07-17 10:38:22
 * @LastEditors: zwq
 * @Description: 
 -->
@ -66,20 +66,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "approve",
    btnName: "审批",
--- a/src/views/modules/code/startEightDisciplineCreateTeam.vue
+++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:16:41
+ * @LastEditTime: 2023-07-17 10:39:16
 * @LastEditors: zwq
 * @Description: 
 -->
@ -96,20 +96,20 @@ const tableProps = [
    align: "center",
  },
  {
-    prop: "userId",
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: "center",
  },
 ];
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "team",
    btnName: "团队",
--- a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
+++ b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:16:46
+ * @LastEditTime: 2023-07-17 10:38:45
 * @LastEditors: zwq
 * @Description: 
 -->
@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "corrective",
    btnName: "纠正",
--- a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
+++ b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:16:53
+ * @LastEditTime: 2023-07-17 10:39:03
 * @LastEditors: zwq
 * @Description: 
 -->
@ -82,7 +82,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
@ -92,10 +92,10 @@ const tableBtn = [
  //   type: "edit",
  //   btnName: "编辑",
  // },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "analysis",
    btnName: "分析",
--- a/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
+++ b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:16:58
+ * @LastEditTime: 2023-07-17 10:38:34
 * @LastEditors: zwq
 * @Description: 
 -->
@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "prevent",
    btnName: "预防",
--- a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
+++ b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:21:25
+ * @LastEditTime: 2023-07-17 10:38:50
 * @LastEditors: zwq
 * @Description: 
 -->
@ -83,20 +83,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "analysis",
    btnName: "分析",
--- a/src/views/modules/code/startEightDisciplineSummaryExperience.vue
+++ b/src/views/modules/code/startEightDisciplineSummaryExperience.vue
@ -2,7 +2,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:37:58
+ * @LastEditTime: 2023-07-17 10:38:29
 * @LastEditors: zwq
 * @Description: 
 -->
@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "summary",
    btnName: "总结",
--- a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
+++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-14 10:17:04
+ * @LastEditTime: 2023-07-17 10:39:25
 * @LastEditors: zwq
 * @Description: 
 -->
@ -89,20 +89,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "measure",
    btnName: "措施",
--- a/src/views/modules/code/startEightDisciplineValidation.vue
+++ b/src/views/modules/code/startEightDisciplineValidation.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:31:04
+ * @LastEditTime: 2023-07-17 10:38:40
 * @LastEditors: zwq
 * @Description: 
 -->
@ -83,20 +83,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
-    type: "edit",
-    btnName: "编辑",
-  },
-  {
-    type: "delete",
-    btnName: "删除",
-  },
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  // {
+  //   type: "delete",
+  //   btnName: "删除",
+  // },
  {
    type: "validation",
    btnName: "验证",
--- a/src/views/modules/code/startEightGrade.vue
+++ b/src/views/modules/code/startEightGrade.vue
@ -1,7 +1,7 @@
 <template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-sys__user">
-      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+      <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
      <base-table
        :table-props="tableProps"
        :page="listQuery.page"
@ -73,10 +73,10 @@ const tableProps = [
    align: "center",
  },
  {
-    prop: "examineStatus",
-    label: i18n.t("code.examineStatus"),
+    prop: "gradeFinish",
+    label: "打分状态",
    align: "center",
-    filter: codeFilter("examineStatus"),
+    filter: codeFilter("gradeFinish"),
  },
 ];
 const tableBtn = [
@ -130,9 +130,16 @@ export default {
      }
    },
    otherMethods(val) {
+      if(val.data.gradeFinish){
+        this.$message({
+          message: '该数据已完成打分操作，请勿重复打分！',
+          type: 'warning'
+        });
+      }else{
      this.addOrEditTitle = "打分";
      this.addOrUpdateVisible = true;
      this.addOrUpdateHandle(val.data.id);
+      }
    },
  },
 };
--- a/src/views/modules/managementCenter/bestPractices.vue
+++ b/src/views/modules/managementCenter/bestPractices.vue
@ -77,11 +77,11 @@ const tableProps = [
    label: "关键字",
    align: "center",
  },
-  {
-    prop: "associationNumber",
-    label: "关联次数",
-    align: "center",
-  },
+  // {
+  //   prop: "associationNumber",
+  //   label: "关联次数",
+  //   align: "center",
+  // },
 ];
 const tableBtn = [
  {
--- a/src/views/modules/managementCenter/eightDisciplineList.vue
+++ b/src/views/modules/managementCenter/eightDisciplineList.vue
@ -93,11 +93,11 @@ const tableProps = [
    label: i18n.t("code.description"),
    align: "center",
  },
-  {
-    prop: "userName",
-    label: "启动人",
-    align: "center",
-  },
+  // {
+  //   prop: "userName",
+  //   label: "启动人",
+  //   align: "center",
+  // },
  {
    prop: "eightDisciplineStatus",
    label: "步骤",
--- a/src/views/modules/managementCenter/joinEightDiscipline.vue
+++ b/src/views/modules/managementCenter/joinEightDiscipline.vue
@ -88,11 +88,11 @@ const tableProps = [
    label: i18n.t("code.description"),
    align: "center",
  },
-  {
-    prop: "userName",
-    label: "启动人",
-    align: "center",
-  },
+  // {
+  //   prop: "userName",
+  //   label: "启动人",
+  //   align: "center",
+  // },
 ];
 const tableBtn = [
  {