From 9485d328a04ace9f2259f512d23aa5e70c414344 Mon Sep 17 00:00:00 2001
From: "bbl\\baobl" <bbl17156787365@163.com>
Date: Fri, 15 Mar 2024 14:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E6=89=98-=E6=8B=86=E5=88=86=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business-data/inventory/index.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index d7f09e2..16229c5 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -201,17 +201,17 @@
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="areaName" label="区域">
           <template slot-scope="scope">
-            <div>{{ scope.row.point.area.name }}</div>
+            <span v-if="scope.row.point != null">{{ scope.row.point.area.name }}</span>
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="pointCode" label="点位号">
           <template slot-scope="scope">
-            <div>{{ scope.row.point.code }}</div>
+            <span v-if="scope.row.point != null">{{ scope.row.point.code }}</span>
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="storageType" label="容器类型">
           <template slot-scope="scope">
-            <div>{{ scope.row.point.storageType }}</div>
+            <span v-if="scope.row.point != null">{{ scope.row.point.storageType }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="quantity" label="数量" />
@@ -319,7 +319,7 @@ export default {
       },
       FromDevanningFlag: false,
       devanPropC6: { startPropC6: null, endPropC6: null },
-      fromDevanning: { ids: [], textPropC6: null, text1PropC6: null, text2PropC6: null, startPointCode: null, endPointCode: null },
+      fromDevanning: { invIds: [], textPropC6: null, text1PropC6: null, text2PropC6: null, startPointCode: null, endPointCode: null },
       rules: {}
     }
   },
@@ -340,11 +340,11 @@ export default {
     },
     LoadDevanning() {
       this.FromDevanningFlag = true
-      this.fromDevanning.ids = []
+      this.fromDevanning.invIds = []
       for (let i = 0; i < this.crud.selections.length; i++) {
-        this.fromDevanning.ids.push(this.crud.selections[i].id)
+        this.fromDevanning.invIds.push(this.crud.selections[i].id)
       }
-      getItemKey(this.fromDevanning.ids).then(res => {
+      getItemKey(this.fromDevanning.invIds).then(res => {
         if (res.status === 200) {
           console.log('值：' + res.data)
           this.fromDevanning.textPropC6 = res.data
@@ -380,6 +380,8 @@ export default {
     devanning() {
       devanning(this.fromDevanning).then(res => {
         this.crud.notify(res.message, res.status)
+        this.FromDevanningFlag = false
+        this.crud.toQuery()
       })
     },
     deleteDataM(id) { // 删除数据的方法