From 1de52d8f9037c20efaccf46b231e99e9c14f6fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 6 Nov 2023 20:51:32 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-06=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/FAIResultEntry.vue  | 34 ++++++++++++++---------
 src/views/modules/qc/FQCResultEntry.vue  | 34 ++++++++++++++---------
 src/views/modules/qc/IPQCResultEntry.vue | 35 +++++++++++++++---------
 3 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 3d293c8..91cb0b2 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -165,7 +165,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
-          <el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
+          <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in operationList"
               :key = "i.operationNo"
@@ -175,14 +175,15 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
-          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
-            <el-option
-              v-for = "i in resourceList"
-              :key = "i.resourceId"
-              :label = "i.resourceDesc"
-              :value = "i.resourceId">
-            </el-option>
-          </el-select>
+<!--          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
+<!--            <el-option-->
+<!--              v-for = "i in resourceList"-->
+<!--              :key = "i.resourceId"-->
+<!--              :label = "i.resourceDesc"-->
+<!--              :value = "i.resourceId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
           <span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@@ -1367,7 +1368,7 @@
         this.modalData.seqNo = item.seqNo
         this.modalData.orderNo = item.orderNo
         this.getOperationList()
-        this.getPartList()
+        //this.getPartList()
       },
 
       // 获取处置措施列表
@@ -1419,7 +1420,7 @@
           this.modalData.operationDesc = ''
           this.modalData.resourceId = ''
           this.getOperationList()
-          this.getPartList()
+          //this.getPartList()
         }
         if (this.tagNo === 205) {
           this.modalData.resourceId = val.resource_id
@@ -1455,7 +1456,7 @@
         } else {
           getResourceList(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
-              this.resourceList = data.rows
+              //this.resourceList = data.rows
               this.modalData.workCenterNo = data.rows[0].workCenterNo
               this.modalData.resourceId = data.rows[0].resourceId
               this.modalData.resourceDesc = data.rows[0].resourceDesc
@@ -1474,7 +1475,14 @@
           if (data && data.code === 0) {
             this.operationList = data.rows
             this.modalData.operationDesc = data.rows[0].operationDesc
-            this.getResourceList()
+            //this.getResourceList()
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 3fb3c05..a9b78db 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -163,7 +163,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
-          <el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
+          <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in operationList"
               :key = "i.operationNo"
@@ -173,14 +173,15 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
-          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
-            <el-option
-              v-for = "i in resourceList"
-              :key = "i.resourceId"
-              :label = "i.resourceDesc"
-              :value = "i.resourceId">
-            </el-option>
-          </el-select>
+<!--          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
+<!--            <el-option-->
+<!--              v-for = "i in resourceList"-->
+<!--              :key = "i.resourceId"-->
+<!--              :label = "i.resourceDesc"-->
+<!--              :value = "i.resourceId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
           <span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@@ -1364,7 +1365,7 @@
         this.modalData.seqNo = item.seqNo
         this.modalData.orderNo = item.orderNo
         this.getOperationList()
-        this.getPartList()
+        //this.getPartList()
       },
 
       // 获取处置措施列表
@@ -1416,7 +1417,7 @@
           this.modalData.operationDesc = ''
           this.modalData.resourceId = ''
           this.getOperationList()
-          this.getPartList()
+          //this.getPartList()
         }
         if (this.tagNo === 205) {
           this.modalData.resourceId = val.resource_id
@@ -1452,7 +1453,7 @@
         } else {
           getResourceList(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
-              this.resourceList = data.rows
+              //this.resourceList = data.rows
               this.modalData.workCenterNo = data.rows[0].workCenterNo
               this.modalData.resourceId = data.rows[0].resourceId
               this.modalData.resourceDesc = data.rows[0].resourceDesc
@@ -1471,7 +1472,14 @@
           if (data && data.code === 0) {
             this.operationList = data.rows
             this.modalData.operationDesc = data.rows[0].operationDesc
-            this.getResourceList()
+            //this.getResourceList()
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 813b977..17201d0 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -173,7 +173,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
-          <el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
+          <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in operationList"
               :key = "i.operationNo"
@@ -181,16 +181,18 @@
               :value = "i.operationDesc">
             </el-option>
           </el-select>
+<!--          <el-input v-model="modalData.operationDesc" style="width: 221px"></el-input>-->
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
-          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
-            <el-option
-              v-for = "i in resourceList"
-              :key = "i.resourceId"
-              :label = "i.resourceDesc"
-              :value = "i.resourceId">
-            </el-option>
-          </el-select>
+<!--          <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
+<!--            <el-option-->
+<!--              v-for = "i in resourceList"-->
+<!--              :key = "i.resourceId"-->
+<!--              :label = "i.resourceDesc"-->
+<!--              :value = "i.resourceId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
           <span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@@ -1414,7 +1416,7 @@
         this.modalData.seqNo = item.seqNo
         this.modalData.orderNo = item.orderNo
         this.getOperationList()
-        this.getPartList()
+        //this.getPartList()
       },
 
       // 获取处置措施列表
@@ -1591,7 +1593,7 @@
           this.modalData.operationDesc = ''
           this.modalData.resourceId = ''
           this.getOperationList()
-          this.getPartList()
+          //this.getPartList()
         }
         if (this.tagNo === 205) {
           this.modalData.resourceId = val.resource_id
@@ -1625,7 +1627,14 @@
           if (data && data.code === 0) {
             this.operationList = data.rows
             this.modalData.operationDesc = data.rows[0].operationDesc
-            this.getResourceList()
+            //this.getResourceList()
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -1642,7 +1651,7 @@
         } else {
           getResourceList(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
-              this.resourceList = data.rows
+              //this.resourceList = data.rows
               this.modalData.workCenterNo = data.rows[0].workCenterNo
               this.modalData.resourceId = data.rows[0].resourceId
               this.modalData.resourceDesc = data.rows[0].resourceDesc