From 46528c3843ce67038ddb2e00dd3d3998c206a69e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 五月 2024 17:26:10 +0800
Subject: [PATCH] 1.递交

---
 src/views/produce/stepReport.vue |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 008b90c..b48169f 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -41,18 +41,24 @@
         </el-button>
       </div>
 
+      <div v-if="form.wocode" style="position: absolute;left: 460px;z-index: 2;top: 23px;font-weight: bolder">
+        褰撳墠宸ュ崟鍙蜂负锛歿{ form.wocode }}
+      </div>
+
       <el-tabs
         ref="elTabs"
         v-model="activeName"
         type="border-card"
         @tab-click="tabClick"
       >
+
         <el-tab-pane
           v-for="item in elTabsArr"
           :key="item.code"
           :label="item.name"
           :name="item.name"
         >
+
           <div class="bodyTopFormGroup">
             <el-form
               ref="form"
@@ -65,10 +71,11 @@
 
                 <el-form-item label="宸ュ崟鍙�" style=" display: flex;">
                   <el-input
-                    v-model="form.wocode"
+                    v-model="workOrderCurrentValue"
                     :name="'produceCode'+item.code"
                     placeholder="璇锋壂鎻忔垨杈撳叆"
                     style="width: 300px"
+
                     @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                   />
                 </el-form-item>
@@ -77,6 +84,7 @@
                     v-model="form.partcode"
                     placeholder="璇疯緭鍏�"
                     style="width: 200px"
+
                     @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                   />
                 </el-form-item>
@@ -84,6 +92,7 @@
                   <el-input
                     v-model="form.partname"
                     placeholder="璇疯緭鍏�"
+
                     style="width: 200px"
                     @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                   />
@@ -94,6 +103,7 @@
                     filterable
                     :popper-append-to-body="false"
                     style="width: 200px"
+
                     placeholder="璇烽�夋嫨"
                   >
                     <el-option
@@ -385,12 +395,13 @@
           <div class="dialogFormItemDiv" style="color:red;">{{ dialogForm.noputqty }}</div>
         </el-form-item>
 
-        <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" prop="eqpcode" label="鎶ュ伐璁惧" class="dialogFormItem">
+        <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" label="鎶ュ伐璁惧" class="dialogFormItem">
           <el-select
             v-model="dialogForm.eqpcode"
             style="width:200px"
             placeholder="璇烽�夋嫨"
             filterable
+            clearable
             :popper-append-to-body="false"
           >
             <el-option
@@ -924,7 +935,8 @@
       wxArr: [], // 寰�鏉ュ崟浣嶄笅鎷�
 
       defectTableData: [],
-      badTableData: []
+      badTableData: [],
+      workOrderCurrentValue: ''
 
     }
   },
@@ -980,7 +992,7 @@
           break
       }
       this.enterNative(this.form.wocode, belong)
-      // this.search()
+
       this.radioSelected = ''
     },
     enterNative(val, belong) {
@@ -1021,6 +1033,8 @@
     },
     // 鏌ヨ
     async search() {
+      this.form.wocode = this.workOrderCurrentValue
+      this.workOrderCurrentValue = ''
       if (this.activeName === '鐢熶骇鍒楄〃') {
         const res = await MesOrderStepSearch(this.form)
         this.tableData = res.data
@@ -1322,8 +1336,8 @@
               return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鍙敹鏁伴噺!')
             }
 
-            if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode)) {
-              if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+            if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode)) {
+              if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
                 return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
               }
             } else {
@@ -1456,6 +1470,7 @@
     reset() {
       this.form.wkshopcode = ''
       this.form.wocode = ''
+      this.form.workOrderCurrentValue = ''
       this.form.partcode = ''
       this.form.partname = ''
       this.form.partspec = ''

--
Gitblit v1.9.3