From 3ffbffba87bfe3a8a9acdc75e38be01db0d3cd1b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 17 十一月 2023 12:22:38 +0800
Subject: [PATCH] ../../Baseset/基础资料/Gy_SellStyle.html:单选改为复选,单击选中,双击返回
---
WebTM/views/项目管理/项目阶段/PM_ProjectReportBillList.html | 207 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 169 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
index ed8a6f6..51c0051 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
@@ -18,6 +18,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
@@ -106,9 +107,13 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -124,7 +129,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙fā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -134,12 +139,14 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , soulTable = layui.soulTable
+
var option = [];
var sWhere = "";
var HModName = "PM_ProjectReportBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","HProcessID_K3","HUSEORGID"];
+ var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HPMGoodsID","HReportEmpID","HEntryID","HEmpID",];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -176,14 +183,30 @@
////娴忚
//case 'get_view': get_view();
// break;
- ////瀹℃牳鎸夐挳
- //case 'btn-Audit':
- // set_CheckBill(0);
- // break;
- ////鍙嶅鏍告寜閽�
- //case 'btn-DeAudit':
- // set_CheckBill(1);
- // break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn-Drop':
+ set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-DeDrop':
+ set_DropBill(2);
+ break;
////绂佺敤鎸夐挳
//case 'btn-Stop':
// set_De_Stop(0);
@@ -243,9 +266,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -256,9 +284,13 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
}
//#endregion
@@ -268,6 +300,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -295,6 +328,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["鏈樁娈典笟缁╁崰姣�"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -308,11 +342,13 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else {
+ 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 });
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
@@ -349,6 +385,12 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
+ //鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
+ var HUserName = getHEmpByHUserName();
+ if (HUserName != "" && HUserName != null) {
+ sWhere = " and (姹囨姤浜� = '" + HUserName + "' or 鎺ユ敹浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
+ }
+
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//椤圭洰浠g爜
@@ -387,10 +429,10 @@
}
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HProNumber) {
- sWhere += " and HProNumber like '%" + HProNumber + "%'";
+ sWhere += " and 椤圭洰浠g爜 like '%" + HProNumber + "%'";
}
if (HProjectStageID != "0") {
sWhere += " and HProjectStageID = " + HProjectStageID + "";
@@ -425,14 +467,14 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ョ▼椤圭洰鍒楄〃-鏂板'
+ , title: '椤归樁娈垫眹鎶�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../椤圭洰绠$悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
}
@@ -448,14 +490,14 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ョ▼椤圭洰鍒楄〃-缂栬緫'
+ , title: '椤圭洰闃舵姹囨姤-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../椤圭洰绠$悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -479,9 +521,9 @@
, content: '../../椤圭洰绠$悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- //window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -512,7 +554,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -534,8 +576,7 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_FastQuery(1);
+ $("#btnSearch").trigger('click');
}
//#endregion
@@ -544,12 +585,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].HItemID.toString();
+ var InterID = data[0].HInterID.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Process/AuditGy_Process", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/PM_ProjectReportBill/AuditPM_ProjectReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -575,17 +616,53 @@
}
//#endregion
- //#region 鍙嶇鐢�/绂佺敤鏁版嵁
- function set_De_Stop(num) {
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].HItemID.toString();
+ var InterID = data[0].HInterID.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Process/StopGy_Process", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/PM_ProjectReportBill/ClosePM_ProjectReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_ProjectReportBill/DropPM_ProjectReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -777,9 +854,63 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+ var HUserName = "";
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ async: false,
+ data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ HUserName = result.data[0]["HEmpName"];
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ return HUserName;
+ }
+ //#endregion
});
- //#endregion
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
</script>
--
Gitblit v1.9.1