From c3ae169e32bd4c86be845c8c12167ee5d214b138 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 14:43:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 133 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 122 insertions(+), 11 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 40b3573..579dda3 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>
@@ -170,6 +181,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
</div>
</script>
</div>
@@ -218,14 +230,15 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
+ }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','excel'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, laydate = layui.laydate
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , excel = layui.excel;
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate1'
@@ -256,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 }
@@ -276,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' */ }
@@ -360,7 +373,11 @@
//闅愯棌id
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
+ if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+ option.cols[0][i + 1]["width"] = 120;
+ } else {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
@@ -374,7 +391,7 @@
//} else {
// option.cols[0][i + 1]["width"] = "";
//}
-
+
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -432,7 +449,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) {
@@ -449,7 +466,13 @@
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 if (data[i].name == '鍥炲浜ゆ湡') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -460,6 +483,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ ,totalRow: true
, page: true
, cellMinWidth: 90
, limit: 500
@@ -521,6 +545,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();
@@ -557,6 +590,42 @@
_cur_page = 1;
get_Display(sqlWhere);
}
+
+ //鐩戝惉鍗曞厓鏍间簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'HSupSendGoodsDateRemark') {
+ layer.prompt({
+ formType: 2
+ , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+ , title: '淇敼璁㈠崟鍙蜂负 銆� ' + data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠ｇ爜 + ' 銆� 鐨勫洖澶嶄氦鏈�'
+ , value: data.鍥炲浜ゆ湡
+ }, function (value, index) {
+ layer.close(index);
+ //鏇存柊鍥炲浜ゆ湡
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
+ async: false,
+ data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HSupSendGoodsDateRemark": value},
+ success: function (result) {
+ if (result.code == 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 鍥炲浜ゆ湡: value
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ },
+ error: function (result) {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ });
+ });
+ }
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -576,11 +645,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 });
@@ -838,8 +924,33 @@
}
});
break;
+ case 'set_dao':
+ //鑾峰彇鍒楄〃鍒楁暟鎹簮
+ var ColName = [];
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["hide"] != true) {
+ ColName.push(option.cols[0][i]["field"]);
+ }
+ }
+ //缁戝畾鏁版嵁
+ var data = excel.filterExportData(option.data, ColName)
+
+ //璧嬪�间簬琛ㄥご鍒楀悕
+ var Title = [];
+ for (var i = 0; i < ColName.length; i++) {
+ Title.push("\"" + ColName[i] + "\":\"" + ColName[i] + "\"");
+ }
+ var TitleName = JSON.parse("{" + Title.toString() + "}");
+ data.unshift(TitleName);
+
+ //瀵煎嚭 sheet1 宸ヤ綔琛ㄥ悕
+ excel.exportExcel({
+ sheet1: data
+ }, '閲囪喘璁㈠崟鍒楄〃.xlsx', 'xlsx');
+ break;
};
});
+
});
</script>
</body>
--
Gitblit v1.9.1