From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBillList.html | 227 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 137 insertions(+), 90 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
index 028882a..7f52063 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
@@ -85,6 +85,60 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -136,7 +190,7 @@
var HModName = "PM_WorkTaskBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID","HEntryID"];
+ var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID", "HEntryID","HProMoneyID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -178,29 +232,29 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
- //瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+ //瀹℃牳鎸夐挳 锛�0:瀹℃牳銆�1:鍙嶅鏍革級
case 'btn-Audit':
- set_CheckBills(1);
+ set_CheckBills(0);
break;
//鍙嶅鏍告寜閽�
case 'btn-DeAudit':
- set_AbandonChecks(2);
+ set_CheckBills(1);
break;
- //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
case 'btn-Close':
- set_CloseBills(1);
+ set_CloseBills(0);
break;
//鍙嶅叧闂寜閽�
case 'btn-DeClose':
- set_CancelCloseBills(2);
+ set_CloseBills(1);
break;
- //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ //浣滃簾鎸夐挳 锛�0:浣滃簾銆�1:鍙嶄綔搴燂級
case 'btn-Drop':
- set_DropBill(1);
+ set_DropBill(0);
break;
//鍙嶄綔搴熸寜閽�
case 'btn-DeDrop':
- set_DropBill(2);
+ set_DropBill(1);
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -283,7 +337,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
@@ -375,6 +429,13 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -395,6 +456,48 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
}
if (HBillNo) {
@@ -419,7 +522,12 @@
$("#HName").val("");
$("#HReceiveEmp").val("");
$("#HBillStatus").val("");
-
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -484,7 +592,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'PM_WorkTaskBill/锘縋M_WorkTaskMoneyBillMainDelete',
+ url: GetWEBURL() + 'PM_WorkTaskBill/DeletePM_WorkTaskMoneyBillMain',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -523,7 +631,7 @@
//#endregion
//#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂�
- //瀹℃牳
+ //瀹℃牳/鍙嶅鏍�
function set_CheckBills(nums) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -532,7 +640,7 @@
layer.confirm("纭瑕佸鏍稿悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/PM_WorkTaskBill/Check锘縋M_WorkTaskMoneyBillMain',
+ url: GetWEBURL() + '/PM_WorkTaskBill/CheckPM_WorkTaskMoneyBillMain',
type: "GET",
data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
@@ -553,37 +661,8 @@
}
}
- //鍙嶅鏍�
- function set_AbandonChecks(nums) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].HInterID.toString();
- layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/PM_WorkTaskBill/Check锘縋M_WorkTaskMoneyBillMain',
- type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- get_FastQuery();
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- }
-
- //鍏抽棴
+
+ //鍏抽棴/鍙嶅叧闂�
function set_CloseBills(nums) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -592,7 +671,7 @@
layer.confirm("纭瑕佸叧闂悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/PM_WorkTaskBill/Close锘縋M_WorkTaskMoneyBillMain',
+ url: GetWEBURL() + '/PM_WorkTaskBill/ClosePM_WorkTaskMoneyBillMain',
type: "GET",
data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -614,16 +693,17 @@
}
}
- //鍙嶅叧闂�
- function set_CancelCloseBills(nums) {
+
+ //浣滃簾/鍙嶄綔搴�
+ function set_DropBill(nums) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].HInterID.toString();
- layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/PM_WorkTaskBill/Close锘縋M_WorkTaskMoneyBillMain',
+ url: GetWEBURL() + '/PM_WorkTaskBill/DropPM_WorkTaskMoneyBillMain',
type: "GET",
data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -646,44 +726,7 @@
}
//#endregion
- //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
- function set_DropBill(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].HInterID.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/PM_WorkTaskBill/Drop锘縋M_WorkTaskMoneyBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //#endregion
-
-
-
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -803,7 +846,7 @@
}
//#endregion
- //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
@@ -813,6 +856,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
--
Gitblit v1.9.1