From 3ed60895223ce83e155ecf9d22ba37d44adb83ec Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 02 四月 2025 15:45:33 +0800
Subject: [PATCH] pda报工平台修改，三升排产页面添加，添加项目待保存页面，项目待审核页面修改
---
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 231 +++++++++++++++++++++++----------------------------------
1 files changed, 94 insertions(+), 137 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index f592c1c..7871d93 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -137,20 +137,12 @@
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
- <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
- </ul>
- <div class="layui-tab-content">
- <!--椤圭洰闃舵-->
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
- <!--椤圭洰鎴愬憳-->
- <div class="layui-tab-item">
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
- </div>
- </div>
+ </script>
</div>
</div>
</div>
@@ -162,18 +154,6 @@
</div>
</div>
</div>
- <!--閲岀▼纰�-->
- <script type="text/html" id="HIsKey">
- <div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HIsKey" lay-filter="HIsKey" id="HIsKey{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
- </div>
- </script>
- <!--椤圭洰缁忕悊-->
- <script type="text/html" id="HIsPM">
- <div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HIsPM" lay-filter="HIsPM" id="HIsPM{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
- </div>
- </script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -198,7 +178,7 @@
//#endregion
//#endregion
var HModName = "PM_ProjectTaskNeedCheckQuery";
-
+ var HModName2 = "PM_ProjectTaskNeedCheckQuery_SellOut";
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -235,6 +215,15 @@
break;
};
});
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option, function () { });
+ break;
+
+ };
+ });
+
//#endregion
//#region 閫�鍑�
@@ -274,6 +263,7 @@
//鏄剧ず椤圭洰淇℃伅
RoadBillMain(obj.data["HInterID"]);
+
})
//#endregion
@@ -343,90 +333,15 @@
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: '搴忓彿', 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: '椤圭洰闃舵', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭', style: 'background-color: #f9f9f9;' }
- , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', event: "HPMGoodsName" } //f7
- , { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
- , { field: 'HRate', title: '涓氱哗鍗犳瘮', totalRow: true }
- , { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEmpName', title: '闃舵璐熻矗浜�', event: "HEmpName" } //f7
- , { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HCheckEmpName', title: '闃舵瀹℃牳浜�', event: "HCheckEmpName" } //f7
- , { field: 'HFinishDate', title: '棰勮瀹屾垚鏃ユ湡', event: "HFinishDate" }
- , { field: 'HWorkDays', title: '棰勮浜哄ぉ', totalRow: true }
- , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
- ]]
- }
- var rowdata = [
- {
- "RowID": 10
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HStageNote': ''
- , 'HPMGoodsID': '0'
- , 'HPMGoodsName': ''
- , 'HIsKey': false
- , 'HRate': '0'
- , 'HEmpID': '0'
- , 'HEmpName': ''
- , 'HCheckEmpID': '0'
- , 'HCheckEmpName': ''
- , 'HFinishDate': ''
- , 'HWorkDays': '0'
- , 'HRemarkSub': ''
- }
- ];
- option.data = rowdata;
- table.render(option);
- option1 = {
- elem: '#mainTable1'
- //, toolbar: '#toolbarDemo1'
- , page: false
- , totalRow: true
+ , toolbar: '#toolbarDemo'
+ , page: true
, limit: 500
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 1000, 2000]
+ , totalRow: true
, cellMinWidth: 120
- , height: 400
- , cols: [[
- //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
- , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEmployeeName', title: '椤圭洰鎴愬憳', event: "HEmployeeName" } //f7
- , { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
- , { field: 'HRate', title: '椤圭洰鍗犳瘮', totalRow: true }
- , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', totalRow: true }
- , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', totalRow: true }
- , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
- ]]
+ , height: 600
+ , cols: [[]]
}
- var rowdata1 = [
- {
- "RowID": 10
- , 'HEmployeeID': '0'
- , 'HEmployeeName': ''
- , 'HIsPM': false
- , 'HRate': '0'
- , 'HPlanAvgMoney': '0'
- , 'HPlanCountMoney': '0'
- , 'HRemarkSub': ''
- }
- ];
- option1.data = rowdata1;
- table.render(option1);
}
//#endregion
@@ -436,6 +351,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
type: "GET",
+ async: false,
data: {"user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -472,7 +388,7 @@
optionNeedCheck.cols = [col];
optionNeedCheck.data = data1.data;
//鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedCheck);
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedCheck, titleData);
ins = table.render(optionNeedCheck);
layer.close(ajaxLoad);
} else {
@@ -498,8 +414,6 @@
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data[0];
- var tableSub = result.data[1];
- var tableSub_Emp = result.data[2];
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": tableMain[0]["HInterID"]
@@ -531,39 +445,82 @@
if (tableMain[0]["HTaskWorkMoneyCheckFlag"] == false) {
$('#btnCheckWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
}
- //娓叉煋椤圭洰闃舵琛�
- //璁剧疆椤圭洰闃舵琛ㄥ畬鎴愭棩鏈熺殑鏍煎紡
- for (var i = 0; i < tableSub.length; i++) {
- tableSub[i]["HFinishDate"] = Format(new Date(tableSub[i]["HFinishDate"]), "yyyy-MM-dd");
- tableSub[i].RowID = (i + 1) * 10;
- }
- option.data = tableSub;
- table.render(option);
- //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
- for (var i = 0; i < tableSub.length; i++) {
- if (tableSub[i].HIsKey) {
- $('#HIsKey' + (i + 1)).attr("checked", true);
- }
- }
form.render('checkbox');
- //娓叉煋椤圭洰鎴愬憳琛�
- for (var i = 0; i < tableSub_Emp.length; i++) {
- tableSub_Emp[i].RowID = (i + 1) * 10;
- }
- option1.data = tableSub_Emp;
- table.render(option1);
- //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
- for (var i = 0; i < tableSub_Emp.length; i++) {
- if (tableSub_Emp[i].HIsPM) {
- $('#HIsPM' + (i + 1)).attr("checked", true);
- }
- }
- form.render('checkbox');
+ RoadBillSub(linterid);
}
})
}
//#endregion
+ //#region 鑾峰彇閿�鍞嚭搴撳崟鍒楄〃
+ function RoadBillSub(linterid)//鍔犺浇琛ㄥご
+ {
+ var ajaxLoad = layer.load();//閬僵
+ //鏄庣粏鍒楄〃
+ var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid ;
+ $.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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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 }); //闅愯棌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 {
+ 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 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //缁熻鏉愭枡璐�
+ let totalAmount = data1.data.reduce((accumulator, currentValue) => {
+ return accumulator + currentValue.閲戦;
+ }, 0);
+ $("#HTaskMaterMoney").val(totalAmount);
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option, titleData);
+ table.render(option);
+ 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 set_CheckBill(type) {
var HInterID = $("#HInterID").val();
--
Gitblit v1.9.1