质量修改

src/views/mes/pro/scheduleList/index.vue

@@ -119,6 +119,15 @@
               end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="工单类型" prop="workorderTypes">
+            <el-select v-model="queryParams.workorderTypes" multiple clearable placeholder="请选择状态" >
+              <el-option v-for="dict in dict.type.mes_workorder_type" 
+              :key="dict.value" 
+              :label="dict.label"
+              :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -271,6 +280,11 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="工单类型" align="center" prop="workorderTypes">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderTypes" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="操作"
         width="150px"
@@ -535,7 +549,7 @@ import WorkuintSelect from "./workunitSelectSche.vue";
 import dayjs from 'dayjs'
 export default {
   components: {BrandSelect, OrderList, arrangCodeList, WorkuintSelect, jobAssign, taskList},
-  dicts: ['TASK_STATUS'],
+  dicts: ['TASK_STATUS', 'mes_workorder_type'],
   name: "scheduleList",
   mixins: [shiftSelectMixin],
   data() {

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

@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检测项名称" prop="indexName">
+      <el-form-item label="检验要求" prop="indexName">
         <el-input
           v-model="queryParams.indexName"
-          placeholder="请输入检测项名称"
+          placeholder="请输入检验要求"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -98,7 +98,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="检测项名称" align="center" prop="indexName" />
+      <el-table-column label="检验要求" align="center" prop="indexName" />
       <el-table-column label="检测项类型" align="center" prop="indexType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
@@ -110,7 +110,7 @@
           <span v-if="scope.row.inputType==2">选择框</span>
         </template>
       </el-table-column>
-      <el-table-column label="检测工具" align="center" prop="qcTool" />
+      <el-table-column label="检验名称" align="center" prop="qcTool" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -157,8 +157,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检测项名称" prop="indexName">
-              <el-input v-model="form.indexName" placeholder="请输入检测项名称" />
+            <el-form-item label="检验要求" prop="indexName">
+              <el-input v-model="form.indexName" placeholder="请输入检验要求" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -186,8 +186,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="检测工具" prop="qcTool">
-              <el-input v-model="form.qcTool" placeholder="请输入检测工具" />
+            <el-form-item label="检验名称" prop="qcTool">
+              <el-input v-model="form.qcTool" placeholder="请输入检验名称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -299,7 +299,7 @@ export default {
           { required: true, message: "检测项编码不能为空", trigger: "blur" }
         ],
         indexName: [
-          { required: true, message: "检测项名称不能为空", trigger: "blur" }
+          { required: true, message: "检验要求不能为空", trigger: "blur" }
         ],
         indexType: [
           { required: true, message: "检测项类型不能为空", trigger: "change" }

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

@@ -41,7 +41,7 @@
 
     <el-table v-loading="loading" :data="templateindexList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="检测项名称" align="center" prop="indexName"/>
+      <el-table-column label="检验要求" align="center" prop="indexName"/>
       <el-table-column label="检测项类型" align="center" prop="indexType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
@@ -53,7 +53,7 @@
           <span v-if="scope.row.inputType==2">选择框</span>
         </template>
       </el-table-column>
-      <el-table-column label="检测工具" align="center" prop="qcTool"/>
+      <el-table-column label="检验名称" align="center" prop="qcTool"/>
       <el-table-column label="检测方法" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
       <!-- <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
@@ -103,8 +103,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检测工具" prop="qcTool">
-              <el-input v-model="form.qcTool" placeholder="请输入检测工具"/>
+            <el-form-item label="检验名称" prop="qcTool">
+              <el-input v-model="form.qcTool" placeholder="请输入检验名称"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -115,14 +115,11 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.inputType == 2" align="center">
+        <!-- <el-row v-if="form.inputType == 2" align="center">
           <el-col :span="24" align="right">
-            <!-- <el-form-item label="选择框值" prop="selectValues">
-              <el-input v-model="form.selectValues" type="textarea" placeholder="请输入下拉选择框内容，格式为：[{&quot;label&quot;:&quot;显式值&quot;,&quot;value&quot;:&quot;存储值&quot;}]" />
-            </el-form-item> -->
+
             <el-table :data="form.selectValues" style="width: 89%"  >
               <el-table-column label="参数值" align="center" style="width: 100%" min-width="100">
-                <!--                <el-input v-model="scope.row.name" placeholder="">{{ scope }}</el-input>-->
 
                 <template v-slot="scope">
                   <el-input v-model="scope.row.name" placeholder=""></el-input>
@@ -149,7 +146,7 @@
               </el-table-column>
             </el-table>
           </el-col>
-        </el-row>
+        </el-row> -->
         <!-- <el-row>
             <el-col :span="12">
                 <el-form-item label="标准值" prop="standerVal">