From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBillList_PDA.html | 84 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
index 6fc2be7..436d97f 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
@@ -123,7 +123,9 @@
var Uploadedoption = []; //宸蹭笂浼犲垪琛�
var columns = "";
var Uploadedcolumns = "";
+ var MvarReportTitle = "鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�";
var HModName = "Kf_OtherInBillList_PDA";
+ var ModRightName = "CE_OtherIn"; //妯″潡鏉冮檺鍙傛暟
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
var UploadedtitleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
@@ -134,17 +136,54 @@
}, function () { window.location.href = "../../user/login_pda.html"; });
}
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ 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");
+ }
+ //#endregion
+
//澶辫触鎻愮ず闊�
function playSound() {
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 鍒濆鍖栫晫闈�
@@ -186,6 +225,24 @@
};
}
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(dj-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+
+ table.on('row(Uploaded-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
//#endregion
@@ -221,6 +278,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: "娓╅Θ鎻愮ず" });
}
@@ -245,9 +303,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -261,6 +319,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: "娓╅Θ鎻愮ず" });
}
@@ -307,7 +366,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left' });
+ col.push({ type: 'radio' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -332,6 +391,7 @@
listOption.cols = [columns];
listOption.data = result.data;
//listOption.totalRow = true;
+ table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
}
else {
@@ -348,7 +408,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");
}
@@ -380,9 +441,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 = [];
@@ -399,7 +460,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left' });
+ col.push({ type: 'radio' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, UploadedtitleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -424,6 +485,7 @@
Uploadedoption.cols = [Uploadedcolumns];
Uploadedoption.data = result.data;
//Uploadedoption.totalRow = true;
+ table.cache['Uploaded-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(Uploadedoption);
}
else {
@@ -443,7 +505,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 }//鍥炴敹璧勬簮
});
}
@@ -460,9 +523,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+ url: GetWEBURL() + "/WEBSController/set_DeleteICStockBillAndWMS_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -479,6 +542,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