From 21777d31885b89a1c6f062786d5c4a2a4d21771b Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 13 十一月 2025 19:29:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_PdaClient
---
H5/PurchaseInventoryReturn.aspx | 501 +++++++++++++++++++++++++------------------------------
1 files changed, 228 insertions(+), 273 deletions(-)
diff --git a/H5/PurchaseInventoryReturn.aspx b/H5/PurchaseInventoryReturn.aspx
index 6d4b208..027dc0b 100644
--- a/H5/PurchaseInventoryReturn.aspx
+++ b/H5/PurchaseInventoryReturn.aspx
@@ -1,290 +1,245 @@
-锘�<%@ Page Title="閲囪喘鍏ュ簱锛堥獙閫�锛�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="PurchaseInventoryReturn.aspx.cs" Inherits="H5_Scll" %>
+锘�<%@ Page Title="閲囪喘鍏ュ簱锛堟柊锛�"
+ Language="C#"
+ MasterPageFile="~/Mst.master"
+ AutoEventWireup="true"
+ CodeFile="PurchaseInventoryReturn.aspx.cs"
+ Inherits="H5_Scll" %>
+
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
- .bg-info {
- background-color:#fff;
- }
- .return-warning {
- color: #ff4444 !important;
- font-weight: bold;
- }
- .return-field .van-field__label {
- color: #ff4444 !important;
- font-weight: bold;
- }
- .return-field .van-field__control {
- color: #ff4444 !important;
- font-weight: bold;
- }
- .return-button {
- background: linear-gradient(135deg, #ff6b6b, #ee5a52) !important;
- border: none !important;
- box-shadow: 0 2px 8px rgba(255, 107, 107, 0.3) !important;
- }
- .weight-field {
- background: linear-gradient(135deg, rgba(15, 157, 88, 0.12), rgba(15, 157, 88, 0.02));
- border-left: 4px solid #0f9d58;
- border-radius: 8px;
- box-shadow: 0 2px 12px rgba(15, 157, 88, 0.18);
- margin-bottom: 12px;
- }
- .weight-field .van-field__label,
- .weight-field .van-field__control {
- color: #0f9d58 !important;
- font-weight: 600;
- }
- .weight-field input {
- color: #0b7a45 !important;
- font-weight: 600;
- }
-</style>
+ /* 鍩虹鑳屾櫙鏍峰紡 */
+ .bg-info {
+ background-color: #fff;
+ }
+
+ /* 楠岄��鐩稿叧璀﹀憡鏍峰紡 */
+ .return-warning {
+ color: #ff4444 !important;
+ font-weight: bold;
+ }
+
+ .return-field .van-field__label {
+ color: #ff4444 !important;
+ font-weight: bold;
+ }
+
+ .return-field .van-field__control {
+ color: #ff4444 !important;
+ font-weight: bold;
+ }
+
+ .return-button {
+ background: linear-gradient(135deg, #ff6b6b, #ee5a52) !important;
+ border: none !important;
+ box-shadow: 0 2px 8px rgba(255, 107, 107, 0.3) !important;
+ }
+
+ /* 鍏嬮噸杈撳叆妗嗘牱寮� */
+ .weight-field {
+ background: linear-gradient(135deg, rgba(15, 157, 88, 0.12), rgba(15, 157, 88, 0.02));
+ border-left: 4px solid #0f9d58;
+ border-radius: 8px;
+ box-shadow: 0 2px 12px rgba(15, 157, 88, 0.18);
+ margin-bottom: 12px;
+ }
+
+ .weight-field .van-field__label,
+ .weight-field .van-field__control {
+ color: #0f9d58 !important;
+ font-weight: 600;
+ }
+
+ .weight-field input {
+ color: #0b7a45 !important;
+ font-weight: 600;
+ }
+ </style>
</asp:Content>
+
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <!-- 瀵艰埅鏍� -->
<van-nav-bar
- title="閲囪喘鍏ュ簱锛堥獙閫�锛�"
- left-text="杩斿洖"
- left-arrow
- @click-left="GoBack()"
-></van-nav-bar>
-<%-- <div class="mySolid">--%>
- <van-cell-group>
- <van-field
- ref="sectionCode"
- v-model="sectionCode"
- label="搴撲綅缂栫爜"
- clearable
- placeholder="璇锋壂鐮�"
- :right-icon-size="19"
- v-focus.noKeyboard
- @keyup.enter.native="getModel"
- <%--@change="getModel" --%>
- autofocus="true"
- ></van-field>
- <van-field
- v-model="depotData.depotName"
- label="浠撳簱鍚嶇О"
- placeholder=""
- disabled
-></van-field>
- <van-field
- v-model="depotData.depotCode"
- label="浠撳簱缂栫爜"
- placeholder=""
- disabled
-></van-field>
- <van-field
- ref="weight"
- v-model="formData.weight"
- label="鍏嬮噸"
- clearable
- placeholder="璇疯緭鍏ュ厠閲�"
- type="text"
- inputmode="decimal"
- class="weight-field"
- @input="handleWeightInput"
- @blur="handleWeightBlur"
- ></van-field>
- <van-field
- ref="barcode"
- v-model="formData.barcode"
- label="鐗╂枡鏉＄爜"
- clearable
- placeholder="璇锋壂鐮�"
- :right-icon-size="19"
- v-focus.noKeyboard
- @keyup.enter.native="getScan"
- <%--@change="getScan"--%>
-></van-field>
- <van-field
- ref="returnBarcode"
- v-model="formData.returnBarcode"
- label="鈿狅笍 楠岄��鏉＄爜"
- clearable
- placeholder="璇锋壂鐮�"
- :right-icon-size="19"
- v-focus.noKeyboard
- @keyup.enter.native="getReturnScan"
- class="return-field"
-></van-field>
- <van-row>
- <van-col span="18">
- <van-field
- v-model="formData.returnQuantity"
- label="鈿狅笍 楠岄��鏁伴噺"
- clearable
- placeholder="璇疯緭鍏ラ獙閫�鏁伴噺"
- type="number"
- class="return-field"
- ></van-field>
- </van-col>
- <van-col span="6" style="padding:10px;">
- <van-button type="primary" size="small" @click="confirmReturn" class="return-button">鈿狅笍 楠岄��</van-button>
- </van-col>
- </van-row>
+ title="閲囪喘鍏ュ簱锛堟柊锛�"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+ ></van-nav-bar>
- <van-field
- v-model="formData.itemNo"
- label="鐗╂枡缂栫爜"
- placeholder=""
- disabled
-></van-field>
- <van-field
- v-model="formData.billNo"
- label="鍒拌揣鍗曞彿"
- placeholder=""
- disabled
-></van-field>
- <van-field
- v-model="formData.barcodeQuantity"
- label="鏉＄爜鏁伴噺"
- placeholder=""
- disabled
-></van-field>
- <van-field
- v-model="formData.sumQuantity"
- label="宸插叆鎬绘暟"
- placeholder=""
- disabled
-></van-field>
-</van-cell-group>
-<%-- </div>--%>
- <van-tabs color="#000" title-active-color="#0283EF">
-<%-- <van-tab title="鐗╂枡鏄庣粏" class="mySolid font">
- <van-row>
+ <!-- 鏍稿績琛ㄥ崟鍖哄煙 -->
+ <van-cell-group>
+ <!-- 搴撲綅缂栫爜 -->
+ <van-field
+ ref="sectionCode"
+ v-model="sectionCode"
+ label="搴撲綅缂栫爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getModel"
+ autofocus="true"
+ ></van-field>
- <van-col span="5">鐗╂枡缂栫爜</van-col>
- <van-col span="5">鐗╂枡鍚嶇О</van-col>
- <van-col span="5">鏁伴噺</van-col>
- <van-col span="4">鍗曚綅</van-col>
- </van-row>
- <van-row v-for="(itm,index) in itemTableData" :key="index">
- <van-col span="5">{{itm.itemNo}}</van-col>
- <van-col span="5">{{itm.itemSname}}</van-col>
- <van-col span="5">{{itm.quantity}}</van-col>
- <van-col span="4">{{itm.unit}}</van-col>
- </van-row>
- </van-tab>--%>
+ <!-- 浠撳簱淇℃伅锛堢鐢ㄧ姸鎬侊級 -->
+ <van-field
+ v-model="depotData.depotName"
+ label="浠撳簱鍚嶇О"
+ placeholder=""
+ disabled
+ ></van-field>
- <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="5">鐗╂枡鍒嗗尯</van-col>
- <van-col span="3">宸插叆搴撴暟</van-col>
- </van-row>
- <van-row v-for="(itm,index) in ItemDetail" :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.fQty}}</van-col>
- <van-col span="5" class="blue-text">{{itm.fQty}}</van-col>
- </van-row>
- </van-tab>
+ <van-field
+ v-model="depotData.depotCode"
+ label="浠撳簱缂栫爜"
+ placeholder=""
+ disabled
+ ></van-field>
- <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 tableData" :key="index">
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.barcode}}</div>
- </van-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
+ <!-- 鍏嬮噸杈撳叆 -->
+ <van-field
+ ref="weight"
+ v-model="formData.weight"
+ label="鍏嬮噸"
+ clearable
+ placeholder="璇疯緭鍏ュ厠閲�"
+ type="text"
+ inputmode="decimal"
+ class="weight-field"
+ @input="handleWeightInput"
+ @blur="handleWeightBlur"
+ ></van-field>
+
+ <!-- 鐗╂枡鏉＄爜 -->
+ <van-field
+ ref="barcode"
+ v-model="formData.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan"
+ ></van-field>
+
+ <%--<!-- 楠岄��鐩稿叧瀛楁锛堢孩鑹茶鍛婃牱寮忥級 -->
+ <van-field
+ ref="returnBarcode"
+ v-model="formData.returnBarcode"
+ label="鈿狅笍 楠岄��鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getReturnScan"
+ class="return-field"
+ ></van-field>
+
+ <!-- 楠岄��鏁伴噺 + 楠岄��鎸夐挳 -->
+ <van-row>
+ <van-col span="18">
+ <van-field
+ v-model="formData.returnQuantity"
+ label="鈿狅笍 楠岄��鏁伴噺"
+ clearable
+ placeholder="璇疯緭鍏ラ獙閫�鏁伴噺"
+ type="number"
+ class="return-field"
+ ></van-field>
</van-col>
- <van-col span="4">
- <div>{{itm.fQty}}</div>
+ <van-col span="6" style="padding: 10px;">
+ <van-button
+ type="primary"
+ size="small"
+ @click="confirmReturn"
+ class="return-button"
+ >鈿狅笍 楠岄��</van-button>
</van-col>
- <van-col span="4">{{itm.kw}}</van-col>
- </van-row>
- </van-tab>
- <%--<van-tab title="鏀舵枡鍘熷崟" class="mySolid font">
- <van-field
- v-model="itemInsFormData.billNo"
- label="鍏ュ簱鍗曞彿"
- placeholder="鍏ュ簱鍗曞彿"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.cbillNo"
- label="鍒拌揣鍗曞彿"
- placeholder="鍒拌揣鍗曞彿"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.createDate"
- label="鍒涘缓鏃堕棿"
- placeholder="鍒涘缓鏃堕棿"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.createBy"
- label="鍒涘缓浜哄憳"
- placeholder="鍒涘缓浜哄憳"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.insDate"
- label="瀹℃牳鏃ユ湡"
- placeholder="瀹℃牳鏃ユ湡"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.depotsCode"
- label="鏀惰揣浠撳簱缂栫爜"
- placeholder="鏀惰揣浠撳簱缂栫爜"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.depotName"
- label="鏀惰揣浠撳簱鍚嶇О"
- placeholder="鏀惰揣浠撳簱鍚嶇О"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.suppNo"
- label="渚涘簲鍟嗙紪鐮�"
- placeholder="渚涘簲鍟嗙紪鐮�"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.suppName"
- label="渚涘簲鍟嗗悕绉�"
- placeholder="渚涘簲鍟嗗悕绉�"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.paperBillNo"
- label="閫佽揣鍗曞彿"
- placeholder="閫佽揣鍗曞彿"
- disabled
- ></van-field>
- <van-field
- v-model="itemInsFormData.remark"
- label="澶囨敞淇℃伅"
- placeholder="澶囨敞淇℃伅"
- disabled
- ></van-field>
- </van-tab>--%>
-</van-tabs>
+ </van-row>--%>
-<%-- <van-button type="primary" @click="getScan" >纭</van-button>--%>
- <%--<van-button type="primary" @click="ToErp" >瀹℃牳</van-button>--%>
-<%-- <van-button type="primary" @click="cleraCode" >娓呴櫎搴撲綅缂栫爜</van-button>--%>
+ <!-- 鍙淇℃伅灞曠ず -->
+ <van-field
+ v-model="formData.itemNo"
+ label="鐗╂枡缂栫爜"
+ placeholder=""
+ disabled
+ ></van-field>
+
+ <van-field
+ v-model="formData.billNo"
+ label="鍒拌揣鍗曞彿"
+ placeholder=""
+ disabled
+ ></van-field>
+
+ <van-field
+ v-model="formData.barcodeQuantity"
+ label="鏉＄爜鏁伴噺"
+ placeholder=""
+ disabled
+ ></van-field>
+
+ <van-field
+ v-model="formData.sumQuantity"
+ label="宸插叆鎬绘暟"
+ placeholder=""
+ disabled
+ ></van-field>
+ </van-cell-group>
+
+ <!-- 鏍囩椤靛尯鍩� -->
+ <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="5">鐗╂枡鍒嗗尯</van-col>
+ <van-col span="3">宸插叆搴撴暟</van-col>
+ </van-row>
+ <!-- 鐗╂枡鍒楄〃寰幆 -->
+ <van-row v-for="(itm, index) in ItemDetail" :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.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.fQty}}</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="4">鏁伴噺</van-col>
+ <van-col span="4">搴撲綅缂栫爜</van-col>
+ </van-row>
+ <!-- 鏉＄爜鍒楄〃寰幆 -->
+ <van-row v-for="(itm, index) in tableData" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.barcode}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="4">{{itm.fQty}}</van-col>
+ <van-col span="4">{{itm.kw}}</van-col>
+ </van-row>
+ </van-tab>
+ </van-tabs>
</asp:Content>
+
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
- <comloading v-if="isLoading"></comloading>
- <%--<comback ></comback>--%>
+ <!-- 鍔犺浇缁勪欢 -->
+ <comloading v-if="isLoading"></comloading>
</asp:Content>
+
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
+ <!-- 寮曞叆JS鏂囦欢锛堝甫鐗堟湰鍙烽槻缂撳瓨锛� -->
<script src="Js/PurchaseInventoryReturn.js?<%=123611111 %>"></script>
-</asp:Content>
+</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3