工序检测模版和检测模版

src/components/qctemplateSelect/single.vue

@@ -90,6 +90,7 @@
 import { listQctemplate, getQctemplate, delQctemplate, addQctemplate, updateQctemplate } from "@/api/mes/qc/qctemplate";
 export default {
   name: "QcindexSelect",
+  props: ['qcType'],
   dicts: ['mes_index_type','mes_qc_type'],
   data() {
     return {
@@ -127,6 +128,13 @@ export default {
       form: {}
     };
   },
+  watch: {
+    showFlag () {
+      if(this.showFlag) {
+        this.getList();
+      }
+    }
+  },
   created() {
     this.getList();
   },
@@ -134,7 +142,11 @@ export default {
     /** 查询检测项列表 */
     getList() {
       this.loading = true;
-      listQctemplate(this.queryParams).then(response => {
+      const params = this.queryParams
+      if (this.qcType) {
+        params['qcType'] = this.qcType
+      }
+      listQctemplate(params).then(response => {
         this.qctemplateList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/mes/qc/pendinginspect/index.vue

@@ -36,9 +36,9 @@
       <el-table v-loading="loading" :data="pendingList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="单据编码" align="center" prop="sourceDocCode" />        
-        <el-table-column label="检测项型" align="center" prop="qcType">
+        <el-table-column label="模版类型" align="center" prop="qcType">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcType"/>
+            <dict-tag :options="dict.type.qc_type" :value="scope.row.qcType"/>
           </template>
         </el-table-column>
         <el-table-column label="物资编码" align="center" prop="itemCode" />

src/views/mes/qc/qctemplate/index.vue

@@ -25,6 +25,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="模板类型" prop="qcType">
+        <el-select v-model="queryParams.qcType" placeholder="请选择模板类型" clearable>
+          <el-option :label="item.label" :value="item.value" v-for="item in dict.type.qc_type" :key="item.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="产品名称" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
@@ -164,8 +169,11 @@
           <el-col :span="12">
             <el-form-item label="模板类型" prop="qcType">
               <el-radio-group v-model="form.qcType">
-                <el-radio label="IPQC">IPQC</el-radio>
-                <el-radio label="IQC">IQC</el-radio>
+                <el-radio
+                  v-for="dict in dict.type.qc_type"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -233,7 +241,7 @@ import TemplateIndex from "./templateindex.vue"
 import TemplateProduct from "./templateproduct";
 export default {
   name: "Qctemplate",
-  dicts: ['sys_yes_no','mes_qc_type'],
+  dicts: ['sys_yes_no','mes_qc_type', 'qc_type'],
   components: {TemplateIndex,TemplateProduct},
   data() {
     return {
@@ -264,6 +272,7 @@ export default {
         pageSize: 10,
         templateCode: null,
         templateName: null,
+        qcType: null,
         itemCode:null,
         itemName:null,
         qcTypesParam: [],

src/views/mes/qc/templateProcess/index.vue

@@ -35,6 +35,11 @@
           <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
+      <el-form-item label="模板类型" prop="qcType">
+        <el-select v-model="queryParams.qcType" placeholder="请选择模板类型" clearable>
+          <el-option :label="item.label" :value="item.value" v-for="item in dict.type.qc_type" :key="item.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -105,7 +110,10 @@
     <el-table v-loading="loading" :data="templateProcessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="模板类型" align="center" prop="qcType">
-      </el-table-column>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.qc_type" :value="scope.row.qcType"/>
+          </template>
+        </el-table-column>
       <el-table-column label="检测模板" align="center" prop="templateName"/>
       <el-table-column label="物料类型名称" align="center" prop="itemTypeName"/>
       <el-table-column label="工序名称" align="center" prop="processName"/>
@@ -148,15 +156,18 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="模板类型" prop="qcType">
           <el-radio-group v-model="form.qcType">
-            <el-radio label="IPQC">IPQC</el-radio>
-            <el-radio label="IQC">IQC</el-radio>
+            <el-radio
+              v-for="dict in dict.type.qc_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="检测模板" prop="templateId">
           <el-input v-model="form.templateName" placeholder="请选择检测模板">
             <el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button>
           </el-input>
-          <TemplateSelect ref="templateSelect" @onSelected="onTemplateSelected"></TemplateSelect>
+          <TemplateSelect ref="templateSelect" :qcType="form.qcType" @onSelected="onTemplateSelected"></TemplateSelect>
         </el-form-item>
         <el-form-item label="物料类型" prop="itemTypeId">
           <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true"
@@ -252,6 +263,7 @@ import {getToken} from "@/utils/auth";
 
 export default {
   name: "TemplateProcess",
+  dicts: ['qc_type'],
   components: {
     Treeselect,
     TemplateSelect,
@@ -289,6 +301,7 @@ export default {
         maxNum: null,
         isConfirm: null,
         isNewProduct: null,
+        qcType: null,
         attr1: null,
         attr2: null,
         attr3: null,