From 2c0e911c075cc25a3d26f89b3ef7b8de2380593f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 二月 2025 14:05:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBillList_PDA.html | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 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\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
index 2565204..7461f29 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_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_EntrustOutBillList_PDA";
var ModRightName = "CE_EntrustOut"; //妯″潡鏉冮檺鍙傛暟
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
@@ -152,7 +149,7 @@
}
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"; });
}
},
@@ -274,12 +271,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: "娓╅Θ鎻愮ず" });
}
});
}
@@ -302,9 +299,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) {
@@ -315,12 +312,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");
@@ -374,14 +371,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' });
}
}
}
@@ -405,7 +402,7 @@
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 }//鍥炴敹璧勬簮
@@ -468,15 +465,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 });
+ }
}
}
}
@@ -502,7 +499,7 @@
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 }//鍥炴敹璧勬簮
@@ -522,9 +519,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) {
@@ -538,12 +535,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