From ee0d962abfe2a210ffa93278643081e6d0511740 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 13 三月 2025 13:55:28 +0800
Subject: [PATCH] 1.生产领料界面优化。
---
H5/Scll.aspx | 134 +++++++++++++++-----------------------------
H5/Js/Config.js | 4
2 files changed, 47 insertions(+), 91 deletions(-)
diff --git a/H5/Js/Config.js b/H5/Js/Config.js
index ca234a3..d48bcbb 100644
--- a/H5/Js/Config.js
+++ b/H5/Js/Config.js
@@ -10,7 +10,7 @@
var that = this;
},
methods: {
- sendMessage() {
+ sendMessage(obj) {
var detail = ["绗竴缁勬寚浠�"+
"! 0 203 203 480 1\r\n" +
"PREFEED 0\n\r" +
@@ -20,7 +20,7 @@
// 鍙充笂瑙掓斁缃竴涓柟鍨嬩簩缁寸爜锛�80*80锛夛紝鎵弿鍚庣殑鍊间负鈥�123456鈥�
"BOX 560 10 640 90 2\r\n" + // 缁樺埗浜岀淮鐮佺殑鏂规
"TEXT 570 20 5 \"鏉＄爜\"\r\n" + // 鍦ㄦ柟妗嗕腑涓婃柟鏄剧ず鈥滄潯鐮佲��
- "QRCODE 570 40 M 4 U 0 \"123456\"\r\n" + // 鍒涘缓浜岀淮鐮�
+ "QRCODE 570 40 M 4 U 0 \"" + obj.qrcode+"\"\r\n" + // 鍒涘缓浜岀淮鐮�
// 鍙充笅瑙掓樉绀轰竴涓潯褰㈢爜锛屾渶宸﹀湪320浣嶇疆锛岄暱搴︿负100锛屽悓鏃惰繖涓潯褰㈢爜灏嗗叾鎵弿鐨勫�兼樉绀哄湪鏉″舰鐮佷笅渚э紝鏉″舰鐮佺殑鍊间负鈥�987654鈥�
"BARCODE 320 350 100 50 1 \"987654\"\r\n" + // 鏄剧ず鏉″舰鐮佺殑浣嶇疆鍜屽ぇ灏�
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index a22014c..c59d35a 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -1,42 +1,19 @@
锘�<%@ Page Title="鐢熶骇棰嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Scll.aspx.cs" Inherits="H5_Scll" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
- .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>
+ .bg-info {
+ background-color: #fff;
+ }
+ .van-col {
+ font-size: 12px; /* 璋冩暣瀛椾綋澶у皬 */
+ word-wrap: break-word;
+ word-break: break-all;
+ }
+ .blue-text {
+ color: #1989fa; /* 璁剧疆瀛椾綋棰滆壊涓鸿摑鑹� */
+ font-weight: bold; /* 瀛椾綋鍔犵矖 */
+ }
+ </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
<van-nav-bar
@@ -95,65 +72,44 @@
</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>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
+
+ <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="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <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>
- </van-col>
- <van-col span="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
+ <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="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
</van-row>
</van-tab>
- <van-tab title="鐗╂枡鎬绘竻鍗�" class="mySolid font">
+ <van-tab title="宸查鐗╂枡" class="mySolid font">
<van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">闇�棰嗘暟</van-col>
- <van-col span="6">宸查鏁�</van-col>
+ <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="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
</van-row>
- <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>
- </van-col>
- <van-col span="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
+ <van-row v-for="(itm,index) in ItemDetail.ysitems" :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="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
</van-row>
</van-tab>
</van-tabs>
@@ -163,5 +119,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123334 %>"></script>
+ <script src="Js/Scll.js?<%=123335 %>"></script>
</asp:Content>
--
Gitblit v1.9.3