From 914a092bc4c21d69641f94b68fecf61b25ddaca1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 13:11:38 +0800
Subject: [PATCH] #拣货单完成、上架规则

---
 src/main/webapp/views/home/map.html |   66 ++++++++++++++------------------
 1 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index cd9ec96..204388f 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -424,7 +424,7 @@
     </style>
 </head>
 <body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: nowrap; " @click="bgClick()">
+<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap:nowrap; " @click="bgClick()">
     <div style="flex: 3;overflow: auto; " :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
         <div style="width: 100%;overflow: auto;">
             <div class="pointContainer" v-for="(x,index) in map" :key="index">
@@ -533,41 +533,33 @@
                             <input id="02" type="radio" v-model="currentLev" name="r" value="2">
                             <label for="03">3F</label>
                             <input id="03" type="radio" v-model="currentLev" name="r" value="3">
-                            <label for="04">4F</label>
-                            <input id="04" type="radio" v-model="currentLev" name="r" value="4">
-                            <label for="05">5F</label>
-                            <input id="05" type="radio" v-model="currentLev" name="r" value="5">
-                            <label for="06">6F</label>
-                            <input id="06" type="radio" v-model="currentLev" name="r" value="6">
-                            <label for="07">7F</label>
-                            <input id="07" type="radio" v-model="currentLev" name="r" value="7">
+
                         </div>
                     </div>
                 </div>
                 <button class="card-button">妤煎眰 {{currentLev}}F</button>
             </div>
 
-            <div class="hoverCard">
-                <div class="card-details">
-                    <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>
-                    <div class="text-body" style="display: flex;">
-                        <div class="floorSelect">
-                            <label for="area01">A鍖�</label>
-                            <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
-                            <label for="area03">B鍖�</label>
-                            <input id="area03" type="radio" v-model="area" name="r" value="3">
-                            <label for="area04">C鍖�</label>
-                            <input id="area04" type="radio" v-model="area" name="r" value="4">
-                            <label for="area05">D鍖�</label>
-                            <input id="area05" type="radio" v-model="area" name="r" value="5">
-                            <label for="area06">E鍖�</label>
-                            <input id="area06" type="radio" v-model="area" name="r" value="6">
+<!--            <div class="hoverCard">-->
+<!--                <div class="card-details">-->
+<!--                    <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>-->
+<!--                    <div class="text-body" style="display: flex;">-->
+<!--                        <div class="floorSelect">-->
+<!--                            <label for="area01">A鍖�</label>-->
+<!--                            <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">-->
+<!--                            <label for="area03">B鍖�</label>-->
+<!--                            <input id="area03" type="radio" v-model="area" name="r" value="3">-->
+<!--                            <label for="area04">C鍖�</label>-->
+<!--                            <input id="area04" type="radio" v-model="area" name="r" value="4">-->
+<!--                            <label for="area05">D鍖�</label>-->
+<!--                            <input id="area05" type="radio" v-model="area" name="r" value="5">-->
 
-                        </div>
-                    </div>
-                </div>
-                <button class="card-button">搴撳尯 {{areaName}}</button>
-            </div>
+
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <button class="card-button">搴撳尯 {{areaName}}</button>-->
+<!--            </div>-->
 
             <div class="hoverCard">
                 <div class="card-details">
@@ -631,11 +623,11 @@
                     <div style="margin-top: 5px;">
                         <button class="layui-btn layui-btn-sm" @click="openLocDetail(map[mapI][mapJ].locNo)">搴撲綅璇︽儏</button>
                     </div>
-                    <div style="margin-top: 5px;">
-                        <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
-                        <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
-                        <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>
-                    </div>
+<!--                    <div style="margin-top: 5px;">-->
+<!--                        <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!--                        <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!--                        <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>-->
+<!--                    </div>-->
                 </div>
             </div>
         </div>
@@ -689,7 +681,7 @@
             rightBoxLeft: "0px",
             pointContainerWidth: 0,
             currentLev: 1,
-            area:6,
+            area:1,
             areaName:"绔嬪簱",
             crnList: null,
             crnBox: false,
@@ -837,12 +829,12 @@
                     if (this.area == 1){
                         if (rowData[i].locNo != undefined) {
                             let locNo = rowData[i].locNo;
-                            return "#" + parseInt(locNo.substr(0, 2));
+                            return "#" + parseInt(locNo.substr(2, 2));
                         }
                     }else if (this.area == 6){
                         if (rowData[i].locNo != undefined) {
                             let locNo = rowData[i].locNo;
-                            return "#" + parseInt(locNo.substr(8, 2));
+                            return "#" + parseInt(locNo.substr(7, 2));
                         }
                     }
                     else {

--
Gitblit v1.9.1