src/filters/code-filter.js

@@ -1,31 +0,0 @@
-
-/*
- * @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]
-  }
-}

src/i18n/zh-CN.js

@@ -573,12 +573,13 @@ 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 = '产品类型'

src/views/modules/code/components/available.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <span>
-    <el-tag v-if="injectData.eightDisciplineStatus === 1" type="success">可用</el-tag>
+    <el-tag v-if="injectData.problemStatus === 1" type="success">可用</el-tag>
     <el-tag v-else type="warning">不可用</el-tag>
   </span>
 </template>

src/views/modules/code/components/eightDiscipline-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-28 16:51:03
+ * @LastEditTime: 2023-06-01 14:22:21
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description: 
 -->
 <template>
@@ -48,15 +48,15 @@ export default {
         }],
       eightDisciplineTypeList: [
         {
-          value: '0',
+          value: 0,
           label: '重复发生问题 '
         },
         {
-          value: '1',
+          value: 1,
-          label: '客诉问题'
+          label: '1客诉问题'
         },
         {
-          value: '2',
+          value: 2,
           label: '重大质量问题'
         }
       ],
@@ -66,7 +66,7 @@ export default {
         name: null,
         code:null,	
         eightDisciplineType:null,
-        eightDisciplineStatus: 0,
+        eightDisciplineStatus: null,
       },
     };
   },

src/views/modules/code/components/startEightDiscipline-add.vue

@@ -1,46 +1,80 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-28 16:53:02
+ * @LastEditTime: 2023-06-01 16:26:20
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description: 
 -->
 <template>
-  <el-form
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
-    :model="dataForm"
-    ref="dataForm"
-    @keyup.enter.native="dataFormSubmitHandle()"
-    label-width="100px"
-  >
     <el-row :gutter="24">
       <el-col :span="8">
         <el-form-item prop="code" :label="$t('basic.code')">
-          <el-input v-model="dataForm.code" :placeholder="$t('basic.code')"> </el-input>
+          <el-input v-model="dataForm.code" :placeholder="$t('basic.code')">
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item prop="title" :label="$t('code.title')">
+        <el-form-item prop="title" :label="$t('basic.title')">
           <el-input v-model="dataForm.title" :placeholder="$t('code.title')"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item prop="eightDisciplineType" :label="$t('code.eightDisciplineType')">
-          <el-select
+          <el-select v-model="dataForm.eightDisciplineType" :placeholder="$t('code.eightDisciplineType')">
-            :style="{ width: '100%' }"
+            <el-option v-for="item in eightDisciplineTypeList" :key="item.value" :label="item.label"
-            v-model="dataForm.eightDisciplineType"
+              :value="item.value">
-            :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>
       </el-col>
     </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="occurrenceDate" :label="$t('code.occurrenceDate')">
+          <el-date-picker v-model="dataForm.occurrenceDate" type="datetime" :placeholder="$t('code.occurrenceDate')"
+            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="requestResponseCycle" :label="$t('code.requestResponseCycle')">
+          <el-input v-model="dataForm.requestResponseCycle" :placeholder="$t('code.requestResponseCycle')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="finalCompletionDate" :label="$t('code.finalCompletionDate')">
+          <el-date-picker v-model="dataForm.finalCompletionDate" type="datetime"
+            :placeholder="$t('code.finalCompletionDate')" format='yyyy-MM-dd HH:mm:ss'
+            valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="sampleAcceptanceTime" :label="$t('code.sampleAcceptanceTime')">
+          <el-date-picker v-model="dataForm.sampleAcceptanceTime" type="datetime"
+            :placeholder="$t('code.sampleAcceptanceTime')" format='yyyy-MM-dd HH:mm:ss'
+            valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="defectSourceId" :label="$t('code.defectSource')">
+          <el-select v-model="dataForm.defectSourceId" :placeholder="$t('code.defectSource')">
+            <el-option v-for="item in defectList" :key="item.dictTypeId" :label="item.dictLabel"
+              :value="item.dictTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="actualResponsePeriod" :label="$t('code.actualResponsePeriod')">
+          <el-input v-model="dataForm.actualResponsePeriod" :placeholder="$t('code.requestResponseCycle')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
     <el-row :gutter="24">
       <el-col :span="8">
         <el-form-item prop="orderNo" :label="$t('code.orderNo')">
@@ -48,11 +82,23 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item prop="requestResponseCycle" :label="$t('code.requestResponseCycle')">
+        <el-form-item prop="batchNumber" :label="$t('code.batchNumber')">
-          <el-input
+          <el-input v-model="dataForm.batchNumber" :placeholder="$t('code.batchNumber')"></el-input>
-            v-model="dataForm.requestResponseCycle"
+        </el-form-item>
-            :placeholder="$t('code.requestResponseCycle')"
+      </el-col>
-          ></el-input>
+      <el-col :span="8">
+        <el-form-item prop="responsibilityAttributionId" :label="$t('code.responsibilityAttribution')">
+          <el-select v-model="dataForm.responsibilityAttributionId" :placeholder="$t('code.responsibilityAttribution')">
+            <el-option v-for="item in dutyList" :key="item.dictTypeId" :label="item.dictLabel" :value="item.dictTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="description" :label="$t('code.description')">
+          <el-input v-model="dataForm.description" :placeholder="$t('code.description')"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
@@ -60,134 +106,32 @@
           <el-input v-model="dataForm.batchNumber" :placeholder="$t('code.batchNumber')"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="24">
       <el-col :span="8">
-        <el-form-item prop="sampleAcceptanceTime" :label="$t('code.sampleAcceptanceTime')">
+        <el-form-item prop="responsibilityAttributionId" :label="$t('code.responsibilityAttribution')">
-          <el-date-picker
+          <el-select v-model="dataForm.responsibilityAttributionId" :placeholder="$t('code.responsibilityAttribution')">
-            :style="{ width: '100%' }"
+            <el-option v-for="item in dutyList" :key="item.dictTypeId" :label="item.dictLabel" :value="item.dictTypeId">
-            v-model="dataForm.sampleAcceptanceTime"
-            type="datetime"
-            :placeholder="$t('code.sampleAcceptanceTime')"
-            format="yyyy-MM-dd HH:mm:ss"
-            valueFormat="yyyy-MM-ddTHH:mm:ss"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item prop="defectSourceId" :label="$t('code.defectSource')">
-          <el-select
-            :style="{ width: '100%' }"
-            v-model="dataForm.defectSourceId"
-            :placeholder="$t('code.defectSource')"
-          >
-            <el-option
-              v-for="item in defectList"
-              :key="item.dictTypeId"
-              :label="item.dictLabel"
-              :value="item.dictTypeId"
-            >
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="8">
-        <el-form-item prop="actualResponsePeriod" :label="$t('code.actualResponsePeriod')">
-          <el-input
-            v-model="dataForm.actualResponsePeriod"
-            :placeholder="$t('code.requestResponseCycle')"
-          ></el-input>
-        </el-form-item>
-      </el-col>
     </el-row>
     <el-row :gutter="24">
-      <el-col :span="8">
-        <el-form-item prop="occurrenceDate" :label="$t('code.occurrenceDate')">
-          <el-date-picker
-            v-model="dataForm.occurrenceDate"
-            type="datetime"
-            :style="{ width: '100%' }"
-            :placeholder="$t('code.occurrenceDate')"
-            format="yyyy-MM-dd HH:mm:ss"
-            valueFormat="yyyy-MM-ddTHH:mm:ss"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item
-          prop="responsibilityAttributionId"
-          :label="$t('code.responsibilityAttribution')"
-        >
-          <el-select
-          :style="{ width: '100%' }"
-            v-model="dataForm.responsibilityAttributionId"
-            :placeholder="$t('code.responsibilityAttribution')"
-          >
-            <el-option
-              v-for="item in dutyList"
-              :key="item.dictTypeId"
-              :label="item.dictLabel"
-              :value="item.dictTypeId"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span="8">
         <el-form-item prop="examineStatus" :label="$t('code.examineStatus')">
-          <el-select 
+          <el-select v-model="dataForm.examineStatus" :placeholder="$t('code.examineStatus')">
-          :style="{ width: '100%' }" 
+            <el-option v-for="item in examineStatusList" :key="item.id" :label="item.name" :value="item.id">
-          v-model="dataForm.examineStatus" 
-          :placeholder="$t('code.examineStatus')">
-            <el-option
-              v-for="item in examineStatusList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="24">
-      <el-col :span="8">
-        <el-form-item prop="finalCompletionDate" :label="$t('code.finalCompletionDate')">
-          <el-date-picker
-          :style="{ width: '100%' }"
-            v-model="dataForm.finalCompletionDate"
-            type="datetime"
-            :placeholder="$t('code.finalCompletionDate')"
-            format="yyyy-MM-dd HH:mm:ss"
-            valueFormat="yyyy-MM-ddTHH:mm:ss"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
       <el-col :span="8">
         <el-form-item prop="teamList" :label="$t('code.eightDTeam')">
-          <el-select 
+          <el-select v-model="dataForm.teamList" :placeholder="$t('code.eightDTeam')" multiple>
-          :style="{ width: '100%' }"
+            <el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id">
-          v-model="dataForm.teamList" 
-          :placeholder="$t('code.eightDTeam')" 
-          multiple>
-            <el-option
-              v-for="item in teamList"
-              :key="item.id"
-              :label="item.teamName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="8">
-        <el-form-item prop="description" :label="$t('code.description')">
-          <el-input v-model="dataForm.description" :placeholder="$t('code.description')"></el-input>
-        </el-form-item>
-      </el-col>
     </el-row>
   </el-form>
 </template>
@@ -202,64 +146,62 @@ export default {
       urlOptions: {
         submitURL: "/code/startEightDiscipline",
         infoURL: "/code/startEightDiscipline/{id}",
-        getDictURL: "/sys/dict/data/page",
+        getDictURL: '/sys/dict/data/page',
-        customerListURL: "/basic/qmsCustomer/page",
+        customerListURL: '/basic/qmsCustomer/page',
-        productListURL: "/basic/qmsProduct/page",
+        productListURL: '/basic/qmsProduct/page',
-        teamListURL: "/basic/qmsTeam/page",
+        teamListURL: '/basic/qmsTeam/page',
       },
       defectList: [],
-      teamList: [],
+      teamList:[],
       customerList: [],
       productList: [],
       dutyList: [],
       examineStatusList: [
         {
           id: 0,
-          name: "不需要审批",
+          name: '不需要审批'
         },
         {
           id: 1,
-          name: "需要审批",
+          name: '需要审批'
-        },
+        }
-      ],
-      options: [
-        {
-          value: 0,
-          label: "不可用",
-        },
-        {
-          value: 1,
-          label: "可用",
-        },
       ],
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+        }],
       eightDisciplineTypeList: [
         {
           value: 0,
-          label: "重复发生问题 ",
+          label: '重复发生问题 '
         },
         {
           value: 1,
-          label: "1客诉问题",
+          label: '1客诉问题'
         },
         {
           value: 2,
-          label: "重大质量问题",
+          label: '重大质量问题'
-        },
+        }
       ],
       listQuery: {
         limit: 10,
-        page: 1,
+        page: 1
       },
       visible: false,
       dataForm: {
-        actualResponsePeriod: null,
+        actualResponsePeriod:null,
         batchNumber: null,
         code: null,
         customId: null,
         defectSourceId: null,
         description: null,
         eightDisciplineId: null,
-        eightDisciplineStatus: 0,
+        eightDisciplineStatus: null,
         eightDisciplineType: null,
         examineStatus: null,
         finalCompletionDate: null,
@@ -268,7 +210,7 @@ export default {
         orderNo: null,
         productId: null,
         productTypeId: null,
-        teamList: undefined,
+        teamList:undefined,
         requestResponseCycle: null,
         responsibilityAttributionId: null,
         sampleAcceptanceTime: null,
@@ -305,19 +247,19 @@ export default {
       };
     },
   },
-  mounted() {
+  mounted () {
-    this.getDict();
+    this.getDict()
   },
   methods: {
-    init(id) {
+    init(id, ) {
-      this.dataForm.id = 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 {
         }
       });
@@ -338,50 +280,50 @@ export default {
         .catch(() => {});
     },
     getDict() {
-      this.$http
+      this.$http.get(this.urlOptions.teamListURL, {
-        .get(this.urlOptions.teamListURL, {
+        params: {
-          params: {
+          limit: 999,
-            limit: 999,
+          page: 1,
-            page: 1,
+        }
-          },
+      })
-        })
         .then(({ data: res }) => {
           if (res.code === 0) {
             console.log(res);
-            this.teamList = res.data.list;
+            this.teamList = res.data.list
           }
         })
-        .catch(() => {});
+        .catch(() => {
-      this.$http
-        .get(this.urlOptions.getDictURL, {
-          params: {
-            limit: 999,
-            page: 1,
-            dictTypeId: "1664162193896206337",
-          },
         })
+      this.$http.get(this.urlOptions.getDictURL, {
+        params: {
+          limit: 999,
+          page: 1,
+          dictTypeId: '1664162193896206337'
+        }
+      })
         .then(({ data: res }) => {
           if (res.code === 0) {
             console.log(res);
-            this.defectList = res.data.list;
+            this.defectList = res.data.list
           }
         })
-        .catch(() => {});
+        .catch(() => {
-      this.$http
-        .get(this.urlOptions.getDictURL, {
-          params: {
-            limit: 999,
-            page: 1,
-            dictTypeId: "1664162455184568321",
-          },
         })
+      this.$http.get(this.urlOptions.getDictURL, {
+        params: {
+          limit: 999,
+          page: 1,
+          dictTypeId: '1664162455184568321'
+        }
+      })
         .then(({ data: res }) => {
           if (res.code === 0) {
             console.log(res);
-            this.dutyList = res.data.list;
+            this.dutyList = res.data.list
           }
         })
-        .catch(() => {});
+        .catch(() => {
+        })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(

src/views/modules/code/eightDiscipline.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-28 16:06:37
+ * @LastEditTime: 2023-06-05 09:12:25
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description: 
 -->
 <template>
@@ -37,7 +37,6 @@ import eightDisciplineAdd from "./components/eightDiscipline-add"
 // import disposalMethodSearch from "./components/disposalMethodSearch"
 import available from "./components/available.vue"
 import basicSearch from "@/mixins/basic-search"
-import codeFilter from '@/filters/code-filter'
 import i18n from "@/i18n"
 const tableProps = [
   {
@@ -53,8 +52,7 @@ const tableProps = [
   {
     prop: 'eightDisciplineType',
     label: i18n.t("code.eightDisciplineType"),
-    align: 'center',
+    align: 'center'
-    filter: codeFilter('eightDisciplineType'),
   },
    {
      prop: 'problemStatus',

src/views/modules/code/startEightDiscipline.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-28 16:49:41
+ * @LastEditTime: 2023-06-05 09:11:52
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description: 
 -->
 <template>
@@ -21,7 +21,7 @@
         @pagination="getDataList" />
       <!-- 弹窗, 新增 / 修改 -->
       <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
-        @confirm="handleConfirm" :before-close="handleCancel" width="70%">
+        @confirm="handleConfirm" :before-close="handleCancel">
         <startEightDiscipline-add ref="addOrUpdate" @refreshDataList="successSubmit">
         </startEightDiscipline-add>
         <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
@@ -37,7 +37,6 @@ import startEightDisciplineAdd from "./components/startEightDiscipline-add"
 // import customSamplingSearch from "./components/customSamplingSearch"
 // import available from "./components/available.vue"
 import basicSearch from "@/mixins/basic-search"
-import codeFilter from '@/filters/code-filter'
 import i18n from "@/i18n"
 const tableProps = [
   {
@@ -53,8 +52,7 @@ const tableProps = [
   {
     prop: 'eightDisciplineType',
     label: i18n.t("code.eightDisciplineType"),
-    align: 'center',
+    align: 'center'
-    filter: codeFilter('eightDisciplineType'),
   },
   {
     prop: 'occurrenceDate',
@@ -131,12 +129,6 @@ export default {
           color: "primary",
         }
       ],
-      listQuery: {
-        limit: 10,
-        page: 1,
-        total: 1,
-        eightDisciplineStatus: 0,
-      },
     };
   },
   // components: {
@@ -213,7 +205,6 @@ export default {
           this.listQuery.code = null
           this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
-          this.listQuery.eightDisciplineStatus = 0
           this.getDataList();
           break;
         case "add":

src/views/modules/incoming/controlChart.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-28 15:52:07
+ * @LastEditTime: 2023-06-20 15:52:27
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description: 
 -->
 <template>
@@ -42,7 +42,7 @@
           <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getOriginalData">{{ $t('code.originalData') }}</el-button>
+          <el-button type="primary" @click="getOriginalData">{{ $t('code.originalData') }}}</el-button>
         </el-form-item>
       </el-form>
     </div>