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 | 166 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 97 insertions(+), 69 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index f6a3a39..204388f 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -16,7 +16,7 @@
<style>
.pointContainer {
display: flex;
- justify-content: center;
+ justify-content: flex-start;
margin-top: 1px;
}
@@ -35,8 +35,8 @@
.pointBox {
background: #fffef9;
- width: 40px;
- height: 40px;
+ width: 35px;
+ height: 35px;
margin-right: 1px;
display: flex;
justify-content: center;
@@ -102,7 +102,7 @@
}
.pointBoxDefault {
- background: #f9f4dc;
+ background: #ffffff;
}
.pointBoxSelected {
@@ -217,7 +217,7 @@
/*婊戝姩鍗＄墖start*/
.hoverCard {
- width: 160px;
+ width: 152px;
height: 224px;
border-radius: 20px;
background: #f5f5f5;
@@ -424,9 +424,9 @@
</style>
</head>
<body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
- <div style="flex: 12;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
- <div>
+<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">
<div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
<div v-if="idx != 0 && (idx != map[index].length-1)">
@@ -465,14 +465,14 @@
</div>
</div>
- <div style="width: 40px;display: flex;justify-content: center;align-items: center;">
+ <div style="width: 40px; display: flex;justify-content: flex-end;align-items: center;">
{{ getRealRowByX(index) }}
</div>
</div>
</div>
</div>
- <div style="padding: 20px;flex: 5;margin-top: -70px;">
+ <div style="padding: 20px;flex: 1;margin-top: -70px;">
<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard" style="width: 100%;">
@@ -481,7 +481,7 @@
<div style="width: 100%;margin-bottom: 20px;">
<div style="display: flex;justify-content: space-between;">
<div><input v-model="searchMatnr" placeholder="鐗╂枡鍙�" type="text" class="search-input"></div>
- <div><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
+ <div style="margin-left: 20px"><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
</div>
<div style="display: flex;justify-content: space-between;margin-top: 10px;">
<div><input style="width: 110px;" v-model="searchMaktx" placeholder="鐗╂枡鍚嶇О" type="text" class="search-input"></div>
@@ -520,6 +520,47 @@
<button class="card-button">鍔熻兘鍖�</button>
</div>
+
+
+ <div class="hoverCard">
+ <div class="card-details">
+ <p class="text-title" style="text-align: center;">搴撲綅灞� {{currentLev}}</p>
+ <div class="text-body" style="display: flex;">
+ <div class="floorSelect">
+ <label for="01">1F</label>
+ <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">
+ <label for="02">2F</label>
+ <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">
+
+ </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">-->
+
+
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <button class="card-button">搴撳尯 {{areaName}}</button>-->
+<!-- </div>-->
+
<div class="hoverCard">
<div class="card-details">
<div class="text-body" style="display: flex;justify-content: space-around;flex-wrap: wrap;">
@@ -555,53 +596,6 @@
<button class="card-button">搴撲綅鐘舵��</button>
</div>
- <div class="hoverCard">
- <div class="card-details">
- <p class="text-title" style="text-align: center;">妤煎眰 {{currentLev}}F</p>
- <div class="text-body" style="display: flex;">
- <div class="floorSelect">
- <label for="01">1F</label>
- <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">
- <label for="02">2F</label>
- <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;">搴撳尯 {{area}}</p>
- <div class="text-body" style="display: flex;">
- <div class="floorSelect">
- <label for="area01">绔嬪簱</label>
- <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
- <label for="area02">骞冲簱A鍖�</label>
- <input id="area02" type="radio" v-model="area" name="r" value="2">
- <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">搴撳尯 {{area}}</button>
- </div>
-
</div>
</div>
@@ -629,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>
@@ -688,6 +682,7 @@
pointContainerWidth: 0,
currentLev: 1,
area:1,
+ areaName:"绔嬪簱",
crnList: null,
crnBox: false,
crnBoxTop: "0px",
@@ -701,7 +696,7 @@
searchLocNo: "",
outSite: null,
outSites: null,
- showScale: 75, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScale: 85, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
0: "0%",
50: {
@@ -713,6 +708,7 @@
100: "100%",
},
locStsList: [],//搴撲綅鐘舵�佸垪琛�
+ y: 1
},
created(){
this.init()
@@ -747,6 +743,23 @@
area: {
deep: true,
handler(val) {
+ if (val == 1){
+ this.areaName = "A鍖�"
+
+ }else if (val == 3){
+ this.areaName = "B鍖�"
+ }
+ else if (val == 4){
+ this.areaName = "C鍖�"
+ }
+ else if (val == 5){
+ this.areaName = "D鍖�"
+ }
+ else if (val == 6){
+ this.areaName = "E鍖�"
+ }
+
+
this.init()
if (this.searchMatnr != ""
|| this.searchOrderNo != ""
@@ -799,7 +812,7 @@
val.searchStatus = false//鎼滅储鏍囪
data2.push(val)
})
- this.pointContainerWidth = item.length * (40+1)
+ this.pointContainerWidth = item.length * (35+1)
data.push(data2)
})
this.map = data
@@ -809,11 +822,26 @@
//鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
let data = this.map
let rowData = data[x]
+
+
for (var i = 1; i < rowData.length; i++) {
- console.log(rowData[i],rowData[i].locNo,rowData[i].locNo != undefined)
- if (rowData[i].locNo != undefined) {
- let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(0, 2));
+
+ if (this.area == 1){
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ 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(7, 2));
+ }
+ }
+ else {
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(7, 2));
+ }
}
}
--
Gitblit v1.9.1