From 84fdebf3b5703202340bcd9afb5a0ec58b5439d5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 03 九月 2024 09:38:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 201 --
WebTM/views/质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html | 11
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 11
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 8
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html | 308 +++-
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 11
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 225 ++-
WebTM/views/home/announcement.html | 205 ++
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 7
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 21
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html | 458 ++++++
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 20
WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html | 7
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 13
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 28
WebTM/views/基础资料/基础资料/Gy_SettleStyle.html | 30
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 45
WebTM/views/采购管理/采购申请单/Cg_PORequestBill.html | 7
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 7
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 238 --
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 66
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 31
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 33
WebTM/layuiadmin/Scripts/webConfig.js | 33
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 28
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 59
WebTM/WebTM.csproj | 6
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMain.html | 7
WebTM/views/user/login.html | 30
WebTM/views/基础资料/公用基础资料/Gy_PoStockStyle.html | 28
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 38
WebTM/views/IpadIndex.html | 52
WebTM/Vlog/webapi20240827.txt | 27
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 3
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 7
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 6
WebTM/views/home/console.html | 10
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 7
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 30
WebTM/views/home/console111.html | 482 ++++++
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 23
WebTM/WebTM.csproj.user | 5
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 39
WebTM/views/indexMenu.html | 17
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 2
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 43
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 14
WebTM/views/PublicPage/PowerInformation.html | 5
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 175 --
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 4
WebTM/views/质量管理/质量报表/QC_QualityMonthSumReport.html | 817 +++++++++++
WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html | 252 --
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 17
54 files changed, 3,187 insertions(+), 1,072 deletions(-)
diff --git a/WebTM/Vlog/webapi20240827.txt b/WebTM/Vlog/webapi20240827.txt
new file mode 100644
index 0000000..bc6cfae
--- /dev/null
+++ b/WebTM/Vlog/webapi20240827.txt
@@ -0,0 +1,27 @@
+2024/8/27 9:52:12 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = order by hmainid desc
+
+2024/8/27 9:54:09 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = order by hmainid desc
+
+2024/8/27 10:01:34 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 1516 order by hmainid desc
+
+2024/8/27 10:01:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 10:01:34 ReportDataSet:1
+
+2024/8/27 16:34:49 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 0 order by hmainid desc
+
+2024/8/27 16:34:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:34:49 ReportDataSet:0
+
+2024/8/27 16:34:59 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 0 order by hmainid desc
+
+2024/8/27 16:34:59 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:34:59 ReportDataSet:0
+
+2024/8/27 16:37:36 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000343580 order by hmainid desc
+
+2024/8/27 16:37:36 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:37:36 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ef8df50..76b18fd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -203,6 +203,8 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\home\announcement.html" />
+ <Content Include="views\home\console.html" />
<Content Include="views\home\console_KaiBeiNaiTe.html" />
<Content Include="views\home\console_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\home\console_pb.html" />
@@ -450,6 +452,7 @@
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
@@ -483,6 +486,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_PPMReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityMonthSumReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_TechnologyParameterClass.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_SkillExamMonthSumReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
@@ -1386,7 +1390,7 @@
<Content Include="views\GRInstall.js" />
<Content Include="views\GRUtility.js" />
<Content Include="views\home\console_Mobile.html" />
- <Content Include="views\home\console.html" />
+ <Content Include="views\home\console111.html" />
<Content Include="views\home\homepage1.html" />
<Content Include="views\home\homepage2.html" />
<Content Include="views\iframe\layer\iframe.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 65037ad..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 1622986..76c6b12 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//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/"; //娼樻禉娓告湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; // 娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
@@ -14,23 +14,30 @@
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/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
- /* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
+ //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ /* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
+ //var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
+ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
+ //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
- //var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
- //var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
- //var WEBURL = "http://192.168.0.214/API/"; //鐟炰笌绁烘湇鍔″櫒
- //var WEBURL = "http://192.168.10.66/API/"; //妫シ鏈嶅姟鍣�
- //var WEBURL = "http://localhost/API/";
+ //var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
+ //var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
+ //var WEBURL = "http://192.168.0.214/API/"; //鐟炰笌绁烘湇鍔″櫒
+ //var WEBURL = "http://192.168.10.66/API/"; //妫シ鏈嶅姟鍣�
//var WEBURL = "http://192.168.80.90:9090/API/"; //瀹夌憺鏈嶅姟鍣�
//var WEBURL = "http://192.168.16.53:8081/API/"; //榫欏北姹介厤
- //var WEBURL = "http://122.227.158.218:8090/API/"; //榫欏北姹介厤澶栫綉
+ //var WEBURL = "http://122.227.158.218:8090/API/"; //榫欏北姹介厤澶栫綉
//var WEBURL = "http://192.168.0.244:8082/API/"; //甯呭▉鍐呯綉
//var WEBURL = "http://192.168.1.237:9003/API"; //澶忓疂鍐呯綉
//var WEBURL = "http://60.190.4.42:9003/API"; //澶忓疂澶栫綉
- //var WEBURL = "http://192.168.60.12/API"; //涓帶
+ //var WEBURL = "http://192.168.60.12/API"; //涓帶
return WEBURL
}
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7fdb583..8e45e25 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1286,6 +1286,40 @@
});
}
+ //寮傚父绛惧埌澶勭悊鐐瑰嚮浜嬩欢
+ function SingErrMsg(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父绛惧埌澶勭悊鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
+ end: function () {
+
+ }
+ });
+ }
+
+ //寮傚父楠屾敹鐐瑰嚮浜嬩欢
+ function ErrMsgBackCheck(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父鍙嶉楠屾敹鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
+ end: function () {
+
+ }
+ });
+ }
+
//閫�鍑�
function Esc(event, obj) {
parent.location.href = "index.html"
@@ -1497,7 +1531,7 @@
<div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
- <span class="imgtitle">寮傚父</span>
+ <span class="imgtitle">寮傚父鐢宠</span>
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1547,7 +1581,21 @@
</div>
</div>
</div>
-
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父绛惧埌澶勭悊</span>
+ </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父楠屾敹</span>
+ </div>
+ </div>
+ </div>
+
</div>
</fieldset>
</div>
diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index d262e8e..67f2c70 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -346,10 +346,9 @@
} else {
treeData.push(it)
}
- })
+ })
return treeData;
- }
-
+ }
</script>
</body>
diff --git a/WebTM/views/home/announcement.html b/WebTM/views/home/announcement.html
new file mode 100644
index 0000000..9b3b5c2
--- /dev/null
+++ b/WebTM/views/home/announcement.html
@@ -0,0 +1,205 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title></title>
+</head>
+<body>
+ <!--椤甸潰鏍峰紡-->
+ <style>
+ .welcome .layui-card {
+ border: 1px solid #f2f2f2;
+ border-radius: 5px;
+ }
+
+ .welcome .layuimini-notice:hover {
+ background: #f6f6f6;
+ }
+
+ .welcome .layuimini-notice {
+ padding: 7px 16px;
+ clear: both;
+ font-size: 12px !important;
+ cursor: pointer;
+ position: relative;
+ transition: background 0.2s ease-in-out;
+ }
+
+ .welcome .layuimini-notice-title {
+ padding-right: 70px !important;
+ text-overflow: ellipsis !important;
+ overflow: hidden !important;
+ white-space: nowrap !important;
+ }
+
+ .welcome .layuimini-notice-title {
+ line-height: 28px;
+ font-size: 14px;
+ }
+
+ .welcome .layuimini-notice-extra {
+ position: absolute;
+ top: 50%;
+ margin-top: -8px;
+ right: 16px;
+ display: inline-block;
+ height: 16px;
+ color: #999;
+ }
+ </style>
+ <div class="layuimini-container layuimini-page-anim">
+ <div class="layuimini-main welcome">
+ <div class="layui-row layui-col-space20">
+ <div class="layui-col-md12">
+ <div class="layui-row layui-col-space15">
+
+ <!--绯荤粺鍏憡-->
+ <div class="layui-col-md6">
+ <div class="layui-card">
+ <div class="layui-card-header"><i class="fa fa-bullhorn icon icon-tip"></i>绯荤粺鍏憡</div>
+ <div class="layui-card-body layui-text">
+
+ <!-- 绯荤粺鍏憡鐨勯�氱煡璇︽儏 -->
+ <div id="notice" class="layui-card">
+ <!-- 瀛樻斁妯℃澘鐨剆cript鏍囩 -->
+ <script type="text/html" id="noticeTemplate">
+ <!-- 浣跨敤layui鐨別ach寰幆, 閬嶅巻鏁版嵁闆嗗悎淇℃伅(娉ㄦ剰: 杩欓噷涓�瀹氳浣跨敤d.data; 鍙傛暟index琛ㄧず闆嗗悎涓嬫爣, item琛ㄧず闆嗗悎鍏冪礌) -->
+ {{# layui.each(d.data,function(index,item){ }}
+ <div class="layuimini-notice">
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-title"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡涓殑鏍囬 -->
+ <!-- 鍒ゆ柇褰撳墠鍏冪礌涓嬫爣鏄惁浣嶄簬闆嗗悎鐨勫墠涓や綅, 鑻ヤ负鍓嶄袱浣�, 鍒欏湪杩愬姩浼氬悕绉板悗鍔犱笂new鐨勫瓧鏍� -->
+ {{# if(index<=1) { }}
+ <!-- 閬嶅巻姣忎釜鍏冪礌鍊煎潎浣跨敤 {{ item.瀛楁鍚� }} 鏍煎紡(娉ㄦ剰: {{鍚庢棤闇�鍔�#鍙�) -->
+ <div class="layuimini-notice-title">{{ item.sportName }}鎶ュ悕寮�鍚� <span class="label layui-bg-red">new</span></div>
+ {{# } else { }}
+ <!-- 鑻ュ綋鍓嶅厓绱犱笅鏍囦笉浣嶄簬闆嗗悎涓殑鍓嶄袱浣�, 鍒欐棤闇�鏄剧ずnew瀛楁牱 -->
+ <div class="layuimini-notice-title">{{ item.sportName }}鎶ュ悕寮�鍚�</div>
+ {{# } }}
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-extra"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡涓殑鍙戝竷鏃堕棿 -->
+ <div class="layuimini-notice-extra">{{ item.createTime }}</div>
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-content"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡鐨勫叿浣撳唴瀹�, 浣跨敤layui-hide灏嗗唴瀹归殣钘�, 鍦ㄦ煡鐪嬭鎯呮椂灞曠ず -->
+ <div class="layuimini-notice-content layui-hide">
+ <!-- 浠嶆棫鏄亶鍘嗘瘡涓厓绱犲��, 涔熸槸浣跨敤 {{ item.瀛楁鍚� }} 鐨勬牸寮� -->
+ <span style="font-size:14px;font-weight: bolder;color: #000000">杩愬姩浼氬悕锛�</span>{{ item.sportName }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鍦哄湴锛�</span>{{ item.place }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鏂癸細</span>{{ item.holder }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鏃堕棿锛�</span>{{ item.startTime}} 鑷� {{ item.endTime }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">璇︽儏鎻忚堪锛�</span>{{ item.description }} <br>
+ </div>
+ </div>
+ <!-- 寰幆缁撴潫璁板緱鍔犱笂杩欎釜 -->
+ {{# }); }}
+ </script>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ /* 鍔犺浇layer,form鍜宼able绛夊疄渚� */
+ layui.use(['layer', 'jquery', 'laytpl'], function () {
+ // 鑾峰彇jquery瀵硅薄
+ var $ = layui.jquery,
+ // 鑾峰彇layer瀵硅薄
+ layer = layui.layer,
+ // 鑾峰彇laytpl瀵硅薄
+ laytpl = layui.laytpl;
+
+ // 宸插彂甯冪殑杩愬姩浼氫俊鎭�
+ let sportInfoList;
+ /* 缂栧啓鑾峰彇宸插彂甯冪殑杩愬姩浼氫俊鎭殑ajax璇锋眰 */
+ $.ajax({
+ // 璇锋眰鏂瑰紡涓篏ET
+ type: 'GET',
+ // 鏁版嵁鎺ュ彛锛氳姹侸SON鏁版嵁鍒板悗绔�
+ url: GetWEBURL() + '/GG_Notice/notices',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ // 寮�鍚悓姝�
+ async: false,
+ /* 澶勭悊璇锋眰鐨勫洖璋冨嚱鏁� */
+ success: function (res) {
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�0锛屽垯鎵ц鎴愬姛澶勭悊鎿嶄綔
+ if (res.count == 1) {
+ // 杩愬姩浼氫俊鎭负褰撳墠鏁版嵁
+ sportInfoList = res.data;
+ // console.log(sportInfoList);
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�1锛屽垯鎵ц澶辫触澶勭悊鎿嶄綔
+ } else {
+ layer.msg('鑾峰彇宸插彂甯冪殑杩愬姩浼氫俊鎭け璐ワ紒', { icon: 2 });
+ }
+ }
+ });
+
+ // 鑾峰彇閫氱煡妯℃澘涓殑html椤甸潰浠ｇ爜(noticeTemplate瀵瑰簲script妯℃澘涓殑id閫夋嫨鍣�)
+ let noticeTpl = noticeTemplate.innerHTML,
+ // 鏍规嵁id閫夋嫨鍣ㄥ畾浣嶅埌鍏憡閫氱煡鐨刣iv鐩掑瓙
+ notice = document.getElementById('notice');
+ // console.log(sportInfoList);
+ //娓叉煋妯℃澘淇℃伅(noticeTpl鏄ā鏉垮紩鎿庣殑html浠ｇ爜, sportInfoList鏄笂闈㈣幏鍙栧埌鐨勫凡鍙戝竷杩愬姩浼氫俊鎭�, html鐢ㄤ簬瀛樺偍div鐩掑瓙涓殑浠ｇ爜)
+ laytpl(noticeTpl).render(sportInfoList, function (html) {
+ // 鑾峰彇妯℃澘寮曟搸涓殑html浠ｇ爜, 灏嗗叾璧嬪�煎埌html鍙傛暟涓幓
+ notice.innerHTML = html;
+ });
+
+ /**
+ * 鏌ョ湅鍏憡璇︽儏淇℃伅鐨勭偣鍑讳簨浠�
+ **/
+ $('body').on('click', '.layuimini-notice', function () {
+ // 鑾峰彇鍏憡閫氱煡涓殑鏍囬鏂囨湰(鐢变簬鍓嶄袱鏉℃暟鎹殑鏍囬鍚庨潰瀛樺湪new瀛楁牱, 杩欓噷灏嗗叾杩涜鏇挎崲
+ var title = $(this).children('.layuimini-notice-title').text().replace("new", ""),
+ // 鑾峰彇鍏憡閫氱煡涓殑鍙戝竷鏃堕棿
+ noticeTime = $(this).children('.layuimini-notice-extra').text(),
+ // 鑾峰彇鍏憡閫氱煡涓殑閫氱煡璇︽儏
+ content = $(this).children('.layuimini-notice-content').html();
+ // 缁樺埗鍏憡閫氱煡璇︽儏鐨刪tml椤甸潰(鍏朵腑\n鐢ㄤ簬鎹㈣)
+ var html = '<div style="padding:15px 20px; text-align:justify; line-height: 22px;border-bottom:1px solid #e2e2e2;background-color: #ffffff;color: #000000">\n' +
+ '<div style="text-align: center;margin-bottom: 20px;font-weight: bold;border-bottom:1px solid #718fb5;padding-bottom: 5px">\n' +
+ '<h3 class="text-danger" style="font-size:16px;font-weight:bolder;color:red;">' + title + '</h3></div>\n' +
+ '<div style="font-size: 15px">' + content + '</div>\n' +
+ '</div>\n';
+ // 鎵撳紑鍏憡閫氱煡椤甸潰
+ parent.layer.open({
+ // 绫诲瀷涓洪〉闈㈠眰
+ type: 1,
+ // 璁剧疆鍏憡閫氱煡鏍囬
+ title: ['绯荤粺鍏憡' + '<span style="float: right;right: 1px;font-size: 14px;color: #b1b3b9;margin-top: 1px">' + noticeTime + '</span>', 'font-size:18px;'],
+ // 璁剧疆椤甸潰鐨勫楂�
+ area: ['500px', '500px'],
+ // 寮�鍚伄缃╂晥鏋�
+ shade: 0.3,
+ // 瀵瑰簲鍏憡閫氱煡div鏍囩鐨刬d
+ id: 'layuimini-notice',
+ // 寮瑰嚭妗嗙殑鎸夐挳
+ btn: ['鏌ョ湅', '鍙栨秷'],
+ // 鎸夐挳鎺掑垪涓哄眳涓榻�
+ btnAlign: 'c',
+ // 绐楀彛鎷栨嫿绫诲瀷
+ moveType: 1,
+ // 椤甸潰鍐呭涓轰笂闈㈢粯鍒剁殑鍏憡閫氱煡璇︽儏
+ content: html,
+ // 璇锋眰鎴愬姛鐨勫洖璋冨嚱鏁�(鍏朵腑layero琛ㄧず鎵撳紑鐨勫脊鍑哄眰椤甸潰)
+ success: function (layero) {
+ // 棣栧厛鍦ㄥ脊鍑哄眰椤甸潰涓畾浣峛tn鎸夐挳
+ var btn = layero.find('.layui-layer-btn');
+ // 鐒跺悗鏍规嵁btn鎸夐挳缁х画瀹氫綅绗竴涓猙tn(鍗虫煡鐪�)鎸夐挳
+ btn.find('.layui-layer-btn0').attr({
+ // 璁剧疆鐐瑰嚮鎸夐挳鍚庤烦杞湴鍧�
+ href: 'https://gitee.com/zhongshaofa/layuimini',
+ // 鎵撳紑鏂瑰紡涓哄綋鍓嶉〉
+ target: '_self'
+ });
+ }
+ });
+ });
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index ffb10e7..5510b29 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -266,6 +266,8 @@
, table = layui.table
, form = layui.form
, element = layui.element
+ , tr = layui.tr
+ , td = layui.td
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
@@ -273,7 +275,7 @@
var $ = layui.jquery;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�"];
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
//鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
var HType = "PC";
@@ -409,12 +411,12 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 75 });
+ 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 + ", 'MM-dd')}}</div>", width: 100 });
break;
case 'String':
- if (data[i].id == '绱ф�ョ▼搴�') {
+ 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
+ field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 80
});
break;
}
diff --git a/WebTM/views/home/console111.html b/WebTM/views/home/console111.html
new file mode 100644
index 0000000..ee6e0f3
--- /dev/null
+++ b/WebTM/views/home/console111.html
@@ -0,0 +1,482 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>鎺у埗鍙颁富椤典竴</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <style id="LAY_layadmin_theme" type="text/css">
+ .layui-side-menu, .layadmin-pagetabs .layui-tab-title li:after, .layadmin-pagetabs .layui-tab-title li.layui-this:after, .layui-layer-admin .layui-layer-title, .layadmin-side-shrink .layui-side-menu .layui-nav > .layui-nav-item > .layui-nav-child {
+ background-color: #20222A !important;
+ }
+
+ .layui-nav-tree .layui-this, .layui-nav-tree .layui-this > a, .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a {
+ background-color: #009688 !important;
+ }
+
+ .layui-layout-admin .layui-logo {
+ background-color: #20222A !important;
+ }
+
+ .layui-table-body.layui-table-main {
+ height: 400px;
+ }
+
+ .layui-table-box {
+ height: 400px;
+ }
+ .welcome .layui-card {
+ border: 1px solid #f2f2f2;
+ border-radius: 5px;
+ }
+
+ .welcome .layuimini-notice:hover {
+ background: #f6f6f6;
+ }
+
+ .welcome .layuimini-notice {
+ padding: 7px 16px;
+ clear: both;
+ font-size: 12px !important;
+ cursor: pointer;
+ position: relative;
+ transition: background 0.2s ease-in-out;
+ }
+
+ .welcome .layuimini-notice-title {
+ padding-right: 70px !important;
+ text-overflow: ellipsis !important;
+ overflow: hidden !important;
+ white-space: nowrap !important;
+ }
+
+ .welcome .layuimini-notice-title {
+ line-height: 28px;
+ font-size: 14px;
+ }
+
+ .welcome .layuimini-notice-extra {
+ position: absolute;
+ top: 50%;
+ margin-top: -8px;
+ right: 16px;
+ display: inline-block;
+ height: 16px;
+ color: #999;
+ }
+ </style>
+ <script>
+ /^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
+ </script>
+
+</head>
+<body layadmin-themealias="default">
+ <div class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md8">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md6">
+ <!-- 蹇嵎鏂瑰紡 -->
+ <div class="layui-card">
+ <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <!--蹇嵎鏂瑰紡-->
+ <div class="FastMenu" carousel-item=""></div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+ <!-- 蹇嵎鏂瑰紡 -->
+ <div class="layui-card">
+ <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="">
+ <ul class="layui-row layui-col-space10 layui-this">
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-console"></i>
+ <cite>澶栬喘鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-engine"></i>
+ <cite>濮斿鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite>浜у搧鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-chart"></i>
+ <cite>棰嗘枡鍑哄簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-unlink"></i>
+ <cite>濮斿鍑哄簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-chat"></i>
+ <cite>閿�鍞嚭搴�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-component"></i>
+ <cite>璋冩嫧鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-app"></i>
+ <cite>鏉＄爜鐢熸垚</cite>
+ </a>
+ </li>
+ </ul>
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template"></i>
+ <cite>涓婃灦褰掕繕鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-snowflake"></i>
+ <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-transfer"></i>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-light"></i>
+ <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-senior"></i>
+ <cite>鏉ユ枡妫�楠屽崟</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-cellphone"></i>
+ <cite>鐢熶骇鎷嗙鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-dollar"></i>
+ <cite>鐢熶骇姹囨姤鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-survey"></i>
+ <cite>鐢熶骇閫�鏂欏崟</cite>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md12">
+ <!-- 鏁版嵁姒傝 -->
+ <div class="layui-card">
+ <div class="layui-card-header">鏁版嵁姒傝</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-dataview" data-anim="fade" lay-filter="LAY-index-dataview" lay-anim="fade" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="" id="LAY-index-dataview">
+ <div class="" _echarts_instance_="1621151534573" style="-webkit-tap-highlight-color: transparent; user-select: none; background-color: rgba(0, 0, 0, 0);">
+ <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
+ <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
+ <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ </div>
+ </div>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class=""></li><!--<li class="layui-this"></li><li class=""></li>--></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md4">
+ <!-- 寰呭姙浜嬮」 -->
+ <div class="layui-card">
+ <div class="layui-card-header">寰呭姙浜嬮」</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-backlog" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="">
+ <ul class="layui-row layui-col-space10 layui-this">
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
+ <h3>寰呭鍗曟嵁</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="app/forum/list.html" class="layadmin-backlog-body">-->
+ <h3>寰呭璧勬枡</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="template/goodslist.html" class="layadmin-backlog-body">-->
+ <h3>寰呮煡鐪嬫秷鎭�</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a href="javascript:;" onclick="layer.tips('涓嶈烦杞�', this, {tips: 3});" class="layadmin-backlog-body">-->
+ <h3>寰呭洖澶嶆秷鎭�</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ </ul>
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs6">
+ <a href="javascript:;" class="layadmin-backlog-body">
+ <h3>鏈槄淇℃伅</h3>
+ <p><cite style="color: #FF5722;">0</cite></p>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+
+ <!--绯荤粺鍏憡-->
+ <div class="main_left1_main_top">
+ <div class="main_left1_main_top_right">
+ <span>
+ <a href="绯荤粺绠＄悊/鍏憡/GG_NoticeBillList.html" style="color: #9a9a9a;"></a>
+ </span>
+ </div>
+ </div>
+ <div class="main_left1_mainx">
+ <div class="main_left1_mainx_right" style="width: 98%; float: none; padding-left: 11px;">
+ <ul class="ullist">
+ </ul>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="./js/index.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'console'], function () {
+ //鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , tr = layui.tr
+ , td = layui.td
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ var element = layui.element;
+ var $ = layui.jquery;
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
+
+ //鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
+ var HType = "PC";
+
+ // 宸插彂甯冪殑鍏憡淇℃伅
+ let noticeInfoList;
+ //椤甸潰鍒濆鍖�
+ set_ClearBill();
+
+ //椤甸潰鍒濆鍖栨柟娉�
+ function set_ClearBill() {
+
+ get_Display();
+ get_Notices();
+ }
+
+ //椤甸潰鍏跺畠鏂规硶
+ function get_Display() {
+ //鑾峰彇鑿滃崟鍒楄〃鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init",
+ type: "GET",
+ async: false,
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ success: function (data) {
+ console.log(data.data);
+ FastMenu(data.data);
+ },
+ error: function (data) {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ function FastMenu(data) {
+ var liStr = '';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0) {
+ liStr += '<ul class="layui-row layui-col-space10 layui-this">';
+ } else if (i % 8 == 0) {
+ liStr += '<ul class="layui-row layui-col-space10">';
+ }
+
+ liStr += '<li class="layui-col-xs3">';
+
+ if (data[i]["HPicNum"] == null || data[i]["HPicNum"] == "") {
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="layui-icon layui-icon-add-circle"></i>';
+ } else {
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="' + data[i]["HPicNum"] + '"></i>';
+ }
+
+ liStr += '<a lay-href="' + data[i]["Hurl"] + '">';
+
+ liStr += '<cite>' + data[i]["HCaption"] + '</cite>';
+
+ liStr += '</a>';
+
+ liStr += '</li>';
+
+ if (i % 8 == 7) {
+ liStr += '</ul>';
+ }
+ };
+ if (data.length % 8 == 0) {
+ liStr += '<ul class="layui-row layui-col-space10">';
+ liStr += '<li class="layui-col-xs3">';
+ liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
+ liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
+ liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
+ liStr += '</a>';
+ liStr += '</li>';
+ liStr += '</ul>';
+ } else {
+ liStr += '<li class="layui-col-xs3">';
+ liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
+ liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
+ liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
+ liStr += '</a>';
+ liStr += '</li>';
+ liStr += '</ul>';
+ }
+ $(".FastMenu").html(liStr);
+ element.init();
+
+ for (var i = 0; i < data.length; i++) {
+ var item = document.getElementById(data[i]["HSubFuncID"]);
+ item.addEventListener("click", function (event) {
+ //alert("hh");
+ //鎵撳紑鍥炬爣璁剧疆瀛愮獥鍙�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "蹇嵎鏂瑰紡-鍥炬爣璁剧疆" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["30%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: '../绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html?HItemID=' + event.srcElement.id
+ , btn: ["纭畾"]
+ , btn1: function (index, laero) {
+ //鍒锋柊蹇嵎鏂瑰紡
+ get_Display();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }, false);
+ }
+ }
+
+ //鐢熸垚閫氱煡鍒楄〃
+ function get_Notices() {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load()
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ let list = document.getElementById("ullist");
+ $.ajax({
+ // 璇锋眰鏂瑰紡涓篏ET
+ type: 'GET',
+ // 鏁版嵁鎺ュ彛锛氳姹侸SON鏁版嵁鍒板悗绔�
+ url: GetWEBURL() + '/GG_Notice/notices',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ // 寮�鍚悓姝�
+ async: false,
+ success: function (res) {
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�0锛屽垯鎵ц鎴愬姛澶勭悊鎿嶄綔
+ if (res.count == 1) {
+ // 鑾峰彇鍏憡鏁版嵁
+ noticeInfoList = res.data;
+ for (var i = 0; i < noticeInfoList.length; i++) {
+ var liObj = document.createElement("li");
+ liObj.innerHTML = "<span>" + layui.util.toDateString(noticeInfoList[i].鏃ユ湡, 'MM-dd') + "</span>";
+ /* + " < a href = \"viewpage.html\" >" + noticeInfoList[i].涓婚 + "</a >";*/
+ list.appendChild(liObj);
+ }
+ } else {
+ layer.msg('鑾峰彇澶辫触', { icon: 2 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ });
+ </script>
+</body>
+
+
+</html>
\ No newline at end of file
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 9d9d2b6..4fa5b0e 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>LMES绠＄悊绯荤粺</title>
+ <title id="HCusName"></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">
@@ -109,7 +109,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
<img src="../layuiadmin/myicon/win.svg" alt="PC绔�" style="width:25px;height:25px;margin-right: 5px;" />
- <span>LMES绠＄悊绯荤粺</span>
+ <span id="HMenuLabel"></span>
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
@@ -195,10 +195,8 @@
set_sideMenuDisPlay();
//#endregion
-
- //#region
-
- //#endregion
+ //鑿滃崟鏍忓懡鍚�
+ setMenuLabel();
//#region 椤甸潰鍏跺畠鏂规硶
//鏄剧ず渚ц竟鑿滃崟
@@ -306,6 +304,13 @@
//#endregion
});
+ //鑿滃崟鏍忓懡鍚�
+ function setMenuLabel() {
+ console.log(sessionStorage["HMenuLabel"]);
+ $("#HMenuLabel").html(sessionStorage["HMenuLabel"]);
+ $("#HCusName").text(sessionStorage["HCusName"]);
+ };
+
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
</script>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index d668963..534abdf 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -29,7 +29,7 @@
<div class="ax-tab" axTab>
<ul class="ax-row ax-tab-nav ax-menu-tab">
- <a href="###" class="ax-item ax-col" style="font-size: 20px;">鏅轰簯杩堟�滾-MES</a>
+ <a href="###" class="ax-item ax-col" style="font-size: 20px;" id="HLogoLabel">鏅轰簯杩堟�滾-MES</a>
<!--<a href="###" class="ax-item">娉ㄥ唽鏂扮敤鎴�</a>-->
<!--<li class="ax-col"></li>-->
</ul>
@@ -266,6 +266,10 @@
});
}
})
+
+ //鑾峰彇鍩虹淇℃伅
+ getBaseInfo();
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
$.ajax({
@@ -290,9 +294,6 @@
layer.closeAll("loading");
}
})
-
-
-
//form.render();
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
@@ -320,7 +321,6 @@
$("#LAY-user-login-password").focus();
}
})
-
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
@@ -352,7 +352,6 @@
//playSound();
layer.msg("璇烽�夋嫨缁勭粐锛�");
return;
-
}
var UserName = $("#LAY-user-login-username").val();
var PassWord = $("#LAY-user-login-password").val();
@@ -433,6 +432,25 @@
audio.play();
}
+ //鑾峰彇鍩虹淇℃伅
+ function getBaseInfo() {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/BaseInfo",
+ data: {},
+ success: function (res) {
+ //鏌ヨ鎴愬姛
+ if (res.count == 1) {
+ var data = res.data[0];
+ console.log(data);
+ sessionStorage["HCusName"] = data.HCusName;
+ sessionStorage["HLogoLabel"] = data.HLogoLabel;
+ sessionStorage["HMenuLabel"] = data.HMenuLabel;
+ $("#HLogoLabel").text(data.HLogoLabel);
+ }
+ }
+ })
+ }
});
</script>
</body>
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/Gy_Currency.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/Gy_Currency.html"
index b040f98..40b01c4 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/Gy_Currency.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/Gy_Currency.html"
@@ -211,6 +211,7 @@
//#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_Currency/list1',
type: "GET",
@@ -1057,6 +1058,33 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
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/Gy_DepartmentList.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/Gy_DepartmentList.html"
index a77c380..52664e5 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/Gy_DepartmentList.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/Gy_DepartmentList.html"
@@ -325,6 +325,7 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Gy_Department/list',
@@ -1082,7 +1083,34 @@
}
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+ var addSWhere = "";
+
+ if (openType == 2 && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
+ return addSWhere;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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/Gy_EmployeeList.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/Gy_EmployeeList.html"
index 8a3ddeb..1a1afd1 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/Gy_EmployeeList.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/Gy_EmployeeList.html"
@@ -955,11 +955,20 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
+ var DeptName = params[params[2]];
if (typeof (openType) != "undefined") {
sWhere += " and 绂佺敤鏍囪 = '' ";
- //Organ(HOrgID);
+ DeptName = decodeURI(DeptName);//瀵筓RI 杩涜瑙ｇ爜
+ if (DeptName != "undefined") {
+ sWhere += " and 閮ㄩ棬鍚嶇О = '" + DeptName+"' ";
+ }
+ if (typeof (HOrgID) != "undefined") {
+ Organ(HOrgID);
+ }
+
}
+
}
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
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/Gy_PoStockStyle.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/Gy_PoStockStyle.html"
index 9595a44..8766011 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/Gy_PoStockStyle.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/Gy_PoStockStyle.html"
@@ -283,6 +283,7 @@
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -907,6 +908,33 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType == 2 && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囧織 = '鍚�' and 浣跨敤缁勭粐 = '" + HOrgName + "'";
+ }
+ return addSWhere;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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/Gy_Unit.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/Gy_Unit.html"
index 084ceb0..cd4df9c 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/Gy_Unit.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/Gy_Unit.html"
@@ -194,7 +194,9 @@
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
- var ajaxLoad = layer.load();
+
+ var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_Unit/list1',
type: "GET",
@@ -770,6 +772,22 @@
return vars;
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType != undefined && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
+ return addSWhere;
+ }
+ //#endregion
layer.close(index)
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/Gy_Warehouse.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/Gy_Warehouse.html"
index 265cecb..6967340 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/Gy_Warehouse.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/Gy_Warehouse.html"
@@ -195,11 +195,7 @@
var ins; //鐢ㄤ簬瀵煎嚭excel
- var params = getUrlVars();
- var Type = params[params[0]];
- //#endregion
- var params = getUrlVars();
- var Type = params[params[0]];
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
var params = getUrlVars();
var Type = params[params[0]];
@@ -417,6 +413,7 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Warehouse/list',
@@ -1214,6 +1211,22 @@
})
}
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if ((openType != undefined) && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
+ return addSWhere;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
index 1ad40a6..947a45c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
@@ -258,6 +258,7 @@
function get_Display(sWhere) {
var wait = layer.load();//閬僵
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_SettleStyle/SettleStyleList',
type: "GET",
@@ -849,6 +850,35 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType == "2") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ /*Organization = HOrgName.toString();*/
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#endregion
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
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 0a2ac95..b191d1b 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"
@@ -145,6 +145,7 @@
<script src="../../../layuiadmin/layui/layui1.js"></script>
<script src="../../../layuiadmin/layui/lay/modules/table.js"></script>-->
<script>
+ var Organization = sessionStorage["Organization"]
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -164,7 +165,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var Organization = sessionStorage["Organization"]
+
var HModName = "Gy_Supplier";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID", "HCurID", "璐у竵", "姹囩巼", "HSSID", "缁撶畻鏂瑰紡", "HAreaID", "鍦板尯","HPSStyleID","閲囪喘鏂瑰紡"];
@@ -331,6 +332,7 @@
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_Supplier/list',
type: "GET",
@@ -882,18 +884,7 @@
}
//#endregion
- //#region 鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
- //#endregion
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
@@ -1117,6 +1108,34 @@
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType != undefined && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
+ return addSWhere;
+ }
+ //#endregion
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 94deba5..0995e6b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -524,6 +524,8 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HCheckEmpID").val(sessionStorage["HEmpID"]); //楠屾敹浜�
+ $("#HCheckEmpName").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HHCheckDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
if (HSouceBillType == '4502') {
var num = 1; //寮傚父鍙嶉鍗�
@@ -571,6 +573,7 @@
$("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
$("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
$("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
}
else if (num == 2) {
var LoadData = data.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 3326e5f..101f624 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -555,7 +555,7 @@
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
- $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
+ $("#HReceiveMan").val(LoadData[0].鎸囨淳澶勭悊浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
$("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
$("#HContext").val(LoadData[0].涓婚); //涓婚
@@ -572,6 +572,10 @@
$("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
$("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
$("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
+ $("#HHandleEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+ $("#HHandleEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
+
} else if (num==2) {
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
@@ -756,6 +760,7 @@
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
+ data.field.HMaker = $("#HHandleEmpName").val();
}
if (OperationType == 3) {
refSav = "Update";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index 000178c..bcd90f7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -539,7 +539,7 @@
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
- $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
+ $("#HReceiveMan").val(LoadData[0].鎸囨淳澶勭悊浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
$("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
$("#HContext").val(LoadData[0].涓婚); //涓婚
@@ -556,6 +556,10 @@
$("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
$("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
$("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
+ $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+ $("#HSignEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
+
} else if (num == 2) {
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
@@ -739,6 +743,7 @@
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
+ data.field.HMaker = $("#HSignEmpName").val();
}
if (OperationType == 3) {
refSav = "Update";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
index 74fc74b..54e79ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
@@ -45,6 +45,9 @@
.layui-form-label {
width: 25%;
}
+ #mainTable tr {
+ height: 100px; /* 浣犳兂瑕佺殑琛岄珮 */
+ }
</style>
</head>
@@ -54,9 +57,10 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 150px;height:120px;width:120px;" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnErrMSg" id="btnErrMSg">澶勭悊</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align: center; padding: 10px 0;"><b>寮傚父鍙嶉鍒峰崱绛惧埌</b></h1>
@@ -92,7 +96,7 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+ <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;" lay-size="lg"></table>
</form>
</div>
</div>
@@ -121,6 +125,10 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
//#endregion
+
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -188,6 +196,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].HEntryID.toString();
layer.open({
type: 2
, area: ['100%', '100%']
@@ -195,7 +204,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + 0 + '&HSouceBillType=' + 4529 + ''
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -211,10 +220,51 @@
}
});
+ //澶勭悊
+ form.on('submit(btnErrMSg)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ if (data[0].鍗曟嵁鐘舵�� != "宸茬鍒�") {
+ layer.msg('璇ュ崟瀛愭湭绛惧埌,涓嶈兘澶勭悊锛�');
+ } else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '寮傚父鍙嶉鎺ユ敹鍗曠鍒�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();//鏌ヨ
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�涓紓甯稿弽棣堟帴鏀跺崟杩涜绛惧埌锛�');
+ }
+ });
+
//閫�鍑�
form.on('submit(btnEdit)', function () {
- //鍏抽棴椤电
- Pub_Close(2);
+ if (OperationType == "2") {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ } else {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+
});
//IC鍗″洖杞︽柟娉�
@@ -264,7 +314,7 @@
, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 200
, done: function (res, curr, count) {
- //soulTable.render(this);
+
}
};
option.data = [];
@@ -292,87 +342,183 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
- success: function (data1) {
- if (data1.count == 1) {
+ if (OperationType == 2) { //淇濈暀鍘熸湁鐨勫埛鍗＄鍒�,鏂板涓�涓姤宸ュ彴鍒峰崱绛惧埌(鑾峰彇鏁版嵁鏂瑰紡涓嶄竴鏍�)
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+ type: "GET",
+ data: { "sWhere": sWhere, "num":"2","user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
- if (data1.data.length > 0) {
- $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
- } else {
- $("#HSignInEmp").val("");
- layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000});
- }
-
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
+ if (data1.data.length > 0) {
+ $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+ } else {
+ $("#HSignInEmp").val("");
+ layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
}
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
}
}
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- , totalRow: true
- , done: function (res, curr, count) {
- //soulTable.render(this);
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
}
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ }
+ }
+
+ ins = table.render(option);
+
+ layer.close(ajaxLoad);
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
}
-
- ins = table.render(option);
-
- layer.close(ajaxLoad);
- } else {
- option.data = data1.data
- ins = table.render(option);
+ }, error: function () {
layer.close(ajaxLoad);
- //layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+ type: "GET",
+ data: { "sWhere": sWhere, "num": "1","user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ if (data1.data.length > 0) {
+ $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+ } else {
+ $("#HSignInEmp").val("");
+ layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
+ }
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ //soulTable.render(this);
+ }
+ }
+
+ ins = table.render(option);
+
+ layer.close(ajaxLoad);
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 132762d..bac467e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -99,6 +99,7 @@
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content" style="height: 900px;">
@@ -121,7 +122,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" >
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -149,6 +150,12 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ <!--<select name="HReceiveMan" lay-filter="HReceiveMan" id="HReceiveMan">
+ <option value="" selected="selected">璇烽�夋嫨</option>
+ <option value="鏉庡痉绂�">鏉庡痉绂�</option>
+ <option value="宕旀潵姝�">宕旀潵姝�</option>
+ <option value="閮戦洦">閮戦洦</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -184,14 +191,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">杞彂鑷�:</label>
- <div class="layui-input-inline">
- <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">杞彂鑷�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -245,14 +252,7 @@
</div>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
- </div>
- </div>
- </div>
+
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
@@ -298,16 +298,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鐝</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
- <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍙戦�侀儴闂�:</label>
<div class="layui-input-inline">
@@ -319,24 +310,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎺ユ敹閮ㄩ棬:</label>
- <div class="layui-input-inline">
- <input type="text" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline" style="display:none;">
- <label class="layui-form-label">鍌績娆℃暟:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
<label class="layui-form-label">鎸囨淳澶勭悊浜�:</label>
<div class="layui-input-inline">
<input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
@@ -347,13 +320,16 @@
<label class="layui-form-label">褰卞搷闈㈢▼搴�:</label>
<div class="layui-input-inline">
<select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
- <option value="鍋滅嚎" selected="selected">鍋滅嚎</option>
+ <option value="鏃犳硶鍒ゆ柇" selected="selected">鏃犳硶鍒ゆ柇</option>
+ <option value="鍋滅嚎">鍋滅嚎</option>
<option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
<option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
- <option value="鏃犳硶鍒ゆ柇">鏃犳硶鍒ゆ柇</option>
</select>
</div>
</div>
+
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿:</label>
<div class="layui-input-inline">
@@ -370,7 +346,48 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline" >
+ <label class="layui-form-label">鎺ユ敹閮ㄩ棬:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" style="width:40px;">
+ <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">鍌績娆℃暟:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline" >
+ <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�:</label>
@@ -471,18 +488,7 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
-
-
-
- //var edit = function (data) {
- // HBillType = data[0].HBillType;
- // HMainSourceInterID = data[0].HSourceInterID;
- // HMainSourceEntryID = data[0].HSourceEntryID;
- // HMainSourceBillNo = data[0].HSourceBillNo;
- // HMainSourceBillType = data[0].HSourceBillType;
-
- //}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -551,10 +557,10 @@
}
else if (OperationType == 4) {
set_AddFNew();
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
var EquipNumber = "";
set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
- set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
- set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
+ set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
set_EquipFile(); //鑾峰彇璁惧鐨勮澶囩紪鐮�
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
var Person = sessionStorage["HUserName"];
@@ -622,7 +628,7 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
-
+
var LoadData = data.data;
$("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
$("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
@@ -671,6 +677,28 @@
layer.alert(err, { icon: 5 });
}
});
+ //鎸囧畾鎸囨淳澶勭悊浜�
+ if (sessionStorage["HDept"] == "鐢熶骇閮�3") {
+ if ($("#HErrMsgBackTypeName").val()=="浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("鏉庨箯"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162680); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("寮犲睍鍧�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161777); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("鏉庨箯"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162680); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鑲栨按娓�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162662); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ $("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "涓嶅悎鏍煎師鍥�") {
+ $("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ }
+ }
}
//鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 褰撳墠鐧诲綍浜虹殑涓婄骇
@@ -734,8 +762,7 @@
});
}
//#endregion
-
-
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -745,7 +772,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
- $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
//鏈夋簮鍗曟柊澧�
@@ -1093,8 +1120,8 @@
});
});
- //鎺ユ敹浜�
- form.on('submit(HReceiveManList)', function () {
+ //鎺ユ敹浜�(浣滃簾)
+ form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1144,6 +1171,52 @@
}
});
});
+
+ //鎺ユ敹浜�
+ form.on('submit(HReceiveManList)', function () {
+ var HOrgID = sessionStorage["OrganizationID"];
+ var DeptName = sessionStorage["HDept"];
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎺ユ敹浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive&HOrgID=' + HOrgID+'&DeptName='+DeptName, 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О); //璐ｄ换浜�
+ $("#HBadProcMan").val(checkStatus.data[0].HItemID); //璐ｄ换浜�
+ if (DeptName=="鐢熶骇閮�3") {
+ $("#HQEMan").val(162622);
+ $("#HQEManName").val("瀛欐枃闈�");
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎶勯�佷汉
form.on('submit(HCopyManList)', function () {
@@ -1377,9 +1450,9 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
// 鎷兼帴瀛楃涓�
- var result = '寮傚父鍙嶉鍗曞彿:' + $("#HBillNo").val()+',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ var result = '寮傚父鍙嶉鍗曞彿:' + $("#HBillNo").val() + ',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
- + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber;
+ + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber + ',瀵瑰簲澶勭悊浜�:' + $("#HHandleEmpName").val();
return result;
}
@@ -1418,16 +1491,22 @@
return Result = false;
}
+ if ($("#HBadProcManName").val() == '' || $("#HSendMan").val() == null) {
+ layer.msg("璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HQEManName").val() == '' || $("#HReceiveMan").val() == null) {
+ layer.msg("QE璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
if (OperationType == "2") {
if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
- //if ($("#HQty").val() > Qty) {
- // layer.msg("涓嶈兘澶т簬璁″垝鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
+
return Result;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 77566a2..6c615ff 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -129,6 +129,28 @@
var HQualifiedNum = [];//鍚堟牸鎬绘暟閲�
var HFirstPassRate = [];//鐩撮�氱巼
var HTitle = "";//鍥惧舰鏍囬
+ var monthlyTotals = [];
+
+ // 閬嶅巻鏁版嵁鏁扮粍
+ option.data.forEach(data => {
+ var year = data["骞�"];
+ var month = data["鏈�"];
+ var quantity = data["娉ㄥ鏁伴噺"];
+
+ // 鍒濆鍖栧勾浠藉璞�
+ if (!monthlyTotals[year]) {
+ monthlyTotals[year] = {};
+ }
+
+ // 鍒濆鍖栨湀浠藉璞�
+ if (!monthlyTotals[year][month]) {
+ monthlyTotals[year][month] = 0;
+ }
+
+ // 绱姞鏁伴噺
+ monthlyTotals[year][month] += quantity;
+ });
+
if (option.data.length > 0) {
var HMaterName = option.data[0].鐗╂枡鍚嶇О
for (let i = 0; i < H_X.length; i++) {
@@ -137,10 +159,21 @@
HFirstPassRate.push(0);
}
// 濉厖鏁版嵁
+ for (let i = 0; i < H_X.length; i++) {
+ let month = i + 1; // 1鍒�12鐨勬湀浠�
+ let year = $("#Hyear").val(); // 褰撳墠骞翠唤
+
+ // 灏� monthlyTotals 涓殑鏁伴噺濉厖鍒� HProcSumNum 涓�
+ if (monthlyTotals[year] && monthlyTotals[year][month]) {
+ HProcSumNum[i] = monthlyTotals[year][month];
+ }
+ }
+
+ // 濉厖鏁版嵁
for (let i = 0; i < option.data.length; i++) {
if (option.data[i].鐗╂枡鍚嶇О === HMaterName) {
let monthIndex = option.data[i].鏈� - 1; // 鏈堜唤鍦ㄦ暟缁勪腑鐨勭储寮曪紙娉ㄦ剰杞崲涓轰粠0寮�濮嬶級
- HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
+ //HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
// 澶勭悊娉ㄥ鑹巼
let qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
@@ -225,9 +258,9 @@
{
type: 'value',
name: '鐢熶骇鏁伴噺',
- min: 0,
- max: 200000,
- interval: 10000,
+ //min: 0,
+ //max: 200000,
+ //interval: 10000,
axisLabel: {
formatter: '{value}'
}
@@ -339,7 +372,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-490'
+ , height: '200px'
, totalRow: true
, page: true
, cellMinWidth: 90
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
index 6038b77..c5e98fe 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
@@ -381,14 +381,16 @@
else if (OperationType == 2) {
//婧愬崟鏂板
var datajson;
- var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
- var arr = str.substring(str.lastIndexOf("=") + 1);
- datajson = $.parseJSON(decodeURI(arr));
+ //鑾峰彇url鍙傛暟
+ var params = new URLSearchParams(location.search);;
+ console.log(params.get('dataJson'));
+ datajson = params.get('dataJson');
+ datajson = JSON.parse(decodeURIComponent(datajson));
+
$("#HRelationInterID").val(datajson.HRelationInterID);
$("#HRelationEntryID").val(datajson.HRelationEntryID);
$("#HRelationBillNo").val(datajson.HRelationBillNo);
$("#HRelationBillType").val(datajson.HRelationBillType);
-
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -705,7 +707,6 @@
end: function () {
},
success: function (layero, index) {
-
}
});
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
new file mode 100644
index 0000000..0b9f660
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
@@ -0,0 +1,458 @@
+锘�<!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">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</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-tab layui-tab-card" style="margin-top:20px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏈獙鏀�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鎴戝彂閫佺殑-->
+ <table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
+ </div>
+ </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-XTReception-in" id="btn-XTReception-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View" id="btn-View"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-XTCheck" lay-filter="btn-XTCheck" id="btn-XTCheck" style="/* display: inline; */height: 100px;margin-left: 100px;">涓嬫帹楠屾敹鍗�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-View1" lay-filter="btn-View1" id="btn-View1" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">鏌ョ湅</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnEdit" id="btnEdit" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">閫�鍑�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View2" id="btn-View2"><i class="layui-icon layui-icon-radio"></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
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_receive = ""; //鏈畬鎴�
+ var option_copy = ""; //宸插畬鎴�
+ var option_send = ""; //姝ｅ湪杩涜
+ var ins;
+ //var TableTab = "mainTable_receive"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+ //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "OA_ErrMsgBackSelfQuery";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鎺ユ敹鐨勶級
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙戦�佺殑锛�
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟妱閫佹垜鐨勶級
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栨帴鏀跺垪琛�
+ set_InitGrid_notStart();
+ //鍒濆鍖栧彂閫�
+ set_InitGrid_send();
+ //鍒濆鍖栨妱閫佸垪琛�
+ set_InitGrid_copy();
+ //鏌ヨ
+ get_Display();
+ }
+
+ table.on('toolbar(mainTable_receive)', function (obj) {
+ switch (obj.event) {
+ //涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
+ case 'btn-XTReception-in': XTReception();
+ break;
+ //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+ case 'btn-XTSign-in': XTSign();
+ break;
+ //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+ case 'btn-XTReceive': XTReceive();
+ break;
+ //鏌ョ湅
+ case 'btn-View': View();
+ break;
+
+ };
+ });
+ table.on('toolbar(mainTable_send)', function (obj) {
+ switch (obj.event) {
+ //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+ case 'btn-XTCheck': XTCheck();
+ break;
+ //鏌ョ湅
+ case 'btn-View1': View();
+ break;
+ };
+ });
+ table.on('toolbar(mainTable_copy)', function (obj) {
+ switch (obj.event) {
+ //鏌ョ湅
+ case 'btn-View2': View();
+ break;
+ };
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function () {
+ //鍏抽棴椤电
+ Pub_Close(1);
+
+ });
+
+ //鍒濆鍖栨帴鏀跺垪琛�
+ function set_InitGrid_notStart() {
+ option_receive = {
+ elem: '#mainTable_receive'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧彂閫佸垪琛�
+ function set_InitGrid_send() {
+ option_send = {
+ elem: '#mainTable_send'
+ , toolbar: '#toolbarDemo1'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栨妱閫佸垪琛�
+ function set_InitGrid_copy() {
+ option_copy = {
+ elem: '#mainTable_copy'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鎴戞帴鏀剁殑
+ option_receive = {
+ elem: '#mainTable_receive'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_receive);
+ ins = table.render(option_receive);
+
+ //鎴戝彂閫佺殑
+ option_send = {
+ elem: '#mainTable_send'
+ , toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery1
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_send);
+
+ //鎶勯�佹垜鐨�
+ option_copy = {
+ elem: '#mainTable_copy'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery2
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_copy);
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option_receive.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.浠诲姟鎻忚堪.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
+ //#endregion
+
+ //涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
+ function XTReception() {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackReceiveBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+ //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+ function XTReceive() {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉鎺ユ敹鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+ //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+ function XTSign() {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+ //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+ function XTCheck() {
+ var checkStatus = table.checkStatus('mainTable_send')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+
+ //#region 鏌ョ湅
+ function View() {
+ var activeTab = getActiveTab();
+
+ if (activeTab == "鎴戞帴鏀剁殑") {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎴戝彂閫佺殑") {
+ var checkStatus = table.checkStatus('mainTable_send')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎶勯�佹垜鐨�") {
+ var checkStatus = table.checkStatus('mainTable_copy')
+ , data = checkStatus.data;
+ }
+
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ if (data.length == 1) {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '寮傚父鍙嶉鍗曟煡鐪�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Reply_MESExecptFeedBackBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('鏃犳硶鏌ョ湅锛�');
+ }
+ }
+ //#endregion
+
+
+ // 鑾峰彇鏍囩
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
index 8634b46..2130244 100644
--- "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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
@@ -67,9 +67,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
@@ -273,6 +279,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HDate").val(Format(new Date, "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date, "yyyy-MM-dd"));
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
////鍔犺浇鎶樼嚎鍥�
@@ -380,7 +387,8 @@
var HEquipName = $("#HEquipName").val();
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
- var HDate = $("#HDate").val();
+ var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -465,7 +473,10 @@
sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
}
if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) = '" + HDate + "'";
+ sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) <= '" + HDate1 + "'";
}
if (HEquipNumber != "" || HTechParamName!="") {
get_Display(sWhere);
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_FiveMenOneRingList.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_FiveMenOneRingList.html"
index f05c2b1..9d9133e 100644
--- "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_FiveMenOneRingList.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_FiveMenOneRingList.html"
@@ -166,7 +166,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id"];
+ var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id", "涓荤敓浜ц鍗�", "閰嶄欢鐢熶骇璁㈠崟", "鎴愬搧鐗╂枡浠ｇ爜", "鎴愬搧瑙勬牸鍨嬪彿", "閰嶄欢鐗╂枡浠ｇ爜", "閰嶄欢瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -672,6 +672,17 @@
}
+ //涓昏〃鏍� 閰嶄欢娴佽浆鍗＄偣鍑绘椂闂�
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '閰嶄欢娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.閰嶄欢娴佽浆鍗d; //澹版槑鍙橀噺linterid 涓� data.hmainid
+
+ }
+ });
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
index 8a8580a..bcef798 100644
--- "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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
@@ -39,7 +39,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">杞﹂棿</label>
<div class="layui-input-block" style="width: 190px;">
<select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -90,90 +90,7 @@
</select>
</div>
</div>
- </div>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
- </div>
+ </div>
</div>
</div>
<div>
@@ -410,81 +327,6 @@
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
sWhere = {
HYear: HYear
@@ -511,16 +353,7 @@
$("#HBatchWork").val("");
$("#HDivisionName").val("");
- $("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
@@ -643,15 +476,15 @@
},
itemStyle: {
normal: {
+ color: '#808080', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#1E90FF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ }
},
data: HBackWorkQty
},
@@ -665,25 +498,25 @@
tooltip: {
valueFormatter: function (value) {
return value;
- }
+ }
},
itemStyle: {
normal: {
+ color: '#FF0000', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#FFFF00' // 璁剧疆鏌辩姸鍥鹃粍鑹�
+ }
},
data: HWasterQty_Work
},
{
name: '鏂欏簾',
- type: 'bar',
+ type: 'bar',
stack: 'Ad',
emphasis: {
focus: 'series'
@@ -695,15 +528,15 @@
},
itemStyle: {
normal: {
+ color: '#FFFF00', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#FF8C00' // 璁剧疆鏌辩姸鍥炬鑹�
+ }
},
data: HWasterQty_Mater
},
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_ProcessPerformancePass.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_ProcessPerformancePass.html"
index fed524e..9fc4509 100644
--- "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_ProcessPerformancePass.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_ProcessPerformancePass.html"
@@ -39,7 +39,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">杞﹂棿</label>
<div class="layui-input-block" style="width: 190px;">
<select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -88,89 +88,6 @@
<select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- </div>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -409,81 +326,6 @@
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
sWhere = {
HYear: HYear
, HDeptName: HDeptName
@@ -509,16 +351,7 @@
$("#HBatchWork").val("");
$("#HDivisionName").val("");
- $("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
@@ -645,6 +478,7 @@
{
name: '鍚堟牸鐜�',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� y 杞�
label: {
show: true,
formatter: '{c}%'
@@ -663,10 +497,11 @@
}
},
data: Pass
- },
+ },
{
name: '鐩爣鍊�',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� y 杞�
label: {
show: true,
formatter: '{c}%'
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_QualityMonthSumReport.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_QualityMonthSumReport.html"
new file mode 100644
index 0000000..8c64471
--- /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_QualityMonthSumReport.html"
@@ -0,0 +1,817 @@
+锘�<!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_QualityMonthSumReport";
+ var HBillType = "QC_QualityMonthSumReport";
+ 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_QualityMonthSumReport_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杞存暟鎹被鍨�
+ {
+ type: 'value'
+ }
+ ],
+ series: [ //璁剧疆y杞存暟鎹�
+ {
+ name: '璐ㄩ噺闂ㄩ�冮�哥巼',
+ type: 'line',
+ barWidth: 30,
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#8E8E8E' // 璁剧疆绾挎潯棰滆壊涓虹伆鑹�
+ },
+ color: '#8E8E8E' // 璁剧疆绾挎潯棰滆壊涓虹伆鑹�
+ }
+ },
+ 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/\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_TechnologyParameterClass.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_TechnologyParameterClass.html"
index 4d742b3..da76cb9 100644
--- "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_TechnologyParameterClass.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_TechnologyParameterClass.html"
@@ -67,120 +67,36 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁惧缂栫爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁惧</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿缂栫爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" value="" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" readonly>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" readonly>
</div>
</div>
-
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
</div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
</div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯″叿缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" value="" readonly>
</div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯″叿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" readonly>
</div>
</div>
</div>
@@ -406,80 +322,7 @@
var HTechParamName = $("#HTechParamName").val();
var HEquipName = $("#HEquipName").val();
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
+
if (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") {
sWhere = {
@@ -502,15 +345,7 @@
$("#HEquipName").val();
$("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+
form.render('select');
sWhere = "";
@@ -535,6 +370,7 @@
var HMin = [];//涓嬮檺鍊�
var HTitle = HTitle1;//涓绘爣棰�
var HTitles = HTitle2;//鍓爣棰�
+
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].宸ヨ壓娆″簭);
@@ -548,15 +384,29 @@
HStd.push(option.data[i].鏍囧噯鍊�);
}
}
- option_ZZT = {
- title: [{
- text: HTitle,
- left: 'center'
- }, {
- subtext: HTitles,
+ const HMinNumbers = HMin.map(value => parseInt(value, 10));
+ const HMaxNumbers = HMax.map(value => parseInt(value, 10));
+
+ // 璁＄畻鏈�灏忓�煎拰鏈�澶у��
+ const minValue = Math.min(...HMinNumbers);
+ const maxValue = Math.max(...HMaxNumbers);
+ option_ZZT = {
+ title: {
+
+ text: HTitles,
left: 'center',
- top: '5%'
- }],
+ textStyle: {
+ color: 'black',
+ fontSize: 18, // 鍔″繀璁颁綇璁剧疆鏂囧瓧澶у皬鍙兘鏄暟瀛�
+ fontWeight: 'normal'
+ },
+ subtext: HTitle,
+ subtextStyle: {
+ color: 'black',
+ fontSize: 18,
+ fontWeight: 'normal'
+ }
+ },
tooltip: {
trigger: 'axis'
},
@@ -588,9 +438,9 @@
yAxis: [
{
type: 'value',
- min: parseInt($("#HMin").val(), 10) - 10, // 璁剧疆鏈�灏忓��
- max: parseInt($("#HMax").val(), 10) + 10, // 璁剧疆鏈�澶у��
- interval: Math.floor(((parseInt($("#HMax").val(), 10) + 10) - (parseInt($("#HMin").val(), 10) - 10))/10) // 璁剧疆闂磋窛
+ min: minValue - 10, // 璁剧疆鏈�灏忓��
+ max: maxValue + 10, // 璁剧疆鏈�澶у��
+ interval: Math.floor(((maxValue + 10) - (minValue - 10)) / 10) // 璁剧疆闂磋窛
}
],
series: [
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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
index b013925..f08b48a 100644
--- "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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
@@ -61,13 +61,21 @@
</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="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -78,90 +86,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<div>
@@ -207,7 +132,7 @@
var option = [];
var HModName = "Sc_StationOutBil_HProc";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["骞�", "鏈�", "宸ュ簭鍚嶇О"];
+ var titleData = ["骞�", "鏈�", "宸ュ簭鍚嶇О","娉ㄥ浜嬩笟閮�","鐗╂枡鍚嶇О"];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -278,6 +203,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
//鍔犺浇鏌辩姸鍥�
@@ -297,6 +223,7 @@
};
}
+
//骞�
function Year() {
var yyyy = new Date().getFullYear();
@@ -309,6 +236,32 @@
$("#HMonth").val(new Date().getMonth() + 1);
form.render('select');
}
+
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮�
+ var HDivisionList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionName").append(HDivisionList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
//鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
@@ -346,7 +299,6 @@
}
}
}
-
//鍔ㄦ�佹樉绀哄垪鍚�
option = {
elem: '#mainTable'
@@ -360,6 +312,7 @@
, cellMinWidth: 90
}
ins = table.render(option);
+
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "Sc_StationOutBil_HProc";
@@ -384,120 +337,37 @@
});
layer.close(index);
}
+
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
var HMonth = $("#HMonth").val();
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
var HProcName = $("#HProcName").val();
- var HMaterName = $("#HMaterName").val();
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
+ var HMaterName = $("#HMaterName").val();
+
+ sWhere = {
+ HYear: HYear
+ , HMonth: HMonth
+ , HDivisionName: HDivisionName
+ , HProcName: HProcName
+ , HMaterName: HMaterName
}
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
- if (HYear) {
- sWhere += " and 骞� = '" + HYear + "'";
- }
- if (HMonth) {
- sWhere += " and 鏈� = '" + HMonth + "'";
- }
- if (HProcName) {
- sWhere += " and 宸ュ簭鍚嶇О like '%" + HProcName + "%'";
- }
- if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
- }
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�
set_Graphics();
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
$("#HMonth").val(new Date().getMonth() + 1);
$("#HProcName").val("");
$("#HMaterName").val("");
- $("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ $("#HDivisionName").val("");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index ae50051..5f744b7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -124,6 +124,12 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵规鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo" id="HBatchNo">
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -656,6 +662,7 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HProject").val("");//椤圭洰鍙�
+ $("#HBatchNo").val("");//鎵规鍙�
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
$("#HBillNo").val("");//鍗曟嵁鍙�
@@ -699,6 +706,7 @@
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
var HDeptName = $("#HDeptName").val();//杞﹂棿
+ var HBatchNo = $("#HBatchNo").val();//鎵规鍙�
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -805,6 +813,9 @@
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
}
+ if (HBatchNo) {
+ sWhere += " and 鎵规鍙� like '%" + HBatchNo + "%'";
+ }
if (number==2) {
if (HProject) {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index bef09c9..a0f96aa 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -819,13 +819,14 @@
//#region 寮圭獥椤甸潰鏂规硶
//#region 閫夋嫨閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -843,13 +844,14 @@
//#endregion
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -873,7 +875,7 @@
, area: ['90%', '90%']//澶у皬
, title: '甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -894,13 +896,14 @@
//#region 涓氬姟鍗曚綅閫夋嫨椤甸潰
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍗曚綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1086,7 +1089,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1120,13 +1123,14 @@
//#region 缁撶畻鍗曚綅閫夋嫨椤甸潰
function get_checkAccSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鍗曚綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1232,6 +1236,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
layer.msg("鎻愪氦鎴愬姛");
});
}
@@ -1733,6 +1738,10 @@
//#endregion
});
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
//#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
function getUrlVars_JSON() {
var datajson;
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
index e4d94d6..b5998e6 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
@@ -1372,7 +1372,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1382,7 +1385,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 5b57107..3074712 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -778,13 +778,14 @@
//#region 寮圭獥閫夋嫨鏂规硶
//#region 閫夋嫨閲囪喘閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -803,13 +804,14 @@
//#region 閫夋嫨閲囪喘涓荤
function get_checkManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘涓荤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -828,13 +830,14 @@
//#region 閫夋嫨涓氬姟鍛�
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -866,13 +869,14 @@
//#region 閫夋嫨閲囪喘鏂瑰紡
function get_checkSellS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -892,13 +896,14 @@
//#region 缁撶畻鏂瑰紡閫夋嫨椤甸潰
function get_checkSS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -923,7 +928,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -2077,6 +2082,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -2085,30 +2091,30 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
}
- OptionData = checkStatus.data[0];
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HUnitID": checkStatus.data[0].HItemID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- }
+ , end: function () {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
})
}
obj.event = "";
@@ -2868,6 +2874,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
@@ -2943,8 +2953,8 @@
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鐗╂枡
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index e3c6aeb..d5b89fc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -616,7 +616,7 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
get_Display(sWhere);
@@ -1432,9 +1432,11 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
- var addSWhere = "";
- if (openType == 2) {
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鍗曟嵁鐘舵�� = '宸插鏍�' and 琛屽叧闂汉 = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index ae4fc72..edd4913 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -1165,7 +1165,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1175,7 +1178,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index bab2c8f..2906ada 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -966,6 +966,9 @@
//#region 鎵撳嵃
function get_PrintReport() {
+ if (linterid == null || linterid == "") {
+ linterid = $("#HInterID").val();
+ }
layer.open({
type: 2
, area: ['50%', '50%']
@@ -973,7 +976,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOOrderBillByID', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
, resize: false
})
}
@@ -1184,6 +1187,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');//鎵撳嵃鏍煎紡
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1360,13 +1364,14 @@
}
//渚涘簲鍟�
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1383,13 +1388,14 @@
}
//浠撳簱
function get_checkWH() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1423,7 +1429,7 @@
, area: ['90%', '90%']//澶у皬
, title: '甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1442,13 +1448,14 @@
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1466,13 +1473,14 @@
}
//閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1718,6 +1726,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1726,7 +1735,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1754,6 +1763,7 @@
}
//鏀舵枡浠撳簱
if (obj.event == "HWHID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1762,7 +1772,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1824,6 +1834,7 @@
}
//杈呭姪鍗曚綅
if (obj.event == "HSecUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1832,7 +1843,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2428,8 +2439,8 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
@@ -2447,7 +2458,10 @@
function GetAuxiliaryUnitValue(data) {
OptionData = data
}
-
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
//椤圭洰
function GetProjectBillValue(data) {
$("#HProjectName").val(data[0].椤圭洰鍚嶇О);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 414abd8..ee92f1c 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -565,7 +565,7 @@
content: '../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
index c4ce325..09c6361 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
@@ -840,7 +840,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -850,7 +853,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 5f195e4..5eadd91 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -1943,7 +1943,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1953,7 +1956,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index b02d07b..b2c13fd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -1649,7 +1649,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1659,7 +1662,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1758,7 +1761,10 @@
for (var i = 1; i < option2.cols[0].length - 1; i++) {
colName += option2.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ colTitleName += option2.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1768,7 +1774,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
index b1371f4..9e28bea 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
@@ -1164,7 +1164,10 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1174,7 +1177,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 2bc618f..5484d63 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -936,6 +936,9 @@
//#region 鎵撳嵃
function get_PrintReport() {
+ if (linterid == null || linterid == "") {
+ linterid = $("#HInterID").val();
+ }
layer.open({
type: 2
, area: ['50%', '50%']
@@ -1160,6 +1163,7 @@
layer.msg(data.Message, { icon: 1 }); //浣跨敤layer鎻掍欢鏄剧ず涓�涓秷鎭紝鍥炬爣涓�1锛堥�氬父琛ㄧず鎴愬姛锛�
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤娣诲姞鎸夐挳锛岄槻姝㈤噸澶嶆彁浜�
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1603,13 +1607,14 @@
}
//渚涘簲鍟�
function get_checkSup() {
+ var HOrgName = $(".layui-form-select input").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName='+ HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1641,7 +1646,7 @@
, area: ['90%', '90%']//澶у皬
, title: '甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1659,13 +1664,14 @@
}
//閲囪喘閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $(".layui-form-select input").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1707,13 +1713,14 @@
}
//閲囪喘鏂瑰紡
function get_checkPSStyle() {
+ var HOrgName = $(".layui-form-select input").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1730,13 +1737,14 @@
}
//缁撶畻鏂瑰紡
function get_checkSS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1754,13 +1762,14 @@
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1779,13 +1788,14 @@
//浠撳簱
function get_btnHWHID() {
+ var HOrgName = $(".layui-form-select input").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -2061,10 +2071,13 @@
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
-
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
//鍙屽嚮杩斿洖鐗╂枡
function GetGyMaterial(data) {
OptionData = data
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 6e7c4c8..414745a 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"
@@ -349,7 +349,7 @@
//#endregion
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+ var titleData = ["hmainid","HEntryID","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
"HFeedback", "HPriority", "HUserID","甯佸埆浠ｇ爜","閲囪喘鏂瑰紡浠ｇ爜","缁撶畻鏂瑰紡浠ｇ爜","閮ㄩ棬浠ｇ爜","涓荤浠ｇ爜","涓氬姟鍛樹唬鐮�","璁￠噺鍗曚綅浠ｇ爜"];
//#endregion
@@ -363,7 +363,6 @@
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
-
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -384,6 +383,9 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
+ break;
+ //閫氱煡鎸夐挳
+ case 'btn-Notice': set_NoticeBill();
break;
//娴忚
case 'btn-view': get_ViewReport();
@@ -784,6 +786,7 @@
//}
}
+
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -873,6 +876,7 @@
}
});
}
+
//鏂板
function set_AddNew() {
layer.open({
@@ -893,6 +897,7 @@
}
});
}
+
//缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -921,6 +926,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
//鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -964,6 +970,30 @@
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //閫氱煡
+ function set_NoticeBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var dataJson = {
+ HRelationInterID: data[0].hmainid,
+ HRelationEntryID: data[0].hsubid,
+ HRelationBillNo: data[0].鍗曟嵁鍙�,
+ HRelationBillType: data[0].HBillType
+ }
+ console.log(JSON.parse(decodeURIComponent(encodeURIComponent(JSON.stringify(dataJson)))));
+ if (data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/宸ヤ綔鑱旂郴鍗�/OA_Add_Edit_WorkLinkBill.html?OperationType=2&linterid=&dataJson=' + encodeURIComponent(JSON.stringify(dataJson))
+ , resize: false
+ })
}
}
@@ -1141,7 +1171,6 @@
}
//#endregion
-
//#region 澶氳涓嬫帹锛堝簲浠樺崟锛�
function set_PushPayableBills() {
var checkStatus = table.checkStatus('mainTable')
@@ -1204,7 +1233,6 @@
}
}
//#endregion
-
//#region 澶氳涓嬫帹锛堥��鏂欓�氱煡鍗曪級
function set_PushPOInStockBackBills() {
@@ -1561,7 +1589,6 @@
}
//#endregion
-
//鑾峰彇鍒楀
function getColumnsWidth() {
var result = [];
@@ -1590,6 +1617,7 @@
return result;
}
+
//淇濆瓨鍒楀
function set_SaveGridColWidth() {
var arr = [];
@@ -1631,6 +1659,7 @@
}
get_FastQuery(table, option);
}
+
//榛樿鍒楀
function set_DefaultGridColWidth() {
var arr = [];
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 a3ba31b..74083ab 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"
@@ -823,6 +823,7 @@
if (HMangerID) {
sWhere += " and 涓荤 like '%" + HMangerID + "%'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1624,6 +1625,22 @@
})
}
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' " ;
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#endregion
@@ -1669,7 +1686,18 @@
});
}
//#endregion
-
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
</script>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index d87dde6..d67d26e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -651,7 +651,7 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
-
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1414,6 +1414,22 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鍗曟嵁鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' ";
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮繃婊ゆ潯浠�
function getSWhereByHUser() {
var res = "";
@@ -1480,7 +1496,18 @@
}
//#endregion
-
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
</script>
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 7ea8eeb..61ae226 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"
@@ -1692,7 +1692,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and HOrgID = " + HOrgID;
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 04c14eb..4dc9552 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -458,7 +458,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "", "HQty": "", "HRemark": "",
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
"HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
@@ -986,7 +986,7 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
, { field: 'HOrderPrice', title: '閲囪喘閲戦', width: 100, edit: 'text', totalRow: true}
- , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
@@ -1114,8 +1114,11 @@
var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID!=0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
+
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1137,8 +1140,10 @@
var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID != 0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1337,7 +1342,8 @@
});
//瀛愯〃 璧嬪��
- var rowdata = [];
+ var rowdata = [];
+
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
@@ -1347,9 +1353,11 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
+ , "HOrderPrice": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1467,6 +1475,7 @@
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1484,13 +1493,14 @@
////#endregion
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1506,13 +1516,14 @@
})
}
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1529,13 +1540,14 @@
}
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1552,13 +1564,14 @@
})
}
function get_checkWH() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1585,13 +1598,14 @@
})
}
function get_checkSecManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '楠屾敹鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1607,13 +1621,14 @@
})
}
function get_checkKeeper() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '淇濈鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1629,13 +1644,14 @@
})
}
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1652,13 +1668,14 @@
}
function get_checkManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '璐熻矗浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1829,6 +1846,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1837,7 +1855,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1864,6 +1882,7 @@
}
//鏀舵枡浠撳簱
if (obj.event == "HWHID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1872,7 +1891,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2669,8 +2688,8 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index 21a7d07..20b7bb7 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -1875,6 +1875,10 @@
colName += option.cols[0][i]["field"] + ",";
}
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -1884,7 +1888,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index be8f68b..a8c6e55 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -543,8 +543,8 @@
maxmin: true,
content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
--
Gitblit v1.9.1