From 32274bc8fad5251f78229d67d86c234a4b32df2e Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 11 九月 2025 17:34:32 +0800
Subject: [PATCH] 销售与其他出入库功能挪移
---
H5/Js/Xsck.js | 9 +
H5/Js/Qtck.js | 104 +++++++++++++++-
H5/Js/Qtrk.js | 7
H5/Qtrk.aspx | 28 ++++
H5/Qtck.aspx | 41 ++++--
H5/Xsck.aspx | 71 ++++++++---
H5/Xsth.aspx | 65 +++++++---
7 files changed, 253 insertions(+), 72 deletions(-)
diff --git a/H5/Js/Qtck.js b/H5/Js/Qtck.js
index adae1b8..dc0552c 100644
--- a/H5/Js/Qtck.js
+++ b/H5/Js/Qtck.js
@@ -18,6 +18,8 @@
show: false,
actions: [],
ItemDetail: [],
+ splitNum: "",
+ zdy: "",
}
},
mounted() {
@@ -87,7 +89,10 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
+ that.zdy = json.data.tbBillList.allList[0].createNmae;
//that.ItemBlDetail = json.data.tbBillList;
+ that.$refs.barcode.focus();
+ that.barcode = "";
}
else {
that.$toast.fail(json.message);
@@ -140,18 +145,23 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
-
- that.itemNo = json.data.form.itemNo;
- that.num = json.data.form.num;
- that.fnm = json.data.form.fum;
- that.barcode = json.data.form.barcode;
- that.ItemBlDetail = json.data.item
- that.$notify({ type: 'success', message: json.data.message });
+ that.num = json.data.tbBillList.barcodeNum;
+ that.GetMesItemBlDetailByBillNo();
+ that.$refs.barcode.focus();
+ that.barcode = null;
that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.splitNum = json.data.tbBillList.splitNum;
+ that.num = json.data.tbBillList.barcodeNum;
}
else {
- that.$toast.fail(json.message);
that.$playSound('error');
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.barcode = null;
}
that.isLoading = false;
})
@@ -234,6 +244,82 @@
that.$playSound('error');
console.log(error);
});
- }
+ },
+
+ getChaiFen() {
+ //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.userInfo.loginAccount) {
+ this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+
+ if (!that.barcode) {
+ this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+
+ if (!that.billNo) {
+ this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+ //that.ip = "";
+ //that.prot = "";
+ //that.getPrintInfo();
+
+ //if (that.ip.length <= 0 || that.prot.length <= 0) {
+ // alert(that.ip);
+ // alert(that.prot);
+ // return;
+ //}
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesItemQt/ScanCodeCF', {
+ userName: that.userInfo.loginAccount,
+ barcode: that.barcode,
+ billNo: that.billNo,
+ Num: that.splitNum,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.splitNum = null;
+ that.num = null;
+ that.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.GetMesItemBlDetailByBillNo();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
+
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+
}
})
\ No newline at end of file
diff --git a/H5/Js/Qtrk.js b/H5/Js/Qtrk.js
index 1f2a1c2..946ec05 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -18,6 +18,7 @@
show: false,
actions: [],
ItemDetail: [],
+ depotInfo:[],
}
},
mounted() {
@@ -61,11 +62,6 @@
that.$playSound('error');
console.log(error);
});
- },
- onClick(index, title) {
- this.$toast(`${index} ${title}`);
- this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
},
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
@@ -139,6 +135,7 @@
if (json.status == 0) {
//that.$notify({ type: 'success', message: json.data.tbBillList });
//that.$playSound('success');
+ that.depotInfo = json.data;
that.$refs.barcode.focus();
}
else {
diff --git a/H5/Js/Xsck.js b/H5/Js/Xsck.js
index 9e004a6..672c7c6 100644
--- a/H5/Js/Xsck.js
+++ b/H5/Js/Xsck.js
@@ -29,8 +29,8 @@
};
},
methods: {
+ //鑾峰彇鍙戣揣閫氱煡鍗曞彿
getInfo() {
-
this.show = true;
var that = this;
that.isLoading = true
@@ -47,11 +47,11 @@
that.actions = json.data.tbBillList.map(item => {
return { name: item }
});
-
}
}
else {
that.$toast.fail(json.message);
+ that.show = false;
}
that.isLoading = false;
})
@@ -67,6 +67,7 @@
// this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
//},
+ //鐐瑰嚮浜嬩欢
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -77,6 +78,7 @@
//this.$toast(item.name);
},
+ //鏍规嵁鍙戣揣閫氱煡鍗曞彿鑾峰彇鏄庣粏
GetMesItemDetailByBillNo() {
var that = this;
that.isLoading = true;
@@ -110,6 +112,7 @@
that.ItemBlDetail = [];
});
},
+ //鎵爜
getBarcode() {
//this.barcode = value;
@@ -155,7 +158,6 @@
that.barcode = null;
that.sms = null;
that.num = null;
- //that.ItemBlDetail = json.data.tbBillList.item2
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.GetMesItemDetailByBillNo();
that.$refs.barcode.focus();
@@ -188,6 +190,7 @@
that.splitNum = "";
});
},
+ //鏉＄爜鎷嗗垎
tmcf() {
//this.show = true;
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index 1a48f8a..42bbfac 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鍏朵粬鍑哄簱"
left-text="杩斿洖"
@@ -29,6 +35,7 @@
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-field
+ ref="barcode"
value=""
label="鐗╂枡鏉＄爜"
clearable
@@ -41,12 +48,13 @@
></van-field>
<van-field
value=""
- label="鐗╂枡缂栫爜"
+ label="鍒跺崟浜�"
clearable
- placeholder="鐗╂枡缂栫爜"
+ placeholder="鍒跺崟浜�"
:right-icon-size="19"
- v-model="itemNo"
+ v-model="zdy"
v-focus.noKeyboard
+ disabled
></van-field>
<van-field
value=""
@@ -55,15 +63,22 @@
placeholder="鏉＄爜鏁伴噺"
disabled
></van-field>
-<van-field
- value=""
- v-model="fnm"
- label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺"
- disabled
-><template #button>
- <van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
- </template></van-field>
+ <van-field
+ ref="splitNum"
+ v-model="splitNum"
+ center
+ clearable
+ label="鍙戞枡鏁伴噺"
+ placeholder="鍙戞枡鏁伴噺">
+ <van-button
+ slot="button"
+ type="info"
+ size="small"
+ plain
+ @click="getChaiFen">
+ 鏉＄爜鎷嗗垎
+ </van-button>
+</van-field>
</van-cell-group>
</div>
@@ -129,5 +144,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtck.js?<%=11300 %>"></script>
+ <script src="Js/Qtck.js?<%=11306 %>"></script>
</asp:Content>
diff --git a/H5/Qtrk.aspx b/H5/Qtrk.aspx
index 89d2c4f..1abe2d6 100644
--- a/H5/Qtrk.aspx
+++ b/H5/Qtrk.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鍏朵粬鍏ュ簱"
left-text="杩斿洖"
@@ -38,6 +44,26 @@
<%--@change="getSectionCode"--%>
:right-icon-size="19"
placeholder="搴撲綅缂栫爜"
+></van-field>
+ <van-field
+ ref="depotsInfo"
+ v-model="depotInfo.depot_code"
+ value=""
+ label="浠撳簱缂栫爜"
+ clearable
+ placeholder="浠撳簱缂栫爜"
+ :right-icon-size="19"
+ disabled
+></van-field>
+ <van-field
+ ref="depotsInfo"
+ v-model="depotInfo.depot_name"
+ value=""
+ label="浠撳簱鍚嶇О"
+ clearable
+ placeholder="浠撳簱鍚嶇О"
+ :right-icon-size="19"
+ disabled
></van-field>
<van-field
ref="barcode"
@@ -132,5 +158,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtrk.js?<%=124000 %>"></script>
+ <script src="Js/Qtrk.js?<%=1240002 %>"></script>
</asp:Content>
diff --git a/H5/Xsck.aspx b/H5/Xsck.aspx
index de1e408..07e2ba7 100644
--- a/H5/Xsck.aspx
+++ b/H5/Xsck.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="閿�鍞嚭搴�"
left-text="杩斿洖"
@@ -62,30 +68,49 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-<%-- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>--%>
+
+<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-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
-</van-row>
- </van-tab>
+ <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 ItemBlDetail.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 ItemBlDetail.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>
- </div>
+
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -95,5 +120,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsck.js?<%=1271111 %>"></script>
+ <script src="Js/Xsck.js?<%=1271113 %>"></script>
</asp:Content>
diff --git a/H5/Xsth.aspx b/H5/Xsth.aspx
index 1e755e8..e708b80 100644
--- a/H5/Xsth.aspx
+++ b/H5/Xsth.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="閿�鍞��璐�"
left-text="杩斿洖"
@@ -68,24 +74,47 @@
</van-cell-group>
</div>
- <van-tabs <%--@click="onClick"--%> 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-row v-for="value in ItemTblDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></van-tab>
+<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 ItemTblDetail.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 ItemTblDetail.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-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -96,6 +125,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsth.js?<%=161 %>"></script>
+ <script src="Js/Xsth.js?<%=162 %>"></script>
</asp:Content>
--
Gitblit v1.9.3