From 2c6011cfd1729a76822ee268ea20bcd295977f6d Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期日, 04 二月 2024 10:24:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产计划平台/Sc_WorkBillMonthPlan.html | 564 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/项目管理/工程项目/PM_WorkPlanMonthBillMain.html | 2
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 16 +
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/index.html | 1
WebTM/WebTM.csproj | 1
6 files changed, 579 insertions(+), 7 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 25d7658..ba5d5c8 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -469,6 +469,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Gy_ProcessBatchReport.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_LookDown.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_WorkBillMonthPlan.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗SingleRowWallList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_BadReasonReport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 922b73b..4f7227a 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e1cb62d..e0abb4f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -347,6 +347,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html" style="margin: 0 0 0 13px;">榻愬鐗╂枡淇℃伅鏄庣粏鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html" style="margin: 0 0 0 13px;">宸ュ巶鏃ュ巻</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_WorkBillMonthPlan.html" style="margin: 0 0 0 13px;">鏈堝害鐢熶骇璁″垝</a></dd>
</dl>
</dd>
<dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_WorkBillMonthPlan.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_WorkBillMonthPlan.html"
new file mode 100644
index 0000000..fb2dbbc
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_WorkBillMonthPlan.html"
@@ -0,0 +1,564 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏈堝害鐢熶骇璁″垝</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <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 src="../../../layuiadmin/soulTable.slim.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 2px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">鎵撳嵃</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_qtys" id="btn_qtys">榻愬杩愮畻</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="height:70px;">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞村害:</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <select name="HYear" id="HYear" lay-filter="HYear" style="width:190px;">
+ <option style="color:blue;" selected="selected" value="2023">2023</option>
+ <option style="color:blue;" value="2024">2024</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈堝害</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <select name="HMonth" id="HMonth" lay-filter="HMonth" style="width:190px;">
+ <option style="color:blue;" selected="selected" value="1">1</option>
+ <option style="color:blue;" value="1">1</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input ForFilteringSchemes" value="" style="float: left; width: 150px; display: inline-block; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input ForFilteringSchemes" value="0">
+ <button type="button" class="layui-btn" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 150px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ 鏌ヨ
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="height:400px;">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鏈堝害璁″垝</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃1-->
+ <div class="layui-tab-item layui-show">
+ <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="set_Del"><i class="layui-icon layui-icon-form"></i>鍙栨秷鎺掑崟</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="height:400px;">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鐢熶骇璁㈠崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃2-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Add"><i class="layui-icon layui-icon-form"></i>鎺掑崟</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--瀛愯〃1锛氬垹闄�-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , soulTable = layui.soulTable
+ , element = layui.element;
+
+ //妯″潡鍚�
+ var titleData = ["HMaterID", "HDeptID", "HInterID","HEntryID"];
+ var HBillType = "3703";
+ var sWhere = "";
+ //琛ㄦ牸娓叉煋鍙傛暟
+ var option = []; //琛�1娓叉煋鍙傛暟
+ var option1 = []; //琛�2娓叉煋鍙傛暟
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ get_WriteConfigFile();
+ });
+
+ //閮ㄩ棬
+ form.on('submit(btnHDept)', function (data) {
+ btnHDept();
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable1)', function (obj) {
+ switch (obj.event) {
+ //鎺掑崟
+ case 'set_Add': set_Add();
+ break;
+ };
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍙栨秷鎺掑崟
+ case 'set_Del': set_Del();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ function set_ClearBill() {
+ Organ();
+ get_ReadConfigFile();
+ //涓嬫媺鍒楄〃鍒濆鍖�
+ Init_selectYearAndMonth();
+ get_FastQuery();
+
+
+ }
+
+ //缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //涓嬫媺鍒楄〃鍒濆鍖�
+ function Init_selectYearAndMonth() {
+ // 椤甸潰鍒濆闇�瑕佺殑鍛ㄥ拰鏈堢殑鏁版嵁
+ const date = new Date();
+
+ //鍒濆鍖栧勾涓嬫媺鍒楄〃
+ var Year = date.getFullYear();
+ var YearList = [];
+ var YearSelect = "";
+ for (var i = Year - 5; i < Year + 5; i++) {
+ YearList.push(i);
+ }
+ for (var i = 0; i < YearList.length; i++) {
+ YearSelect += '<option style="color:blue;" value="' + YearList[i] + '">' + YearList[i] + '</option>';
+ }
+ $("#HYear").empty();
+ $("#HYear").append(YearSelect);
+ $("#HYear").val(Year);
+ form.render('select');
+
+ //鍒濆鍖栨湀涓嬫媺鍒楄〃
+ var Month = date.getMonth() + 1;
+ var MonthSelect = "";
+
+ for (var i = 0; i < 12; i++) {
+ MonthSelect += '<option style="color:blue;" value="' + (i + 1) + '">' + (i + 1) + '</option>';
+ }
+ $("#HMonth").empty();
+ $("#HMonth").append(MonthSelect);
+ $("#HMonth").val(Month);
+ form.render('select');
+ }
+
+ //閮ㄩ棬
+ function btnHDept() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
+
+ //鏌ヨ鏈堝害璁″垝淇℃伅
+ function set_WorkBillMonthPlanList(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillMonthPlan/Sc_WorkBillMonthPlanList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 350
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ table.render(option);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //鏌ヨ鐢熶骇璁㈠崟淇℃伅
+ function set_DisplayICMOList() {
+ var sWheres = "";
+ var HDeptID =$("#HDeptID").val();
+ if (HDeptID != 0) {
+ sWheres = " and HDeptID=" + HDeptID;
+ }
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillMonthPlan/Sc_WorkBillMonthPlan',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWheres, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData.push(data1.list[key].ColmCols);
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option1 = {
+ elem: '#mainTable1'
+ , toolbar: '#toolbarDemo1'
+ , height: 350
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ table.render(option1);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HYear = $("#HYear").val();
+ var HMonth = $("#HMonth").val();
+ var HDeptID = $("#HDeptID").val();
+
+ if (HYear) {
+ sWhere += " and year(鏃ユ湡) =" + HYear ;
+ }
+
+ if (HMonth) {
+ sWhere += "and month(鏃ユ湡) =" + HMonth ;
+ }
+
+ if (HDeptID != 0) {
+ sWhere += "and HDeptID ='" + HDeptID + "'";
+ }
+
+ //鏌ヨ鐢熶骇璁㈠崟淇℃伅
+ set_DisplayICMOList();
+ //鏌ヨ鎺掑崟鏈堝害璁″垝
+ set_WorkBillMonthPlanList(sWhere);
+ sWhere = "";
+ }
+
+ //鎺掑崟
+ function set_Add() {
+ var checkStatus = table.checkStatus('mainTable1')
+ , data = checkStatus.data;
+ if (data.length != 0) {
+ var HDeptID = $("#HDeptID").val();
+ if (HDeptID != 0) {
+
+ layer.confirm("纭鎺掑崟鍚�?", function (index) {
+ var datas = [];
+ for (var i = 0; i < data.length; i++) {
+ var HInterID = data[i].HInterID;
+ var HEntryID = data[i].HEntryID;
+ datas.push(HInterID + "_" + HEntryID);
+ }
+ var ajaxLoad = layer.load();
+
+ var sMainSub = datas + ';' + HDeptID + ';' + sessionStorage["HUserName"];
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillMonthPlan/Add_WorkBillMonthPlanList',
+ type: "post",
+ async: false,
+ data: { "msg": sMainSub },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ get_FastQuery();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!")
+ }
+ } else {
+ layer.msg("璇烽�夋嫨鏁版嵁杩涜鎺掑崟!")
+ }
+ }
+
+ //鍙栨秷鎺掑崟
+ function set_Del() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 0) {
+ var HDeptID = $("#HDeptID").val();
+ if (HDeptID != 0) {
+
+ layer.confirm("纭鍙栨秷鎺掑崟鍚�?", function (index) {
+ var datas = [];
+ for (var i = 0; i < data.length; i++) {
+ var HInterID = data[i].HInterID;
+ datas.push(HInterID);
+ }
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillMonthPlan/DelWorkBillMonthPlanList',
+ type: "get",
+ async: false,
+ data: { "HInterID": datas.toString(), "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ get_FastQuery();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!")
+ }
+ } else {
+ layer.msg("璇烽�夋嫨鏁版嵁杩涜鎺掑崟!")
+ }
+ }
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("Sc_WorkBillMonthPlan");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#HDeptID").val(data2["HDeptID"]);
+ $("#HDeptName").val(data2["HDeptName"]);
+ form.render('select');
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("Sc_WorkBillMonthPlan");
+ var data = {
+ HDeptID: $("#HDeptID").val()
+ , HDeptName: $("#HDeptName").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("Sc_WorkBillMonthPlan", JSON.stringify(data));
+ }
+
+
+ //#endregion
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index bc2fc86..4741101 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -166,7 +166,7 @@
//#endregion
var params = getUrlVars();
- var UserName = params[params[0]];
+ var UserName = params[params[2]];
UserName = decodeURI(UserName);//瀵筓RI 杩涜瑙ｇ爜
@@ -466,8 +466,10 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- if (UserName!="") {
- sWhere += " and 椤圭洰缁忕悊 = '" + UserName + "' and 鍗曟嵁鐘舵�� != '宸插叧闂�' ";
+ if (number == 2) {
+ if (HOrgID==null) {
+ sWhere += " and 椤圭洰缁忕悊 = '" + UserName + "' and 鍗曟嵁鐘舵�� != '宸插叧闂�' ";
+ }
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -958,7 +960,7 @@
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
- var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
@@ -1008,7 +1010,11 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
index 5d9d0dc..dc7b25b 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
@@ -789,7 +789,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ョ▼椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?UserName=' + UserName, 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=&UserName=' + UserName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
--
Gitblit v1.9.1