From 0ca6e523743f8772acef18f8b2e42c2df5a093ad Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 14:43:19 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 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 7fe2c0f..fdfdae4 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
@@ -151,6 +151,17 @@
</select>
</div>
</div>
+ <!--鐟炵惇-->
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鍏抽棴</label>
+ <div class="layui-input-block">
+ <select id="HIsClose" name="HIsClose" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�">鍚�</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -258,7 +269,7 @@
//$("#HBeginDate").val("2022-03-14");
//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
//{ type: 'radio', fixed: true }
, { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true */ }
, { field: 'hmainid', title: 'hmainid', sort: true, /*fixed: true,*/ hide: true }
@@ -278,8 +289,8 @@
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', sort: true }
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', sort: true }
- , { field: '宸插彂璐ф暟閲�', title: '宸插彂璐ф暟閲�', sort: true }
- , { field: '鍙彂璐ф暟閲�', title: '鍙彂璐ф暟閲�', sort: true }
+ , { field: '宸插彂璐ф暟閲�', title: '宸插彂璐ф暟閲�', sort: true, totalRow: true }
+ , { field: '鍙彂璐ф暟閲�', title: '鍙彂璐ф暟閲�', sort: true, totalRow: true}
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
, { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 180, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true/*, fixed: 'left' */ }
@@ -434,7 +445,7 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -451,7 +462,11 @@
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:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ 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 {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -462,6 +477,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ ,totalRow: true
, page: true
, cellMinWidth: 90
, limit: 500
@@ -523,6 +539,15 @@
sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
}
}
+ /*鐟炵惇*/
+ if ($("#HIsClose").val() != "") {
+ if ($("#HIsClose").val() == "鏄�") {
+ sqlWhere += " and 涓氬姟鍏抽棴 = ^^宸插叧闂璣^";
+ }
+ else if ($("#HIsClose").val() == "鍚�") {
+ sqlWhere += " and 涓氬姟鍏抽棴 = ^^鏈叧闂璣^";
+ }
+ }
var Time = $("#Time").val();
if (Time > 0) {
var dd = new Date();
@@ -578,11 +603,28 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
_cur_page = $(".layui-laypage-em").next().html();
+
+ var HInterIDArr = "";
+ var HBillNoArr = "";
+ var HBillInter = "";
+
+ for (let i = 0; i < data.length; i++) {
+ HInterIDArr += data[i].hmainid.toString() + ",";
+ HBillNoArr += "'" + data[i].鍗曟嵁鍙�.toString() + "'" + ",";
+ HBillInter += data[i].鍗曟嵁鍙�.toString() + "@" + data[i].hmainid.toString() + ",";
+ }
+
+ HInterIDArr = HInterIDArr.substring(0, HInterIDArr.length - 1)//鍐呯爜
+ HBillNoArr = HBillNoArr.substring(0, HBillNoArr.length - 1)//鍗曟嵁鍙�
+ HBillInter = HBillInter.substring(0, HBillInter.length - 1)//鍗曟嵁鍙� + @ + 鍐呯爜鎷兼帴
+
+ var oData = JSON.stringify(HInterIDArr) + ";" + JSON.stringify(HBillInter) + ";" + sessionStorage["HUserName"];
+
layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
$.ajax({
- type: "get",
+ type: "post",
url: GetWEBURL() + "POOrderAccept",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"] },
+ data: { "oData": oData },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(result.Message, { icon: 1 });
--
Gitblit v1.9.1