From e136eb3e3f7278fbb80610db5f8d0fc9c78523e5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 十二月 2023 16:08:24 +0800
Subject: [PATCH] 	modified:   src/views/plan/manufacturingorder/index.vue

---
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c9e9c33..5457054 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -30,19 +30,25 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
+                            <el-form-item label="鎶ュ伐鍗曞彿锛�">
+                                <el-input disabled v-model="processInspectVo.productNo"
+                                    placeholder="璇疯緭鍏ユ姤宸ュ崟鍙凤細" autocomplete="off" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
                             <el-form-item label="瀹㈡埛鍚嶇О锛�">
                                 <el-input disabled v-model="processInspectVo.prname"
                                     placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
                             </el-form-item>
                         </el-col>
+                    </el-row>
+                    <el-row>
                         <el-col :span="6">
                             <el-form-item label="宸ョ▼鍚嶇О锛�">
                                 <el-input disabled v-model="processInspectVo.sname"
                                     placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-row>
                         <el-col :span="6">
                             <el-form-item label="浜у搧鍚嶇О锛�">
                                 <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
@@ -65,14 +71,14 @@
                                     placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
                             </el-form-item>
                         </el-col>
+                    </el-row>
+                    <el-row>
                         <el-col :span="6">
                             <el-form-item label="鍗曚綅锛�">
                                 <el-input disabled v-model="processInspectVo.unit"
                                     placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-row>
                         <el-col :span="6">
                             <el-form-item label="鏁伴噺锛�">
                                 <el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�"
@@ -88,7 +94,7 @@
                             <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
                                 <el-select @change="changeLocation" clearable style="width:100%" 
                                 v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
-                                    autocomplete="off">
+                                :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>
@@ -294,7 +300,7 @@
     mounted() {
         this.getDeviceList()
         this.processInspectVo.id = this.$route.query.id
-        this.resultVal = this.$route.query.resultVal
+        this.resultVal = this.$route.params.resultVal
         if(this.resultVal == null){
             let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
             val == undefined ? this.resultVal=null : this.resultVal = val
@@ -515,7 +521,6 @@
                 let id = res.data.data
                 if(id != null){
                     queryById(id).then(response=>{
-                        console.log(response.data.data.children)
                         let proList = response.data.data.children
                         proList.forEach(item=>{
                             item.iid = Math.random();

--
Gitblit v1.9.3