From 758275d35a4354bbabc0eabfcace5f74f318f33e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 02 九月 2025 10:15:24 +0800
Subject: [PATCH] 1.PDA拆分bug优化，转换为浮点型比较。 2.AGV操作组织页面优化
---
H5/Scll.aspx | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 8579263..d9ca1f1 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -4,20 +4,42 @@
.bg-info {
background-color: #fff;
}
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<div class="content-wrapper">
<van-nav-bar
- title="鐢熶骇棰嗘枡"
+ title="鐢熶骇澶囨枡"
left-text="杩斿洖"
left-arrow
@click-left="GoBack()">
</van-nav-bar>
+
<div class="mySolid">
<van-cell-group>
+ <van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
<van-field
ref="daa001"
v-model="modeInfo.daa001"
@@ -76,6 +98,8 @@
</van-cell-group>
</div>
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
@@ -84,16 +108,40 @@
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
</van-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="5">{{itm.recoKw}}</van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
</van-row>
</van-tab>
@@ -125,5 +173,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123336 %>"></script>
+ <script src="Js/Scll.js?<%=123336158 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3