From 160967106cde2e2f9144b98b4c77d9706bb64fc1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 13 十月 2025 14:29:18 +0800
Subject: [PATCH] 1.产品绑定提示样式调整 2.其他入库优化(已更新) 3.核对送检提示样式调整 4.内箱核对提示样式调整
---
H5/Xcsl.aspx | 197 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 137 insertions(+), 60 deletions(-)
diff --git a/H5/Xcsl.aspx b/H5/Xcsl.aspx
index 1069911..64cdd20 100644
--- a/H5/Xcsl.aspx
+++ b/H5/Xcsl.aspx
@@ -51,6 +51,23 @@
flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
}
+
+
+ /* 鏂板锛氬喕缁撴爣棰樿鏍峰紡 */
+ .sticky-header {
+ position: sticky;
+ top: 0;
+ background-color: #fafafa; /* 鑳屾櫙鑹诧紝鍙牴鎹渶瑕佽皟鏁� */
+ z-index: 10;
+ border-bottom: 1px solid #ebedf0;
+ font-weight: bold;
+ }
+
+ /* 纭繚琛ㄦ牸瀹瑰櫒鏈夊浐瀹氶珮搴﹀拰婊氬姩 */
+ .van-tab__pane {
+ max-height: 60vh; /* 鍙牴鎹渶瑕佽皟鏁撮珮搴� */
+ overflow-y: auto;
+ }
</style>
</asp:Content>
@@ -66,13 +83,51 @@
<div class="mySolid">
<van-cell-group>
<van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
+ :right-icon-size="19"
+ v-model="selectKey"
+ @keyup.enter.native="GetMesItemBlDetailByBillNo"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+ <van-field
ref="DAA001"
v-model="DAA001"
label="鎸囦护宸ュ崟"
placeholder="鎸囦护宸ュ崟"
+ @keyup.enter.native="GetItemsXcsl"
autofocus="true"
- readonly
>
+ </van-field>
+ <van-field
+ v-model="DaaInfo.workNo"
+ label="浠诲姟鍗曞彿"
+ clearable
+ :right-icon-size="19"
+ placeholder="浠诲姟鍗曞彿"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
</van-field>
<van-field
@@ -86,77 +141,99 @@
<van-field
ref="Bar"
v-model="Bar"
- label="绠辨潯鐮�"
- placeholder="璇锋壂澶栫鐮�"
- @keyup.enter.native="getXBarInfo"
+ label="鐗╂枡鏉＄爜"
+ placeholder="璇锋壂鐗╂枡鏉＄爜"
+ @keyup.enter.native="ScanXcsl"
autofocus="true">
</van-field>
</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>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="4">澶囨枡鏁�</van-col>
- <van-col span="4">鎺ユ敹鏁�</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-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
- </van-col>
- <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="6" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6" class="text-left padding-left">瑙勬牸鍨嬪彿</van-col>
+ <van-col span="4">闇�棰嗘暟</van-col>
+ <van-col span="4">澶囨枡鏁�</van-col>
+ <van-col span="4">鎺ユ敹鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in xcslItemList" :key="index">
+ <van-col span="6" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="6" class="text-left padding-left">
+ <div>{{itm.item_model}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.DAB006}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.BL_Num}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.JS_Num}}</van-col>
+ </van-row>
+ </div>
</van-tab>
<van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
- <van-row>
- <van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
- </van-row>
- <van-row
- v-for="(itm,index) in XbarInfo"
- :key="index"
- :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
- <van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
- <van-col span="7" class="text-left padding-left">
- <div class="blue-text">{{itm.item_no}}</div>
- <div>{{itm.item_name}}</div>
- </van-col>
- <van-col span="7" class="text-left padding-left">
- <div>{{itm.item_model}}</div>
- </van-col>
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >浜哄憳</van-col>
+ <van-col span="5" >鏃堕棿</van-col>
+ </van-row>
+ <van-row
+ v-for="(itm,index) in xcslWjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.QUANTITY}}</div>
+ </van-col>
+ <van-col span="3">
+ <div>{{itm.USER_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.create_date}}</div>
+ </van-col>
+ </van-row>
+ </div>
</van-tab>
<van-tab title="宸叉帴鏀跺垪琛�" class="mySolid font">
- <van-row>
- <van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
- </van-row>
- <van-row v-for="(itm,index) in KbBarMxInfo" :key="index">
- <van-col span="7" class="text-left padding-left" >{{itm.iteM_BARCODE}}</van-col>
- <van-col span="7" class="text-left padding-left">
- <div class="blue-text">{{itm.item_no}}</div>
- <div>{{itm.item_name}}</div>
- </van-col>
- <van-col span="7" class="text-left padding-left">
- <div>{{itm.item_model}}</div>
- </van-col>
-
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >鎺ユ敹浜�</van-col>
+ <van-col span="5" >鎺ユ敹鏃堕棿</van-col>
+ </van-row>
+ <van-row
+ v-for="(itm,index) in xcslYjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.QUANTITY}}</div>
+ </van-col>
+ <van-col span="3">
+ <div>{{itm.USER_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.XCSL_CREATE_DATE}}</div>
+ </van-col>
+ </van-row>
+ </div>
</van-tab>
</van-tabs>
</div>
@@ -167,5 +244,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xcsl.js?<%=1 %>"></script>
+ <script src="Js/Xcsl.js?<%=11111115 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3