From 6c03505f24d8a22eb2988ab16d7154e95da5a358 Mon Sep 17 00:00:00 2001
From: 况洋洋 <3283105747@qq.com>
Date: 星期四, 10 七月 2025 11:31:16 +0800
Subject: [PATCH] 入库前拆分
---
Scripts/config.js | 6 +++---
H5/PurchaseInventory.aspx | 17 +++++++++++++++--
H5/Js/PurchaseInventory.js | 24 +++++++++++++++++++-----
Mst.master | 3 ++-
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/H5/Js/PurchaseInventory.js b/H5/Js/PurchaseInventory.js
index f00beb1..b680737 100644
--- a/H5/Js/PurchaseInventory.js
+++ b/H5/Js/PurchaseInventory.js
@@ -34,6 +34,9 @@
sectionCode:"",
depotData: [],
ItemDetail: [],
+ rkType: "姝ｅ父鍏ュ簱",
+ show: false,//涓嬫媺妗嗙殑鏄剧ず
+ actions: [{ name: "姝ｅ父鍏ュ簱" }, { name: "宸ュ簾鍏ュ簱" }, { name: "鏂欏簾鍏ュ簱" }],//涓嬫媺妗嗙殑鏁板��
}
},
mounted() {
@@ -44,6 +47,19 @@
};
},
methods: {
+ getInfo() {
+ this.show = true;
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+
+ this.rkType = item.name;
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
+ },
getModel() {
var that = this;
that.isLoading = true;
@@ -93,17 +109,15 @@
sectionCode: that.sectionCode,
userName: that.userInfo.loginAccount,
barcode: that.formData.barcode,
+ cgrkType: that.actions
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- //that.formData.itemNo = json.data.tbBillList.itemNo;
- //that.formData.sumQuantity = json.data.tbBillList.sumQuantity;
+
that.ItemDetail = json.data.tbBillList.itemInDetails;
- //that.itemInsFormData = json.data.tbBillList.itemIns;
- //that.itemTableData = json.data.tbBillList.itemInDetails;g
that.tableData = json.data.tbBillList.itemBarCDetails;
- //that.barMessage = json.data.tbBillList.message;
+
that.$refs.barcode.focus();
that.formData.barcode = null;
that.$notify({ type: 'success', message: json.message });
diff --git a/H5/PurchaseInventory.aspx b/H5/PurchaseInventory.aspx
index 65a426f..0ad2df3 100644
--- a/H5/PurchaseInventory.aspx
+++ b/H5/PurchaseInventory.aspx
@@ -16,6 +16,17 @@
></van-nav-bar>
<%-- <div class="mySolid">--%>
<van-cell-group>
+ <van-field
+ value=""
+ label="鍏ュ簱绫诲瀷"
+ clearable
+ placeholder="閫夋嫨/鎵嬪綍"
+ :right-icon-size="19"
+ v-model="rkType"
+ v-focus.noKeyboard
+><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+</template></van-field>
<van-field
ref="sectionCode"
v-model="sectionCode"
@@ -192,6 +203,8 @@
</van-tab>--%>
</van-tabs>
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
<%-- <van-button type="primary" @click="getScan" >纭</van-button>--%>
<%--<van-button type="primary" @click="ToErp" >瀹℃牳</van-button>--%>
<%-- <van-button type="primary" @click="cleraCode" >娓呴櫎搴撲綅缂栫爜</van-button>--%>
@@ -201,5 +214,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/PurchaseInventory.js?<%=123611111 %>"></script>
-</asp:Content>
+ <script src="Js/PurchaseInventory.js?<%=1236111111 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/Mst.master b/Mst.master
index 3e62dbd..bd81d92 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,11 +11,12 @@
<script src="/Scripts/vue.min.js"></script>
<script src="/Scripts/js.cookie.min.js"></script>
<script src="/scripts/axios0.25.0.js"></script>
- <script src="/scripts/config.js?<%=123611117 %>"></script>
+ <script src="/scripts/config.js?<%=123611118 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
<link href="/Images/Style.css?<%=169950 %>" rel="stylesheet" />
<script src="/Scripts/uni.webview.1.5.2.js"></script>
+
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
</head>
diff --git a/Scripts/config.js b/Scripts/config.js
index 97d05c2..7a9c453 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,7 +1,7 @@
-锘�/*var APIURL = "http://192.168.1.145:83/api/";*/
+锘�/*var APIURL = "http://192.168.1.145:83/api/";*///鍚庣鍙戝竷鐨勫湴鍧�
var APIURL = "http://localhost:5204/api/";
-/*var APIURL_PC = "http://192.168.1.145:81/";*/
-var APIURL_PC = "http://192.168.1.145:8081/";//娴嬭瘯
+/*var APIURL_PC = "http://192.168.1.145:81/";*/ //PC鍚庣鐨勫湴鍧�
+var APIURL_PC = "http://192.168.1.145:81/";//娴嬭瘯
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
--
Gitblit v1.9.3