From e1d24d932247e443a8893d8ebe85315fea5a5018 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 26 八月 2025 13:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaClient
---
H5/My.aspx | 2
H5/Js/PurchaseReturn.js | 10 +
H5/PurchaseReturn.aspx | 260 ++++++++++++++++++++++++++++-----------------------
3 files changed, 151 insertions(+), 121 deletions(-)
diff --git a/H5/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index 1624203..1045ce2 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -170,7 +170,6 @@
//if (json.data.tbBillList) {
// //this.ToErp();
//} else {
-
//}
that.scanFormData.quantity = json.data.tbBillList.barcodeNum
that.getItem();
@@ -244,16 +243,19 @@
var json = res;
if (json.status == 0) {
// that.modeInfo = json.data.tbBillList;
+ that.getItem();
that.scanInfo.splitNum = null;
that.scanFormData.quantity = null;
that.scanFormData.barcode = null;
that.$notify({ type: 'success', message: json.message });
that.$playSound('success');
-
- that.sendMessage(json.data.tbBillList);
+ //kyy
+ // that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
that.$refs.barcode.focus();
- that.getItem();
+ //kyy
+ // that.getItem();
}
else {
that.$playSound('error');
diff --git a/H5/My.aspx b/H5/My.aspx
index bd7e030..3a79cd4 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -59,6 +59,6 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
<script src="Js/comWebNav.js"></script>
- <script src="Js/My.js?<%=123456 %>"></script>
+ <script src="Js/My.js?<%=123457 %>"></script>
</asp:Content>
diff --git a/H5/PurchaseReturn.aspx b/H5/PurchaseReturn.aspx
index 2ae3b4c..875f4c1 100644
--- a/H5/PurchaseReturn.aspx
+++ b/H5/PurchaseReturn.aspx
@@ -1,127 +1,155 @@
-锘�<%@ Page Title="閲囪喘閫�鏂�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %>
+锘�<%@ Page Title="閲囪喘閫�鏂�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true"
+ CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %>
+
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
- .bg-info {
- background-color:#fff;
- }
-
-</style>
+ .bg-info {
+ background-color: #fff;
+ }
+ </style>
</asp:Content>
+
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
- <div class="content-wrapper">
- <van-nav-bar
- title="閲囪喘閫�鏂�"
- left-text="杩斿洖"
- left-arrow
- @click-left="GoBack()"
-></van-nav-bar>
- <div class="mySolid">
- <van-cell-group>
- <van-field
- value=""
- label="鐢宠鍗曞彿"
- clearable
- placeholder="閫夋嫨鐢宠鍗曞彿"
- :right-icon-size="19"
- v-model="scanFormData.itemOutNo"
- @keyup.enter.native="getItem"
- v-focus.noKeyboard
- ><template #button>
- <van-button size="small" type="info" plain @click="getItemOutNo" >閫夋嫨</van-button>
- </template></van-field>
- <van-field
- ref="barcode"
- v-model="scanFormData.barcode"
- label="鐗╂枡鏉＄爜"
- clearable
- placeholder="璇锋壂鎻忕墿鏂欐潯鐮�"
- :right-icon-size="19"
- v-focus.noKeyboard
- @keyup.enter.native="SaveBarCodes"
- <%--@change="SaveBarCodes"--%>
-></van-field>
- <van-field
- v-model="scanFormData.itemNo"
- label="鐗╂枡缂栫爜"
- placeholder="鐗╂枡缂栫爜"
- disabled
-></van-field>
- <van-field
- v-model="scanFormData.quantity"
- label="鏁伴噺"
- placeholder="鏁伴噺"
- disabled
-></van-field>
- <van-field
- ref="splitNum"
- v-model="scanInfo.splitNum"
- center
- clearable
- label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺">
- <van-button
- slot="button"
- type="info"
- size="small"
- plain
- @click="getChaiFen">
- 鏉＄爜鎷嗗垎
- </van-button>
-</van-field>
-</van-cell-group>
+ <div class="content-wrapper">
+ <!-- 瀵艰埅鏍� -->
+ <van-nav-bar
+ title="閲囪喘閫�鏂�"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+ ></van-nav-bar>
+
+ <!-- 琛ㄥ崟鍖哄煙 -->
+ <div class="mySolid">
+ <van-cell-group>
+ <!-- 鐢宠鍗曞彿杈撳叆妗� -->
+ <van-field
+ value=""
+ label="鐢宠鍗曞彿"
+ clearable
+ placeholder="閫夋嫨鐢宠鍗曞彿"
+ :right-icon-size="19"
+ v-model="scanFormData.itemOutNo"
+ @keyup.enter.native="getItem"
+ v-focus.noKeyboard
+ >
+ <template #button>
+ <van-button size="small" type="info" plain @click="getItemOutNo">閫夋嫨</van-button>
+ </template>
+ </van-field>
+
+ <!-- 鐗╂枡鏉＄爜杈撳叆妗� -->
+ <van-field
+ ref="barcode"
+ v-model="scanFormData.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鎻忕墿鏂欐潯鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="SaveBarCodes"
+ <%--@change="SaveBarCodes"--%>
+ ></van-field>
+
+ <!-- 鐗╂枡缂栫爜锛堢鐢級 -->
+ <van-field
+ v-model="scanFormData.itemNo"
+ label="鐗╂枡缂栫爜"
+ placeholder="鐗╂枡缂栫爜"
+ disabled
+ ></van-field>
+
+ <!-- 鏁伴噺锛堢鐢級 -->
+ <van-field
+ v-model="scanFormData.quantity"
+ label="鏁伴噺"
+ placeholder="鏁伴噺"
+ disabled
+ ></van-field>
+
+ <!-- 鍙戞枡鏁伴噺涓庢潯鐮佹媶鍒� -->
+ <van-field
+ ref="splitNum"
+ v-model="scanInfo.splitNum"
+ center
+ clearable
+ label="鍙戞枡鏁伴噺"
+ placeholder="鍙戞枡鏁伴噺"
+ >
+ <van-button
+ slot="button"
+ type="info"
+ size="small"
+ plain
+ @click="getChaiFen"
+ >
+ 鏉＄爜鎷嗗垎
+ </van-button>
+ </van-field>
+ </van-cell-group>
+ </div>
+
+ <!-- 鏍囩椤靛尯鍩� -->
+ <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="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-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-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.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>
+
+ <%--<van-button type="primary" @click="SaveBarCodes">纭</van-button>--%>
+
+ <!-- 搴曢儴寮圭獥 -->
+ <van-action-sheet
+ v-model="show"
+ :actions="itemOutNoStr"
+ @select="onSelect"
+ ></van-action-sheet>
</div>
- <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="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-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-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.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>
-
-<%-- <van-button type="primary" @click="SaveBarCodes" >纭</van-button>--%>
- <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet>
- </div>
</asp:Content>
+
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
- <comloading v-if="isLoading"></comloading>
-
-
+ <comloading v-if="isLoading"></comloading>
<%--<comback ></comback>--%>
</asp:Content>
+
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
<script src="Js/PurchaseReturn.js?<%=12811111 %>"></script>
-</asp:Content>
+</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3