From 86d06136956078d6a72183980f5a9e25d3b24e42 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 17:07:20 +0800
Subject: [PATCH] 1.其他出入库优化 2.样式调整
---
Images/Style.css | 12 +++++
H5/Js/Qtck.js | 31 ++++++++++++++-
H5/Js/Qtrk.js | 19 +++++++++
H5/Qtck.aspx | 49 +++++++++++++++++++++++-
Mst.master | 2
5 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/H5/Js/Qtck.js b/H5/Js/Qtck.js
index 3666b7b..adae1b8 100644
--- a/H5/Js/Qtck.js
+++ b/H5/Js/Qtck.js
@@ -17,6 +17,7 @@
active: 0,
show: false,
actions: [],
+ ItemDetail: [],
}
},
mounted() {
@@ -40,6 +41,7 @@
if (json.status == 0) {
if (json.data.tbBillList.length <= 0) {
that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
} else {
that.actions = json.data.tbBillList.map(item => {
return { name: item }
@@ -48,12 +50,14 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -82,21 +86,26 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList;
+ that.ItemDetail = json.data.tbBillList;
+ //that.ItemBlDetail = json.data.tbBillList;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
getBarcode() {
-
+ if (this.isLoading) {
+ return;
+ }
//this.barcode = value;
var that = this;
@@ -104,18 +113,21 @@
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;
}
@@ -135,48 +147,60 @@
that.barcode = json.data.form.barcode;
that.ItemBlDetail = json.data.item
that.$notify({ type: 'success', message: json.data.message });
+ that.$playSound('success');
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
tmcf() {
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
that.isLoading = true;
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;
}
if (!that.fnm) {
this.$toast.fail("鍙戞枡鏁伴噺涓嶈兘涓虹┖");
+ that.$playSound('error');
that.isLoading = false;
return;
}
if (that.fnm <= 0) {
this.$toast.fail("鍙戞枡鏁伴噺涓嶈兘灏忎簬绛変簬闆�");
+ that.$playSound('error');
that.isLoading = false;
return;
}
@@ -196,15 +220,18 @@
that.barcode = json.data.form.barcode;
that.ItemBlDetail = json.data.item
that.$notify({ type: 'success', message: json.data.message });
+ that.$playSound('success');
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
}
diff --git a/H5/Js/Qtrk.js b/H5/Js/Qtrk.js
index 3f1e950..df59cda 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -42,6 +42,7 @@
if (json.data.tbBillList.length <= 0) {
that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
} else {
that.actions = json.data.tbBillList.map(item => {
return { name: item }
@@ -50,12 +51,14 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -90,12 +93,14 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -111,6 +116,7 @@
if (!that.billNo) {
this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
+ that.$playSound('error');
that.$refs.sectionCode.focus();
that.sectionCode = null;
that.isLoading = false;
@@ -119,6 +125,7 @@
if (!that.sectionCode) {
this.$toast.fail("搴撲綅缂栫爜涓嶈兘涓虹┖");
+ that.$playSound('error');
that.isLoading = false;
return;
}
@@ -130,11 +137,13 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.$notify({ type: 'success', message: json.data.tbBillList });
+ //that.$notify({ type: 'success', message: json.data.tbBillList });
+ //that.$playSound('success');
that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.sectionCode.focus();
that.sectionCode = null;
}
@@ -143,6 +152,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -155,24 +165,28 @@
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;
}
if (!that.sectionCode) {
this.$toast.fail("搴撲綅缂栫爜涓嶈兘涓虹┖");
+ that.$playSound('error');
that.isLoading = false;
return;
}
@@ -193,11 +207,13 @@
that.barcode = null;
that.ItemBlDetail = json.data.items;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
that.$refs.barcode.focus();
//that.GetMesItemBlDetailByBillNo()
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.barcode.focus();
that.barcode = null;
}
@@ -206,6 +222,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index aa67d91..1a48f8a 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -67,7 +67,7 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
+ <%-- <div class="van-tab-left">
<van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
<van-tab title="寰呴鐗╂枡">
<van-row v-for="value in ItemBlDetail" class="font">
@@ -77,7 +77,50 @@
</van-row>
</van-tab>
</van-tabs>
- </div>
+ </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-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
</asp:Content>
@@ -86,5 +129,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtck.js?<%=113 %>"></script>
+ <script src="Js/Qtck.js?<%=11300 %>"></script>
</asp:Content>
diff --git a/Images/Style.css b/Images/Style.css
index ea6b789..dc02823 100644
--- a/Images/Style.css
+++ b/Images/Style.css
@@ -4,7 +4,7 @@
font-family: Microsoft YaHei,Helvitica,Verdana,Arial,san-serif;
padding: 0px;
margin: 0px;
- /*font-family: '寰蒋闆呴粦', 'Microsoft YaHei', sans-serif;*/
+/* font-family: '瀹嬩綋', 'Microsoft YaHei', sans-serif;*/
}
a, a:hover {
@@ -366,6 +366,13 @@
padding: .020rem .0800rem; /* 鏇村皬鐨勫唴杈硅窛 */
}
+ /* 鍑忓皯宸︿晶鏍囬鐨勫瓧浣撳ぇ灏忓苟浣块鑹叉洿娣� */
+ .van-field__label {
+ color: #000000!important; /* 鏇存贰鐨勯鑹� */
+ }
+ .van-field--disabled .van-field__label {
+ color: #000000 !important;
+ }
/*IQC妫�楠屾暣浣撴牱寮� 20250322 姹犲崡楠�*/
.van-popup__close-icon--top-right {
@@ -405,6 +412,9 @@
margin-right: 0rem;
font-size: .20rem; /* 瀛椾綋澶у皬鍑忓皬 */
}
+ .van-field--disabled .van-field__label {
+ color: #9c9898 !important;
+ }
/* 澧炲姞鍙充晶杈撳叆鍖哄煙鐨勫瓧浣撳ぇ灏忓苟鍔犳繁棰滆壊 */
.van-cell__value {
diff --git a/Mst.master b/Mst.master
index 974d37a..3e62dbd 100644
--- a/Mst.master
+++ b/Mst.master
@@ -14,7 +14,7 @@
<script src="/scripts/config.js?<%=123611117 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
- <link href="/Images/Style.css?<%=16994 %>" rel="stylesheet" />
+ <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>
--
Gitblit v1.9.3