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/Js/IPQC_XJ/Add.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/H5/Js/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 5351162..e3131a3 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -24,6 +24,7 @@
mocode: "",
boardStyle: ""
},
+ jyGw:"",//妫�楠屽伐浣�
isShowTable: false,
tableData: [],//杩斿洖鐨勬楠岄」鐩�
jymxData: [],//灞曠ず鐨勬楠岄」鐩�
@@ -51,7 +52,24 @@
}
},
mounted() {
- var that = this;
+ let that = this;
+ //璇诲彇鎵爜beg 2025-7-25
+ window.msgFromUniapp = function (arg) {
+ //alert(arg.txtName);
+ //alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //alert("宸ヤ綅鐮�:" + that.jyGw);
+ if (arg.txtName === "GW") {
+ that.jyGw = arg.msg;
+ that.selIpqcItemsByGw();
+ }
+ else if (arg.txtName === "DAA") {
+ that.formData.lotNo = arg.msg;
+ that.createByWomdaa();
+ }
+
+
+ }
+ //璇诲彇鎵爜end
this.userInfo = {
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
@@ -59,7 +77,16 @@
this.formData.id = this.Request("id"),
this.formData.releaseNo = this.Request("releaseNo");
this.formData.lotNo = this.Request("lotNo");
+
+ ////璇诲彇鎵爜beg 2025-7-25
+ //let that = this;
+ //window.msgFromUniapp = function (arg) {
+ // alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //}
+ ////璇诲彇鎵爜end
+
this.init();
+
},
methods: {
// 杈撳叆杩囨护
@@ -193,6 +220,7 @@
},
addJyzIpqc(input) {
+
var that = this;
var guid1 = that.formData.guid;//涓昏〃id
var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid
@@ -203,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();//鍒锋柊妫�楠屾槑缁嗛潰鏉�
@@ -257,7 +289,7 @@
//妫�楠屾槑缁嗗埛鏂�
refreshJYItem() {
const that = this;
- return that.AxiosHttp("post", 'LLJ/getJYItem', {
+ return that.AxiosHttp("post", 'Ipqc/getJYItem', {
releaseNo: that.formData.releaseNo
}, false).then(res1 => {
const tableData = res1.data.tbBillList || [];
@@ -285,7 +317,7 @@
that.formData = data;
that.remarks = that.formData.fnGDesc;
that.lineId = data.lineId;
- that.AxiosHttp("post", 'LLJ/getJYItem', {
+ that.AxiosHttp("post", 'Ipqc/getJYItem', {
//id: that.formData.guid,
releaseNo: that.formData.releaseNo
}, false).then(function (res1) {
@@ -534,5 +566,62 @@
that.init();//鍒锋柊妫�楠岄」鐩�
})
},
+ //妫�楠岄」鐩壂鎻忓伐浣嶅彲鍋氭楠�
+ selIpqcItemsByGw() {
+ //alert("寮�濮嬪伐浣�");
+ const that = this;
+ var guid1 = that.formData.guid;//涓昏〃id
+ return that.AxiosHttp("post", 'Ipqc/selIpqcItemsByGw', {
+ inOrderGuid1: guid1,
+ userAccount: that.userInfo.loginAccount,
+ gw: that.jyGw
+ }, false).then(res => {
+ var json = res;
+ if (json.status == 0) {
+ that.init();//鍒锋柊
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.jyGw = "";
+ }
+ that.isLoading = false;
+
+
+ }).catch(error => {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.error('Refresh error:', error);
+ });
+ },
+
+ //鎵弿宸ヤ綅
+ scanOnH5GW() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'GW',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
+
+ //鎵弿宸ュ崟
+ scanOnH5DAA() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'DAA',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
}
})
\ No newline at end of file
--
Gitblit v1.9.3