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_ProjectStageBill.html | 279 +++++++++++++++++++------------------------------------
1 files changed, 98 insertions(+), 181 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
index f6e9089..02fd27a 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>椤圭洰闃舵鍒楄〃</title>
+ <title>椤圭洰闃舵娓呭崟</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -14,7 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <style>
+ <!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
height: 30px;
@@ -44,7 +44,7 @@
.layui-form-label {
width: 25%;
}
- </style>
+ </style>-->
</head>
<body>
@@ -75,14 +75,14 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�*</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
@@ -90,7 +90,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
@@ -207,8 +207,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
</script>
</div>
@@ -230,7 +230,7 @@
</div>
</script>
<script>
-
+ var optiondata = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -262,10 +262,6 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
//#endregion
//#region 鍒濆鍖栫粍缁�
@@ -337,30 +333,6 @@
}
});
//#endregion
-
- //#region 瀹℃牳
- form.on('submit(set_CheckBill)', function (data) {
- set_CheckBill(data);
- });
- //#endregion
-
- //#region 鍙嶅鏍�
- form.on('submit(set_AbandonCheck)', function (data) {
- set_AbandonCheck(data);
- });
- //#endregion
-
- //#region 鍏抽棴
- form.on('submit(set_CloseBill)', function (data) {
- set_CloseBill(data);
- });
- //#endregion
-
- //#region 鍙嶅叧闂�
- form.on('submit(set_CancelCloseBill)', function (data) {
- set_CancelCloseBill(data);
- });
- //#endregion
//#endregion
//#region 澶嶉�夋 閫変腑/鍙栨秷 瑙﹀彂浜嬩欢
@@ -427,12 +399,10 @@
//涓婁竴琛�
case 'btn_up':
btn_up(data);
- CheckedSet_tableSub();
break;
//涓嬩竴琛�
case 'btn_under':
btn_under(data);
- CheckedSet_tableSub();
break;
}
});
@@ -448,21 +418,37 @@
//#region 瀛愯〃锛氳鍐呴紶鏍囩寮�浜嬩欢锛氭鏌ラ」鐩樁娈垫槸鍚﹂噸澶�
table.on('edit(mainTable)', function (obj) {
- if (obj.field == "HProjectStageID") {
- var num = 0;
- for (var i = 0; i < option.data.length; i++) {
- if (obj.value == option.data[i]["HProjectStageID"]) {
- num += 1;
- }
- if (num > 1) {
- layer.msg("椤圭洰闃舵:" + obj.value + "閲嶅!");
- return false;
- }
- }
- }
})
//#endregion
+ //#region 瀛愯〃锛氬崟鍏冩牸缂栬緫鐩戝惉
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //姝ｅ垯琛ㄨ揪寮�-鏍￠獙闈炶礋娴偣鏁�
+ var ref = /^\d+(\.\d+)?$/;
+
+ switch (field) {
+ case "HRate": //鏁伴噺
+ if (!ref.test(value)) { //鑻ヨ緭鍏ュ�兼牸寮忎笉姝ｇ‘锛屽垯鍙樺洖鍘熸潵鐨勫��
+ obj.update({
+ HRate: oldText
+ });
+ layer.msg("涓氱哗鍗犳瘮锛氭暟鎹敊璇紝璇疯緭鍏ラ潪璐熷皬鏁�")
+ table.render(option);
+ CheckedSet_tableSub();
+ } else {
+ table.render(option);
+ CheckedSet_tableSub();
+ }
+ break;
+ default:
+ }
+ });
+ //#endregion
//
@@ -546,27 +532,25 @@
}
//#endregion
- //#region 椤圭洰闃舵琛ㄣ�侀」鐩垚鍛樿〃鍒濆鍖�
+ //#region 瀛愯〃鍒濆鍖�
function get_InitGrid() {
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: true
- , limit: 500
- , limits: [50, 500, 5000, 50000]
+ , totalRow: true
, cellMinWidth: 120
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰闃舵璇︾粏鍐呭' }
- , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true }
+ , { field: 'HStageNote', title: '椤圭洰闃舵璇︾粏鍐呭', edit: 'text' }
+ , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', edit: 'text', event: "HPMGoodsName" } //f7
, { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
- , { field: 'HRate', title: '涓氱哗鍗犳瘮', edit: 'text' }
+ , { field: 'HRate', title: '涓氱哗鍗犳瘮', edit: 'text', totalRow: true }
//, { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true }
//, { field: 'HEmpName', title: '闃舵璐熻矗浜�', edit: 'text', event: "HEmpName" } //f7
//, { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true }
@@ -706,106 +690,6 @@
}
//#endregion
- //#region 瀹℃牳
- function set_CheckBill() {
- layer.confirm("纭瑕佸鏍稿悧?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍙嶅鏍�
- function set_AbandonCheck() {
- layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍏抽棴
- function set_CloseBill() {
- layer.confirm("纭瑕佸叧闂悧?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍙嶅叧闂�
- function set_CancelCloseBill() {
- layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
//#region 闈炵┖楠岃瘉
function AllowLoadData(data) {
//#region 琛ㄥご鏁版嵁妫�楠�
@@ -813,41 +697,55 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
//#endregion
//#region 椤圭洰闃舵琛ㄦ暟鎹楠�
- var num = [];
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
- //椤圭洰闃舵閲嶅妫�楠�
- if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
- num.push(option.data[i]["HProjectStageID"]);
- } else {
- layer.msg("绗�" + (i + 1) + "琛�,椤圭洰闃舵:" + option.data[i]["HProjectStageName"] + "閲嶅!");
- return false;
- }
//椤圭洰闃舵闈炵┖妫�楠�
- if (option.data[i]["HProjectStageName"] == "") {
+ if (option.data[i]["HProjectStageID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:椤圭洰闃舵涓嶈兘涓虹┖!");
return false;
}
-
//涓氱哗鍗犳瘮鏍煎紡妫�楠�
var HRate = option.data[i]["HRate"] + "";
if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
layer.msg("涓氱哗鍗犳瘮鏈熬涓嶈兘涓�.锛�");
- return;
+ return false;
} else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HRate)) {
layer.msg("涓氱哗鍗犳瘮璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
- return;
+ return false;
}
}
- ////閲岀▼纰戝唴瀹规楠�
- //if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
- // layer.msg("閲岀▼纰戣杈撳叆0鎴�1锛�");
- //}
+ }
+ }
+ //#endregion
+
+ //#region 涓氱哗鍗犳瘮鍚堣妫�楠�
+ var total = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ total += option.data[i]["HRate"] * 1;
+ }
+ if (total > 100) {
+ layer.msg("涓氱哗鍗犳瘮鍚堣涓嶈兘澶т簬100锛�");
+ return false;
+ }
+ //#endregion
+
+ //#region 鍏抽敭瀛楁閲嶅鎬ф牎楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
+ num.push(option.data[i]["HProjectStageID"]);
+ } else {
+ layer.msg("绗�" + (i + 1) + "琛�,椤圭洰闃舵:" + option.data[i]["HProjectStageName"] + "閲嶅!");
+ return false;
}
}
//#endregion
@@ -938,7 +836,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html?openType=2", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -948,13 +846,30 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProjectStageID": checkStatus.data[0].HItemID
, "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
, "HStageNote": checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭
+ , "HPMGoodsID": checkStatus.data[0].HPMGoodsID == null ? 0 : checkStatus.data[0].HPMGoodsID
+ , "HPMGoodsName": checkStatus.data[0].鐩稿叧浜や粯鐗�
+ , "HRate": checkStatus.data[0].鐞嗚涓氱哗鍗犳瘮
+ , "HIsKey": checkStatus.data[0].閲岀▼纰� == "Y" ? true : false
})
+ CheckedSet_tableSub();
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function (data) {
+ obj.update({
+ "HProjectStageID": optiondata[0].HItemID
+ , "HProjectStageName": optiondata[0].闃舵鍚嶇О
+ , "HStageNote": optiondata[0].椤圭洰闃舵璇︾粏鍐呭
+ , "HPMGoodsID": optiondata[0].HPMGoodsID == null ? 0 : optiondata[0].HPMGoodsID
+ , "HPMGoodsName": optiondata[0].鐩稿叧浜や粯鐗�
+ , "HRate": optiondata[0].鐞嗚涓氱哗鍗犳瘮
+ , "HIsKey": optiondata[0].閲岀▼纰� == "Y" ? true : false
+ })
}
})
}
@@ -1040,9 +955,9 @@
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] += "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
@@ -1106,7 +1021,9 @@
});
-
+ function GetProjectStageValue(data) {
+ optiondata = data;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1