From 51c957b4dc4f6cd814bbaa225d26b3a050b1d06a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 23 八月 2024 17:22:30 +0800
Subject: [PATCH] 1
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 68
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 13
WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMain.html | 119 ++
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 8
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 120 ++
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 9
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 125 ++
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 124 ++
WebTM/views/home/console.html | 210 +--
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 41
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 1
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 472 ++++++++
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 611 ++++++++++-
WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html | 119 ++
WebTM/WebTM.csproj.user | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 18
WebTM/views/系统管理/单据类型/Xt_BillType_Edit.html | 221 +---
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 16
WebTM/layuiadmin/lib/admin.js | 2
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 237 ++++
WebTM/views/采购管理/采购申请单/Cg_PORequestBill.html | 122 ++
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 120 ++
WebTM/views/销售管理/收款单/YS_ReceiveBillList.html | 1
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 9
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 8
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 9
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 121 ++
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 159 ++
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 1
33 files changed, 2,567 insertions(+), 531 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index 70a8712..79d8489 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
+ <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 6fdd83b..26274fe 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3786,7 +3786,7 @@
<publishTime>07/17/2024 14:22:42</publishTime>
</File>
<File Include="views/搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/Xs_SeOrderBarCodeInAndOutStockDetailReport.html">
- <publishTime>08/20/2024 10:57:47</publishTime>
+ <publishTime>08/22/2024 08:55:57</publishTime>
</File>
<File Include="views/搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/YS_ContactBalReport.html">
<publishTime>08/16/2024 10:24:17</publishTime>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 50873e6..147597a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 0ce3a86..05883df 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,15 +5,15 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
+ /*var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/layuiadmin/lib/admin.js b/WebTM/layuiadmin/lib/admin.js
index 8ab78cc..4f3838c 100644
--- a/WebTM/layuiadmin/lib/admin.js
+++ b/WebTM/layuiadmin/lib/admin.js
@@ -233,7 +233,7 @@
}
style.id = id;
- styleElem && $body[0].removeChild(styleElem);
+ //styleElem && $body[0].removeChild(styleElem);
$body[0].appendChild(style);
$body.attr('layadmin-themealias', options.color.alias);
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index a80506e..d30526a 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -1,6 +1,4 @@
-锘�
-
-<!DOCTYPE html>
+锘�<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
@@ -10,7 +8,7 @@
<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">
- <style id="LAY_layadmin_theme">
+ <style id="LAY_layadmin_theme" type="text/css">
.layui-side-menu, .layadmin-pagetabs .layui-tab-title li:after, .layadmin-pagetabs .layui-tab-title li.layui-this:after, .layui-layer-admin .layui-layer-title, .layadmin-side-shrink .layui-side-menu .layui-nav > .layui-nav-item > .layui-nav-child {
background-color: #20222A !important;
}
@@ -23,8 +21,14 @@
background-color: #20222A !important;
}
- .FastMenu {
+ .layui-table-body.layui-table-main {
+ height: 400px;
}
+
+ .layui-table-box {
+ height: 400px;
+ }
+
</style>
<script>
/^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
@@ -155,12 +159,6 @@
<cite>鐢熶骇閫�鏂欏崟</cite>
</a>
</li>
- <!--<li class="layui-col-xs3">
- <a lay-href="set/user/info.html">
- <i class="layui-icon layui-icon-set"></i>
- <cite>鎴戠殑璧勬枡</cite>
- </a>
- </li>-->
</ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
@@ -183,44 +181,11 @@
<canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
</div>
</div>
- <!--<div class="layui-this" _echarts_instance_="1621151534574" style="-webkit-tap-highlight-color: transparent; user-select: none; cursor: default; background-color: rgba(0, 0, 0, 0);">
- <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
- <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
- <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- </div>
- </div>
- <div class="" _echarts_instance_="1621151534575" style="-webkit-tap-highlight-color: transparent; user-select: none; background-color: rgba(0, 0, 0, 0);">
- <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
- <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
- <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
- </div>
- </div>-->
</div>
<div class="layui-carousel-ind"><ul><li class=""></li><!--<li class="layui-this"></li><li class=""></li>--></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
</div>
</div>
- <!--鏂伴椈鐗堝潡-->
- <!--<div class="layui-card">
- <div class="layui-tab layui-tab-brief layadmin-latestData">
- <ul class="layui-tab-title">
- <li class="layui-this">浠婃棩鐑悳</li>
- <li>浠婃棩鐑笘</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table id="LAY-index-topSearch"></table>
- </div>
- <div class="layui-tab-item">
- <table id="LAY-index-topCard"></table>
- </div>
- </div>
- </div>
- </div>-->
</div>
</div>
</div>
@@ -274,92 +239,56 @@
</div>
</div>
</div>
- <div class="layui-card">
- <div class="layui-card-header">鏁堢巼鎶ュ憡</div>
- <div class="layui-card-body layadmin-takerates">
- <div class="layui-progress" lay-showPercent="yes">
- <h3>瀹屽伐鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-top" lay-tips="澧為暱" lay-offset="-15"></span>锛�</h3>
- <div class="layui-progress-bar" lay-percent="0%"></div>
- </div>
- <div class="layui-progress" lay-showPercent="yes">
- <h3>涓嶈壇鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-bottom" lay-tips="涓嬮檷" lay-offset="-15"></span>锛�</h3>
- <div class="layui-progress-bar" lay-percent="0%"></div>
- </div>
- </div>
+ <div class="layui-card" style="height:400px;">
+ <div class="layui-card-header">鍏憡閫氱煡</div>
+ <table class="mainTable" id="mainTable" lay-filter="mainTable"></table>
</div>
- <div class="layui-card">
- <div class="layui-card-header">瀹炴椂鐩戞帶</div>
- <div class="layui-card-body layadmin-takerates">
- <div class="layui-progress" lay-showPercent="yes">
- <h3>璁惧绋煎姩鐜�</h3>
- <div class="layui-progress-bar" lay-percent="0%"></div>
- </div>
- <div class="layui-progress" lay-showPercent="yes">
- <h3>璁惧鏁呴殰鐜�</h3>
- <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
- </div>
- </div>
- </div>
- <!--浜у搧鍔ㄦ��-->
- <!--<div class="layui-card">
- <div class="layui-card-header">浜у搧鍔ㄦ��</div>
- <div class="layui-card-body">
- <div class="layui-carousel layadmin-carousel layadmin-news" data-autoplay="true" data-anim="fade" lay-filter="news">
- <div carousel-item>
- <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-red">蹇�熶笂鎵嬫枃妗�</a></div>
- <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-green">浼氬憳璁ㄨ涓撳尯</a></div>
- <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-blue">鑾峰緱瀹樻柟鍚庡彴妯℃澘绯荤粺</a></div>
- </div>
- </div>
- </div>
- </div>-->
- <!--浣滆�呭績璇�-->
- <!--<div class="layui-card">
- <div class="layui-card-header"
- 浣滆�呭績璇�
- <i class="layui-icon layui-icon-tips" lay-tips="瑕佹敮鎸佺殑鍣�" lay-offset="5"></i>
- </div>
- <div class="layui-card-body layui-text layadmin-text">
- <span>
- 涔︿腑鎻忓啓浜嗕竴涓偅鏍风殑绀句細锛屽拰鍦ㄩ偅涓ぞ浼氱敓娲讳腑鐨勭绉嶄汉鐗╃殑鐘舵�侊紝楹绘湪鐨勫閭ｄ釜寮楁瘮鏂紝鏈�搴曞眰鐨勫鑰侀紶娲為噷鐨勯偅
- 鍑犱釜闅愪慨濂筹紝鐤媯鐨勫壇涓绘暀锛岃繕鏈夊敖鍏ㄥ姏鍙嶆姉鐨勬渶涓戦檵鐨勫崱榻愯帿澶氾紝鍓富鏁欏拰鍗￠綈鑾褰㈡垚浜嗕汉鎬т笂鐨勯矞鏄庡姣旓紝鍚屾牱鐖变笂浜�
- 缇庝附鐨勫濞橈紝鍚屾牱鐨勯伃鍒颁簡鎷掔粷锛屼粬浠殑鐖遍兘鏄偅涔堢殑鐑儓锛岄偅涔堢殑璇氭寶锛屽彲鏄紝涓�涓槸鍗犳湁锛屼竴涓槸濂夌尞锛屽凡鍗犳湁涓虹洰鐨勭殑锛�
- 褰撶洰鐨勬棤娉曡揪鍒扮殑鏃跺�欙紝浠栨兂鍒扮殑鏄瘉鐏紝姣佺伃鍒汉;浠ュ鐚负鐩殑鐨勶紝褰撴棤娉曞鐚殑鏃跺�欙紝鎯冲埌鐨勪篃鏄瘉鐏紝姣佺伃鑷繁
- </span>
- <p>--<a href="http://www.baidu.com" target="_blank">鐧惧害</a>锛�</p>
- <p>鈥斺�� 浣氬悕锛�<a href="http://www.baidu.com/" target="_blank">baidu.com</a>锛�</p>
- </div>
- </div>-->
</div>
</div>
</div>
-
- <script src="../../layuiadmin/layui/layui.js?t=1"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/layui/layui.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/zgqCustom/zgqCustom.js"></script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element', 'console'], function () {
- var $ = layui.$;
+ //鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
var element = layui.element;
var $ = layui.jquery;
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�"];
+
//鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
var HType = "PC";
- //#region 椤甸潰鍒濆鍖�
- set_ClearBill();
- //#endregion
- //#region 椤甸潰鍒濆鍖栨柟娉�
+ //椤甸潰鍒濆鍖�
+ set_ClearBill();
+
+ //椤甸潰鍒濆鍖栨柟娉�
function set_ClearBill() {
get_Display();
+ get_Notices();
}
- //#endregion
- //#region 椤甸潰鍏跺畠鏂规硶
+ //椤甸潰鍏跺畠鏂规硶
function get_Display() {
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
$.ajax({
@@ -453,8 +382,67 @@
}, false);
}
}
- //#endregion
+
+ //鐢熸垚閫氱煡鍒楄〃
+ function get_Notices() {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/GG_Notice/notices',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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 });
+ }
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ 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: 75 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-10'
+ , page: true
+ , cellMinWidth: 20
+ , limit: 4
+ }
+ table.render(option);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
});
</script>
</body>
+
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 20571b1..0b2a3bb 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -301,7 +301,6 @@
//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
dataCol = data1.data[0].HGridString.split(',');
}
-
colNames = colName.split(',');
if (data1.data.length != 0 && dataCol.length == colNames.length) {
@@ -317,7 +316,8 @@
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
- cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })
+ var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5] })
}
option.data = cols;
table.render(option);
@@ -371,7 +371,9 @@
, { field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
- , { field: 'ColumnWidth', title: '鍒楀', width: 100,edit: 'text' }
+ , { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text' }
+ , { field: 'ColumnName_Other', title: '鍒悕', width: 120, edit: 'text' }
+ , { field: 'ColumnName_real', title: '鍒悕瀵瑰簲鍒楀悕', width: 120, edit: 'text', hide: "true" }
]]
};
}
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 24abdde..9140bcc 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍗曟嵁绫诲瀷鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,10 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<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>
+
</head>
<body>
<div class="layui-fluid">
@@ -17,86 +20,147 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>-->
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- </div>
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span>鏇村</span>
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
+ <span>鏇村</span>
</div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </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: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
</div>
- <div class="layui-row layui-form-item">
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <!--涓夋杩囨护閫夐」妗�-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
- </div>
- <table class="" 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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- </div>
- </script>
+ <table class="" 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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></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_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
</form>
</div>
</div>
</div>
</div>
- <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>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -119,6 +183,15 @@
var HModName = "Xt_BillTypeList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "绯荤粺鍗曟嵁绫诲瀷";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+ var ins;
//#endregion
//#region 鍒濆鍖栫晫闈�
@@ -133,6 +206,31 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鏂板鎸夐挳
+ case 'btn-Add':
+ set_AddNew();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete':
+ delete_Bill();
+ break;
+ //淇敼鎸夐挳
+ case 'btn-Edit':
+ set_ShowBill();
+ break;
};
});
//#endregion
@@ -143,9 +241,12 @@
set_ClearQuery();
});
+ //鑾峰彇缁勭粐
+ Organ();
+
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(table, option, 2);
});
//#endregion
@@ -257,22 +358,37 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- form.render('select');
- //$("#Hmaker").val("");//鍒跺崟浜�
+ $("#ColName1").val();//澶嶉�夋
+ $("#Comparator1").val();
+ $("#ColContent1").val();
+ $("#ColName2").val();//澶嶉�夋
+ $("#Comparator2").val();
+ $("#ColContent2").val();;
+ form.render('select');
sWhere = "";
}
// 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(table, option, number) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ //浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -295,7 +411,48 @@
}
sWhere += " and " + ColName + " " + com;
}
- //var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 鍗曟嵁绫诲瀷璧勬枡浠ｇ爜 like '%" + HNumber + "%'";
@@ -306,6 +463,13 @@
//if (Hmaker) {
// sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
//}
+
+ if (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -439,17 +603,306 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ 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 set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Xt_SystemLogListExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板绯荤粺鍙傛暟绠＄悊',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Xt_BillType_Edit.html?hID=0&OperationType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ //#region 淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫绯荤粺鍙傛暟鏌ヨ'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: './Xt_BillType_Edit.html?hID=' + hID + "&OperationType=3"
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function delete_Bill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID;
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'YS_ReceiveBill/delete_Test1',
+ type: "GET",
+ data: { "HItemID": hID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ //var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ //layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ //layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //layer.close(wait);
+ }
+ });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
}
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
-
</script>
</body>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html"
index ee9dd4f..04acbaf 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html"
@@ -21,12 +21,8 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
@@ -60,12 +56,6 @@
<label class="layui-form-label">鏁版嵁搴撳瓙琛�</label>
<div class="layui-input-inline">
<input type="text" name="HEntryTable" id="HEntryTable" lay-verify="HEntryTable" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">妯″潡鍚�</label>
- <div class="layui-input-inline">
- <input type="text" name="HTemplate" id="HTemplate" lay-verify="HTemplate" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
</div>
@@ -187,11 +177,9 @@
, util = layui.util
var sWhere = "";
-
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
- //鑾峰彇鍙傛暟
+ //鑾峰彇閾炬帴鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -203,134 +191,57 @@
return vars;
}
- ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
+ //鑾峰彇 閫掑叆鍙傛暟
var params = getUrlVars();
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var hID = params[params[0]];//缂栬緫鏌ョ湅
+ var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫 4娴佹按鍙锋柊澧�
-
-
- if (HType == "Modify") {
+ if (OperationType == 1) {
+ //鑾峰緱鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Xt_BillType/GetMAXBillID",
+ type: "GET",
+ data: {},
+ success: function (d) {
+ $("#HInterID").val(d.data[0].hitemid);
+ }
+ });
+ }
+ else if (OperationType == 3) {
+ //鑾峰彇鍗曟嵁淇℃伅
$.ajax({
url: GetWEBURL() + "/Xt_BillType/xg",
//url: "http://localhost:12761/Xt_BillType/xg",
type: "GET",
data: {
- "HInterID": linterid
+ "HInterID": hID
},
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
$("#HNumber").val(d.data[0].HNumber);
$("#HName").val(d.data[0].HName);
$("#HRemark").val(d.data[0].HRemark);
+ $("#HTemplate").val(d.data[0].HTemplate);
+ $("#HHeadTable").val(d.data[0].HHeadTable);
+ $("HEntryTable").val(d.data[0].HEntryTable);
+ $("#HViewName").val(d.data[0].HViewName);
+ $("#HRightName").val(d.data[0].HRightName);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
}
});
}
- else {
- $.ajax({
- url: GetWEBURL() + "/Xt_BillType/GetMAXBillID",
- type: "GET",
- data: { },
- success: function (d) {
- $("#HInterID").val(d.data[0].hitemid);
- }
- });
- //Initialization();
- }
-
-
- //閫夋嫨楠屾敹
- form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
- var sMainStr = JSON.stringify(data.field);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '楠屾敹鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- ////閫夋嫨鍒涘缓缁勭粐
- //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- // var sMainStr = JSON.stringify(data.field);
- // layer.open({
- // type: 2
- // , area: ['100%', '100%']
- // , title: '缁勭粐'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- // , resize: false
- // , cancel: function () {
- // //$(".layui-btn").removeClass("layui-btn-disabled");
- // }
- // })
- //});
-
-
- //鑾峰彇鏈�澶у熀纭�璧勬枡ID
- $.ajax({
- url: GetWEBURL() + "/Xt_BillType/GetMAXBillID",
- type: "GET",
- data: { },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].hitemid);
- }
- });
-
- //鎵撳嵃Printing
- form.on("submit(print)", function (data) {
- layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
- //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-
- });
-
- //鏂板
- form.on('submit(Add)', function () {
- window.location.reload();
- $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
- });
-
- //瀹℃牳
- form.on('submit(Check)', function () {
-
- });
-
//閫�鍑�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index.html";
+ /*parent.location.href = "../../../views/index.html";*/
+ parent.layer.closeAll();
});
});
-
-
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
-
var HNumber = $("#HNumber").val();
if (HNumber == null || HNumber == undefined || HNumber == "") {
@@ -347,62 +258,18 @@
}
var ModRightNameAdd = 'Xt_BillType_Edit';
var user = sessionStorage["HUserName"];
-
-
var oMain = JSON.stringify(data.field)
- var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+ var sBillModeify = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
var index = layer.load();
- if (HType == "Modify") {
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/'Xt_BillType/AddBill1",
- //url: "http://localhost:12761/'Xt_BillType/AddBill1",
- async: true,
- data: { "oMain": sBillModeify},
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
- else
- {
+ if (OperationType == 1) {
$.ajax({
type: "POST",
url: GetWEBURL() + "/Xt_BillType/AddBill",
- //url: "http://localhost:12761/Xt_BillType/AddBill",
async: true,
data: { "oMain": oMain },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
}
@@ -417,9 +284,31 @@
}
});
}
+ //淇敼
+ else if (OperationType == 3) {
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Xt_BillType/AddBill1",
+ async: true,
+ data: { "oMain": sBillModeify},
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("淇濆瓨鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
});
-
-
});
//浠ヤ笂涓簂ayui妯″潡
@@ -428,12 +317,6 @@
$("#HSecManager").val(obj[0].HName);
$("#HSecManagerID").val(obj[0].HItemID);
}
-
-
-
-
-
</script>
-
</body>
</html>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index 8a82b41..e01c716 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -75,6 +75,8 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <!--涓夋杩囨护閫夐」妗�-->
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index fb3d2c2..b5ef21c 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -702,14 +702,14 @@
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100 }
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, style: 'background-color:#efefef4d;'}
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;'}
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true,edit:'text' }
, { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
@@ -747,11 +747,13 @@
//, { field: 'HSeContractInterID', title: '閿�鍞悎鍚屽唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
//, { field: 'HSeContractEntryID', title: '閿�鍞悎鍚屽瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
//, { field: 'HSeContractBillNo', title: '閿�鍞悎鍚屽彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ , { field: '鎿嶄綔' ,fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
option.data = [];
table.render(option);
+
+ DisPlay_HideColumn();
}
//#endregion
@@ -986,7 +988,7 @@
//#endregion
- //#region 閫夋嫨婧愬崟-浠樻鍗�
+ //#region 閫夋嫨婧愬崟-搴斾粯鍗�
function setPayableBill(checkStatus) {
var dataArray = [];
@@ -997,10 +999,10 @@
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
return;
}
- //if (temp.琛岀姸鎬� == "宸插叧闂�") {
- // layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
- // return;
- //}
+ if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
dataArray.push(temp);
} else {
return;
@@ -1057,7 +1059,7 @@
, "HSourceInterID": dataArray[i].hmainid
, "HSourceEntryID": dataArray[i].hsubid
, "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HSourceBillType": '1114'
, "HRelationQty": "0"
, "HRelationMoney": "0"
@@ -1338,7 +1340,7 @@
, "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�
, "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�
, "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": 1114
+ , "HSourceBillType": result.data[i].婧愬崟绫诲瀷
, "HRelationQty": result.data[i].鍏宠仈鏁伴噺
, "HRelationMoney": result.data[i].鍏宠仈閲戦
@@ -1534,7 +1536,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -1563,6 +1565,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1579,7 +1582,7 @@
for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[j].split('|');
//閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[4]) {
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -1610,7 +1613,11 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
- newCols[0].push(option.cols[0][i + 1]);
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i+1]);
}
}
}
@@ -1638,16 +1645,8 @@
}
}
table.render(option);
- var HBillType = "1102";
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
} else {
table.render(option);
- var HBillType = "1102";
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index 5e6ae3f..d636d33 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -199,7 +199,7 @@
var option = [];
var sWhere = "";
var HModName = "YF_PayMentBillList";
-
+ var HBillType = "2103"
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -716,7 +716,7 @@
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
- if (data[0].鐘舵�� == "鍒涘缓") {
+ if (data[0].鍗曟嵁鐘舵�� == "鍒涘缓") {
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
url: GetWEBURL() + 'YF_PayMentBill/delete',
@@ -1046,7 +1046,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -1075,6 +1075,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1115,6 +1116,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1160,7 +1165,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
index 7dcfd91..e4d94d6 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
@@ -287,6 +287,7 @@
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</div>
@@ -478,7 +479,10 @@
form.render('select');
}
break;
-
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
//#endregion
@@ -857,7 +861,7 @@
,limit:100
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HProjectMoneyID', title: '璐圭敤椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HPMoneyName', title: '璐圭敤椤圭洰鍚嶇О', edit: 'text', event: "HPMoneyName", style: 'background-color: #f9f9f9;' } //f7
, { field: 'HTypeSub', title: '鍙戠エ绫诲瀷', templet: '#HTypeSub' }
@@ -867,7 +871,7 @@
//, { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HSumMoney', title: '鎬婚噾棰�', style: 'background-color: #f9f9f9;' }
, { field: 'HRemark', title: '瀛愯〃澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -884,7 +888,7 @@
];
option.data = rowdata;
table.render(option);
-
+ DisPlay_HideColumn();
}
//#endregion
@@ -1361,7 +1365,114 @@
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 978fee1..477f137 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -1025,7 +1025,7 @@
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100 }
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
@@ -2406,7 +2406,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -2489,6 +2489,10 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
}
//鍙栨秷鍐荤粨鍒�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 20897ee..e3c6aeb 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -1006,7 +1006,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -1064,6 +1064,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1103,6 +1104,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1384,7 +1389,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index 794aae0..ae4fc72 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -240,6 +240,7 @@
<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="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -269,7 +270,7 @@
var option;
//#endregion
-
+ HModName = 'Sup_QuotePriceBillEdit'
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -356,6 +357,10 @@
break;
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -903,6 +908,8 @@
$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//澶辨晥鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
+ DisPlay_HideColumn();
}
//鍒濆鍖栬〃鏍�
@@ -910,7 +917,7 @@
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', totalRow: true }
, { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterID", width: 165 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 220 }
@@ -931,7 +938,7 @@
, { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
, { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 120 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
];
option = {
id: 'mainTable'
@@ -1151,7 +1158,114 @@
}
})
}
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//鎵撳嵃
function get_print(data) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 7abf806..d17c14b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -351,7 +351,7 @@
var allVal;
window.OptionData = [];
//#endregion
-
+ var HModName = "Add_Edit_Cg_POInStockBillList"
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -521,6 +521,10 @@
break;
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -821,10 +825,10 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
- , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { type: 'numbers', field: '搴忓彿',title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
- , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
@@ -852,6 +856,7 @@
option.data = [];
table.render(option);
+ DisPlay_HideColumn()
}
//#region 鍔犺浇琛ㄥご
@@ -2185,7 +2190,114 @@
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 鑾峰彇婧愬崟绫诲瀷
function HSourceBillType() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 709ff40..414abd8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -374,8 +374,7 @@
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(1)
- //闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
+
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
@@ -535,7 +534,9 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1103";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1363,7 +1364,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1398,6 +1399,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1446,6 +1448,10 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
}
//鍙栨秷鍐荤粨鍒�
@@ -1486,7 +1492,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
index c1e7e19..c4ce325 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
@@ -248,6 +248,7 @@
<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="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -277,7 +278,7 @@
var option;
//#endregion
-
+ HModName = 'Sup_AskPriceBillEdit'
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -362,6 +363,10 @@
break;
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -665,7 +670,7 @@
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', totalRow: true }
, { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterID", width: 165 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 220 }
@@ -679,7 +684,7 @@
, { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
, { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 120 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
];
option = {
id: 'mainTable'
@@ -711,6 +716,7 @@
}];
table.render(option);
+ DisPlay_HideColumn();
}
@@ -827,7 +833,114 @@
}
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 68bb4a4..5f195e4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -330,7 +330,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
//#endregion
-
+ var HModName = "Add_Edit_Cg_POInStockBackBillList"
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -480,10 +480,10 @@
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -593,10 +593,10 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
- , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { type: 'numbers', field: '搴忓彿',title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
- , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
@@ -623,6 +623,7 @@
option.data = [];
table.render(option);
+ DisPlay_HideColumn();
}
//#endregion
//#endregion
@@ -1935,6 +1936,114 @@
return HTaxRate;
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index d78a18c..b02d07b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -323,7 +323,8 @@
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
-
+ var HModName = "Add_Edit_Cg_ContractBillSub1"
+ var HModName2 = "Add_Edit_Cg_ContractBillSub2"
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -448,6 +449,10 @@
case 'get_InOutSum': get_InOutSum();
break;
//鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ //鍒楄缃�
//case 'set_hidecolumn':
// get_hidecolumn();
// break;
@@ -487,6 +492,10 @@
//鍒锋柊澶嶉�夋
//checkRefresh();
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn2':
+ get_HideColumn2();
break;
//鍒楄缃�
//case 'set_hidecolumn':
@@ -788,7 +797,7 @@
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�', style: 'background-color:#efefef4d;' }
- , { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
@@ -802,12 +811,13 @@
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
option.data = rowdata;
table.render(option);
+ DisPlay_HideColumn();
}
function set_InitGrid2() {
option2 = {
@@ -819,19 +829,20 @@
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�', style: 'background-color:#efefef4d;' }
- , { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HCurID', title: '璐у竵浠ｇ爜', width: 100, hide: true }
, { field: '璐у竵鍚嶇О', title: '璐у竵鍚嶇О', width: 100, edit: 'text', event: "HCurID" }//f7
, { field: 'HExRate', title: '姹囩巼', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
, { field: 'HDate', title: '鍒拌揣鏃ユ湡', width: 120, event: 'HDate' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2', width: 70 }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo2', width: 70 }
]]
}
option2.data = rowdata2;
table.render(option2);
+ DisPlay_HideColumn2();
}
//#endregion
//#region 鍔犺浇琛ㄥご
@@ -1631,7 +1642,223 @@
//#endregion
//#endregion
+ //#region 鍒楄缃�1
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楄缃�2
+ //闅愯棌鍒楄缃�
+ function get_HideColumn2() {
+ var colName = "";
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ colName += option2.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn2() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option2.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option2.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option2.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option2.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+ option2.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option2.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option2.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option2.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option2.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ if (option2.cols[0][i]["fixed"] != null) {
+ option2.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option2.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option2);
+ } else {
+ table.render(option2);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
index b340de7..b1371f4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
@@ -279,7 +279,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
//#endregion
-
+ var HModName = "Cg_PORequestBill"
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -382,10 +382,10 @@
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -617,7 +617,7 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, totalRow: true }
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
@@ -630,12 +630,13 @@
, { field: 'HDate', title: '寤鸿鍒拌揣鏃ユ湡', width: 120, event: 'HDate' }
, { field: 'HUseSub', title: '鐢宠鐢ㄩ��', width: 120, edit: 'text'}
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
option.data = rowdata;
table.render(option);
+ DisPlay_HideColumn();
}
//#region 鍔犺浇琛ㄥご
@@ -1156,7 +1157,114 @@
//#endregion
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 4ceb2df..e0a73fa 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -371,7 +371,7 @@
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0; //澹版槑浜嗕竴涓悕涓� HOrgIDBar 鐨勫彉閲忥紝骞跺皢鍏跺垵濮嬪寲涓� 0
-
+ var HModName = "Cg_POOrderBillEdit"
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -524,10 +524,10 @@
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -986,6 +986,8 @@
option.data = rowdata; //瀛愯〃鐨勫�艰祴鍊肩粰option.data 鍚憃ption瀵硅薄娣诲姞涓�涓猟ata灞炴�э紝骞跺皢鍏惰缃负rowdata
table.render(option);//娓茬晫闈�
+
+ DisPlay_HideColumn();
}
//#region 鍔犺浇琛ㄥご
@@ -1894,6 +1896,115 @@
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 1b368a7..4fbc899 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -654,8 +654,7 @@
//闅愯棌鍕鹃�夊瓧娈�
/*DisPlay_HideColumn();*/
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -858,7 +857,9 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1102";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -2162,7 +2163,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -2191,6 +2192,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -2207,7 +2209,7 @@
for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[j].split('|');
//閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[4]) {
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -2237,6 +2239,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
newCols[0].push(option.cols[0][i+1]);
}
@@ -2328,7 +2334,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 44614bb..a3ba31b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -1302,6 +1302,7 @@
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
async: false,
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index 7037b3f..d87dde6 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -1037,7 +1037,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1072,6 +1072,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1118,6 +1119,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1396,7 +1401,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index 3309fae..58ccf57 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -285,6 +285,18 @@
<input class="layui-input" name="HAvailableBalance" id="HAvailableBalance" autocomplete="off" readonly>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
@@ -298,7 +310,7 @@
</div>
<!--闅愯棌瀛楁-->
- <div class="layui-row" style="display:none;">
+ <!--<div class="layui-row" style="display:none;">
<div class="layui-inline">
<div class="layui-input-block">
<input class="layui-input" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off">
@@ -307,7 +319,7 @@
<input class="layui-input" name="HMainSourceBillType" id="HMainSourceBillType" value="" autocomplete="off">
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -404,11 +416,19 @@
</div>
</div>
</div>
+ <table 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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
</form>
</div>
</div>
</div>
-
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script>
layui.config({
@@ -446,7 +466,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//#endregion
@@ -464,12 +484,16 @@
//閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠″垵濮嬪寲
getCzyglByUser();
+ //鍒濆鍖栧瓙琛�
+ set_InitGrid();
}
- else if (OperationType == 3) { //缂栬緫
+ else if (OperationType == 3) {//缂栬緫
+ //鍒濆鍖栧瓙琛�
+ set_InitGrid();
if (closeType == 10) {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
-
+
}
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
@@ -490,10 +514,54 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) { //鐩戝惉mainTable琛ㄦ牸涓婄殑宸ュ叿鏍忎簨浠� 瑙﹀彂鍥炶皟鍑芥暟obj鍙傛暟
+ var checkStatus = table.checkStatus('mainTable') // 鐩戝惉閫変腑鐨勭殑鐘舵��
+ , data = checkStatus.data; //浠庨�変腑鐘舵�佷腑鎻愬彇鏁版嵁锛岃繖浜涙暟鎹槸琛ㄦ牸涓閫変腑鐨勮
+ switch (obj.event) { // switch (obj.event)鐢ㄤ簬鏍规嵁obj.event鐨勫�兼潵鍐冲畾鎵ц鍝釜case鍧�
+ ////鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ }
+ });
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+ //#endregion
+
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
//#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
//#region 閫夋嫨閿�鍞儴闂ㄦ寜閽�
form.on('submit(HDeptList)', function () {
get_checkDept();
+ });
+ //#endregion
+
+ //#region 閫夋嫨婧愬崟鎸夐挳
+ form.on('submit(HMainSource)', function () {
+ get_checkMainSource();
});
//#endregion
@@ -569,7 +637,7 @@
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
- HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -614,7 +682,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
- HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HGiftMoney").val(HGiftMoney);
});
@@ -762,6 +830,70 @@
}
//#endregion
+ //#region 瀛愯〃鍒濆鍖�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text'}
+ , { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillEntryID', title: '鎺ユ敹婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillNo', title: '鎺ユ敹婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceDate', title: '婧愬崟鏃ユ湡', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceMoney', title: '婧愬崟閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceMoneyBB', title: '婧愬崟閲戦鏈綅甯�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HInovceExRate', title: '褰撴湡姹囩巼', width: 100, style: 'background-color:#efefef4d;' }
+ //, { field: 'HReadyCheckMoney', title: '宸叉牳閿�閲戦', width: 100 }
+ //, { field: 'HUnCheckMoney', title: '鏈牳閿�閲戦', width: 100 }
+ //, { field: 'HCheckMoney', title: '鏈鏍搁攢閲戦', width: 100}
+ //, { field: 'HCheckMoneyBB', title: '鏈鏍搁攢閲戦', width: 100}
+ , { field: 'HSourceRemark', title: '婧愬崟澶囨敞', width: 100 }
+
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ //, { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractInterID', title: '閲囪喘鍚堝悓鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractEntryID', title: '閲囪喘鍚堝悓瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractBillNo', title: '閲囪喘鍚堝悓鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ //, { field: 'HSeContractInterID', title: '閿�鍞悎鍚屽唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HSeContractEntryID', title: '閿�鍞悎鍚屽瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HSeContractBillNo', title: '閿�鍞悎鍚屽彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+ option.data = [];
+ table.render(option);
+ }
+ //#endregion
+
//#region 鏃堕棿缁勪欢鍒濆鍖�
function set_InitDate() {
var dateList = ["#HAccDate"];
@@ -887,7 +1019,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟瀹㈡埛鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp='+HEmpID, 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp=' + HEmpID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1009,8 +1141,129 @@
})
}
//#endregion
+
+ //#region 閫夋嫨婧愬崟
+ function get_checkMainSource() {
+ var url = "";
+ var HOrgID = $("#HOrgID").val();
+ url = "../../閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBillList.html?openType=2&HOrgID=" + HOrgID;
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '婧愬崟-搴旀敹鍗�' + '鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: [url, '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 === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ setReceivableBill(checkStatus);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//#endregion
-
+
+ //#region 閫夋嫨婧愬崟-搴旀敹鍗�
+ function setReceivableBill(checkStatus) {
+ var dataArray = [];
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = checkStatus.data[i];
+ if (temp != "none") {
+ if (temp.鍗曟嵁鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ return;
+ }
+ if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
+ dataArray.push(temp);
+ } else {
+ return;
+ }
+ }
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": 0
+ , "HMainSourceEntryID": 0
+ , "HMainSourceBillNo": ''
+ , "HMainSourceBillType": '1426'
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ , "HCusID": dataArray[0].HCusID
+ , "HCusName": dataArray[0].瀹㈡埛
+ /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
+ , "HSumMoney": dataArray[0].閲戦
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ var sumMoney = 0;
+ for (var i = 0; i < dataArray.length; i++) {
+ sumMoney = sumMoney + dealDoubleToFixed(dataArray[i].閲戦, 2);
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HReceiveBillInterID": dataArray[i].hmainid
+ , "HReceiveBillEntryID": dataArray[i].hsubid
+ , "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceDate": Format(dataArray[i].鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , "HInovceExRate": dataArray[i].姹囩巼
+
+ , "HSourceRemark": dataArray[i].琛ㄤ綋澶囨敞
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": 1426
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': dataArray[i].HPOOrderInterID
+ , 'HPOOrderEntryID': dataArray[i].HPOOrderEntryID
+ , 'HPOOrderBillNo': dataArray[i].HPOOrderBillNo
+
+ , "HSeOrderInterID": dataArray[i].HSeOrderInterID
+ , "HSeOrderEntryID": dataArray[i].HSeOrderEntryID
+ , "HSeOrderBillNo": dataArray[i].HSeOrderBillNo
+ }
+ );
+ }
+ $("#HSumMoney").val(sumMoney);
+ $("#HRelSumMoney").val(sumMoney);
+ option.data = rowdata;
+ table.render(option);
+ }
+ //#endregion
+
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇鎿嶄綔鏂瑰紡
@@ -1033,7 +1286,21 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
- var sSubStr = JSON.stringify([]); //瀛愯〃鏁版嵁
+ //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+ var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
+ //瀛愯〃鏁版嵁
+ if (table.cache["mainTable"].length != 0) {
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ var sSubStr = JSON.stringify(num);
+ } else {
+ var sSubStr = JSON.stringify([]);
+ }
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
@@ -1131,7 +1398,59 @@
});
HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
+ if (data.hsubid != null) {
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ var allMoney = 0;
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i].瀛愯〃涓婚敭 == null ? 0 : result.data[i].瀛愯〃涓婚敭
+ , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": result.data[i].HUnitID == null ? 0 : result.data[i].HUnitID
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅鍚嶇О
+ , "HQty": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(result.data[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(result.data[i].缁撶畻閲戦, 2)
+ , "HReceiveBillInterID": result.data[i].婧愬崟涓诲唴鐮�
+ , "HReceiveBillEntryID": result.data[i].婧愬崟瀛愬唴鐮�
+ , "HReceiveBillNo": result.data[i].婧愬崟鍗曞彿
+ , "HSourceDate": Format(result.data[i].婧愬崟鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(result.data[i].婧愬崟閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(result.data[i].婧愬崟閲戦鏈綅甯�, 2)
+ , "HInovceExRate": result.data[i].褰撴湡姹囩巼
+ , "HSourceRemark": result.data[i].婧愬崟澶囨敞
+
+ , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�
+ , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�
+ , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
+ , "HSourceBillType": result.data[i].婧愬崟绫诲瀷
+ , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
+ , "HRelationMoney": result.data[i].鍏宠仈閲戦
+
+ , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟涓诲唴鐮�
+ , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
+ , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
+
+ , "HSeOrderInterID": result.data[i].閿�鍞鍗曚富鍐呯爜
+ , "HSeOrderEntryID": result.data[i].閿�鍞鍗曞瓙鍐呯爜
+ , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
+ }
+ );
+ allMoney = Number(result.data[i]["缁撶畻閲戦"]) + allMoney
+ }
+ option.data = rowdata;
+ table.render(option);
+
+ //璁剧疆涓昏〃閲戦
+ $("#HSumMoney").val(allMoney);
+ var HDiscountRate = $("#HDiscountRate").val() * 1; //鏁村崟鎶樻墸
+ var HRelSumMoney = allMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ $("#HRelSumMoney").val(HRelSumMoney);
+ }
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1248,7 +1567,7 @@
return false;
}
-
+
if ($("#HSSID").val() == "0") {
layer.msg("缁撶畻鏂瑰紡鏈�夋嫨!");
@@ -1362,6 +1681,133 @@
return HSourceBillData;
}
//#endregion
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["hmainid", "HBillType", "HSupID", "涓氬姟鐘舵��", "HUnitID", "渚涘簲鍟嗕唬鐮�", "涓氬姟鍛樹唬鐮�", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ table.render(option);
+ var HBillType = "1102";
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ } else {
+ table.render(option);
+ var HBillType = "1102";
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
//#endregion
//#endregion
@@ -1577,7 +2023,7 @@
}
}
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
index 4cc2a04..022aeb0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
@@ -1121,6 +1121,7 @@
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
async: false,
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 40846ed..6104de2 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -192,42 +192,42 @@
<table class="" 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" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞嚭搴撳崟)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICStockBackBills" id="btn-PushICStockBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞��璐у崟)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞嚭搴撳崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICStockBackBills" id="btn-PushICStockBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞��璐у崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseRow" id="set_CancelCloseRow"><i class="layui-icon layui-icon-form"></i>琛屽弽鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>鎵撳嵃(鍏ュ簱鐮佸崟)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CancelCloseRow" id="set_CancelCloseRow"><i class="layui-icon layui-icon-form"></i>琛屽弽鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>鎵撳嵃(鍏ュ簱鐮佸崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>楂樼骇杩囨护</button>-->
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index aa15712..7ea8eeb 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -1540,6 +1540,7 @@
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
async: false,
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 39bbd2b..e0c6851 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -116,7 +116,7 @@
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -126,7 +126,7 @@
<label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -136,7 +136,7 @@
<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="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -363,7 +363,7 @@
var allVal;
//#endregion
-
+ var HModName = "Add_Edit_Kf_POStockInBillList"
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -498,10 +498,10 @@
//checkRefresh();
}
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -970,10 +970,10 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { type: 'numbers',field: '搴忓彿', title: '搴忓彿', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
- , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
@@ -1001,6 +1001,8 @@
option.data = [];
table.render(option);
+ DisPlay_HideColumn();
+
}
//#region 鍔犺浇琛ㄥご
@@ -1323,6 +1325,8 @@
, "HCurID": dataArray[0].HCurID
, "HCurName": dataArray[0].甯佸埆
, "HExRate": dataArray[0].姹囩巼
+ , "HWHName": dataArray[0].涓昏〃浠撳簱
+ , "HWHID": dataArray[0].涓昏〃浠撳簱ID
, "HSSID": "0"
, "HSSName": ""
, "HProjectID": dataArray[0].HProjectID
@@ -1345,7 +1349,7 @@
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1390,10 +1394,10 @@
//#endregion
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if ($("#HEmpName").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HEmpName").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HDeptName").val() == 0) {
layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1407,14 +1411,14 @@
layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HKeeperID").val() == 0) {
- layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSecManagerID").val() == 0) {
- layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HKeeperID").val() == 0) {
+ // layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSecManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
var num = [];
@@ -2367,7 +2371,114 @@
return res;
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 淇濆瓨鏂规硶鏍￠獙
function AllowLoadData(data) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index 83eaf94..21a7d07 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -335,7 +335,7 @@
var allVal;
//#endregion
-
+ var HModName = "Kf_POStockInBackBill_Add_Up"
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -514,10 +514,10 @@
//checkRefresh();
}
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -798,10 +798,10 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100}
- , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100}
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
- , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
@@ -826,6 +826,7 @@
option.data = [];
table.render(option);
+ DisPlay_HideColumn();
}
//#region 鍔犺浇琛ㄥご
@@ -1866,7 +1867,114 @@
}
//#endregion
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 8c824d5..be8f68b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -1331,7 +1331,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1366,6 +1366,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1413,6 +1414,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1484,7 +1489,7 @@
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
--
Gitblit v1.9.1