From e65f93b744365c32cdf821bcacc15f7ac14f5bb1 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期日, 29 九月 2024 15:41:55 +0800
Subject: [PATCH] 工资结算单个人、集体新增模块优化修改；工序出站汇报单列表模块返回列表信息调用方法修改
---
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 211 +++++++++++++++++++++++------
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 146 +++++++++++++++++---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 40 ++---
3 files changed, 306 insertions(+), 91 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
index b20275b..b8ceaba 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
@@ -112,7 +112,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -121,17 +121,18 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -755,6 +756,10 @@
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
}
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
+ }
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
HSourceTitle = "鐢熶骇閫�搴撳崟";
@@ -805,22 +810,18 @@
, "HGroupID": result.data[0].HGroupID == null ? 0 : result.data[0].HGroupID
, "HGroupName": result.data[0].鐝粍
});
- $("#HMainSourceInterID").val(result.data[0].hmainid);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -845,7 +846,7 @@
, "HSubsidyMoney": result.data[i].HSubsidyMoney == null ? 0 : result.data[i].HSubsidyMoney
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1247,14 +1248,39 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = OptionData.HItemID;
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": OptionData.HItemID
, "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
, "HMaterName": OptionData.鐗╂枡鍚嶇О
, "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1282,13 +1308,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = OptionData.HItemID;
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProcID": OptionData.HItemID
, "HProcNumber": OptionData.宸ュ簭浠ｇ爜
, "HProcName": OptionData.宸ュ簭鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1316,13 +1367,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = OptionData.HItemID;
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": OptionData.HItemID
, "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1774,6 +1850,33 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡銆佸伐搴忋�佺敓浜ц祫婧愬姞杞藉伐浠�
+ function subTable_GetHPrice2(HMaterID, HProcID, HSourceID) {
+ var HPrice = 0;
+ if (HMaterID != "0" && HProcID != "0") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID },
+ success: function (data) {
+ if (data.count == 1) {
+ HPrice = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ return HPrice;
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -1934,11 +2037,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -1947,7 +2050,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
index 4975aca..93946c6 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
@@ -102,7 +102,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -111,23 +111,24 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">璁′欢宸ヨ祫<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁′欢宸ヨ祫</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
+ <!--<input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>-->
+ <input type="number" name="HSumMoney" id="HSumMoney" lay-verify="HSumMoney" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();"readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬琛ヨ创<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬琛ヨ创</label>
<div class="layui-input-inline">
<input type="number" name="HOtherSubsidy" id="HOtherSubsidy" lay-verify="HOtherSubsidy" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬鎵ｆ<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬鎵ｆ</label>
<div class="layui-input-inline">
<input type="number" name="HOtherDeduct" id="HOtherDeduct" lay-verify="HOtherDeduct" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
@@ -144,10 +145,11 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -681,7 +683,7 @@
, { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveDays', title: '璇峰亣澶╂暟', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
- , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
, { field: 'HOtherSubsidy', title: '鍏朵粬琛ヨ创', width: 100, edit: 'text', totalRow: true }
, { field: 'HOtherDeduct', title: '鍏朵粬鎵ｆ', width: 100, edit: 'text', totalRow: true }
, { field: 'HYF', title: '搴斾粯宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
@@ -866,6 +868,8 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '2');
}
else {
@@ -914,6 +918,10 @@
if ($("#HSourceBillType").val() == "1202") {
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
+ }
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
}
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
@@ -969,25 +977,21 @@
set_InitGrid2(); //鍒濆鍖栧瓙琛�
GetEmployee(); //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
}
- $("#HMainSourceInterID").val(result.data[0].HMainID);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HUnitID": result.data[i].HUnitID == null ? 0 : result.data[i].HUnitID
, "HUnitNumber": result.data[i].璁￠噺鍗曚綅浠ｇ爜
, "HUnitName": result.data[i].璁￠噺鍗曚綅鍚嶇О
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -997,7 +1001,7 @@
, "HPrice": result.data[i].HPrice == null ? 0 : result.data[i].HPrice
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1017,6 +1021,9 @@
table.render(option);
//鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
subTable_GetHPrice();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '1');
}
@@ -1408,9 +1415,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1453,9 +1460,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1498,9 +1505,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1582,9 +1589,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
case "HPrice": //宸ヤ环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1610,9 +1617,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
default:
}
@@ -1938,6 +1945,8 @@
value.HAvgFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
});
//#endregion
@@ -2022,9 +2031,6 @@
, "HCTPrjNumber": OptionData.HCTPrjNumber
, "HCTPrjName": OptionData.HCTPrjName
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
}
})
}
@@ -2082,6 +2088,34 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
+ case "HBaseTimes": //鍩烘湰宸ユ椂
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HBaseTimes: oldText
+ });
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ layer.msg("鍩烘湰宸ユ椂锛氭暟鎹敊璇紝鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes = isNaN(value) ? 0 : value; //鍩烘湰宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HBaseTimes: HBaseTimes
+ });
+ //table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ break;
case "HMoney": //璁′欢宸ヨ祫
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
@@ -2111,8 +2145,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherSubsidy": //鍏朵粬琛ヨ创
//鏁版嵁鏍煎紡鏍￠獙
@@ -2143,8 +2175,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherDeduct": //鍏朵粬鎵ｆ
//鏁版嵁鏍煎紡鏍￠獙
@@ -2175,8 +2205,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
default:
}
@@ -2213,7 +2241,10 @@
});
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = isNaN(rowList[i].HQty) ? 0 : rowList[i].HQty; //鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦
option.data[i]["HPrice"] = HPrice;
+ option.data[i]["HMoney"] = HMoney;
}
table.render(option);
}
@@ -2296,6 +2327,54 @@
}
//#endregion
+ //#region 瀛愯〃1鍙樻洿鏀瑰彉涓昏〃
+ function Sub1ChangeMain() {
+ var HSumMoney = 0;
+ //鎬婚噾棰�
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMaterID"] != "0") {
+ HSumMoney += option.data[i]["HMoney"] * 1;
+ }
+ }
+
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HSumMoney").val(HSumMoney);
+ $("#HPayMoney").val(HPayMoney);
+ }
+ //#endregion
+
+ //#region 涓昏〃鍙樻洿鏀瑰彉瀛愯〃2
+ function MainChangeSub2() {
+ var HPayMoney = $("#HPayMoney").val(); //搴旀敮浠樺伐璧�
+ var HBaseTimes = 0;
+ //鍛樺伐鎬诲伐鏃�
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && option2.data[i]["HAvgFlag"] == true) {
+ HBaseTimes += option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * 1;
+ }
+ }
+ if (HBaseTimes == 0) {
+ for (var i = 0; i < option2.data.length; i++) {
+ option2.data[i]["HMoney"] = (0).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ else {
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && HBaseTimes != 0) {
+ option2.data[i]["HMoney"] = (option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * (HPayMoney / HBaseTimes)).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HMoney"] * 1 + option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ }
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -2305,6 +2384,19 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ //鏁板�煎瀷瀛楁锛岀晫闈负绌烘椂锛岃祴鍊间负0
+ if ($("#HSumMoney").val() == '') {
+ data.field.HSumMoney = 0
+ }
+ if ($("#HOtherSubsidy").val() == '') {
+ data.field.HOtherSubsidy = 0
+ }
+ if ($("#HOtherDeduct").val() == '') {
+ data.field.HOtherDeduct = 0
+ }
+ if ($("#HPayMoney").val() == '') {
+ data.field.HPayMoney = 0
+ }
//鑾峰彇鐢熶骇姹囨姤鍒楄〃瀛愯〃鏁版嵁
var tableSub1 = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -2329,7 +2421,7 @@
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ';' + OperationType + ";" + HMaker;
- if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ if (!AllowLoadData(sSubStr2))//鏁版嵁楠岃瘉
{
return false;
}
@@ -2395,6 +2487,32 @@
form.render('checkbox');
}
//#endregion
+
+ //#region 鐩戝惉鏂囨湰妗�
+
+ //鍏朵粬琛ヨ创
+ $("#HOtherSubsidy").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney*1 + HOtherSubsidy*1 - HOtherDeduct*1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+
+ //鍏朵粬鎵ｆ
+ $("#HOtherDeduct").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+ //#endregion
+
});
@@ -2490,11 +2608,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HYF == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,搴斾粯宸ヨ祫涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -2503,7 +2621,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
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_StationOutBillList.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_StationOutBillList.html"
index babad37..3ca460f 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_StationOutBillList.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_StationOutBillList.html"
@@ -264,6 +264,10 @@
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var params = get_UrlVars();
+ var sProcExchBillNo = params[params[0]] == null ? "undefined" : params[params[0]]; //娴佽浆鍗″彿锛堝伐搴忔祦杞崱涓嬫煡鐢ㄥ埌锛�
+ var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ var ViewName = params[params[2]] == null ? "h_v_MES_StationOutBillList" : params[params[2]]; //鎵�璋冪敤鐨勮鍥�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -287,7 +291,6 @@
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
- var params = get_UrlVars(); //鑾峰彇鍙傛暟
//鍒濆鍖栬〃鏍�
@@ -1578,8 +1581,8 @@
//蹇�熻繃婊�
function get_FastQuery() {
//鍒ゆ柇鏄惁涓轰笅鏌ユ搷浣滐紝鑻ユ槸鍒欏彉鏇存煡璇㈠崟鍙峰拰鏃堕棿杩囨护鏉′欢
- if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
- $("#HProcExchBillNo").val(params[params[0]]);
+ if (sProcExchBillNo != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(sProcExchBillNo);
$("#HBeginDate").val("1990-01-01");
$("#HEndDate").val("2200-12-30");
lookDownBar = 1;
@@ -1684,26 +1687,14 @@
var ajaxLoad = layer.load();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
- //success: function (data1) {
- // if (data1.count == 0) {
- // option.data = [];
- // layer.alert(data1.Message, { icon: 5 });
- // } else {
- // option.data = data1.data;
- // }
- // table.render(option);
- // btnIs();
- // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- // ColFilter();
- // }
- // layer.close(wait);
- //}, error: function () {
- // layer.close(wait);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- //}
+ url: GetWEBURL() + '/Cj_StationOutBillController/GetSc_StationOutBillList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sWhere": sWhere, "HMaker": sessionStorage["HUserName"], "HBillSubType": "3791", "OperationType": OperationType, "ViewName": ViewName },
+
+ //url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ //type: "GET",
+ //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1711,6 +1702,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
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: '鍚堣' });
--
Gitblit v1.9.1