From baa980a58e7fa79fcab8a610f8d02a48c1b3e8ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 10 五月 2024 17:39:14 +0800
Subject: [PATCH] 1.发货通知单,销售出库单 选单后,给子表 仓库 赋值 2.销售订单列表 增加子表 仓库ID与名称字段 已隐藏
---
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBillList_PDA.html | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
index 325a4f0..7ac24ea 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
@@ -155,7 +155,8 @@
icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -166,12 +167,22 @@
console.log("playSound");
var audio = document.getElementById("cs");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//鎴愬姛鎻愮ず闊�
function playSound_OK() {
console.log("playSound_OK");
var audio = document.getElementById("cs2");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//#region 鍒濆鍖栫晫闈�
@@ -236,8 +247,8 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- //, content: ['../../WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
- , content: ['../../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ , content: ['../../WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ //, content: ['../../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
, resize: false
, cancel: function () {
$(".layui-btn").removeClass("layui-btn-disabled");
@@ -248,6 +259,7 @@
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -288,6 +300,7 @@
layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -359,6 +372,7 @@
listOption.cols = [columns];
listOption.data = result.data;
//listOption.totalRow = true;
+ table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
}
else {
@@ -375,7 +389,8 @@
table.render(listOption);
//layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -407,9 +422,9 @@
function DisUploadedList() {
$.ajax({
type: "GET",
- url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_User_Json',
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
success: function (result) {
var data = [];
var col = [];
@@ -451,6 +466,7 @@
Uploadedoption.cols = [Uploadedcolumns];
Uploadedoption.data = result.data;
//Uploadedoption.totalRow = true;
+ table.cache['Uploaded-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(Uploadedoption);
}
else {
@@ -470,7 +486,8 @@
table.render(Uploadedoption);
//layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
@@ -506,6 +523,7 @@
layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
--
Gitblit v1.9.1