From e607f23451a8d7d5feb4ed19ad8eb9227905aaf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 29 五月 2023 16:06:45 +0800
Subject: [PATCH] 检测提交的出库库位提示语

---
 src/main/webapp/views/home/map.html |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 8e4e6fc..4ac865e 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -414,7 +414,7 @@
                         <!--搴撲綅-->
                         <div v-else-if="map[index][idx].value  == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
                             <div v-if="map[index][idx].locSts == 'O'" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
-                            <div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
+                            <div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
                             <div v-else-if="map[index][idx].locSts == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
                             <div v-else-if="map[index][idx].locSts == 'P'" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
                             <div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
@@ -479,7 +479,13 @@
 <!--                        <div>-->
 <!--                            <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>-->
 <!--                        </div>-->
-                        <div v-if="!locOutStatus">
+                        <div>
+                            <button @click="init" class="layui-btn layui-btn-sm">鍒锋柊</button>
+                        </div>
+                        <div style="margin-left: 10px;">
+                            <button @click="resetSearch" class="layui-btn layui-btn-sm">閲嶇疆</button>
+                        </div>
+                        <div v-if="!locOutStatus" style="margin-left: 10px;">
                             <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>
                         </div>
                         <div v-else style="margin-left: 10px;border: 1px red solid;display: flex;">
@@ -575,7 +581,7 @@
                     搴撲綅鍙�: {{ map[mapI][mapJ].locNo }}
                 </div>
                 <div style="margin-top: 10px;">
-                    搴撲綅鐘舵��: {{ map[mapI][mapJ].locSts$ }}
+                    搴撲綅鐘舵��: {{ getLocSts(map[mapI][mapJ].locSts) }}
                 </div>
                 <div style="margin-top: 10px;display: flex;justify-content: space-between;flex-wrap: wrap;">
                     <div style="margin-top: 5px;">
@@ -662,7 +668,8 @@
                     label: "50%"
                 },
                 100: "100%",
-            }
+            },
+            locStsList: [],//搴撲綅鐘舵�佸垪琛�
         },
         created(){
             this.init()
@@ -685,6 +692,13 @@
                 deep: true,
                 handler(val) {
                     this.init()
+                    if (this.searchMatnr != ""
+                        || this.searchOrderNo != ""
+                        || this.searchSpecs != ""
+                        || this.searchMaktx != ""
+                        || this.searchLocNo != "") {
+                        this.searchLoc()
+                    }
                 }
             }
         },
@@ -702,6 +716,16 @@
 
                 this.locOutStatus = false
                 this.locOutLocNo = []
+
+                this.getLocStsList();//鑾峰彇搴撲綅鐘舵�佸垪琛�
+            },
+            resetSearch(){
+                this.searchMatnr = ""
+                this.searchOrderNo = ""
+                this.searchSpecs = ""
+                this.searchMaktx = ""
+                this.searchLocNo = ""
+                this.searchLoc()
             },
             printData() {
                 this.mapData = JSON.stringify(this.map)
@@ -757,6 +781,29 @@
                     }
                 });
             },
+            getLocStsList() {
+                //鑾峰彇搴撲綅鐘舵�佸垪琛�
+                let that = this
+                $.ajax({
+                    url: baseUrl + "/basLocSts/list/auth",
+                    headers: {'token': localStorage.getItem('token')},
+                    method: "get",
+                    success: (res) => {
+                        that.locStsList = res.data.records
+                    }
+                })
+            },
+            getLocSts(locSts) {
+                //鑾峰彇搴撲綅鐘舵��
+                let locStsList = this.locStsList
+                let locDesc = ""
+                locStsList.forEach((item,index) => {
+                    if (item.locSts == locSts) {
+                        locDesc = item.locDesc
+                    }
+                })
+                return locDesc
+            },
             locMove(locNo) {
                 //搴撲綅绉昏浆
                 let that = this

--
Gitblit v1.9.1