From 86a60ffd1bb3a6c748a88fbe6241266f1b43052a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 19 一月 2026 14:06:46 +0800
Subject: [PATCH] 添加添康阶梯工资报表，阶梯工价系数调整
---
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html | 76 ++++++---
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 2
WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html | 300 +++++++++++++++++++++++--------------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html | 56 ++++++
4 files changed, 287 insertions(+), 147 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
index b4c470e..d82276b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
@@ -13,7 +13,9 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -74,15 +76,39 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+
+ <div class="layui-tab layui-tab-card" lay-filter="table">
+ <ul class="layui-tab-title">
+ <li class="layui-this">璁′欢鏁版嵁</li>
+ <li>闃舵璁′欢鏁版嵁</li>
+ </ul>
+ <div class="layui-tab-content" style="">
+ <div class="layui-tab-item layui-show">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item ">
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </div>
+
</div>
- </script>
+ </div>
+
+
</form>
</div>
</div>
@@ -108,7 +134,9 @@
var ins;
var sWhere = "";
var option = [];
+ var option2 = [];
var HModName = "Pay_PaymentEntryReport";
+ var HModName2 = "Pay_PaymentEntryReport2";
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -122,14 +150,16 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(1);
+ get_FastQuery(2);
});
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- get_FastQuery();
+ get_FastQuery(1);
+ get_FastQuery(2);
});
//#region 閫夋嫨鐝粍鎸夐挳
@@ -146,18 +176,38 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
case 'btn-reload':
- get_FastQuery();
+ get_FastQuery(1);
break;
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ });
+
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn2':
+ get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_FastQuery);
+ break;
+ case 'btn-reload2':
+ get_FastQuery(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export2':
+ get_Export2();
break;
//閫�鍑�
case 'btn-exit': Pub_Close(2);
@@ -178,10 +228,11 @@
get_Dept();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
//鏌ヨ
get_FastQuery(1);
+ get_FastQuery(2);
}
//#endregion
@@ -189,6 +240,20 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , height: 'full-80'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 500
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
, height: 'full-80'
, page: true
, cellMinWidth: 90
@@ -294,10 +359,11 @@
option.cols = [col]
option.data = data1.data;
- table.render(option);
+
layer.close(ajaxLoad);
- DisPlay_HideColumn();
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+ table.render(option);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
@@ -309,17 +375,83 @@
}
});
}
+
+ function get_Display2(sWhere) {
+ var ajaxLoad = layer.load();
+
+ var sql = "exec h_p_Pay_PaymentEntryReportStepped " + sWhere;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, filter: true}); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ } else if (isValidDate(data[i].name)) {
+ col.push({ field: data[i].name, title: Format(data[i].name, 'MM-dd'), width: 70, totalRow: true, filter: true })
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
+ }
+ }
+ }
+ option2.cols = [col];
+ option2.data = data1.data;
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
+ table.render(option2);
+ layer.close(ajaxLoad);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(type) {
var HBDate = $("#HBDate").val();//寮�濮嬫椂闂�
var HEDate = $("#HEDate").val();//缁撴潫鏃堕棿
var HDeptID = $("#HDeptID").val();
var HEmpID = $("#HEmpID").val();
var HGroupID = $("#HGroupID").val();
sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
- get_Display(sWhere);
+ if (type == 1) {
+ get_Display(sWhere);
+ } else {
+ get_Display2(sWhere);
+ }
+
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -387,7 +519,7 @@
}
}
});
- table.exportFile(ins.config.id, option.data, "xls");
+ table.exportFile("mainTable", option.data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -396,6 +528,38 @@
}
});
}
+ function get_Export2() {
+ var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option2.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile("mainTable2", option2.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#endregion
//#region 閫夋嫨鐝粍
@@ -459,103 +623,7 @@
}
//#endregion
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- async: false,
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
- newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
- dataCol = data1.data[0].HGridString.split(',');
- //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
- }
- newCols[0].push(option.cols[0][i + 1]);
- }
- }
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- }
- }
- ins = table.render(option);
- } else {
- ins = table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
//table.on('row(mainTable)', function (obj) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
index 91e654a..9ebb046 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
@@ -57,7 +57,7 @@
</div>
</div>
<!-- 鍒跺崟鏃ユ湡锛堝垱寤烘椂闂达級杩囨护 -->
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_Begin" style="width:190px;">
@@ -68,7 +68,7 @@
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_End" style="width:190px;">
</div>
- </div>
+ </div>-->
<!-- 鍗曟嵁鍙锋煡璇� -->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
@@ -222,11 +222,7 @@
console.log("GetWEBURL:", typeof GetWEBURL);
var HModName = "Gy_SteppedPriceCoefficientBillList";
-<<<<<<< HEAD
- var HBillType = "";
-=======
var HBillType = "3341";
->>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
var HMaker = sessionStorage["HUserName"];
var Organization = sessionStorage["Organization"];
@@ -291,10 +287,10 @@
case 'btn_Refresh': btn_Refresh();
break;
//鍏抽棴
- case 'btn_Close': set_CloseBill(1);
+ case 'btn_Close': set_CloseBill(0);
break;
//鍙嶅叧闂�
- case 'btn_DeClose': set_CloseBill(2);
+ case 'btn_DeClose': set_CloseBill(1);
break;
//浣滃簾
case 'btn_Drop': set_DropBill(1);
@@ -372,18 +368,16 @@
var endDate = new Date();
var startDate = new Date(endDate - 1000 * 60 * 60 * 24 * 30);
- if (typeof Pub_Format === 'function') {
- console.log("浣跨敤 Pub_Format 鍑芥暟");
- $("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
- $("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
- } else {
- console.log("Pub_Format 涓嶅瓨鍦紝浣跨敤鍘熺敓鏂规硶");
- $("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
- $("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
- }
+ //if (typeof Pub_Format === 'function') {
+ // console.log("浣跨敤 Pub_Format 鍑芥暟");
+ // $("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
+ // $("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
+ //} else {
+ // console.log("Pub_Format 涓嶅瓨鍦紝浣跨敤鍘熺敓鏂规硶");
+ // $("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
+ // $("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
+ //}
- console.log("寮�濮嬫棩鏈熷��:", $("#HMakeDate_Begin").val());
- console.log("缁撴潫鏃ユ湡鍊�:", $("#HMakeDate_End").val());
option = {
elem: '#mainTable'
@@ -490,6 +484,7 @@
} else {
layer.close(wait);
+ option.data = data1.data;
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -506,8 +501,8 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HMakeDate_Begin = $("#HMakeDate_Begin").val();
- var HMakeDate_End = $("#HMakeDate_End").val();
+ //var HMakeDate_Begin = $("#HMakeDate_Begin").val();
+ //var HMakeDate_End = $("#HMakeDate_End").val();
var HBillNo = $("#HBillNo").val();
var ColName = $("#ColName").val();
var Comparator = $("#Comparator").val();
@@ -587,12 +582,12 @@
}
// 娣诲姞鏃ユ湡鏉′欢
- if (HMakeDate_Begin) {
- sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) >= '" + HMakeDate_Begin + "'";
- }
- if (HMakeDate_End) {
- sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) <= '" + HMakeDate_End + "'";
- }
+ //if (HMakeDate_Begin) {
+ // sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) >= '" + HMakeDate_Begin + "'";
+ //}
+ //if (HMakeDate_End) {
+ // sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) <= '" + HMakeDate_End + "'";
+ //}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -820,6 +815,33 @@
data = checkStatus.data;
if (data && data.length === 1) {
// 瀹炵幇鍏抽棴閫昏緫
+ var HInterID = data[0].HInterID || data[0].hmainid;
+ if (!HInterID) {
+ layer.msg('鍗曟嵁ID鏃犳晥锛�', { icon: 5 });
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SteppedPriceCoefficientBill/CloseGy_SteppedPriceCoefficientBill",
+ async: false,
+ data: {
+ "HInterID": HInterID,
+ "IsAudit": num,
+ "user": HMaker
+ },
+ success: function (result) {
+ if (result.code === "1") {
+ layer.msg(result.Message || (num === 1 ? "鍏抽棴鎴愬姛" : "鍙嶅叧闂垚鍔�"), { time: 1000, icon: 1 }, function () {
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.msg(result.Message || "鎿嶄綔澶辫触", { icon: 2 });
+ }
+ },
+ error: function () {
+ layer.msg('鎺ュ彛璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index a80b19a..eeb47c7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -597,7 +597,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0];
+ var linterid = data[0].hmainid;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
index 7b36426..68308a2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
@@ -9,11 +9,16 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -229,6 +234,8 @@
};
set_ClearQuery();
get_FastQuery();
+ //鍒濆鍖栬嚜鍔ㄥ悓姝ヤ竴娆�
+ get_InSync_Batch2(option.data);
}
@@ -338,6 +345,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (data1) {
if (data1.count == 0) {
@@ -375,8 +383,9 @@
}
option.cols = [col];
option.data = data1.data;
+
//鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option,[]);
}
table.render(option);
layer.close(wait);
@@ -432,6 +441,47 @@
layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
}
}
+ //鎵归噺鍚屾
+ function get_InSync_Batch2(data) {
+ if (data.length == 0) {
+ return;
+ }
+ if (data.length > 0) {
+ var InterID = '';
+ var BillNo = '';
+ syncMessage = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID = (data[i].hmainid.toString());
+ BillNo = (data[i].鍗曟嵁鍙�.toString());
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ let errMessage = [];
+ errMessage.push(data1.Message);
+ syncMessage.push(errMessage);
+ layer.alert(data1.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ }
+
+ }
//鍚屾
function get_InSync() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1