From b28c9a27dfefb67600192dcd587efdf0cf64cc98 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 10:00:38 +0800
Subject: [PATCH] 不同订单类型不能合并下推送货单；设置默认打印模板；一键打印
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 145165f..eb1ae4e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -127,6 +127,16 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">涓氬姟缁堟</label>
+ <div class="layui-input-block">
+ <select id="HIsStop" name="HIsStop" lay-filter="">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�" selected>鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -248,7 +258,7 @@
});
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鏁伴噺", "鐘舵��", "鍗曚綅", "閲戦"];
+ var titleData = ["HItemID", "HParentID", "鍗曚綅", "閲戦"];
var option = [];
var HModName = "SRM_POOrderBillList";
var sqlWhere = "";
@@ -472,7 +482,7 @@
var wait = layer.load();//閬僵
$.ajax({
type: "POST",
- url: GetWEBURL() + "GetPOOrderBill",
+ url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
success: function (data1) {
@@ -501,7 +511,7 @@
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 });
break;
default:
- if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+ if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
} else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
@@ -567,10 +577,10 @@
if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "瀹夌憺闆嗗洟")
sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
if ($("#HDate1").val() != "") {
- sqlWhere += " and 閲囪喘鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+ sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
}
if ($("#HDate2").val() != "") {
- sqlWhere += " and 閲囪喘鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+ sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
}
if ($("#HISGenerate").val() != "") {
if ($("#HISGenerate").val() == "鏄�") {
@@ -596,7 +606,16 @@
else if ($("#HIsFreeze").val() == "涓氬姟鍐荤粨") {
sqlWhere += " and 涓氬姟鍐荤粨 = ^^涓氬姟鍐荤粨^^";
}
+ }
+ if ($("#HIsStop").val() != "") {
+ if ($("#HIsStop").val() == "鏄�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^涓氬姟缁堟^^";
+ }
+ else if ($("#HIsStop").val() == "鍚�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^姝ｅ父^^";
+ }
}
+
var Time = $("#Time").val();
if (Time > 0) {
var dd = new Date();
@@ -786,22 +805,31 @@
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
if (data.length == 0) {
layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
}
if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
return layer.msg('璁㈠崟宸插畬鎴愶紒')
- }
+ }
ajaxLabelData = data;
//鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
var ids = "";
var entryids = "";
+ var HBillType = data[0].璁㈠崟绫诲瀷
+ var HErr = "";
$.each(data, function (obj) {
ids += data[obj].hmainid + ",";
entryids += data[obj].hsubid + ",";
+ if (HBillType != data[obj].璁㈠崟绫诲瀷) {
+ HErr += data[obj].璁㈠崟绫诲瀷;
+ }
})
+ if (HErr != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+
ids = ids.substring(0, ids.length - 1);
entryids = entryids.substring(0, entryids.length - 1);
var hasPrivileage = true;
--
Gitblit v1.9.1