From cffe020f05fe07f491ab7cfc0a3e4d5b83ff805e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 八月 2024 16:45:08 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 28
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 6
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 70 +
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMainList.html | 9
WebTM/views/home/console.html | 7
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 824 +++++++++++++++++++
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 12
WebTM/views/销售管理/信用额度申请单/Xs_CusRatingChangeBillList.html | 10
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 1
WebTM/views/销售管理/出门确认单/Xs_OutDoorCheckBillList.html | 9
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBillList.html | 9
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBillList.html | 11
WebTM/views/质量管理/质量报表/QC_PPMReport.html | 857 ++++++++++++++++++++
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 141 +++
WebTM/WebTM.csproj.user | 4
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBill.html | 137 +++
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 131 +++
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBill.html | 4
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 37
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html | 9
WebTM/views/Baseset/基础资料/Gy_HProjectGroup.html | 105 ++
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 5
WebTM/views/销售管理/收款单/YS_ReceiveBillList.html | 1
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBillList.html | 10
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 4
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBillList.html | 9
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html | 6
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBill.html | 5
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html | 9
WebTM/WebTM.csproj | 3
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
34 files changed, 2,409 insertions(+), 73 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f3a2f92..219b10c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -173,6 +173,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_HProjectGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
@@ -480,7 +481,9 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_PPMReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_TechnologyParameterClass.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_SkillExamMonthSumReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 147597a..6cd52dd 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 05883df..9b92e50 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
@@ -13,7 +13,7 @@
//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/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
new file mode 100644
index 0000000..d557238
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
@@ -0,0 +1,105 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <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">
+ <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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
+ RoadQuery($('#Value').val());
+ });
+
+ form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHProjectGroupNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+
+ RoadQuery($('#Value').val());
+
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', width: 150, title: '鍗曚綅缁処D', hide: true }
+ , { field: '椤圭洰浠ｇ爜', width: 150, title: '椤圭洰浠ｇ爜' }
+ , { field: '椤圭洰缁�', width: 150, title: '椤圭洰缁�', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_Material/GetProjectGroupList_Json",
+ async: true,
+ data: { "Unit": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index d30526a..21861e1 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -411,6 +411,13 @@
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;
+ case 'String':
+ if (data[i].id == '绱ф�ョ▼搴�') {
+ col.push({
+ field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 70``
+ });
+ break;
+ }
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 142b3ce..64f6691 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -332,8 +332,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -432,9 +432,9 @@
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -493,13 +493,24 @@
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HProjectBillMainID" id="HProjectBillMainID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProjectGroupList" id="HProjectGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -958,7 +969,6 @@
//鏈湴瀛樺偍
localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
}
-
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
function RoadBillMain(hID)//鍔犺浇琛ㄥご
@@ -1425,9 +1435,7 @@
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
-
}
-
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -1568,7 +1576,6 @@
})
});
-
//閫夋嫨杈呭姪璁￠噺鍗曚綅
form.on('submit(HSecUnitList)', function () {//閫夋嫨瀹胯垗
$("#UnitType").val(2);
@@ -1599,7 +1606,6 @@
})
});
-
//閫夋嫨璁￠噺鍗曚綅缁�
form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
@@ -1623,6 +1629,37 @@
}
$("#HUnitGroupName").val(checkStatus.data[0].璁￠噺鍗曚綅缁�);
$("#HUnitGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨椤圭洰
+ form.on('submit(HProjectGroupList)', function () {
+ layer.open({
+ type: 2
+ , area: ['60%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_HProjectGroup.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus.data[0].椤圭洰缁�);
+ console.log(checkStatus.data[0].HInterID);
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰缁�);
+ $("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1942,6 +1979,13 @@
$("#HUnitGroupName").val(obj[0].璁￠噺鍗曚綅缁�);
$("#HUnitGroupID").val(obj[0].HItemID);
}
+
+ //杩斿洖椤圭洰缁�
+ function GetHProjectGroupNameValue(obj) {
+ $("#HProjectName").val(obj[0].椤圭洰缁�);
+ $("#HProjectBillMainID").val(obj[0].HInterID);
+ }
+
//杩斿洖璁￠噺鍗曚綅
function GetHUnitNameValue(obj) {
if ($("#UnitType").val() == 1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2e3bb01..0a2ac95 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -5,6 +5,7 @@
<title>渚涘簲鍟嗚缃�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -171,6 +172,7 @@
var params = getUrlVars();
var Type = params[params[0]];
var HSupTypeID = 0;
+ var HSupClsName = '';
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -240,22 +242,22 @@
break;
};
});
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
//#region 閲嶆柊鍚屾鎸夐挳
form.on('submit(btnResCnz)', function (data) {
set_ResCnz();
});
//#endregion
- //#endregion
-
-
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -300,6 +302,7 @@
//鏍戠姸鍥剧敓鎴�
get_Display_Tree();
}
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
option = {
@@ -323,6 +326,7 @@
//]]
};
}
+
//鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
@@ -397,7 +401,6 @@
layer.close(index);
}
-
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -457,6 +460,7 @@
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
// 閲嶇疆鎸夐挳
function set_ClearQuery() {
$("#HNumber").val("");
@@ -469,6 +473,7 @@
sWhere = "";
}
+
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
var HNumber2 = $('#HNumber2').val();
@@ -496,6 +501,7 @@
}
});
}
+
// 鍒犻櫎鎸夐挳
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -531,6 +537,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
// 淇敼鎸夐挳
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -542,10 +549,11 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
+ , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID]
, resize: false
})
}
+
//鏂板鎸夐挳
function set_AddNew() {
layer.open({
@@ -581,7 +589,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=2&HSupTypeID=' + HSupTypeID,
+ content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=2&linterid=0&HSupTypeID=' + HSupTypeID + '&HSupClsName=' + encodeURIComponent(HSupClsName),
end: function () {
//鍒锋柊椤甸潰,
get_FastQuery(table, option);
@@ -594,7 +602,6 @@
}
//#endregion
-
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
@@ -668,7 +675,6 @@
}
//#endregion
-
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
var ajaxLoad = layer.load();
@@ -698,7 +704,7 @@
for (var i = 0; i < data.length; i++) {
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
if (data[i].children != null && data[i].children.length > 0) {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
// 閬嶅巻鑾峰彇瀛愯彍鍗�
for (var k = 0; k < data[i].children.length; k++) {
liStr += getChildMenu(data[i].children[k], 0);
@@ -706,7 +712,7 @@
liStr = liStr.substring(0, liStr.length - 1);
liStr += ']},';
} else {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
}
};
liStr = liStr.substring(0, liStr.length - 1);
@@ -726,9 +732,10 @@
HSupTypeID = 0;
} else if (data.id == "0") {
sql = "";
- HMaterTypeID = 0;
+ HSupTypeID = 0;
} else {
sql = " and HSupTypeID = '" + data.id + "' ";
+ HSupClsName = data.title;
HSupTypeID = data.id;
}
get_Display(sql);
@@ -741,7 +748,7 @@
num++;
var subStr = '';
if (subMenu.children != null && subMenu.children.length > 0) {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ subStr += '{"title": "' + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
for (var j = 0; j < subMenu.children.length; j++) {
subStr += getChildMenu(subMenu.children[j], num);
if (j + 1 == subMenu.children.length) {
@@ -750,11 +757,10 @@
}
subStr += ']},';
} else {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
}
return subStr;
}
-
//#endregion
//#region 闅愯棌鍒楄缃�
@@ -791,6 +797,7 @@
}
})
}
+
//#endregion
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -900,7 +907,6 @@
$("#ColName").append(Organization);
form.render('select');
}
-
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -1111,6 +1117,7 @@
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index e5cbee1..b6301c8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -5,6 +5,7 @@
<title>渚涘簲鍟嗗熀纭�璧勬枡</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -20,6 +21,7 @@
.layui-form-item .layui-inline {
margin-right: 0px;
}
+
.layui-input, .layui-textarea {
width: 124%;
}
@@ -377,7 +379,6 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
layui.config({
@@ -412,10 +413,13 @@
else if (OperationType == 2) {//鏂板娴佹按鍙�
setInitHCurName()
- var HSupTypeID = params[params[1]];//绫诲瀷id
+ var HSupTypeID = params[params[2]];//绫诲瀷id
+ var HSupClsName = params[params[3]];//绫诲瀷鍚嶇О
+ console.log(HSupClsName)
setHNumber(HSupTypeID);
- $("#HNumber").attr("readonly", true);
-
+ $("#HNumber").attr("readonly", false);
+ $("#HSupTypeID").val(HSupTypeID);
+ $("#HSupClsName").val(decodeURIComponent(HSupClsName));
//鍒濆鍖栬〃
get_InitGrid();
}
@@ -522,6 +526,7 @@
}
});
});
+
//閫夋嫨閲囪喘鏂瑰紡鎸夐挳
form.on('submit(btnSearchPss)', function () {
layer.open({
@@ -545,6 +550,7 @@
, btn2: function (index, layero) { }
})
});
+
//榛樿璐у竵寮圭獥
form.on('submit(btnCurrency)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -649,6 +655,7 @@
}
});
});
+
//淇濆瓨
form.on('submit(Saver)', function (data) {//鎻愪氦
var ModRightNameAdd = 'Gy_Supplier_Edit';
@@ -724,6 +731,7 @@
}
}
});
+
//閫�鍑�
form.on('submit(Exit)', function () {
if (linterid == undefined) {
@@ -735,10 +743,12 @@
Pub_Close(1);
}
});
+
//瀹℃牳
form.on('submit(Check)', function () {
});
+
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
@@ -746,21 +756,23 @@
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(HCreateOrgID_BT)', function () {
HCreateOrgID_BT();
});
+
//浣跨敤缁勭粐
form.on('submit(HUseOrgID_BT)', function () {
HUseOrgID_BT();
});
//#endregion
-
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//鍒濆鍖栭〉闈�
@@ -796,6 +808,7 @@
}
});
}
+
//鏂板璁剧疆榛樿绋庣巼鍜岃揣甯�
function setInitHCurName() {
var ajaxLoad = layer.load();
@@ -863,7 +876,7 @@
var rowdata = [
{
- "HPayType": ""
+ "HPayType": ""
, "HPayRate": "0"
, "HPayTime": "0"
, "HPayRemark": ""
@@ -873,7 +886,6 @@
table.render(option);
}
//#endregion
-
//缂栬緫椤甸潰鍔犺浇
function set_EditFromGrid() {
@@ -934,11 +946,13 @@
}
});
}
+
//杩斿洖楠屾敹
function GetHSecManagerValue(obj) {
$("#HSecManager").val(obj[0].HName);
$("#HSecManagerID").val(obj[0].HItemID);
}
+
//鏁版嵁楠岃瘉
function AllowLoadData() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 57483a9..4930702 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -202,6 +202,7 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝叧鑱旂敤鎴凤級
var titleData1 = ["HCusID"];
var HCusTypeID = 0;
+ var HCusClsName = '';
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -775,7 +776,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID,
+ content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID + '&HCusClsName=' + encodeURIComponent(HCusClsName),
end: function () {
//鍒锋柊椤甸潰,
get_FastQuery(table, option);
@@ -1121,7 +1122,7 @@
for (var i = 0; i < data.length; i++) {
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
if (data[i].children != null && data[i].children.length > 0) {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
// 閬嶅巻鑾峰彇瀛愯彍鍗�
for (var k = 0; k < data[i].children.length; k++) {
liStr += getChildMenu(data[i].children[k], 0);
@@ -1129,7 +1130,7 @@
liStr = liStr.substring(0, liStr.length - 1);
liStr += ']},';
} else {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ liStr += '{"title": "'+ data[i].title + '", "id": "' + data[i].id + '"},';
}
};
liStr = liStr.substring(0, liStr.length - 1);
@@ -1153,6 +1154,7 @@
} else {
sql = " and HCusTypeID='" + data.id + "' ";
HCusTypeID = data.id;
+ HCusClsName = data.title;
}
get_Display(sql);
}
@@ -1164,7 +1166,7 @@
num++;
var subStr = '';
if (subMenu.children != null && subMenu.children.length > 0) {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
for (var j = 0; j < subMenu.children.length; j++) {
subStr += getChildMenu(subMenu.children[j], num);
if (j + 1 == subMenu.children.length) {
@@ -1173,7 +1175,7 @@
}
subStr += ']},';
} else {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
}
return subStr;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 2c0e9fe..3bb1fb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -406,8 +406,10 @@
else if (OperationType == 2) {//娴佹按鍙锋柊澧�
var HCusTypeID = params[params[1]];//绫诲瀷id
+ var HCusClsName = params[params[2]]//绫诲瀷鍚嶇О
setHNumber(HCusTypeID);
- $("#HNumber").attr("readonly", true);
+ $("#HNumber").attr("readonly", false);
+ $("#HCusTypeName").val(decodeURIComponent(HCusClsName));
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
$("#HCreateOrgID").attr("disabled", true);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 5a4a381..abe3730 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -625,7 +625,7 @@
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 == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ 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 hh:mm:ss')}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
new file mode 100644
index 0000000..6887eaf
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
@@ -0,0 +1,857 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>PPM缁╂晥瓒嬪娍鍥�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <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" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+ 鍔ㄦ�佹覆鏌撶粍缁�
+ </select>
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div>
+ <div style="width:99%;height:calc(100vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="histogram" style="width: 99.5%; height: calc(68vh); margin-top: 10px;; margin-bottom: 100px;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var HModName = "QC_PPMReport";
+ var HBillType = "QC_PPMReport";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var sDate = Format(new Date(), "yyyy-MM-dd")
+ var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var option = [];
+ var columns = "";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+ //#endregion
+ var totalArray = [];
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鑾峰彇缁勭粐
+ //set_StockOrg();
+ //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitDate();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ }
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 鑾峰彇缁勭粐
+ //function set_StockOrg() {
+ // //鑾峰彇鐧诲綍椤电粍缁囧垪
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Web/GetOrganizations",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // success: function (result) {
+ // var Organization = "";
+ // Organization += '<option style="color:blue;" value="-1">鍏ㄩ儴</option>';
+ // 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>';
+ // }
+ // $("#HStockOrgID").append(Organization);
+ // $("#HStockOrgID").val(HStockOrgID)
+ // form.render('select');
+ // }
+ // layer.closeAll("loading");
+ // },
+ // complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ // })
+ //}
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ , type: 'year'
+ , value: new Date()
+ , btns: ['now']
+ , showBottom: false //鏄惁鏄剧ず搴曢儴鏍�
+ , ready: function (date) {
+ $("#layui-laydate").off('click', '.laydate-month-list li', function () {
+ $("#layui-laydate").remove;
+ });
+ }
+ //閫夋嫨骞翠唤鎴栨湀浠介兘浼氬叧闂�
+ , change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
+ lay('#HDate').val(value);
+ if ($(".layui-laydate").length) {
+ $(".layui-laydate").remove();
+ }
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ //, totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ data: { "HModName": HModName, "user": HMaker },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+ var totalArray = [];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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);
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ //鍒锋柊鍒楄〃
+ get_FastQuery();
+ }
+ })
+ });
+ //#endregion
+
+ //#region 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鍒锋柊鎸夐挳
+ case 'btn_Refresh': btn_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'btn_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, HMaker);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function btn_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy"));
+ sDate = Format(new Date(), "yyyy-MM-dd")
+ $("#HDeptName").val("");
+ //$("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ form.render('select');
+ sWhere = "";
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ sDate = $("#HDate").val(); //鏃ユ湡
+ get_Display(sWhere);
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ }
+
+ //#endregion
+
+ //#region 鍒楄〃鍒锋柊
+ function get_Display(sWhere) {
+ var HDate = sDate; //鏃ユ湡
+ //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ }
+ var HDeptID = $("#HDeptID").val()
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/QC_QualityReportsController/GetQC_PPMReport_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HYear": HDate, "HDeptID": HDeptID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', hide: true }); //闅愯棌id鍒�
+ }else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
+ break;
+ default:
+ if (data[i].name == '缁熻椤�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 200 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 130 });
+ }
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ //, totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ columns = col;
+
+ option.cols = [columns];
+ option.data = data1.data;
+ //option.totalRow = true;
+ table.render(option);
+ ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍔犺浇鍥捐〃
+ function set_Graphics() {
+ //#region 銆愭煴鐘跺浘銆�
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_mychart;
+
+ //#region [鏌辩姸鍥惧竷灞�鏍峰紡]
+ const posList = [
+ 'left',
+ 'right',
+ 'top',
+ 'bottom',
+ 'inside',
+ 'insideTop',
+ 'insideLeft',
+ 'insideRight',
+ 'insideBottom',
+ 'insideTopLeft',
+ 'insideTopRight',
+ 'insideBottomLeft',
+ 'insideBottomRight'
+ ];
+ app.configParameters = {
+ rotate: {
+ min: -90,
+ max: 90
+ },
+ align: {
+ options: {
+ left: 'left',
+ center: 'center',
+ right: 'right'
+ }
+ },
+ verticalAlign: {
+ options: {
+ top: 'top',
+ middle: 'middle',
+ bottom: 'bottom'
+ }
+ },
+ position: {
+ options: posList.reduce(function (map, pos) {
+ map[pos] = pos;
+ return map;
+ }, {})
+ },
+ distance: {
+ min: 0,
+ max: 100
+ }
+ };
+ app.config = {
+ rotate: 90,
+ align: 'left',
+ verticalAlign: 'middle',
+ position: 'insideBottom',
+ distance: 15,
+ onChange: function () {
+ const labelOption = {
+ rotate: app.config.rotate,
+ align: app.config.align,
+ verticalAlign: app.config.verticalAlign,
+ position: app.config.position,
+ distance: app.config.distance
+ };
+ myChart.setOption({
+ series: [
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ }
+ ]
+ });
+ }
+ };
+ const labelOption = {
+ show: true,
+ position: 'top',
+ textStyle: {
+ //color: '#333', // 鏍囩瀛椾綋棰滆壊
+ fontSize: 12, // 鏍囩瀛椾綋澶у皬
+ //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
+ //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
+ //fontFamily: 'Arial' // 鏍囩瀛椾綋
+ }
+ };
+ const labelOption1 = {
+ show: true,
+ position: 'right',
+ textStyle: {
+ //color: '#333', // 鏍囩瀛椾綋棰滆壊
+ fontSize: 12, // 鏍囩瀛椾綋澶у皬
+ //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
+ //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
+ //fontFamily: 'Arial' // 鏍囩瀛椾綋
+ }
+ }
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
+ var HBadQty = []; //y杞达細涓嶈壇鎬绘暟
+ var HPPM = []; //y杞达細PPM
+ var HTarget = []; //y杞达細鐩爣
+ for (let i = 0; i < option.data.length; i++) {
+ //鑾峰彇涓嶈壇鎬绘暟琛屾暟鍊�
+ if (option.data[i].缁熻椤� == '涓嶈壇鎬绘暟') {
+ for (let j = 1; j <= 12; j++) {
+ HBadQty.push(option.data[i][j + "鏈�"]);
+ }
+ }
+ //鑾峰彇PPM琛屾暟鍊�
+ if (option.data[i].缁熻椤� == 'PPM') {
+ for (let j = 1; j <= 12; j++) {
+ HPPM.push(option.data[i][j + "鏈�"]);
+ }
+ }
+ //鑾峰彇鐩爣琛屾暟鍊�
+ if (option.data[i].缁熻椤� == '鐩爣') {
+ for (let j = 1; j <= 12; j++) {
+ HTarget.push(option.data[i][j + "鏈�"]);
+ }
+ }
+ }
+
+ option_mychart = {
+ title: {
+ text: 'PPM缁熻鍥捐〃',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['涓嶈壇鎬绘暟', 'PPM', '鐩爣'],
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
+ },
+ //toolbox: { //宸ュ叿鏍�
+ // show: true,
+ // orient: 'vertical',
+ // left: 'right',
+ // top: 'center',
+ // feature: {
+ // mark: { show: true },
+ // dataView: { show: true, readOnly: false },
+ // magicType: { show: true, type: ['line', 'bar', 'stack'] },
+ // restore: { show: true },
+ // saveAsImage: { show: true }
+ // }
+ //},
+ grid:
+ {
+ left: '5%',
+ right: '5%',
+ bottom: '10%',
+ //top: '10%',
+ containLabel: true
+ },
+ xAxis: [ //璁剧疆x杞村潗鏍�
+ {
+ type: 'category',
+ axisTick: { show: true },
+ data: H_X,
+ axisLabel: {
+ formatter: function (value) {
+ var temp = "";
+ var temp_len = 5;
+ for (var i = 0; i < value.length; i = i + temp_len) {
+ if (i + temp_len <= value.length) {
+ temp += '\n' + value.slice(i, i + temp_len)
+ } else {
+ temp += '\n' + value.slice(i);
+ }
+ }
+
+ return temp;
+
+ // 浣跨敤 '\n' 瀹炵幇鎹㈣
+ //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
+ },
+ width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛�
+ }
+ }
+ ],
+ yAxis: [ //璁剧疆y杞存暟鎹被鍨�
+ {
+ type: 'value',
+ position: 'left',
+ data: [HBadQty] // 宸︿晶Y杞寸殑鏁版嵁
+ }, {
+ type: 'value',
+ position: 'right',
+ data: [HPPM, HTarget], // 鍙充晶Y杞寸殑鏁版嵁
+ axisLabel: {
+ formatter: '{value}' // 鍙互娣诲姞鍗曚綅
+ }
+ }
+ ],
+ series: [ //璁剧疆y杞存暟鎹�
+ {
+ name: '涓嶈壇鎬绘暟',
+ type: 'bar',
+ barWidth: 30,
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
+ },
+ color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
+ }
+ },
+ data: HBadQty
+ },
+ {
+ name: 'PPM',
+ type: 'line',
+ yAxisIndex: 1,
+ barWidth: 10,
+ barGap: 0,
+ label: labelOption1,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
+ },
+ color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
+ }
+ },
+ data: HPPM
+ },
+ {
+ name: '鐩爣',
+ type: 'line',
+ barWidth: 10,
+ barGap: 0,
+ label: labelOption1,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ }
+ },
+ data: HTarget
+ }
+ ]
+ };
+ option_mychart && myChart.setOption(option_mychart);
+ //#endregion
+ }
+ ////#endregion
+ //#endregion
+
+ });
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
new file mode 100644
index 0000000..ad3ba45
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
@@ -0,0 +1,824 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <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" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+ 鍔ㄦ�佹覆鏌撶粍缁�
+ </select>
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div>
+ <div style="width:99%;height:calc(100vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="histogram" style="width: 99.5%; height: calc(68vh); margin-top: 10px;; margin-bottom: 100px;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var HModName = "QC_SkillExamMonthSumReport";
+ var HBillType = "QC_SkillExamMonthSumReport";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var sDate = Format(new Date(), "yyyy-MM-dd")
+ var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var option = [];
+ var columns = "";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+ //#endregion
+ var totalArray = [];
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鑾峰彇缁勭粐
+ //set_StockOrg();
+ //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitDate();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ }
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 鑾峰彇缁勭粐
+ //function set_StockOrg() {
+ // //鑾峰彇鐧诲綍椤电粍缁囧垪
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Web/GetOrganizations",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // success: function (result) {
+ // var Organization = "";
+ // Organization += '<option style="color:blue;" value="-1">鍏ㄩ儴</option>';
+ // 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>';
+ // }
+ // $("#HStockOrgID").append(Organization);
+ // $("#HStockOrgID").val(HStockOrgID)
+ // form.render('select');
+ // }
+ // layer.closeAll("loading");
+ // },
+ // complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ // })
+ //}
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ , type: 'year'
+ , value: new Date()
+ , btns: ['now']
+ , showBottom: false //鏄惁鏄剧ず搴曢儴鏍�
+ , ready: function (date) {
+ $("#layui-laydate").off('click', '.laydate-month-list li', function () {
+ $("#layui-laydate").remove;
+ });
+ }
+ //閫夋嫨骞翠唤鎴栨湀浠介兘浼氬叧闂�
+ , change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
+ lay('#HDate').val(value);
+ if ($(".layui-laydate").length) {
+ $(".layui-laydate").remove();
+ }
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ //, totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ data: { "HModName": HModName, "user": HMaker },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+ var totalArray = [];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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);
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ //鍒锋柊鍒楄〃
+ get_FastQuery();
+ }
+ })
+ });
+ //#endregion
+
+ //#region 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鍒锋柊鎸夐挳
+ case 'btn_Refresh': btn_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'btn_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, HMaker);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function btn_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy"));
+ sDate = Format(new Date(), "yyyy-MM-dd")
+ $("#HDeptName").val("");
+ //$("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ form.render('select');
+ sWhere = "";
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ sDate = $("#HDate").val(); //鏃ユ湡
+ get_Display(sWhere);
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ }
+
+ //#endregion
+
+ //#region 鍒楄〃鍒锋柊
+ function get_Display(sWhere) {
+ var HDate = sDate; //鏃ユ湡
+ //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ }
+ var HDeptID = $("#HDeptID").val()
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HYear": HDate, "HDeptID": HDeptID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', hide: true }); //闅愯棌id鍒�
+ }else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ //, totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ columns = col;
+
+ option.cols = [columns];
+ option.data = data1.data;
+ //option.totalRow = true;
+ table.render(option);
+ ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍔犺浇鍥捐〃
+ function set_Graphics() {
+ //#region 銆愭煴鐘跺浘銆�
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_mychart;
+
+ //#region [鏌辩姸鍥惧竷灞�鏍峰紡]
+ const posList = [
+ 'left',
+ 'right',
+ 'top',
+ 'bottom',
+ 'inside',
+ 'insideTop',
+ 'insideLeft',
+ 'insideRight',
+ 'insideBottom',
+ 'insideTopLeft',
+ 'insideTopRight',
+ 'insideBottomLeft',
+ 'insideBottomRight'
+ ];
+ app.configParameters = {
+ rotate: {
+ min: -90,
+ max: 90
+ },
+ align: {
+ options: {
+ left: 'left',
+ center: 'center',
+ right: 'right'
+ }
+ },
+ verticalAlign: {
+ options: {
+ top: 'top',
+ middle: 'middle',
+ bottom: 'bottom'
+ }
+ },
+ position: {
+ options: posList.reduce(function (map, pos) {
+ map[pos] = pos;
+ return map;
+ }, {})
+ },
+ distance: {
+ min: 0,
+ max: 100
+ }
+ };
+ app.config = {
+ rotate: 90,
+ align: 'left',
+ verticalAlign: 'middle',
+ position: 'insideBottom',
+ distance: 15,
+ onChange: function () {
+ const labelOption = {
+ rotate: app.config.rotate,
+ align: app.config.align,
+ verticalAlign: app.config.verticalAlign,
+ position: app.config.position,
+ distance: app.config.distance
+ };
+ myChart.setOption({
+ series: [
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ }
+ ]
+ });
+ }
+ };
+ const labelOption = {
+ show: true,
+ position: 'top',
+ textStyle: {
+ //color: '#333', // 鏍囩瀛椾綋棰滆壊
+ fontSize: 12, // 鏍囩瀛椾綋澶у皬
+ //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
+ //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
+ //fontFamily: 'Arial' // 鏍囩瀛椾綋
+ }
+ };
+ const labelOption1 = {
+ show: true,
+ position: 'right',
+ textStyle: {
+ //color: '#333', // 鏍囩瀛椾綋棰滆壊
+ fontSize: 12, // 鏍囩瀛椾綋澶у皬
+ //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
+ //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
+ //fontFamily: 'Arial' // 鏍囩瀛椾綋
+ }
+ }
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
+ var HAverage = []; //y杞达細骞冲潎鍒�
+ var HTarget = []; //y杞达細鐩爣鍊�
+ for (let i = 0; i < option.data.length; i++) {
+ //鑾峰彇骞冲潎鍒嗚鏁板��
+ if (option.data[i].椤圭洰 == '骞冲潎鍒�') {
+ for (let j = 1; j <= 12; j++) {
+ HAverage.push(option.data[i][j + "鏈�"]);
+ }
+ }
+ //鑾峰彇鐩爣鍊艰鏁板��
+ if (option.data[i].椤圭洰 == '鐩爣鍊�') {
+ for (let j = 1; j <= 12; j++) {
+ HTarget.push(option.data[i][j + "鏈�"]);
+ }
+ }
+ }
+
+ option_mychart = {
+ title: {
+ text: '闄烽槺娴嬭瘯鍒嗘暟缁熻琛�',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['骞冲潎鍒�', '鐩爣鍊�'],
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
+ },
+ //toolbox: { //宸ュ叿鏍�
+ // show: true,
+ // orient: 'vertical',
+ // left: 'right',
+ // top: 'center',
+ // feature: {
+ // mark: { show: true },
+ // dataView: { show: true, readOnly: false },
+ // magicType: { show: true, type: ['line', 'bar', 'stack'] },
+ // restore: { show: true },
+ // saveAsImage: { show: true }
+ // }
+ //},
+ grid:
+ {
+ left: '5%',
+ right: '5%',
+ bottom: '10%',
+ //top: '10%',
+ containLabel: true
+ },
+ xAxis: [ //璁剧疆x杞村潗鏍�
+ {
+ type: 'category',
+ axisTick: { show: true },
+ data: H_X,
+ axisLabel: {
+ formatter: function (value) {
+ var temp = "";
+ var temp_len = 5;
+ for (var i = 0; i < value.length; i = i + temp_len) {
+ if (i + temp_len <= value.length) {
+ temp += '\n' + value.slice(i, i + temp_len)
+ } else {
+ temp += '\n' + value.slice(i);
+ }
+ }
+
+ return temp;
+
+ // 浣跨敤 '\n' 瀹炵幇鎹㈣
+ //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
+ },
+ width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛�
+ }
+ }
+ ],
+ yAxis: [ //璁剧疆y杞存暟鎹被鍨�
+ {
+ name: '',
+ type: 'value',
+ min: 0,
+ max: 100,
+ interval: 10,
+ axisLabel: {
+ formatter: '{value} '
+ }
+ }
+ ],
+ series: [ //璁剧疆y杞存暟鎹�
+ {
+ name: '骞冲潎鍒�',
+ type: 'bar',
+ barWidth: 30,
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
+ },
+ color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
+ }
+ },
+ data: HAverage
+ },
+ {
+ name: '鐩爣鍊�',
+ type: 'line',
+ barWidth: 10,
+ barGap: 0,
+ label: labelOption1,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ }
+ },
+ data: HTarget
+ }
+ ]
+ };
+ option_mychart && myChart.setOption(option_mychart);
+ //#endregion
+ }
+ ////#endregion
+ //#endregion
+
+ });
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
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 4fbc899..6e7c4c8 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"
@@ -281,6 +281,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Notice" id="Notice"><i class="layui-icon layui-icon-export"></i>閫氱煡</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp" id="fp"><i class="layui-icon layui-icon-tips"></i>鍒嗛厤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>鍙戝竷</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>鎾ら攢</button>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
index cae3596..e810495 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
@@ -936,7 +936,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('/');
@@ -970,6 +970,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async:false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1019,6 +1020,11 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
}
//鍙栨秷鍐荤粨鍒�
@@ -1055,7 +1061,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\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 41dc719..16c05f9 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -291,6 +291,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>
@@ -499,6 +500,10 @@
}
form.render('select');
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
@@ -904,6 +909,8 @@
];
option.data = rowdata;
table.render(option);
+
+ DisPlay_HideColumn();
}
//#endregion
@@ -1436,6 +1443,130 @@
});
}
//#endregion
+
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMaterID", "HUnitID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍙�", "婧愬崟绫诲瀷", "鍏宠仈鏁伴噺", "鍏宠仈閲戦", "HQty_Old", "HQty_New"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
index da496c9..ca6613d 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
@@ -925,7 +925,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('/');
@@ -959,6 +959,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1007,6 +1008,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];
}
}
@@ -1287,7 +1292,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\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
index 5233bdd..77919cd 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
@@ -380,6 +380,11 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
}
//鍙栨秷鍐荤粨鍒�
@@ -670,7 +675,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('/');
@@ -914,7 +919,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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
index f06d730..6cbfcb3 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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
@@ -358,6 +358,7 @@
<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>
<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>
</div>
@@ -397,7 +398,8 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
-
+
+ var HModName = "Add_Edit_Xs_SeOutStockBillList";
//#endregion
@@ -446,6 +448,8 @@
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
//#endregion
+
+
var rowdata = [{
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
@@ -500,10 +504,10 @@
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -838,6 +842,8 @@
option.data = [];
table.render(option);
+
+ DisPlay_HideColumn();
}
//#region 鍔犺浇琛ㄥご
@@ -1373,6 +1379,131 @@
}
//#endregion
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMaterID", "HUnitID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍙�", "婧愬崟绫诲瀷", "鍏宠仈鏁伴噺", "鍏宠仈閲戦", "HQty_Old", "HQty_New"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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 set_GridDelete(obj) {
var data = obj.data;
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 6fe6e49..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"
@@ -1300,6 +1300,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
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_ReceivableBill.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_ReceivableBill.html"
index c863cf9..6c11492 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_ReceivableBill.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_ReceivableBill.html"
@@ -2431,6 +2431,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async:false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
async: false,
@@ -2480,6 +2481,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\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
index 666eef2..1d557c7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
@@ -913,7 +913,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('/');
@@ -947,6 +947,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -996,6 +997,11 @@
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];
}
}
@@ -1275,7 +1281,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_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 16b4d37..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"
@@ -1119,6 +1119,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
index cdd2f3d..484c74e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
@@ -979,7 +979,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('/');
@@ -1014,6 +1014,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1061,6 +1062,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];
}
}
@@ -1341,7 +1346,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/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
index bb11eed..de0523e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
@@ -302,6 +302,7 @@
<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>
<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>
</div>
@@ -341,6 +342,8 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
+
+ var HModName = "Xs_SeOutStockBackBill";
//#endregion
@@ -443,10 +446,10 @@
//鍑哄叆搴撹褰曟煡璇�
case 'get_InOutSum': get_InOutSum();
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -773,6 +776,8 @@
option.data = [];
table.render(option);
+
+ DisPlay_HideColumn();
}
//#region 鍔犺浇琛ㄥご
@@ -1174,6 +1179,130 @@
}
//#endregion
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMaterID", "HUnitID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍙�", "婧愬崟绫诲瀷", "鍏宠仈鏁伴噺", "鍏宠仈閲戦", "HQty_Old", "HQty_New"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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 set_GridDelete(obj) {
var data = obj.data;
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
index 608b3ba..d10d271 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
@@ -989,7 +989,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -1016,6 +1016,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1057,6 +1058,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];
}
}
@@ -1345,7 +1350,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/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
index e89c6e4..c0270e8 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
@@ -1698,6 +1698,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
async: false,
@@ -1747,6 +1748,11 @@
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\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
index ce86790..3c68969 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
@@ -977,7 +977,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('/');
@@ -1012,6 +1012,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1059,6 +1060,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];
}
}
@@ -1339,7 +1344,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/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
index 135e398..5511857 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
@@ -1344,6 +1344,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
async: false,
@@ -1393,6 +1394,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\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
index 3f45c6a..90073e0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
@@ -934,7 +934,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('/');
@@ -968,6 +968,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1015,6 +1016,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];
}
}
@@ -1292,7 +1297,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/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
index 19a8335..95f68fc 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
@@ -2416,6 +2416,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\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
index 1105493..270fbe1 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
@@ -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 杩涜缂栫爜
@@ -1074,6 +1074,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -1120,6 +1121,12 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+
}
//鍙栨秷鍐荤粨鍒�
@@ -1162,7 +1169,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\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.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_SellOutBill.html"
index 4ec1a08..1c81d05 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_SellOutBill.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_SellOutBill.html"
@@ -2780,6 +2780,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
async: false,
@@ -2832,6 +2833,11 @@
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\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 1cba602..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"
@@ -1538,6 +1538,7 @@
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
@@ -1581,6 +1582,7 @@
option.cols[0][i + 1]["align"] = "right";
break;
}
+
//璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
if (dataCols[4] != null && dataCols[4] != "") {
option.cols[0][i + 1]["title"] = dataCols[4];
--
Gitblit v1.9.1