From e61447458f29e55c53f65be44f0d3d6a82777dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 10:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/produceScreen/index.vue         | 15 ++++-----------
 .../src/views/wms/produceScreen/setup.vue         |  7 +++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index d6a2f03..ec5a204 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -110,7 +110,7 @@
       <el-row class="filter-wraper" type="flex" justify="space-between">
         <el-col :span="2" class="p-label">目的地</el-col>
         <el-col :span="8" class="select-wraper">
-          <el-select v-model="value1" placeholder="请选择" @change="selectChange">
+          <el-select v-model="value1" placeholder="请选择">
             <el-option
               v-for="item in options1"
               :key="item.value"
@@ -281,6 +281,7 @@ export default {
         crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
           this.vcode = res
         })
+        this.popList.push({ order_code: '', material_qty: '' })
         this.show = true
       } else if (type === 'BACK') {
         crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
@@ -321,7 +322,7 @@ export default {
           this.disabled = false
         })
       } else if (this.type === 'SCANER') {
-        crudProduceScreen.sendMater({ device_code: this.popData.device_code, mater: this.popList, point_code: this.value1 }).then(res => {
+        crudProduceScreen.sendMater({ device_code: this.screenData.in_code, mater: this.popList, point_code: this.value1 }).then(res => {
           this.disabled = false
           this.$message(res.msg)
         }).catch(() => {
@@ -337,15 +338,7 @@ export default {
       this.show = false
     },
     addRow() {
-      if (this.value1 === '1') {
-        this.popList.push({ order_code: '', material_qty: '' })
-      }
-    },
-    selectChange(e) {
-      this.popList = []
-      if (e === '1') {
-        this.popList.push({ order_code: '', material_qty: '' })
-      }
+      this.popList.push({ order_code: '', material_qty: '' })
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
index e7a6623..08bc6b2 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
@@ -92,6 +92,13 @@ export default {
       }
       crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
         res.username = this.username
+        let in_code = ''
+        res.region_points.map(el => {
+          if (el.type === '0') {
+            in_code = el.device_code
+          }
+        })
+        res.in_code = in_code
         this.$store.dispatch('addScreenData', JSON.stringify(res))
         this.show = false
         this.disabled = false