From adebb0660a3414da01ca04e44bd6be4e23e1c664 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 15 九月 2025 08:38:59 +0800
Subject: [PATCH] 华远：不良分析报表 优化
---
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBackBillList_PDA.html | 123 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 45 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_EntrustInBackBillList_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_EntrustInBackBillList_PDA.html"
index 200a961..4a50a63 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_EntrustInBackBillList_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_EntrustInBackBillList_PDA.html"
@@ -37,30 +37,26 @@
</div>
<!--宸蹭笂浼犲垪琛�-->
<div class="layui-tab-item">
- <div class="layui-form-item" style="padding: 0px; margin: 0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-form-item" style="padding: 10px; margin: 0px">
+ <div class="layui-row" style="margin-top: -10px;">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs9">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs9">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
- <div class="layui-col-xs6">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
- </div>
- <div class="layui-col-xs4">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
- </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
+ <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -73,16 +69,16 @@
</div>
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:0px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
</div>
@@ -123,6 +119,7 @@
var Uploadedoption = []; //宸蹭笂浼犲垪琛�
var columns = "";
var Uploadedcolumns = "";
+ var MvarReportTitle = "濮斿閫�搴撳崟缂撳瓨鍒楄〃";
var HModName = "Kf_EntrustInBackBillList_PDA";
var ModRightName = "CE_EntrustInBack"; //妯″潡鏉冮檺鍙傛暟
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
@@ -152,10 +149,11 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', 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 +164,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 鍒濆鍖栫晫闈�
@@ -213,6 +221,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
@@ -244,11 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', 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: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -273,7 +300,7 @@
type: "Get",
url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_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, "HStockOrgID": HStockOrgID, "MvarReportTitle": MvarReportTitle },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -284,11 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', 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: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -333,7 +361,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鍒�
@@ -342,14 +370,14 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
} else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left' });
}
}
}
@@ -358,6 +386,7 @@
listOption.cols = [columns];
listOption.data = result.data;
//listOption.totalRow = true;
+ table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
}
else {
@@ -372,9 +401,10 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -406,9 +436,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 = [];
@@ -425,7 +455,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鍒�
@@ -434,15 +464,15 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- if (data[i].name == '鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
- }
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 80 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
}
}
}
@@ -450,6 +480,7 @@
Uploadedoption.cols = [Uploadedcolumns];
Uploadedoption.data = result.data;
//Uploadedoption.totalRow = true;
+ table.cache['Uploaded-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(Uploadedoption);
}
else {
@@ -467,9 +498,10 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
@@ -486,9 +518,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) {
@@ -502,11 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', 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: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
--
Gitblit v1.9.1