From 99984437e1d6b52a6641d9c5b7a95fc04fedb14e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 21 Aug 2024 15:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/produceScreen/index.vue     | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index 78a0369..91e6cb6 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -184,7 +184,8 @@
         </el-row>
         <el-row class="filter-wraper" type="flex" justify="space-between">
           <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18" class="select-wraper">
+          <el-col :span="18"><input v-model="emptyObj.regin_code" type="text" class="p-value" disabled></el-col>
+          <!-- <el-col :span="18" class="select-wraper">
             <el-select v-model="val2" placeholder="请选择">
               <el-option
                 v-for="item in options2"
@@ -194,7 +195,7 @@
                 class="option-wraper"
               />
             </el-select>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
       <el-row v-show="type === 3" class="pop-btns">
@@ -220,7 +221,8 @@
         </el-row>
         <el-row class="filter-wraper" type="flex" justify="space-between">
           <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18" class="select-wraper">
+          <el-col :span="18"><input v-model="sendObj.regin_code" type="text" class="p-value" disabled></el-col>
+          <!-- <el-col :span="18" class="select-wraper">
             <el-select v-model="val2" placeholder="请选择">
               <el-option
                 v-for="item in options2"
@@ -230,7 +232,7 @@
                 class="option-wraper"
               />
             </el-select>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row class="filter-wraper" type="flex" justify="space-between">
           <el-col :span="5" class="p-label">载具编码</el-col>
@@ -262,7 +264,8 @@
         </el-row>
         <el-row class="filter-wraper" type="flex" justify="space-between">
           <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18" class="select-wraper">
+          <el-col :span="18"><input v-model="backObj.regin_code" type="text" class="p-value" disabled></el-col>
+          <!-- <el-col :span="18" class="select-wraper">
             <el-select v-model="val2" placeholder="请选择">
               <el-option
                 v-for="item in options2"
@@ -272,7 +275,7 @@
                 class="option-wraper"
               />
             </el-select>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
       <el-row v-show="type === 5" class="pop-btns">
@@ -339,12 +342,13 @@ export default {
       } else if (type === 3 && name in this.pointState) {
         this.emptyObj = {}
         this.val1 = ''
-        this.val2 = ''
+        // this.val2 = ''
         this.show = true
         this.emptyObj.device_code = this.pointState[name]
+        this.emptyObj.regin_code = this.pkObj.value
       } else if (type === 4 && name in this.pointState) {
         this.sendObj = {}
-        this.val2 = ''
+        // this.val2 = ''
         this.check1 = false
         this.check2 = false
         this.show = true
@@ -352,12 +356,14 @@ export default {
         this.sendObj.material_qty = null
         this.sendObj.vehicle_code = ''
         this.sendObj.device_code = this.pointState[name]
+        this.sendObj.regin_code = this.pkObj.value
       } else if (type === 5 && name in this.pointState) {
         this.backObj = {}
-        this.val2 = ''
+        // this.val2 = ''
         this.show = true
         this.backObj.material_qty = null
         this.backObj.device_code = this.pointState[name]
+        this.backObj.regin_code = this.pkObj.value
       }
     },
     handleCurrentChange1(val) {
@@ -382,6 +388,7 @@ export default {
         this.$message.error('请选择设备！')
         return
       }
+      this.currentRow2.device_code = this.pointState[name]
       crudProduceScreen.callMater(this.currentRow2).then(res => {
         this.$message(res.msg)
       })
@@ -392,12 +399,12 @@ export default {
         this.$message.error('请选择托盘类型！')
         return
       }
-      if (!this.val2) {
-        this.$message.error('请选择设备工序！')
-        return
-      }
+      // if (!this.val2) {
+      //   this.$message.error('请选择设备工序！')
+      //   return
+      // }
       this.emptyObj.vehicle_type = this.val1
-      this.emptyObj.regin_code = this.val2
+      // this.emptyObj.regin_code = this.val2
       crudProduceScreen.callEmp(this.emptyObj).then(res => {
         this.$message(res.msg)
       })
@@ -412,15 +419,15 @@ export default {
         this.$message.error('请输入合格数量！')
         return
       }
-      if (!this.val2) {
-        this.$message.error('请选择设备工序！')
-        return
-      }
+      // if (!this.val2) {
+      //   this.$message.error('请选择设备工序！')
+      //   return
+      // }
       if (this.sendObj.vehicle_code === '') {
         this.$message.error('请输入载具编码！')
         return
       }
-      this.sendObj.regin_code = this.val2
+      // this.sendObj.regin_code = this.val2
       this.sendObj.has_report = this.check1
       this.sendObj.target_region_code = this.check2
       crudProduceScreen.sendMater(this.sendObj).then(res => {
@@ -433,11 +440,11 @@ export default {
         this.$message.error('请输入物料数量！')
         return
       }
-      if (!this.val2) {
-        this.$message.error('请选择设备工序！')
-        return
-      }
-      this.backObj.regin_code = this.val2
+      // if (!this.val2) {
+      //   this.$message.error('请选择设备工序！')
+      //   return
+      // }
+      // this.backObj.regin_code = this.val2
       crudProduceScreen.sendVehicle(this.backObj).then(res => {
         this.$message(res.msg)
       })