From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index f264e13..5457054 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -24,9 +24,15 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="鎶ュ伐鍗曞彿锛�">
+                            <el-form-item label="璁㈠崟鍙凤細">
                                 <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                 v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+                            </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">
@@ -35,14 +41,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.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="璇疯緭鍏ユ暟閲�"
@@ -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