From dce1a39a7c7c52d36007e2b134def3d2bfb85ce0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 04 一月 2024 13:58:13 +0800
Subject: [PATCH] 质检模块修改

---
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |   40 ++++++++++------------------------------
 1 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 1dbc295..0ca060a 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -90,13 +90,9 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6" v-if="processInspectVo.id != null">
-                            <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
-                                <el-select @change="changeLocation" clearable style="width:100%" 
-                                v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
-                                :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
-                                    <el-option v-for="(item,i) in locationList" :key="i" 
-                                    :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
-                                </el-select>
+                            <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locName">
+                                <el-input v-model="processInspectVo.locName" clearable style="width:100%" placeholder="璇烽�夋嫨鍚堟牸搴撲綅" disabled autocomplete="off">
+                                </el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -289,7 +285,7 @@
             // 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
             empiricalValueAddMaxNumber: 0,
             processInspectRules: {
-                locationId: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
+                locName: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
             },
             processInspectVo: {
                 id: null,
@@ -306,7 +302,8 @@
                 technologyId: null,
                 documentId: null,
                 outBatchNo: null,
-                locationId: null,
+                locName: null,
+                productNo: null,
             },
             inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
             inspectionResultForm: [],
@@ -353,25 +350,12 @@
         }
       },
       codeDevice(row,index){
-        this.row=row 
+        this.row=row
         console.log("row",row);
         this.deviceCode =true
         this.$refs.codeDeviceCompont.openCamera()
         this.proIndex=index
       },
-        changeLocation(val){
-            if(val){
-                let obj = {
-                    id: this.processInspectVo.id,
-                    locationId: val
-                }
-                updateLocationIdById(obj).then(res=>{
-                    if(res.status===200){
-                        this.$message.success("鏇存柊鍚堟牸搴撲綅鎴愬姛")
-                    }
-                })
-            }
-        },
         getIfsLocation(){
             getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
                 if(res.status===200){
@@ -382,11 +366,6 @@
             })
         },
         submitSave(){
-            let locationId = this.processInspectVo.locationId
-            if(locationId==null){
-                this.$message.error("璇烽�夋嫨浜у搧鍚堟牸搴撲綅")
-                return
-            }
             let pro = 0
             this.inspectionItems.forEach(item => {
                 if(item.children){
@@ -461,7 +440,8 @@
                     this.processInspectVo.quantity = result.quantity
                     this.processInspectVo.documentId = result.documentId
                     this.processInspectVo.outBatchNo = result.outBatchNo
-                    this.processInspectVo.locationId = result.locationId
+                    this.processInspectVo.locName = result.locName
+                    this.processInspectVo.productNo = result.productNo
                     let userList = []
                     result.children.forEach(item=>{
                         item.iid = Math.random()
@@ -648,7 +628,7 @@
                                 updateFinishedInsProduct(obj).then(res => {
                                     if (res.data.code == 0) {
                                         this.init()
-                                    } 
+                                    }
                                 })
                             }
                         })

--
Gitblit v1.9.3