From 3876860f19d3f5693fd35b956e2a375ba1a0ada1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 14 八月 2025 16:23:34 +0800
Subject: [PATCH] 1.巡检成功提示优化 2.巡检检验状态bug优化 3.产品绑定“不合格数”bug优化 4.到货单送货条码标记
---
H5/Cpbd.aspx | 2
H5/Js/Cpbd.js | 9 ++++
H5/Js/Cpbdsj.js | 50 +++++++++++++++++++++---
H5/Dhdsh.aspx | 5 +-
H5/IPQC_XJ/List.aspx | 2
H5/Cpdbsj.aspx | 10 ++--
H5/IPQC_XJ/Add.aspx | 2
H5/Js/IPQC_XJ/Add.js | 9 +++-
8 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/H5/Cpbd.aspx b/H5/Cpbd.aspx
index 4e1286d..9117907 100644
--- a/H5/Cpbd.aspx
+++ b/H5/Cpbd.aspx
@@ -155,5 +155,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbd.js?<%=1211121 %>"></script>
+ <script src="Js/Cpbd.js?<%=1211122 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 23846ff..cfeaf59 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -144,12 +144,12 @@
</van-field>
<van-field
- ref="xt"
- v-model="xt"
+ ref="xtName"
+ v-model="xtName"
label="绾垮埆"
placeholder="璇烽�夋嫨绾垮埆"
autofocus="true"
- onclick="">
+ @click.native="selectXt">
</van-field>
<!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
<div class="button-container">
@@ -181,7 +181,7 @@
<van-row
v-for="(itm,index) in XbarInfo"
:key="index"
- :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
+ :style="{ background: itm.is_hedui === '1' ? '#75f41d !important' : 'transparent' }">
<van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
<van-col span="7" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
@@ -223,5 +223,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=1211111142 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=121111114211 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Dhdsh.aspx b/H5/Dhdsh.aspx
index 5860050..0aaa39f 100644
--- a/H5/Dhdsh.aspx
+++ b/H5/Dhdsh.aspx
@@ -130,8 +130,9 @@
<van-col span="5" >閲囪喘璁㈠崟</van-col>
</van-row>
<van-row
- v-for="(itm,index) in BarList"
- :key="index">
+ v-for="(itm,index) in BarList"
+ :key="index"
+ :style="{ background: itm.include_qty == itm.ysl ? '#75f41d !important' : 'transparent' }">
<van-col span="7" class="text-left padding-left">{{itm.small_barcode}}</van-col>
<van-col span="6" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 03f3081..e21e52b 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -368,5 +368,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=111111111124 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=1111111111254 %>"></script>
</asp:Content>
diff --git a/H5/IPQC_XJ/List.aspx b/H5/IPQC_XJ/List.aspx
index 6feccb3..c313e86 100644
--- a/H5/IPQC_XJ/List.aspx
+++ b/H5/IPQC_XJ/List.aspx
@@ -79,7 +79,7 @@
<van-tag round plain v-else-if="item.fCheckResu === 'W:鏈煡'" type="warning">鏈煡</van-tag>
<van-tag round plain v-else-if="item.fCheckResu === ''" type="warning">鏈煡</van-tag>
<van-tag round plain v-else-if="item.fCheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">鏈煡</van-tag>
+ <van-tag round plain v-else type="warning">鏈煡</van-tag>
</template>
</van-field>
</van-cell-group>
diff --git a/H5/Js/Cpbd.js b/H5/Js/Cpbd.js
index ec4b01b..bb144f8 100644
--- a/H5/Js/Cpbd.js
+++ b/H5/Js/Cpbd.js
@@ -28,7 +28,7 @@
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/getZsBarInfo', {
- Xt: that.GX,
+ GX: that.GX,
Zsbarcode: that.ZsBar
}, false)
.then(function (res) {
@@ -40,6 +40,7 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -50,6 +51,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -60,10 +62,12 @@
var that = this;
if (that.ZsBar.length <= 0) {
that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
return;
}
if (that.LsBar.length <= 0) {
that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
return;
}
@@ -78,12 +82,14 @@
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
@@ -94,6 +100,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index 47681a5..f43b7c5 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -29,7 +29,8 @@
DAA001: [],
show: false,//鍒楄〃灞曠ず
actions: [],//鍒楄〃鐨勫��
- xt:"",
+ xtName: "",//绾夸綋鍚嶇О
+ xtNum: "",//绾夸綋缂栧彿
}
},
mounted() {
@@ -349,17 +350,52 @@
},
onSelect(item) {
- // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
- // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
console.log(item);
// 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
- const regex = /\[([^\]]+)\]/;
- const matchResult = item.name.match(regex);
- this.xt = item.name;
- //this.$toast(item.name);
+ this.modeInfo.Xt = item;
},
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectXt() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname:"[绾夸綋鍚嶇О][]"
+
+ };
+ });
+ }
+ }
+ 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/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 0f6f4b0..e3131a3 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -220,6 +220,7 @@
},
addJyzIpqc(input) {
+
var that = this;
var guid1 = that.formData.guid;//涓昏〃id
var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid
@@ -230,8 +231,12 @@
inP1: input,//鎴栬��0k-19,鎴栬�卬g-19,鎴栧疄闄呮楠屽��
}, true, 1).then(function (res1) {
if (res1.rtnCode > 0) {
- that.$notify({
- type: 'success', message: res1.rtnMsg
+ //that.$notify({
+ // type: 'success', message: res1.rtnMsg
+ //});
+ that.$toast.success({
+ duration: 1000, // 鎸佺画灞曠ず toast
+ message: '鎿嶄綔鎴愬姛',
});
that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
//that.handleTabClick();//鍒锋柊妫�楠屾槑缁嗛潰鏉�
--
Gitblit v1.9.3