From 055959f23d9d1f67beb681f7dec3ac895a19f21f Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 12 三月 2025 15:17:36 +0800
Subject: [PATCH] 1.生产退料优化
---
H5/Scll.aspx | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index d792906..a22014c 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -4,6 +4,37 @@
.bg-info {
background-color:#fff;
}
+ /*.van-popup--bottom {
+ height: 50%;*/ /* 璁剧疆寮圭獥楂樺害 */
+/*}
+
+.printer-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;*/ /* 宸﹀彸瀵归綈 */
+ /*width: 100%;
+}
+
+.printer-info {
+ display: flex;
+ flex-direction: column;*/ /* 鍨傜洿鎺掑垪缂栧彿鍜孖P鍦板潃 */
+ /*flex-grow: 1;*/ /* 鍗犳嵁鍓╀綑绌洪棿 */
+/*}
+
+.printer-id {
+ font-size: 16px;
+ color: #333;
+}
+
+.ip-address {
+ font-size: 12px;
+ color: #666;
+ margin-top: 4px;
+}
+
+.printer-radio {
+ margin-left: 16px;*/ /* 璋冩暣涓庡唴瀹圭殑璺濈 */
+/*}*/
</style>
</asp:Content>
@@ -24,7 +55,7 @@
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-focus.noKeyboard
- @change="getModel" autofocus="true"
+ @keyup.enter.native="getModel" autofocus="true"
></van-field>
<van-field
v-model="modeInfo.planNo"
@@ -42,7 +73,7 @@
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-focus.noKeyboard
- @change="getScan"
+ @keyup.enter.native="getScan"
></van-field>
<van-field
v-model="scanInfo.barcodeNum"
@@ -56,7 +87,7 @@
center
clearable
label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺" required
+ placeholder="鍙戞枡鏁伴噺"
>
<van-button slot="button" type="info" size="small" plain @click="getChaiFen">
鏉＄爜鎷嗗垎
@@ -64,6 +95,36 @@
</van-field>
</van-cell-group>
</div>
+
+<%--<!-- 寮圭獥缁勪欢 -->
+<van-popup v-model="isPrinterPopupVisible" position="bottom" round>
+ <van-radio-group v-model="selectedPrinter" @change="onPrinterSelected">
+ <van-cell-group>
+ <van-cell
+ v-for="(printer, index) in printerList"
+ :key="index"
+ clickable
+ @click="selectPrinter(printer)"
+ >
+ <!-- 鑷畾涔夊唴瀹瑰竷灞� -->
+ <template #default>
+ <div class="printer-item">
+ <div class="printer-info">
+ <span class="printer-id">{{ printer.printerId }}</span>
+ <span class="ip-address">{{ printer.ipAddress }}</span>
+ </div>
+ <van-radio class="printer-radio" :name="printer.printerId"></van-radio>
+ </div>
+ </template>
+ </van-cell>
+ </van-cell-group>
+ </van-radio-group>
+ <div style="text-align: center; margin-top: 10px;">
+ <van-button type="info" size="small" @click="confirmSelection">纭</van-button>
+ </div>
+</van-popup>--%>
+
+
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呭彂鐗╂枡" class="mySolid font">
<van-row>
@@ -71,7 +132,7 @@
<van-col span="6">寰呮壂</van-col>
<van-col span="6">宸叉壂</van-col>
</van-row>
- <van-row v-for="(itm,index) in modeInfo.daisao" :key="index">
+ <van-row v-for="(itm,index) in ItemDetail.daisao" :key="index">
<van-col span="12" class="text-left padding-left">
<div>{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -86,7 +147,7 @@
<van-col span="6">闇�棰嗘暟</van-col>
<van-col span="6">宸查鏁�</van-col>
</van-row>
- <van-row v-for="(itm,index) in modeInfo.totals" :key="index">
+ <van-row v-for="(itm,index) in ItemDetail.totals" :key="index">
<van-col span="12" class="text-left padding-left">
<div>{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -99,8 +160,8 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
- <comback ></comback>
+ <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123331 %>"></script>
+ <script src="Js/Scll.js?<%=123334 %>"></script>
</asp:Content>
--
Gitblit v1.9.3