From 87ee25bcc236b70b0d22b2ff121f9552959d4873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:04:57 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/quality/processInspect/processInspect-form.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 6a85e93..60b4afb 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -18,6 +18,12 @@
                     <div class="formwrapper">
                         <el-row>
                             <el-col :span="6">
+                                <el-form-item label="杩囩▼妫�楠岀紪鍙凤細">
+                                    <el-input @blur="selectInfoByOrderId" disabled
+                                    v-model="processInspectVo.proInsNo"  autocomplete="off" />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
                                 <el-form-item label="璁㈠崟鍙凤細">
                                     <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                         v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
@@ -40,14 +46,15 @@
                                         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.specs" 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%" :disabled="processInspectVo.id != null"
@@ -64,8 +71,6 @@
                                         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="璇疯緭鍏ユ暟閲�" autocomplete="off"
@@ -249,6 +254,7 @@
             empiricalValueAddMaxNumber: 0,
             processInspectVo: {
                 id: null,
+                proInsNo: null,
                 material: null,
                 materialCode: null,
                 orderNumber: "ZTTIC20230001",
@@ -352,6 +358,7 @@
             if (id != null) {
                 queryById(id).then(res => {
                     let result = res.data.data
+                    this.processInspectVo.proInsNo = result.proInsNo
                     this.processInspectVo.orderNumber = result.orderNumber
                     this.processInspectVo.materialCode = result.materialCode
                     this.processInspectVo.material = result.material

--
Gitblit v1.9.3