From 85f91eb0a200a21f3dd0151568ebd9c1a909b967 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 27 六月 2022 08:53:22 +0800
Subject: [PATCH] nothing
---
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 6 +-
WebTM/views/Baseset/基础资料/Gy_GetProductionTeamList.html | 30 +++++-----
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 4
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjBillEdit.html | 45 ++++++++++-----
WebTM/views/Baseset/基础资料/Gy_ClassTimePrjGroupList.html | 2
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjBillList.html | 79 --------------------------
6 files changed, 51 insertions(+), 115 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
index 04c894b..84cdcc6 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
index 1bf5e72..a80a22f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
@@ -37,8 +37,8 @@
<script>
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
- , form = layui.form
- , layer = layui.layer;
+ , form = layui.form
+ , layer = layui.layer;
//蹇�熸煡璇�
form.on('submit(HQuery)', function () {
//var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -48,7 +48,7 @@
form.on('submit(FH)', function () {//閫夋嫨浠撳簱
//var sMainStr = JSON.stringify(table.cache['mainTable']);
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
parent.GetProductionTeamValue(data);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
@@ -57,21 +57,21 @@
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
- , data: []
- //, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- , cols: [[
- { type: 'radio' }
- , { field: 'HItemID', title: '鐝粍ID', hide: true }
- , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
- , { field: '鐝粍', title: '鐝粍', sort: true }
- ]]
- , page: true
+ , data: []
+ //, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', title: '鐝粍ID', hide: true }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ , { field: '鐝粍', title: '鐝粍', sort: true }
+ ]]
+ , page: true
});
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where) {
- var Value = " and HNumber like '%" + Where + "%' or HName like '%" + Where + "%'";
- if (!Where) {
- Value = '';
+ var Value = " and HUSEORGID = " + sessionStorage["OrganizationID"] + "";
+ if (Where) {
+ Value += " and (鐝粍浠ｇ爜 like '%" + Where + "%' or 鐝粍鍚嶇О like '%" + Where + "%')";
}
$.ajax({
type: "get",
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 98ec153..8f5e2ea 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"
@@ -143,7 +143,7 @@
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HMainSourceInterNo" id="HMainSourceInterNo" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="SourceBillList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -1206,7 +1206,7 @@
});
}
else {
- f_alert(data.Message);
+ layer.msg(data.Message);
}
},
error: function (err) {
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 ca706bc..d2c9f70 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"
@@ -156,9 +156,9 @@
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
- , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
- , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
- , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+ //, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+ //, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
+ //, { field: 'HEmpName', title: '鑱屽憳', width: 125 }
, { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
//, { field: '宸ヨ祫浠ｇ爜', title: '宸ヨ祫浠ｇ爜', width: 180 }
, { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
index e85d434..ae1cfec 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
@@ -37,7 +37,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
- <input id="HLevel" name="HLevel" type="hidden" value="0"/>
+ <input id="HLevel" name="HLevel" type="hidden" value="0" />
</div>
</div>
<div class="layui-inline">
@@ -97,9 +97,10 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
-//鑾峰彇鍙傛暟
- function getUrlVars() {
+ //鑾峰彇鍙傛暟
+ function get_UrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
for (var i = 0; i < hashes.length; i++) {
@@ -109,13 +110,23 @@
}
return vars;
}
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
-
- var params = getUrlVars();
+ var params = get_UrlVars();
var hID = params[params[0]];//缂栬緫鏌ョ湅
var HType = params[params[1]]; //鍗曟嵁鐘舵�併�佸眰绾�
var TagParentId = params[params[2]]; //鐖剁骇ID
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -183,16 +194,12 @@
});
}
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);
}
});
}
@@ -202,7 +209,7 @@
type: "POST",
url: GetWEBURL() + "/Gy_ClassTimePrj/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainSub},
+ data: { "oMain": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -215,16 +222,24 @@
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);
}
});
+ }
+ });
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
}
});
function f_alert(sMsg) {
@@ -360,7 +375,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鎵�灞炵粍鍒楄〃'//鏍囬
+ , title: '鏍哥畻鏂瑰紡缁勫垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
index 78d1fa6..2c6c41c 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
@@ -147,58 +147,6 @@
, tree = layui.tree
var sWhere = "";
let that = this;
- //tree.render({
- // elem: '#treeCheckItem',
- // data: getData(sWhere),
- // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- // id: 'demoId',
- // isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
- // showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
- // onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
- // click: function (obj) {
- // //鐐瑰嚮楂樺厜
- // if (obj.data.id !== treeCkData.id) {
- // $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = obj.data;
- // TagId = obj.data.id;
- // TagParentId = obj.data.ParentID;
- // Level = obj.data.HLevel+1;
- // }
- // else {
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = { id: 0 };
- // TagId = "";
- // TagParentId = "";
- // Level = "1";
- // }
-
- // $.ajax({
- // url: GetWEBURL() + '/Gy_ClassTimePrj/cx',
- // type: "GET",
- // data: { "HInterID": obj.data.id },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- // }
- //});
-
-
-
-
-
-
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
@@ -224,7 +172,6 @@
, { field: '缁勫悕绉�', title: '鏍哥畻鏂瑰紡缁勫悕绉�' }
]]
};
-
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -245,9 +192,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
-
-
-
//鏂板
form.on('submit(btnAdd)', function (obj) {
//椤甸潰灞�-鑷畾涔�
@@ -270,7 +214,6 @@
});
return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
})
-
//鍒犻櫎
form.on('submit(btndelete)', function (obj) {
var ModRightNameDelete = 'Gy_ClassTimePrj_Delete'
@@ -347,10 +290,6 @@
}
}
});
-
-
-
-
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
var HNumber = $("#HNumber").val();
@@ -380,8 +319,6 @@
});
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
-
-
//淇敼鎸夐挳
form.on('submit(btnModify)', function (data) {
if (TagId != "") {
@@ -436,17 +373,6 @@
}
}
});
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
-
- //浠ヤ笂鏄痩ayui妯″潡
});
//鏌ヨ鏍戠姸鏁版嵁
@@ -487,11 +413,6 @@
})
return treeData;
}
-
-
-
-
</script>
-
</body>
</html>
--
Gitblit v1.9.1