From c6810c0b5e051bd68b174c92fe8656e7d142e3f5 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 06 十二月 2021 16:22:24 +0800
Subject: [PATCH] 工资结算单(其他)
---
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html | 355 +++++++++++++++++--------------------------
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 20 +-
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 0
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 36 ++-
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 8
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html | 10
WebTM/views/index.html | 4
WebTM/WebTM.csproj | 4
8 files changed, 187 insertions(+), 250 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 09b9a5b..49fe9d1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -643,9 +643,9 @@
<Content Include="views\宸ヨ祫绠$悊\Gy_WorkTypeBillList.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
- <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
- <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
<Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
<Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index bfcd195..95817e4 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -611,14 +611,14 @@
<dd>
<a>宸ヨ祫缁撶畻鍗�(闆嗕綋)</a>
<dl class="layui-nav-child">
- <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBill.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)</a></dd>
+ <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)</a></dd>
<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillList.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)缁存姢</a></dd>
</dl>
</dd>
<dd>
<a>宸ヨ祫缁撶畻鍗�(鍏朵粬)</a>
<dl class="layui-nav-child">
- <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBill.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
+ <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillList.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)缁存姢</a></dd>
</dl>
</dd>
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 9d7db9d..3eaf788 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"
@@ -753,7 +753,7 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
+ $("#HInterID").val(0);
}
});
}
@@ -948,7 +948,7 @@
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -1050,6 +1050,10 @@
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
+ if ($("#HGroupID").val() == '') {
+ layer.msg("鐝粍娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HDeptID").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -1058,10 +1062,10 @@
layer.msg("鑱屽憳娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- //if ($("#HPayID").val() == '') {
- // layer.msg("宸ヨ祫绫诲瀷娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
+ if ($("#HPayType").val() == '') {
+ layer.msg("宸ヨ祫绫诲瀷娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
//if ($("#HBillNo").val() == '') {
// layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
@@ -1074,15 +1078,21 @@
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (!typeof (sSubStr) == "undefined") {
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
+ if (sSubStr[i].HProcID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ュ簭淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HEmpID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
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_SingleBalBillList.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_SingleBalBillList.html"
index 88c889d..5d1cf54 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_SingleBalBillList.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_SingleBalBillList.html"
@@ -170,9 +170,9 @@
//, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠g爜', width: 125 }
- //, { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
- //, { field: '鍗曚环', title: '鍗曚环', width: 125 }
- //, { field: '閲戦', title: '閲戦', width: 125 }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
+ , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+ , { field: '閲戦', title: '閲戦', width: 125 }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
@@ -230,7 +230,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
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\345\205\266\344\273\226\051/Pay_OtherBalBill.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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
similarity index 80%
rename from "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\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
rename to "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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
index 80327da..bcf69b9 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\345\205\266\344\273\226\051/Pay_OtherBalBill.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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
@@ -63,7 +63,7 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input id="HInterID" name="HInterID" type="hidden" />
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
</div>
</div>
@@ -84,7 +84,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
- <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -94,7 +94,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -104,7 +104,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鑱屽憳</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -112,7 +112,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -133,119 +133,105 @@
<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
</div>
</div>
- </div>
-
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷</label>
<div class="layui-input-inline">
- <input type="text" name="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPayType" id="HPayType" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
- </div>
- </div>-->
- <div class="layui-col-xs4 layui-inline">
+ <div class="layui-col-xs4 layui-inline ">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs7 layui-inline">
+ <div class=" layui-col-xs4 layui-inline">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
</div>
</div>
</div>
- </div>
-
-
- <!--鍒跺崟淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
-
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
</div>
</div>
</div>
- </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
- <table class="layui-hide" 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-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="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>
-
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
</form>
</div>
</div>
@@ -290,15 +276,6 @@
elem: '#HDate'
});
-
-
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
var tableReload = table.reload;
var option = {
elem: '#mainTable'
@@ -311,13 +288,12 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCheck', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 190 }
- //, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 150 }
, { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck", width: 100 }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', edit: 'text', width: 100 }
, { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
- , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: 'HEmpCheck', width: 150 }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: 'HEmpCheck', width: 100 }
, { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
, { field: 'HTimes', title: '宸ユ椂', edit: 'text', width: 100 }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
@@ -384,10 +360,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = {
- "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
- , "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0
- , "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0, "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcNumber": "", "HProcName": "", "HSourceCode": "", "HSourceName": "", "HEmpCode": "", "HEmpName": "", "HTimes": 0, "HQty": 0, "HPrice": 0, "HPriceRate": 0, "HSubsidyQty": 0, "HSubsidyMoney": 0, "HSubsidyTotal": 0, "HDeuctTotal": 0, "HPackQty": 0, "HPackPrice": 0, "HPackMoney": 0, "HPackMaterID": 0, "HMoney": 0, "HICMOInterID": 0, "HICMOBillNo": 0, "HProcReportInterID": 0, "HProcReportEntryID": 0, "HProcReportBillNo": 0, "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HRelationQty": 0, "HRelationQty": 0, "HRelationMoney": 0, "HCloseMan": 0, "HCloseDate": 0, "HCloseType": 0, "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -422,7 +395,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -617,6 +589,7 @@
, HEmpID: checkStatus.data[0].HItemID
, HEmpNumber: checkStatus.data[0].HNumber
});
+
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -716,7 +689,7 @@
//alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "/Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail",
+ url: GetWEBURL() + "Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail",
type: "GET",
data: {
"HID": hID
@@ -725,7 +698,6 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Pay_OtherBalBillList[0];
- console.info(data);
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
@@ -733,10 +705,10 @@
, "HGroupID": data.HGroupID //鐝粍ID
, "HGroupName": data.鐝粍 //鐝粍鍚嶇О
, "HEmpID": data.HEmpID //涓荤ID
- , "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
+ , "HEmpName": data.HEmpName //涓荤鍚嶇О
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HPayID": data.HPayID
+ , "HPayType": data.HPayType
, "HPayTypeName": data.宸ヨ祫绫诲瀷
, "HSourceBillType": "" //婧愬崟绫诲瀷
, "Box2": "" //閫夊崟鍙�
@@ -781,7 +753,7 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
+ $("#HInterID").val("0");
}
});
}
@@ -914,7 +886,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', 'yes'],
+ content: ['../../../views/宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html?Type=HPayType', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -925,7 +897,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
- $("#HPayID").val(checkStatus.data[0].HItemID);
+ $("#HPayType").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) {
@@ -953,17 +925,6 @@
}
});
-
-
-
-
-
- //form.on('submit(Cancel)', function () {
- // //sessionStorage["SourceFlag"] = false;
- // parent.location.href = "../../../views/index.html"
- // //window.close();//鍏抽棴褰撳墠椤�
- //})
-
function formatDate(date) {
var d = new Date(date),
month = '' + (d.getMonth() + 1),
@@ -977,77 +938,48 @@
}
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ var refSav = "";
+ if (linterid == "" || linterid == null) {
+ refSav = "Add";
+ }
+ if (linterid != "" && linterid != null) {
+ refSav = "Update";
+ }
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- var index = layer.load();
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';'+ sessionStorage["HUserName"];
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Pay_OtherBalBill/AddBill",
+ url: GetWEBURL() + "/Pay_OtherBalBill/SaveGetOtherBalBillList",
async: true,
- data: { "sMainSub": sMainSub },
+ data: { "msg": sMainSub },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
-
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
}
else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ f_alert(data.Message);
}
},
error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ f_alert("閿欒:" + err);
}
});
});
- //form.on('submit(Saver)', function (data) {//淇濆瓨
- // //debugger;
- // data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- // var sMainStr = JSON.stringify(data.field);
- // var sSubStr = JSON.stringify(table.cache['mainTable']);
- // var sMainSub = sMainStr + ';' + sSubStr;
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
-
- // $.ajax(
- // {
- // type: "POST",
- // url: GetWEBURL() + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // async: true,
- // data: { "msg": sMainSub },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- // $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- // var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- // parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- // });
- // }
- // else {
-
- // f_alert(data.Message);
- // console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- // }
- // layer.closeAll("loading");
- // },
- // error: function (err) {
-
- // f_alert("閿欒:" + err);
- // console.log("Reason" + sMainStr);
- // }
- // });
- //});
- //function f_alert(sMsg) {
- // layer.alert(sMsg, { icon: 5 });
-
- //}
-
+ }
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -1117,61 +1049,56 @@
//$("#HItemID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
+ var Result = true;
+ if ($("#HGroupID").val() == '') {
+ layer.msg("鐝粍娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HEmpID").val() == '') {
+ layer.msg("鑱屽憳娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HPayType").val() == '') {
+ layer.msg("宸ヨ祫绫诲瀷娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
+ //if ($("#HBillNo").val() == '') {
+ // layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
//}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
if ($("#HInterID").val() == '') {
layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (typeof (sSubStr) == "undefined") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HProcID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ュ簭淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HEmpID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
- return true;
+ return Result;
}
+ return Result;
}</script>
</body>
</html>
\ No newline at end of file
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\345\205\266\344\273\226\051/Pay_OtherBalBillList.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\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index a29deb8..b6a92e2 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\345\205\266\344\273\226\051/Pay_OtherBalBillList.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\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -170,9 +170,9 @@
//, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠g爜', width: 125 }
- //, { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
- //, { field: '鍗曚环', title: '鍗曚环', width: 125 }
- //, { field: '閲戦', title: '閲戦', width: 125 }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
+ , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+ , { field: '閲戦', title: '閲戦', width: 125 }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
@@ -230,7 +230,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -254,7 +254,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBill.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
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_GroupBalBill.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"
similarity index 100%
rename from "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_GroupBalBill.html"
rename to "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"
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_GroupBalBillList.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_GroupBalBillList.html"
index 845fe50..25d7ede 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_GroupBalBillList.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_GroupBalBillList.html"
@@ -154,12 +154,12 @@
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 180 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
- //, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
- //, { field: 'HEmpNumber', title: '鑱屽憳浠g爜', width: 180 }
- //, { field: 'HEmpName', title: '鑱屽憳', width: 125 }
- //, { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
+ , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', width: 180 }
+ , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+ , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
//, { field: '宸ヨ祫浠g爜', title: '宸ヨ祫浠g爜', width: 180 }
- //, { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
+ , { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
, { field: '鎽樿', title: '鎽樿', width: 125 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
@@ -170,9 +170,9 @@
//, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠g爜', width: 125 }
- //, { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
- //, { field: '鍗曚环', title: '鍗曚环', width: 125 }
- //, { field: '閲戦', title: '閲戦', width: 125 }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
+ , { field: '鍗曚环', title: '鍗曚环', width: 125 }
+ , { field: '閲戦', title: '閲戦', width: 125 }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
@@ -230,7 +230,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -254,7 +254,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBill.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
--
Gitblit v1.9.1