55

src/views/produce/components/jobBooking/components/oneJobQualityBom.vue

@@ -41,7 +41,7 @@
       </el-table-column>
 
       
-      <el-table-column label="外观" width="120" prop="appearance">
+      <!-- <el-table-column label="外观" width="120" prop="appearance">
         <template slot-scope="{ row, $index }">
           <el-select
             size="mini"
@@ -60,9 +60,9 @@
             </el-option>
           </el-select>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
-      <el-table-column label="尺寸" width="120" prop="dimension">
+      <!-- <el-table-column label="尺寸" width="120" prop="dimension">
         <template slot-scope="{ row, $index }">
           <el-select
             size="mini"
@@ -81,8 +81,103 @@
             </el-option>
           </el-select>
         </template>
+      </el-table-column> -->
+
+
+      <el-table-column
+        label="是否合格"
+        width="110"
+        prop="isQualified"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-select
+          
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.isQualified"
+            filterable
+            placeholder="请选择"
+            :disabled="isDetails"
+          >
+            <el-option
+              v-for="item in isQualifiedList"
+              :label="item.name"
+              :value="item.code"
+              :key="item.code"
+            >
+            </el-option>
+          </el-select>
+     
+        </template>
+      </el-table-column>
+
+
+      
+      <el-table-column
+        label="类型"
+        width="110"
+        prop="notType"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-select
+           v-if="row.extInfo.isQualified && row.extInfo.isQualified == 2"
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.notType"
+            filterable
+            placeholder="请选择"
+            :disabled="isDetails"
+
+          >
+            <el-option
+              v-for="item in notTypeList"
+              :label="item.name"
+              :value="item.code"
+              :key="item.code"
+            >
+            </el-option>
+          </el-select>
+     
+        </template>
       </el-table-column>
 
+      <el-table-column label="处置" width="130" prop="taskName">
+        <template slot-scope="{ row, $index }" >
+          <div  v-if="row.extInfo.isQualified != 1  && row.extInfo.notType && row.extInfo.notType != 5 ">
+           <span v-if="isDetails">{{ row.extInfo.notReason }}</span>
+          <el-input
+            v-else
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.notReason"
+            placeholder="原因"
+          
+          />
+          </div>
+        <div v-if="![1,2,3,4].includes(Number(row.extInfo.notType))">
+          <span v-if="isDetails">{{ row.extInfo.taskName }}</span>
+          <el-select
+            v-else
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.taskId"
+            filterable
+            placeholder="请选择"
+            @change="(e) => selectName(e, $index)"
+          >
+            <el-option
+              v-for="item in stepsList"
+              :label="item.taskTypeName"
+              :value="item.taskId"
+              :key="item.taskId"
+            >
+            </el-option>
+          </el-select>
+          </div>
+        </template>
+      </el-table-column>
+
+
       <el-table-column label="规格" prop="specification">
         <template slot-scope="{ row, $index }">
           {{ row.specification }}
@@ -164,6 +259,10 @@
 </template>
 
 <script>
+  import {
+    getTaskInstanceList,
+  } from '@/api/produce/job';
+
   export default {
     name: 'semiProductJobBom',
 
@@ -172,6 +271,11 @@
         type: Array,
         default: () => []
       },
+
+      item: {
+        type: Object,
+        default: () => {}
+      },
       equipmentList: {
         type: Array,
         default: () => []
@@ -185,20 +289,68 @@
 
     data() {
       return {
-        qualityList: [
-          {
-            name: '合格',
-            value: 1
-          },
-          {
-            name: '不合格',
-            value: 2
-          }
-        ]
+        // qualityList: [
+        //   {
+        //     name: '合格',
+        //     value: 1
+        //   },
+        //   {
+        //     name: '不合格',
+        //     value: 2
+        //   }
+        // ]
+
+
+        stepsList: [],
+        
+				isQualifiedList: [{
+						code: 1,
+						name: '合格'
+					},
+					{
+						code: 2,
+						name: '不合格'
+					}
+				],
+
+				notTypeList: [{
+						code: 1,
+						name: '返工'
+					},
+					{
+						code: 2,
+						name: '返修'
+					},
+					{
+						code: 3,
+						name: '报废'
+					},
+					{
+						code: 4,
+						name: '降级使用'
+					},
+					{
+						code: 5,
+						name: '让步接收'
+					}
+				]
       };
     },
 
+    
+    created() {
+      this.getTaskFn();
+
+    },
+
     methods: {
+
+      getTaskFn() {
+        getTaskInstanceList(this.item.workOrderId).then((res) => {
+          this.stepsList = res;
+        });
+      },
+
       getDelete(index) {
         this.list.splice(index, 1);
       }

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -242,7 +242,7 @@
       >
         <template slot-scope="{ row, $index }">
           <el-select
-          v-if="row.extInfo.isQualified && row.extInfo.isQualified == 1"
+          v-if="row.extInfo.isQualified && row.extInfo.isQualified == 2"
             size="mini"
             class="content_num"
             v-model="row.extInfo.notType"
@@ -279,7 +279,7 @@
 
       <el-table-column label="处置" width="130" prop="taskName">
         <template slot-scope="{ row, $index }" >
-          <div  v-if="row.extInfo.isQualified != 1  && row.extInfo.notType != 5 ">
+          <div  v-if="row.extInfo.isQualified != 1  &&  row.extInfo.notType &&  row.extInfo.notType != 5 ">
             <span v-if="isDetails">{{ row.extInfo.notReason }}</span>
           <el-input
             v-else
@@ -477,7 +477,7 @@
     getComputeParam,
     saveParam
   } from '@/api/produce/job';
-import { row } from 'mathjs';
+
 
   export default {
     name: 'semiProductJobBom',
@@ -535,33 +535,33 @@ import { row } from 'mathjs';
 
         
 				isQualifiedList: [{
-						code: '1',
+						code: 1,
 						name: '合格'
 					},
 					{
-						code: '2',
+						code: 2,
 						name: '不合格'
 					}
 				],
 
 				notTypeList: [{
-						code: "1",
+						code: 1,
 						name: '返工'
 					},
 					{
-						code: "2",
+						code: 2,
 						name: '返修'
 					},
 					{
-						code: "3",
+						code: 3,
 						name: '报废'
 					},
 					{
-						code: '4',
+						code: 4,
 						name: '降级使用'
 					},
 					{
-						code: "5",
+						code: 5,
 						name: '让步接收'
 					}
 				]