From a40798a6290b41c4aacab2e142a23b944743bda9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 19 八月 2025 10:48:32 +0800
Subject: [PATCH] 1.核对送检新增AGV送检和AGV呼叫 2.样式优化
---
H5/Cpdbsj.aspx | 102 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 38c2311..8506108 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -52,7 +52,10 @@
min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
}
-
+ .van-checkbox__icon--checked .van-icon
+ {
+ color: #ffffff !important;
+ }
</style>
</asp:Content>
@@ -85,14 +88,16 @@
<div class="si-status__left">
<span class="si-status__label">鍙鏁�</span>
</div>
- <div class="si-status__right">{{KbBarInfo.oldqty}}</div>
+ <div class="si-status__right">{{KbBarInfo.quantity||0}}</div>
</div>
<div class="si-status-box si-status--error">
<div class="si-status__left">
<span class="si-status__label">寰呰鏁�</span>
</div>
- <div class="si-status__right">{{KbBarInfo.ySum}}</div>
+ <div class="si-status__right">
+ {{ ((+(KbBarInfo.quantity || 0) - +(KbBarInfo.ySum || 0)) || 0) }}
+ </div>
</div>
</div>
@@ -117,42 +122,83 @@
</van-field>
<van-field
- ref="LsBar"
- v-model="LsBar"
+ ref="DAA001"
+ v-model="DAA001"
+ label="鎸囦护宸ュ崟"
+ placeholder="鎸囦护宸ュ崟"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+ <van-field
+ ref="XBar"
+ v-model="XBar"
label="绠辨潯鐮�"
placeholder="璇锋壂澶栫鐮�"
+ @keyup.enter.native="getXBarInfo"
autofocus="true">
</van-field>
+
<van-field
ref="LsBar"
v-model="LsBar"
label="浜у搧鏉＄爜"
+ class="custom-label-field"
placeholder="璇锋壂浜у搧鏉＄爜"
+ @keyup.enter.native="checkProductBarcode"
autofocus="true">
+ <template #extra>
+ <span style="margin-right:8px">AGV</span>
+ <van-checkbox
+ v-model="agvChecked"
+ shape="round"
+ icon-size="18px">
+ </van-checkbox>
+ </template>
</van-field>
-
+
<van-field
- ref="LsBar"
- v-model="LsBar"
+ ref="xtName"
+ v-model="xtName"
label="绾垮埆"
placeholder="璇烽�夋嫨绾垮埆"
- autofocus="true">
+ autofocus="true"
+ @click.native="selectXt">
+ <template #button >
+ <van-button
+ style="background-color: #ffcc00;border-color: #ffcc00;color: white"
+ class="action-button reset-button"
+ @click.stop="handleAGVCall"
+ >鍛煎彨</van-button>
+ </template>
</van-field>
+ <div style="height: 10px"></div>
<!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
- <div class="button-container">
- <van-button
- type="warning"
- class="action-button reset-button"
- >閲嶇疆</van-button>
- <van-button
- type="info"
- class="action-button submit-button"
- >閫佹</van-button>
- </div>
+ <div class="button-container">
+ <van-button
+ type="warning"
+ class="action-button reset-button"
+ @click.native="handleClear"
+ >閲嶇疆</van-button>
+ <van-button
+ type="primary"
+ class="action-button"
+ @click.native="handleAGVInspection"
+ >閫佹</van-button>
+ <!-- style="background-color: #27f83f;border-color: #27f83f;color: white" -->
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleSubmit"
+ >鎻愪氦</van-button>
+ </div>
</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">
@@ -160,10 +206,13 @@
<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-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-row
+ v-for="(itm,index) in XbarInfo"
+ :key="index"
+ :style="{ background: itm.is_hedui === '1' ? '#75f41d !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>
@@ -171,8 +220,7 @@
<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-col span="3" class="blue-text">{{itm.weight}}</van-col>
</van-row>
</van-tab>
@@ -181,7 +229,7 @@
<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-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>
@@ -193,7 +241,7 @@
<div>{{itm.item_model}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.weight}}</van-col>
</van-row>
</van-tab>
</van-tabs>
@@ -205,5 +253,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=11111 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=12111111421512 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3