Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

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

@@ -156,17 +156,17 @@
           </el-col>
         </el-row>
         <el-row>
+          <WorkuintSelect ref="WorkuintSelect" @onSelected="val => onWorkstationSelected(val)"></WorkuintSelect>
           <el-col :span="8">
-            <el-form-item label="工作中心编号" prop="workstationCode">
-              <el-input v-model="form.workstationCode" placeholder="请输入工作中心编号">
-                <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
+            <el-form-item label="工作单元编号" prop="workunitCode">
+              <el-input v-model="form.workunitCode" placeholder="工作单元编号" >
+                <el-button slot="append" icon="el-icon-search" @click="$refs.WorkuintSelect.showFlag = true"></el-button>
               </el-input>
             </el-form-item>
-            <WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="工作中心名称" prop="workstationName">
-              <el-input v-model="form.workstationName" readonly="readonly" />
+            <el-form-item label="工作单元名称" prop="workunitName">
+              <el-input v-model="form.workunitName" readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -308,12 +308,12 @@
 import { listIpqc, getIpqc, delIpqc, addIpqc, updateIpqc } from "@/api/mes/qc/ipqc";
 import { genCode } from "@/api/system/autocode/rule"
 import WorkorderSelect from "@/components/workorderSelect/single.vue"
-import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
+import WorkuintSelect from "@/components/workunitSelect/single.vue";
 import Ipqcline from "./line.vue"
 import dayjs from 'dayjs';
 export default {
   name: "Ipqc",
-  components: { WorkorderSelect, WorkstationSelect, Ipqcline },
+  components: { WorkorderSelect, WorkuintSelect, Ipqcline },
   dicts: ['mes_ipqc_type_pc', 'mes_qc_result', 'mes_order_status'],
   data() {
     return {
@@ -353,9 +353,9 @@ export default {
         taskId: null,
         taskCode: null,
         taskName: null,
-        workstationId: null,
-        workstationCode: null,
-        workstationName: null,
+        workunitId: null,
+        workunitCode: null,
+        workunitName: null,
         processId: null,
         processCode: null,
         processName: null,
@@ -388,7 +388,7 @@ export default {
         ipqcType: [
           { required: true, message: "请选择检验类型", trigger: "change" }
         ],
-        workstationCode: [
+        workunitCode: [
           { required: true, message: "请选择工作中心", trigger: "blur" }
         ],
 
@@ -449,9 +449,9 @@ export default {
         taskId: null,
         taskCode: null,
         taskName: null,
-        workstationId: null,
-        workstationCode: null,
-        workstationName: null,
+        workunitId: null,
+        workunitCode: null,
+        workunitName: null,
         processId: null,
         processCode: null,
         processName: null,
@@ -626,9 +626,9 @@ export default {
     },
     onWorkstationSelected(row) {
       if (row != undefined && row != null) {
-        this.form.workstationId = row.workstationId;
-        this.form.workstationCode = row.workstationCode;
-        this.form.workstationName = row.workstationName;
+        this.form.workunitCode = row.workunitCode;
+        this.form.workunitId = row.workunitId;
+        this.form.workunitName = row.workunitName;
       }
     },
     //自动生成编码

src/views/mes/qc/ipqc/line.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-table v-loading="loading" :data="ipqclineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="质检项目" width="110" align="center" prop="indexName" />
-      <el-table-column label="检验要求" align="center" prop="checkMethod" />
-      <el-table-column label="检验结果" width="300" align="center" prop="qualityCheckResults">
+      <el-table-column label="检验名称" width="110" align="center" prop="qcTool" />
+      <el-table-column label="检验要求" align="center" prop="indexName" />
+      <el-table-column label="项目判定" width="300" align="center" prop="qualityCheckResults">
         <template slot-scope="scope">
           <div>
             <el-radio-group v-if="scope.row.inputType == 2" v-model="scope.row.qualityCheckResults">
-              <el-radio v-for="(item, index) in scope.row.selectValues" :key="index" :label="item.name"></el-radio>
+              <el-radio v-for="(item, index) in jcResultOpt" :key="index" :label="item.text"></el-radio>
             </el-radio-group>
             <el-input v-else v-model="scope.row.qualityCheckResults" placeholder="请输入检验结果"></el-input>
           </div>
@@ -17,8 +17,8 @@
       <el-table-column label="判定" width="120" align="center">
         <template slot-scope="scope">
           <div>
-            <el-radio-group v-model="scope.row.status">
-              <el-radio v-for="(item, index) in dict.type.ver_item_determination" :key="index" :label="item.value"  style="margin-right: 0">{{item.label}}</el-radio>
+            <el-radio-group v-model.number="scope.row.status">
+              <el-radio v-for="(item, index) in dict.type.ver_item_determination" :key="index" :label="Number(item.value)"  style="margin-right: 0">{{item.label}}</el-radio>
             </el-radio-group>
           </div>
         </template>
@@ -78,6 +78,20 @@ export default {
       total: 0,
       // 过程检验单行表格数据
       ipqclineList: [],
+      jcResultOpt: [
+        {
+          text: 'OK',
+          value: 'OK',
+        },
+        {
+          text: 'NG',
+          value: 'NG',
+        },
+        {
+          text: 'NA',
+          value: 'NA',
+        },
+      ],
       // 弹出层标题
       title: "",
       // 是否显示弹出层