增加查询条件，修改bug

src/views/modules/qc/qcItem3.vue

@@ -1419,7 +1419,7 @@
           methodNo: 'IPQC-0001',
           methodName: '',
           updateBy: '',
-          inspectionTypeNo: 'PF',
+          inspectionTypeNo: '***',
           itemSamplingQuantity: '',
           samplingProgrammeNo: '',
           samplingProgrammeDesc: '',

src/views/modules/qc/qcTemplate2.vue

@@ -18,6 +18,16 @@
       <el-form-item :label="'模板名称'">
         <el-input v-model="searchData.templateName" clearable style="width: 200px"></el-input>
       </el-form-item>
+      <el-form-item :label="'使用工序'">
+        <el-select v-model="searchData.operation" placeholder="请选择" style="width: 221px" filterable clearable>
+          <el-option
+            v-for = "i in operationList"
+            :key = "i.operationNo"
+            :label = "i.operationDesc"
+            :value = "i.operationDesc">
+          </el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="检验类型">-->
 <!--        <el-select v-model="searchData.inspectionTypeNo" placeholder="请选择" style="width: 100px">-->
 <!--          <el-option label="全部" value=""></el-option>-->
@@ -189,7 +199,7 @@
 <!--      </el-form>-->
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="版本号">
-          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 221px"></el-input>
+          <el-input v-model="modalData.templateVersion"  style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验模板备注">
           <el-input v-model="modalData.templateRemark" style="width: 221px"></el-input>
@@ -1104,6 +1114,10 @@
       this.favoriteIsOk()
       // 获取检验类型
       this.inspectionTypeSearch()
+      //查询数据字典数据
+      this.queryTemplateSortList()
+      // 获取特殊工序列表
+      this.getSpecialOperationList()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table',1)
       if (!this.authSearch) {
@@ -1408,10 +1422,6 @@
           ac: '',
           re: ''
         }
-        //查询数据字典数据
-        this.queryTemplateSortList()
-        // 获取特殊工序列表
-        this.getSpecialOperationList()
         this.modalDisableFlag = false
         this.modalFlag = true
       },
@@ -1463,7 +1473,9 @@
           ac: row.ac,
           re: row.re,
           defaultSamplingQuantity: row.defaultSamplingQuantity,
-          defaultSamplingProportion: row.defaultSamplingProportion
+          defaultSamplingProportion: row.defaultSamplingProportion,
+          templateSort : row.templateSort,
+          operation : row.operation
         }
         this.modalDisableFlag = true
         this.modalFlag = true

src/views/modules/qc/qcTemplate3.vue

@@ -18,6 +18,16 @@
       <el-form-item :label="'模板名称'">
         <el-input v-model="searchData.templateName" clearable style="width: 200px"></el-input>
       </el-form-item>
+      <el-form-item :label="'使用工序'">
+        <el-select v-model="searchData.operation" placeholder="请选择" style="width: 221px" filterable clearable>
+          <el-option
+            v-for = "i in operationList"
+            :key = "i.operationNo"
+            :label = "i.operationDesc"
+            :value = "i.operationDesc">
+          </el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="检验类型">-->
 <!--        <el-select v-model="searchData.inspectionTypeNo" placeholder="请选择" style="width: 100px">-->
 <!--          <el-option label="全部" value=""></el-option>-->
@@ -190,7 +200,7 @@
 <!--      </el-form>-->
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="版本号">
-          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 221px"></el-input>
+          <el-input v-model="modalData.templateVersion"  style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验模板备注">
           <el-input v-model="modalData.templateRemark" style="width: 221px"></el-input>
@@ -1106,6 +1116,10 @@
       this.favoriteIsOk()
       // 获取检验类型
       this.inspectionTypeSearch()
+      //查询数据字典数据
+      this.queryTemplateSortList()
+      // 获取特殊工序列表
+      this.getSpecialOperationList()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table',1)
       if (!this.authSearch) {
@@ -1254,9 +1268,9 @@
        * 查询检验项目
        */
       getItem () {
-        getItemList(this.detailData).then(({data}) => {
+        getItem(this.detailData).then(({data}) => {
           if (data.code === 0) {
-            this.itemList1 = data.row1
+            this.itemList1 = data.rows
           }
         })
       },
@@ -1410,10 +1424,6 @@
           ac: '',
           re: ''
         }
-        //查询数据字典数据
-        this.queryTemplateSortList()
-        // 获取特殊工序列表
-        this.getSpecialOperationList()
         this.modalDisableFlag = false
         this.modalFlag = true
       },
@@ -1465,7 +1475,9 @@
           ac: row.ac,
           re: row.re,
           defaultSamplingQuantity: row.defaultSamplingQuantity,
-          defaultSamplingProportion: row.defaultSamplingProportion
+          defaultSamplingProportion: row.defaultSamplingProportion,
+          templateSort : row.templateSort,
+          operation : row.operation
         }
         this.modalDisableFlag = true
         this.modalFlag = true