From bf0cb438b93ef323bc7b801336fdf9f102855db0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 八月 2024 10:13:09 +0800
Subject: [PATCH] 1
---
WebTM/views/home/console_QiaoYi.html | 6
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 196 +
WebTM/views/质量管理/巡检记录单/MES_QC_PatrolProcCheckOtherBill_PDA.html | 817 +++++++
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 883 ++++++++
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 2
WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html | 4
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 946 ++++++++
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 24
WebTM/views/index_Mobile.html | 24
WebTM/views/WMS扫码模块/扫码验证/Gy_BarCodeConfirmBill_PDA.html | 107
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 34
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 37
WebTM/views/index_QiaoYi.html | 15
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 389 +++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 1
WebTM/views/应收管理/报表分析/Xs_SellOutMoneyRangeReport.html | 1
WebTM/views/系统管理/多级审批/审批进度/Xt_CheckFlowProgressList.html | 4
WebTM/WebTM.csproj.user | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 175 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 18
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 35
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 5
WebTM/views/质量管理/巡检记录单/MES_QC_PatrolProcCheckOtherBillList_PDA.html | 426 +++
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 484 +++
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 757 +++++++
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 784 +++++++
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 8
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 276 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 1
WebTM/WebTM.csproj | 8
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 4
33 files changed, 6,214 insertions(+), 265 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2d648c3..4c894a1 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -62,6 +62,9 @@
<File Include="layuiadmin/HideButton.js">
<publishTime>09/25/2023 09:17:10</publishTime>
</File>
+ <File Include="layuiadmin/img/img_little_new.png">
+ <publishTime>07/31/2024 08:38:47</publishTime>
+ </File>
<File Include="layuiadmin/json/console/prograss.js">
<publishTime>09/05/2022 13:34:25</publishTime>
</File>
@@ -2015,6 +2018,18 @@
<File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBill_PDA.html">
<publishTime>07/17/2024 11:35:08</publishTime>
</File>
+ <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList.html">
+ <publishTime>07/12/2024 14:03:59</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList_BarCodeList.html">
+ <publishTime>07/12/2024 14:56:01</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList_PDA.html">
+ <publishTime>07/25/2024 11:21:38</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBill_PDA.html">
+ <publishTime>07/29/2024 15:15:30</publishTime>
+ </File>
<File Include="views/WMS鎵爜妯″潡/鏉＄爜鍑哄叆搴撴煡璇�/Gy_BarCodeBillInOut__PDA.html">
<publishTime>02/28/2024 14:07:44</publishTime>
</File>
@@ -2752,6 +2767,9 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_UnitConvertRateList.html">
<publishTime>07/17/2024 11:35:08</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_UnitConvertRateList.html">
+ <publishTime>07/15/2024 09:58:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
<publishTime>07/17/2024 11:35:08</publishTime>
@@ -4838,6 +4856,12 @@
<File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html">
<publishTime>03/07/2024 10:25:25</publishTime>
</File>
+ <File Include="views/鐪嬫澘/閲囪喘鏀舵枡/KB_CGSL.html">
+ <publishTime>07/31/2024 13:11:01</publishTime>
+ </File>
+ <File Include="views/鐪嬫澘/閲囪喘鏀舵枡/KB_CGSL_New.html">
+ <publishTime>07/31/2024 13:36:13</publishTime>
+ </File>
<File Include="views/绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodAdd.html">
<publishTime>06/14/2024 13:06:23</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 334d16e..be7f460 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -435,6 +435,7 @@
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkSelfQuery.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_Add_Edit_WorkLinkBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkBillList.html" />
@@ -451,8 +452,14 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_PerformanceScrapLedger.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformancePass.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
@@ -479,6 +486,7 @@
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 147597a..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 78b642e..2752599 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,9 +8,9 @@
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /*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/"; //鏅轰簯鏈嶅姟鍣�*/
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
index 88bee87..620c40d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
@@ -54,15 +54,20 @@
</div>
</div>
</div>
- <div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
+ <div class="layui-tab" lay-filter="tab-Gy_BarCodeConfirmBill_PDA">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1">鎵爜淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
+ <li lay-id="2">琛ユ壂淇℃伅</li>
+ <li lay-id="3">鍗曟嵁淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鎵爜淇℃伅-->
<div class="layui-tab-item">
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <!--琛ユ壂娓呭崟淇℃伅-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="wl-table1" lay-filter="wl-table1"></table>
</div>
<!--鍗曟嵁淇℃伅-->
<div class="layui-tab-item">
@@ -108,8 +113,11 @@
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdExport">瀵煎嚭</button>
+ </div>-->
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSuppRush">琛ユ壂娓呭崟</button>
</div>
</div>
</div>
@@ -149,6 +157,7 @@
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"]
var option = [];
+ var option1 = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -265,6 +274,9 @@
//#region 鏄剧ず瀹㈡埛鐗╂枡鏉＄爜鍒楄〃淇℃伅
function DisBillEntryList() {
+ //鍒囨崲椤电涓烘壂鐮佸垪琛�
+ element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '1');
+
var ajaxLoad = layer.load();
$.ajax({
type: "GET",
@@ -318,7 +330,7 @@
$("#HQty_Total").val(data1.data.length);
var data_Temp = []; //瀛樻斁瀛愯〃闇�瑕佹樉绀虹殑鏁版嵁
- var data_temp_length = 10; //閫氳繃缂撳瓨鍒楄〃鎴栨柊澧炶繘鍏ラ〉闈㈡椂锛屽瓙琛ㄦ樉绀虹殑鏈�澶ц褰曟暟
+ var data_temp_length = 3; //閫氳繃缂撳瓨鍒楄〃鎴栨柊澧炶繘鍏ラ〉闈㈡椂锛屽瓙琛ㄦ樉绀虹殑鏈�澶ц褰曟暟
if (data1.data.length < data_temp_length) {
data_temp_length = data1.data.length;
}
@@ -470,6 +482,12 @@
get_Export();
})
//#endregion
+
+ //#region 琛ユ壂娓呭崟 鍔熻兘鎺т欢
+ form.on('submit(cmdSuppRush)', function () {
+ get_SuppRushList();
+ })
+ //#endregion
//#endregion
@@ -493,6 +511,30 @@
function set_InitGrid() {
option = {
elem: '#wl-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 100000
+ //, limits: [50, 500, 5000, 20000]
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', hide: true }
+ , { field: 'HInterID', title: 'HInterID', hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 125, sort: true }
+ , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 125, sort: true, hide: true }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 125, sort: true }
+ , { field: 'HQty', title: '鏁伴噺', width: 125, sort: true, totalRow: true, hide: true }
+ , { field: 'HOrgID', title: 'HOrgID', sort: true, hide: true }
+ , { field: 'HDate', title: '鏃ユ湡', width: 125, sort: true }
+ , { field: 'HRelationInterID', title: 'HRelationInterID', width: 125, sort: true, hide: true }
+ , { field: 'HMaker', title: '鎵爜浜�', width: 125, sort: true }
+ ]]
+ };
+
+ option1 = {
+ elem: '#wl-table1'
, height: 'full-50'
//, page: true
, cellMinWidth: 90
@@ -578,6 +620,63 @@
//});
}
//#endregion
+
+ //#region 琛ユ壂娓呭崟
+ function get_SuppRushList() {
+ //鍒囨崲椤电涓鸿ˉ鎵竻鍗�
+ element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '2');
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/Gy_BarCodeConfirmBill_getSuppRushList',
+ async: false,
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HOrgID": HStockOrgID },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ col.push({ type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ option1.cols = [col];
+ option1.data = data1.data;
+ table.cache['wl-table1'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(option1);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#endregion
});
diff --git a/WebTM/views/home/console_QiaoYi.html b/WebTM/views/home/console_QiaoYi.html
index 4bfd49e..d58d1c6 100644
--- a/WebTM/views/home/console_QiaoYi.html
+++ b/WebTM/views/home/console_QiaoYi.html
@@ -96,6 +96,12 @@
<cite>娴佽浆鍗℃湭鍏ュ簱鎶ヨ〃</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SC_DayRkReport.html">
+ <i class="layui-icon layui-icon-add-circle"></i>
+ <cite>鐢熶骇鏃ヨ</cite>
+ </a>
+ </li>
<!--<li class="layui-col-xs3">
<a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
<i class="layui-icon layui-icon-mike"></i>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index b0c2bcb..6d9d7df 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -795,6 +795,30 @@
</a>
<dl class="layui-nav-child">
<dd>
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_ColorRecordBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 棣栨璁板綍鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/MES_ColorRecordBillList_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 棣栨璁板綍鍗曞垪琛�
+ </a>
+ </dd>
+ <dd>
+ <a href="璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/MES_QC_PatrolProcCheckOtherBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸℃璁板綍鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/MES_QC_PatrolProcCheckOtherBillList_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸℃璁板綍鍗曞垪琛�
+ </a>
+ </dd>
+ <dd>
<a href="璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/MES_ProcessCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭妫�楠屽崟
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 1efd070..ad83b59 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -255,16 +255,17 @@
<!-- <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd> -->
</dl>
</dd>
- <!-- <dd>
+ <dd>
<a>浠撳簱鎶ヨ〃</a>
<dl class="layui-nav-child">
- <dd><a lay-href="浠撳瓨绠＄悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/Kf_ICStockBillSubList.html">鏉＄爜鍑哄叆搴撹褰曡〃</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryList_WMS.html">鏉＄爜搴撳瓨鏌ヨ</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉＄爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>-->
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/Kf_ICStockBillSubList.html">鏉＄爜鍑哄叆搴撹褰曡〃</a></dd>-->
+ <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/KF_ICinventoryQueryReport.html">鍙婃椂搴撳瓨鏌ヨ鎶ヨ〃</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICInventory_BarCode.html">鏉＄爜搴撳瓨鏌ヨ鎶ヨ〃</a></dd>
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉＄爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>-->
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>-->
</dl>
- </dd> -->
+ </dd>
</dl>
</li>
<!-- 璁″垝绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index cabce5b..a431536 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -51,7 +51,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>缇婃瘺淇℃伅</li>
+ <li>琛ュ厖淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
<li>闄勪欢淇℃伅</li>
</ul>
@@ -670,7 +670,8 @@
//鑾峰彇 閫掑叆鍙傛暟
var params = getUrlVars();
var hID = params[params[0]];//缂栬緫鏌ョ湅
- var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫
+ var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫 4娴佹按鍙锋柊澧�
+ var HMaterTypeID = params[params[2]];//绫诲瀷id
//鍒濆鍖� 鍙� 鍏敤鍙橀噺
var date = new Date();
var day = date.getDate();
@@ -746,7 +747,12 @@
PicUpload();
getFile();
}
-
+ //娴佹按鍙锋柊澧�
+ if (OperationType == 4) {
+ $("#HNumber").attr("readonly", true);
+ setHNumber(HMaterTypeID);
+
+ }
$(this).removeAttr("lay-key");
//鎵ц涓�涓猯aydate瀹炰緥
@@ -1012,6 +1018,28 @@
});
}
+ //娴佹按鍙锋柊澧炶幏鍙栫紪鐮�
+ function setHNumber(TypeID) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Material/getMaxNum',
+ type: "GET",
+ data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+ success: function (data1) {
+ if (data1.data != null) {
+ layer.close(ajaxLoad);
+ $("#HNumber").val(data1.data)
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
console.log(data.field.HCHECKINCOMING)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Warehouse.html"
index 08c2315..f36ce38 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Warehouse.html"
@@ -97,6 +97,13 @@
<input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熷簱瀛樻帶鍒舵爣璁�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStockCtrlFlag" id="checkboxHStockCtrlFlag" lay-skin="primary" lay-filter="checkboxHStockCtrlFlag" value="true" title="鏄惁鍚敤">
+ <input type="hidden" value="false" name="HStockCtrlFlag" id="HStockCtrlFlag">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -221,6 +228,11 @@
Pub_Close(1);
})
+ //璐熷簱瀛樻帶鍒舵寜閽�
+ form.on('checkbox(checkboxHStockCtrlFlag)', function (data) {
+ $("#HStockCtrlFlag").val(data.elem.checked);
+ });
+
//鏄惁绂佺敤鎸夐挳
form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
@@ -321,10 +333,15 @@
var data = result.data[0];
var IsHStopflag = data.绂佺敤鏍囪;
var HSPFlag = data.鍚敤浠撲綅;
+ var IsHStockCtrlFlag = data.璐熷簱瀛樻帶鍒舵爣璁�;
var IsHTypeFlow = data.鏄庣粏鏍囪;
//绂佺敤鏍囪
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ }
+ //璐熷簱瀛樻帶鍒舵爣璁�
+ if (IsHStockCtrlFlag) {
+ $("input[name='checkboxHStockCtrlFlag'][value='" + IsHStockCtrlFlag + "']").attr("checked", true);
}
//鍚敤鏍囪
if (HSPFlag=="Y") {
@@ -346,6 +363,7 @@
, "HAddress": data.浠撳簱鍦板潃
, "HPhone": data.鑱旂郴鐢佃瘽
, "HStopflag": data.绂佺敤鏍囪
+ , "HStockCtrlFlag": data.璐熷簱瀛樻帶鍒舵爣璁�
, "HSPFlag": data.鍚敤浠撲綅 == "Y" ? 1 : 0
, "HRemark": data.HRemark
, "HRemark": data.HRemark
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_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index cdd0cf9..173bc0c 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_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -131,6 +131,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layui-iconlayuiiconfileb"></i>娴佹按鍙锋柊澧�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
@@ -200,6 +201,7 @@
var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -240,6 +242,10 @@
//鏂板鎸夐挳
case 'btn-Add':
set_AddNew();
+ break;
+ //鏂板娴佹按鍙锋寜閽�
+ case 'btn-NumAdd':
+ set_NumAddNew();
break;
case 'btn-Edit':
set_ShowBill();
@@ -805,6 +811,34 @@
}
//#endregion
+ //#region 娴佹按鍙锋柊澧�
+ function set_NumAddNew() {
+ if (HMaterTypeID == 0 || HMaterTypeID == null) {
+ layer.msg('璇烽�夋嫨鍏蜂綋鐗╂枡鍒嗙被锛�');
+ }
+ else {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐗╂枡',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html?hID=0&OperationType=4&HMaterTypeID=' + HMaterTypeID,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ }
+ //#endregion
+
//#region 缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -937,10 +971,13 @@
var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
if (data.id == "100") {
sql = " and HMaterTypeID=0 ";
+ HMaterTypeID = 0;
} else if (data.id == "0") {
sql = "";
+ HMaterTypeID = 0;
} else {
sql = " and HMaterTypeID='" + data.id + "' ";
+ HMaterTypeID = data.id;
}
get_Display(sql);
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 8e7cac6..3376d0b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -89,7 +89,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1 " class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 55bb2df..06f0fa3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -47,7 +47,7 @@
<label class="layui-form-label">鍒涘缓缁勭粐</label>
<div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
<input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
- <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input" >
+ <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -222,7 +222,7 @@
<div class="layui-row" style="margin-bottom:5px">
<div class="layui-inline" style="width: 585px;">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline" >
+ <div class="layui-input-inline">
<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
@@ -325,11 +325,32 @@
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">浠樻璁″垝</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
-
+ <!--椤圭洰闃舵琛細鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -365,16 +386,20 @@
var sWhere = "";
//#endregion
-
+ var option;
//#region 杩涘叆椤甸潰鏃㈠姞杞�
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+ //鍒濆鍖栬〃
+ get_InitGrid();
}
else if (OperationType == 3) {//缂栬緫
$("#HInterID").val(linterid);
set_EditFromGrid();
+ //鍒濆鍖栬〃
+ get_InitGrid();
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -383,6 +408,58 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+
+ var NewRow = {
+ "HPayType": ""
+ , "HPayRate": "0"
+ , "HPayTime": "0"
+ , "HPayRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+
+ }
+ });
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ /*set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�*/
+
+ });
+ //#endregion
+
//缁撶畻鏂瑰紡寮圭獥
form.on('submit(btnSearchProc)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -524,10 +601,19 @@
var isEndCheck = document.getElementById("HStopflag").checked;
isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
+ //瀛愯〃
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ //瀛愯〃搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
var oMain = JSON.stringify(data.field)
- var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+ var sBillModeify = oMain + ';' + sSubStr + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
if (AllowLoadData()) {
if (OperationType == "3") {
$.ajax({
@@ -561,7 +647,7 @@
type: "POST",
url: GetWEBURL() + "/Gy_Supplier/AddBill",
async: true,
- data: { "oMain": oMain },
+ data: { "oMain": oMain + ';' + sSubStr },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -633,6 +719,62 @@
}
});
}
+
+
+ //#region 璁″垝琛�
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 璁″垝琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPayType', title: '浠樻闃舵', edit: 'text' }
+ , { field: 'HPayRate', title: '浠樻姣斾緥% ', edit: 'text'}
+ , { field: 'HPayTime', title: '缁撶畻鍛ㄦ湡', edit: 'text' }
+ , { field: 'HPayRemark', title: '澶囨敞璇存槑', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HPayType": ""
+ , "HPayRate": "0"
+ , "HPayTime": "0"
+ , "HPayRemark": ""
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+ }
+ //#endregion
+
+
//缂栬緫椤甸潰鍔犺浇
function set_EditFromGrid() {
$.ajax({
@@ -682,6 +824,8 @@
form.render('select');
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ option.data = d.list[0]["Gy_Supplier_PayPlan"];
+ table.render(option);
//table.reload(layTableId, {
// data: ajaxReturnData
//});
@@ -695,6 +839,28 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData() {
+
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+
+ //#region 瀛愯〃鏍￠獙
+ for (var i = 0; i < option.data.length; i++) {
+
+ //鏁伴噺鏍煎紡鏍￠獙
+ temp = option.data[i]["HPayRate"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細浠樻姣斾緥璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+
+ //鍗曚环鏍煎紡鏍￠獙
+ temp = option.data[i]["HPayTime"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細缁撶畻鍛ㄦ湡璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ }
+ //#endregion
+
var HNumber = $("#HNumber").val();
if (HNumber == null || HNumber == undefined || HNumber == "") {
layer.msg("璇疯緭鍏ヤ緵搴斿晢缂栫爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -703,6 +869,15 @@
var HName = $("#HName").val();
if (HName == null || HName == undefined || HName == "") {
layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ var HTaxRate = $("#HTaxRate").val();
+ if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
+ layer.msg("璇疯緭鍏ュ鍊肩◣鐜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(HTaxRate)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細澧炲�肩◣鐜囪杈撳叆澶т簬0鐨勬暟瀛楋紒");
return false;
}
//var HAddress = $("#HAddress").val();
@@ -731,13 +906,12 @@
return false;
}
var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
- if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "" ) {
+ if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "") {
layer.msg("璇峰～鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
- if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "")
- {
+ if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "") {
layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
@@ -804,7 +978,7 @@
//#endregion
});
- //浠ヤ笂涓簂ayui妯″潡
+ //浠ヤ笂涓簂ayui妯″潡
</script>
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutMoneyRangeReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutMoneyRangeReport.html"
index 5d2de72..aa01445 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutMoneyRangeReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutMoneyRangeReport.html"
@@ -307,6 +307,7 @@
legend: {
top: 'bottom'
},
+ color: ['#C71585', '#D87093', '#FF1493', '#FF69B4', '#FFE4E1', '#2F4F4F', '#556B2F', '#808000', '#006400', '#228B22', '#2E8B57', '#008080', '#20B2AA', '#66CDAA', '#3CB371', '#8FBC8F', '#9ACD32', '#32CD32', '#0OFF00', '#0OFF7F', '#1E90FF', '#6495ED', '#4682B4', '#008B8B', '#5F9EA0'],
series: [
{
name: '閿�鍞搴�',
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
index 5cd71c0..c40bce5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
@@ -159,6 +159,8 @@
<label class="layui-form-label">娴佽浆鍗″彿:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" disabled autocomplete="off">
+ <input id="HProcExchInterID" name="HProcExchInterID" type="hidden" /> <!--娴佽浆鍗′富id-->
+ <input id="HProcExchEntryID" name="HProcExchEntryID" type="hidden" /> <!--娴佽浆鍗″瓙id-->
<input id="HSourceInterID" name="HSourceInterID" type="hidden" />
<input id="HSourceEntryID" name="HSourceEntryID" type="hidden" />
<input type="hidden" name="HSourceBillNo" id="HSourceBillNo">
@@ -948,6 +950,8 @@
, "HICMOInterID": data.HICMOInterID
, "HICMOEntryID": data.HICMOEntryID
, "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HProcExchEntryID": data.HProcExchEntryID
, "HProcExchQty": ""
, "HSourceInterID": data.HMainSourceInterID
, "HSourceEntryID": data.HMainSourceEntryID
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 af71747..77566a2 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"
@@ -152,12 +152,7 @@
let firstPassRate = parseFloat(firstPassRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
HFirstPassRate[monthIndex] = firstPassRate;
}
- }
- //for (let i = 1; i <= 12; i++) {
- // HProcSumNum.push(option.data[0][i + "鏈�"]);
- // HQualifiedNum.push(option.data[1][i + "鏈�"]);
- // HFirstPassRate.push(option.data[3][i + "鏈�"].replace('%', ''));
- //}
+ }
}
switch ($("#HWorkCenter").val()) {
@@ -187,6 +182,20 @@
crossStyle: {
color: '#999'
}
+ },
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ if (item.seriesType === 'line') {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(2) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+ } else {
+ tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // 鏌辩姸鍥炬暟鎹洿鎺ユ樉绀�
+ }
+ });
+
+ return tooltipHtml;
}
},
toolbox: {
@@ -248,23 +257,13 @@
{
name: '娉ㄥ鑹巼',
type: 'line',
- yAxisIndex: 1,
- tooltip: {
- valueFormatter: function (value) {
- return value;
- }
- },
+ yAxisIndex: 1,
data: HQualifiedNum
},
{
name: '鍏ㄦ鑹巼',
type: 'line',
- yAxisIndex: 1,
- tooltip: {
- valueFormatter: function (value) {
- return value + ' ';
- }
- },
+ yAxisIndex: 1,
data: HFirstPassRate
}
]
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\244\232\347\272\247\345\256\241\346\211\271/\345\256\241\346\211\271\350\277\233\345\272\246/Xt_CheckFlowProgressList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\244\232\347\272\247\345\256\241\346\211\271/\345\256\241\346\211\271\350\277\233\345\272\246/Xt_CheckFlowProgressList.html"
index a284231..2c9c043 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\244\232\347\272\247\345\256\241\346\211\271/\345\256\241\346\211\271\350\277\233\345\272\246/Xt_CheckFlowProgressList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\244\232\347\272\247\345\256\241\346\211\271/\345\256\241\346\211\271\350\277\233\345\272\246/Xt_CheckFlowProgressList.html"
@@ -19,7 +19,7 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
- <div class="layui-colla-item">
+ <div class="layui-colla-item" style="display:none;">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
@@ -240,7 +240,7 @@
else {
switch (data[i].Type) {
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 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 6db322f..231c1a0 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -307,10 +307,7 @@
<tbody id="ProImgByList">
</tbody>
</table>
- </div>
- <div>
- <button class="layui-btn" id="cameraBtn">璋冪敤鐩告満</button>
- </div>
+ </div>
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index a27edd5..aaa6ef8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -419,6 +419,7 @@
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
//宸ュ簭娴佽浆鍗￠〉闈笅鎺�
set_ProcessBill(HInterID, HEntry);
+ OperationType = 1;
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBillList_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBillList_PDA.html"
new file mode 100644
index 0000000..bc76271
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBillList_PDA.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;">鏃ユ湡</label>
+ <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:5px">-</label>
+ </div>
+ <div class="layui-inline">
+ <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 90px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:120px">
+ </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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "MES_QC_PatrolProcCheckOtherBillList_PDA";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btnCheck': btnCheck(1);
+ break;
+ //鍙嶅鏍�
+ case 'btnAdutCheck': btnCheck(2);
+ break;
+ //鍒犻櫎
+ case 'btnDel': btnDel();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "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, "") > -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 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , height: 'full-70'
+ , totalRow: false //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HProductName").val("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ ColFilter();
+ sWhere = "";
+ }
+
+ //鍒犻櫎
+ function btnDel() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/DelQC_PatrolProcCheckOtherBillBill_PDA',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBill_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBill_PDA.html"
new file mode 100644
index 0000000..d4b0dc3
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/MES_QC_PatrolProcCheckOtherBill_PDA.html"
@@ -0,0 +1,817 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸℃璁板綍鍗�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <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 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/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .set_height {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: left;
+ }
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;" class="gxcz"><i class="layui-icon layui-icon-form"></i>宸℃璁板綍鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>-->
+
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input set_height" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鏁伴噺</th>
+ <td class="bz_td">
+ <input type="text" name="HQty" class="layui-input set_height" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSourceName" class="layui-input set_height" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input set_height">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder;">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>璇曟牱缁撹</th>
+ <td class="bz_td">
+ <input type="radio" name="HLastResult" value="true" title="鍚堟牸">
+ <input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input set_height" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input set_height" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input set_height">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇缁勭粐</th>
+ <td class="bz_td">
+ <input type="text" name="HPRDORGName" class="layui-input set_height" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input set_height">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOBillNo" class="layui-input set_height" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input set_height">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input set_height">
+ </tr>
+ <tr>
+ <th>娴佽浆鍗�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcExchBillNo" class="layui-input set_height" id="HProcExchBillNo" placeholder="娴佽浆鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" class="layui-input set_height" id="HProcExchHinteID">
+ <input type="hidden" name="HProcExchInterID" class="layui-input set_height" id="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" class="layui-input set_height" id="HProcExchEntryID" value="0">
+ </td>
+ </tr>
+ <tr>
+ <th>鎵规鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBatchNo" class="layui-input set_height" id="HBatchNo" placeholder="鎵规鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡浠ｇ爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterNumber" class="layui-input set_height" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" class="layui-input set_height" id="HMaterID">
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input set_height" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterModel" class="layui-input set_height" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>璁￠噺鍗曚綅</th>
+ <td class="bz_td">
+ <input type="text" name="HUnitName" class="layui-input set_height" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input set_height">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHUnit" id="BtnHUnit" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input set_height" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input set_height">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HQCSchemeName" id="HQCSchemeName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="btnSearchQCScheme" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--搴忓彿-->
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+ <!--澶嶉�夋锛堢粨鏋滐級-->
+ <script type="text/html" id="HResult">
+ <input type="checkbox" value="{{d.HResult}}" lay-skin="primary" id="HResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HResult" {{ d.HResult == 1 ? 'checked' : '' }}>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒跺崟浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input set_height" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒跺崟鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input set_height" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input set_height" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input set_height" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input set_height" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input set_height" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input set_height" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input set_height" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>妫�楠岄」鐩�</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ </div>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="eventType" id="eventType" value="Add">
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , upload = layui.upload
+ , element = layui.element;
+ //#region 鍏叡鍙橀噺
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+ else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
+ var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ }
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7520' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳榛樿绂佺敤
+ //GetDefValByUser();
+ }
+
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //閫夋嫨璁￠噺鍗曚綅
+ form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HUnitID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ });
+
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchQCScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟妗堝垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ get_CheckItem();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($('input[name="HLastResult"]:checked').val() == undefined) {
+ layer.msg("璇烽�夋嫨璇曟牱缁撹!");
+ return;
+ }
+ if (!HProcExchBillNoFlag) {
+ layer.msg("璇锋壂鏉＄爜!");
+ return;
+ }
+ Get_Save(data);
+
+ });
+
+ //閫�鍑�--鍏ㄥ睆鐗�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
+ });
+ })
+
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('MES_ColorRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ });
+ })
+
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆琛ㄦ牸鏁版嵁
+ rowdata = [{
+ "HQCCheckItemID": 0, "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
+ }];
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HResult', title: '妫�楠岀粨鏋�', width: 80, templet: '#HResult', unresize: false }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', width: 100, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', width: 80, templet: '#HKeyInspect', unresize: false }
+ , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID', hide: true }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 60 }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ //$cr.find('input').val(value.HResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ function get_CheckItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": 0 },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"] == 1 ? true : false,
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0
+ }
+ );
+ }
+ //妫�楠岄」鐩�
+ option.data = rowdata;
+ table.render(option);
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ }
+ })
+ }
+
+ function txtHBarCode_KeyDown(HBarCode) {
+ //妫�鏌ユ壂鎻忕殑鏉＄爜鏄惁涓虹函鏁板瓧锛屽鏋滄槸绾暟瀛楋紝鐩墠榛樿鍒ゆ柇涓� "宸ュ簭杩涚珯鎺ユ敹鍗曞彿"
+ var result = /^\d+$/.test(HBarCode)
+ if (result == true) {
+ HBarCode = HBarCode.slice(0, 0) + 'GXJZ' + HBarCode.slice(0)
+ }
+ //鎵爜绫诲瀷1
+ var barNo = HBarCode.substr(0, 3);
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "7505" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ switch (barNo) {
+ case "HCX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSourceID": data.HItemID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ });
+ break;
+ }
+
+ switch (barNo2) {
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.hsubid,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HUnitID": data.HUnitID,
+ "HUnitName": data.鍗曚綅,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
+ });
+ //鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ break;
+ case "GXJZ":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.娴佽浆鍗″彿,
+ "HProcExchInterID": data.HProcExchInterID,
+ "HProcExchEntryID": data.HProcExchEntryID,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗�,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HUnitID": data.HUnitID,
+ "HUnitName": data.璁￠噺鍗曚綅,
+ "HProcName": data.褰撳墠宸ュ簭,
+ "HProcID": data.HProcID,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
+ });
+ //鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ HProcExchBillNoFlag = true;
+ break;
+ case "MO00":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": "",
+ "HProcExchInterID": 0,
+ "HProcExchEntryID": 0,
+ "HICMOInterID": data.hmainid,
+ "HICMOEntryID": data.hsubid,
+ "HICMOBillNo": data.鍗曟嵁鍙�,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": 0,//data.缁勭粐,
+ "HPRDORGName": '',//data.缁勭粐鍚嶇О,
+ "HUnitID": data.hunitid,
+ "HUnitName": data.璁￠噺鍗曚綅,
+ "HProcName": data.褰撳墠宸ュ簭,
+ "HProcID": data.HProcID,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
+ });
+ //鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ HProcExchBillNoFlag = true;
+ break;
+ }
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //淇濆瓨
+ function Get_Save(data) {
+
+ var tableData = data.field;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType + ";" + sSubStr;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillAddBill_PDA",
+ async: false,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鑾峰彇鍙傛暟
+ 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>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
index bb59b78..efc8bf7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
@@ -148,6 +148,12 @@
</td>
</tr>
<tr>
+ <th>鎵规鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBatchNo" class="layui-input set_height" id="HBatchNo" placeholder="鎵规鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
<th>鐗╂枡浠ｇ爜</th>
<td class="bz_td">
<input type="text" name="HMaterNumber" class="layui-input set_height" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -652,6 +658,7 @@
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HProcExchInterID": data.hmainid,
"HProcExchEntryID": data.hsubid,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
"HICMOInterID": data.hicmointerid,
"HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
@@ -684,6 +691,7 @@
"HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿,
"HProcExchInterID": data.HProcExchInterID,
"HProcExchEntryID": data.HProcExchEntryID,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
"HICMOInterID": data.HICMOInterID,
"HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗�,
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 580db9d..7fc76a5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1487,7 +1487,6 @@
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
});
data = result.data;
- //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < data.length; i++) {
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"
new file mode 100644
index 0000000..68b5abd
--- /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_ProcessPerformanceFirstPass.html"
@@ -0,0 +1,883 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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/lib/extend/echarts.min.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-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+ </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 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 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;">
+ </div>
+ <div id="histogram1" style="width:99.5%;height:calc(68vh);margin-top:30px;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sc_StationOutBil_HProc";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HYear", "鏈�", "宸ュ簭"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProcList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#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 set_ClearBill() {
+ Year(); //鍒濆鍖栧勾
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ get_FastQuery();
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ //鍔犺浇鎶樼嚎鍥�
+ set_Graphics1();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy);
+ form.render('select');
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/getQC_ProcessPerformanceFirstPass',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "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 (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;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProc";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HYear = $("#HYear").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 (HYear) {
+ sWhere += " and HYear = '" + HYear + "'";
+ }
+ get_Display(sWhere);
+ //鍔犺浇鏌辩姸鍥�,鎶樼嚎鍥�
+ set_Graphics();
+ set_Graphics1();
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HYear").val(new Date().getFullYear());
+
+ $("#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 = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = [];//X杞存爣棰�
+ var HBackWorkQty = [];//杩斿伐
+ var HWasterQty_Work = [];//宸ュ簾
+ var HWasterQty_Mater = [];//鏂欏簾
+ var FistPass = [];//涓�娆″悎鏍肩巼
+ var HTitle = "鐩撮�氱巼瓒嬪娍鍥�";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length; i++) {
+ H_X.push(option.data[i].鏈堜唤);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+
+ HBackWorkQty.push(option.data[i].杩斿伐);
+ HWasterQty_Work.push(option.data[i].宸ュ簾);
+ HWasterQty_Mater.push(option.data[i].鏂欏簾);
+ FistPass.push((option.data[i].涓�娆″悎鏍肩巼).replace('%', ''));
+
+ }
+ }
+ option_ZZT = {
+ title: {
+ text: HTitle,
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ },
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ if (item.seriesType === 'line') {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+ } else {
+ tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // 鏌辩姸鍥炬暟鎹洿鎺ユ樉绀�
+ }
+ });
+
+ return tooltipHtml;
+ }
+ },
+ 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 }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ name: '鏁伴噺',
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
+ {
+ type: 'value',
+ name: '鐧惧垎姣�',
+ min: 0,
+ max: 100,
+ axisLabel: {
+ formatter: '{value} %'
+ }
+ }
+ ],
+ series: [
+ {
+ name: '杩斿伐',
+ type: 'bar',
+ stack: 'Ad',
+ barGap: 0,
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HBackWorkQty
+ },
+ {
+ name: '宸ュ簾',
+ type: 'bar',
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HWasterQty_Work
+ },
+ {
+ name: '鏂欏簾',
+ type: 'bar',
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HWasterQty_Mater
+ },
+ {
+ name: '涓�娆″悎鏍肩巼',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
+ data: FistPass
+ }
+ ]
+ };
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 銆愭姌绾垮浘銆�
+ function set_Graphics1() {
+ var chartDom1 = document.getElementById('histogram1');
+ var myChart = echarts.init(chartDom1);
+ var option_ZZT1;
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X1 = [];//X杞存爣棰�
+ var HWorkPass = [];//宸ュ簾鐜�
+ var HMaterPass = [];//鏂欏簾鐜�
+ var HTitle = "涓嶈壇鐜囩粺璁¤秼鍔垮浘";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length; i++) {
+ H_X1.push(option.data[i].鏈堜唤);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+
+ HWorkPass.push((option.data[i].宸ユ枡鐜�).replace('%', ''));
+ HMaterPass.push((option.data[i].鏂欏簾鐜�).replace('%', ''));
+ }
+ }
+ option_ZZT1 = {
+ title: {
+ text: HTitle,
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // Y杞存暟鍊硷紝骞舵坊鍔犵櫨鍒嗗彿
+ });
+
+ return tooltipHtml;
+ }
+ },
+ legend: {
+ data: ['宸ユ枡鐜�', '鏂欏簾鐜�'],
+ top: 'bottom',
+ left: 'center'
+ },
+ 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 }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X1
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ axisLabel: {
+ formatter: '{value} %'
+ }
+ }
+ ],
+ series: [
+ {
+ name: '宸ユ枡鐜�',
+ type: 'line',
+ data: HWorkPass
+ },
+ {
+ name: '鏂欏簾鐜�',
+ type: 'line',
+ data: HMaterPass
+ }
+ ]
+ };
+
+ option_ZZT1 && myChart.setOption(option_ZZT1);
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#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 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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"
new file mode 100644
index 0000000..178d0e8
--- /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_ProcessPerformancePass.html"
@@ -0,0 +1,757 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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/lib/extend/echarts.min.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-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+ </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 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 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;">
+ </div>
+ <div id="histogram1" style="width:99.5%;height:calc(68vh);margin-top:30px;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sc_StationOutBil_HProc";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HYear", "鏈�", "宸ュ簭"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProcList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#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 set_ClearBill() {
+ Year(); //鍒濆鍖栧勾
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ get_FastQuery();
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy);
+ form.render('select');
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/getQC_ProcessPerformancePass',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "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 (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;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProc";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HYear = $("#HYear").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 (HYear) {
+ sWhere += " and HYear = '" + HYear + "'";
+ }
+ get_Display(sWhere);
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HYear").val(new Date().getFullYear());
+
+ $("#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 = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = [];//X杞存爣棰�
+ var HBackCount = [];//涓嶈壇鎬绘暟
+ var Pass = [];//鍚堟牸鐜�
+ var HTitle = "鍚堟牸鐜囪秼鍔垮浘";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length; i++) {
+ H_X.push(option.data[i].鏈堜唤);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+
+ HBackCount.push(option.data[i].涓嶈壇鎬绘暟);
+ Pass.push((option.data[i].鍚堟牸鐜�).replace('%', ''));
+
+ }
+ }
+ option_ZZT = {
+ title: {
+ text: HTitle,
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ },
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ if (item.seriesType === 'line') {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+ } else {
+ tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // 鏌辩姸鍥炬暟鎹洿鎺ユ樉绀�
+ }
+ });
+
+ return tooltipHtml;
+ }
+ },
+ 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 }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ name: '鏁伴噺',
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
+ {
+ type: 'value',
+ name: '鐧惧垎姣�',
+ min: 0,
+ max: 100,
+ axisLabel: {
+ formatter: '{value} %'
+ }
+ }
+ ],
+ series: [
+ {
+ name: '涓嶈壇鎬绘暟',
+ type: 'bar',
+ barGap: 0,
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HBackCount
+ },
+ {
+ name: '鍚堟牸鐜�',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
+ data: Pass
+ }
+ ]
+ };
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "QC_ProcessPerformancePass";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#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 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
new file mode 100644
index 0000000..466b118
--- /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/SB_TechnologyParameterList.html"
@@ -0,0 +1,946 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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/lib/extend/echarts.min.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-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭娴佽浆鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcExchBillNo" name="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</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: 75%; 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;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HTechParamName" name="HTechParamName" id="HTechParamName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHTechParam" id="btnHTechParam" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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;">
+ <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="HEquipName" id="HEquipName" value="" readonly>
+ </div>
+ </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>
+ </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 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;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "SB_TechnologyParameterList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["骞�", "鏈�", "宸ュ簭"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#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 set_ClearBill() {
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ get_FastQuery();
+ ////鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , data: []
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', sort: true }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', sort: true }
+ , { field: '鍗曚綅 ', title: '鍗曚綅 ',sort: true }
+ , { field: '涓婇檺鍊�', title: '涓婇檺鍊�', sort: true }
+ , { field: '鏍囧噯鍊�', title: '鏍囧噯鍊�', sort: true }
+ , { field: '涓嬮檺鍊�', title: '涓嬮檺鍊�', sort: true }
+ , { field: '瀹為檯鍊�', title: '瀹為檯鍊�', sort: true }
+
+ ]]
+ };
+ table.render(option)
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "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 = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HProcName = $("#HProcName").val();
+ 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 = {
+ HProcExchBillNo: HProcExchBillNo
+ , HProcName: HProcName
+ , HTechParamName: HTechParamName
+ , HEquipName: HEquipName
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ } else {
+ layer.alert('璇烽�夋嫨 娴佽浆鍗�,宸ュ簭,宸ヨ壓鍙傛暟鍚�,鍦ㄧ偣鍑绘悳绱�', {
+ title: '鎻愮ず',
+ style: 'background-color: #f8f9fa; color: #333;' // 鑷畾涔夋牱寮�
+ });
+ }
+
+
+
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HProcExchBillNo").val();
+ $("#HProcName").val();
+ $("#HTechParamName").val();
+ $("#HMaterName").val();
+ $("#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 = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 銆愭姌绾垮浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鎶樼嚎鍥剧粦瀹氭暟鎹�
+ var H_X = [];//X杞存爣棰�
+ var HVaule = [];//瀹為檯鍊�
+ var HStd = [];//鏍囧噯鍊�
+ var HMax = [];//涓婄嚎鍊�
+ var HMin = [];//涓嬮檺鍊�
+ var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥�";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length ; i++) {
+ H_X.push(option.data[i].鏃ユ湡);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+
+ HVaule.push(option.data[i].瀹為檯鍊�);
+ HMax.push( option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ }
+ }
+ option_ZZT = {
+ title: {
+ text: HTitle,
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['瀹為檯鍊�', '涓婇檺鍊�', '涓嬮檺鍊�','鏍囧噯鍊�'],
+ top: 'bottom',
+ left: 'center'
+ },
+ 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 }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '瀹為檯鍊�',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HVaule
+ },
+ {
+ name: '涓婇檺鍊�',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMax
+ },
+ {
+ name: '涓嬮檺鍊�',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMin
+ },
+ {
+ name: '鏍囧噯鍊�',
+ type: 'line',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'green' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HStd
+ }
+ ]
+ };
+
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //宸ュ簭娴佽浆鍗″脊绐�
+ form.on('submit(btnHProcExch)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+ $("#HProcName").val(checkStatus.data[0].褰撳墠宸ュ簭);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_EquipList();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //宸ヨ壓鍙傛暟
+ form.on('submit(btnHTechParam)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鏍规嵁娴佽浆鍗¤幏鍙栬澶囩偣妫�琛ㄧ殑 璁惧
+ function get_EquipList() {
+
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ $.ajax({
+ url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipList",
+ type: "GET",
+ async: false,
+ data: { "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data;
+ $("#HEquipName").val(data[0]["HName"]);
+
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+
+ //#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 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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"
new file mode 100644
index 0000000..7d16e52
--- /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/Sc_StationOutBil_HProc.html"
@@ -0,0 +1,784 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.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/lib/extend/echarts.min.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-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HMonth" id="HMonth" lay-verify="HMonth">
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
+ <option value="11">11</option>
+ <option value="12">12</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName">
+ </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 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 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;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sc_StationOutBil_HProc";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["骞�", "鏈�", "宸ュ簭"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProcList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#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 set_ClearBill() {
+ Year(); //鍒濆鍖栧勾
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ get_FastQuery();
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy);
+ $("#HMonth").val(new Date().getMonth() + 1);
+ form.render('select');
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+
+ url: GetWEBURL() + '/QC_CustomerAppealReport/getSc_StationOutBill_HProc',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "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 (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;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_StationOutBil_HProc";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HYear = $("#HYear").val();
+ var HMonth = $("#HMonth").val();
+ var HProcName = $("#HProcName").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 (HYear) {
+ sWhere += " and 骞� = '" + HYear + "'";
+ }
+ if (HMonth) {
+ sWhere += " and 鏈� = '" + HMonth + "'";
+ }
+ if (HProcName) {
+ sWhere += " and 宸ュ簭鍚嶇О like '%" + HNumber + "%'";
+ }
+ get_Display(sWhere);
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HYear").val(new Date().getFullYear());
+ $("#HMonth").val(new Date().getMonth() + 1);
+ $("#HProcName").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 = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'];//X杞存爣棰�
+ var HQtySumNum = [];//鐢熶骇鎬绘暟閲�
+ var HQtyNum = [];//鍚堟牸鎬绘暟閲�
+ var HBadCount = [];//涓嶈壇鏁伴噺
+ var HTitle = "鍚勫伐搴忚秼鍔垮浘";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < H_X.length; i++) {
+ HQtySumNum.push(0);
+ HQtyNum.push(0);
+ HBadCount.push(0);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+ let monthIndex = option.data[i].鏃ユ湡 - 1; // 鏃ユ湡浠藉湪鏁扮粍涓殑绱㈠紩锛堟敞鎰忚浆鎹负浠�0寮�濮嬶級
+ HQtySumNum[monthIndex] += option.data[i].鐢熶骇鎬绘暟;
+
+ // 澶勭悊娉ㄥ鑹巼
+ let qualifiedRateString = option.data[i].鍚堟牸鏁�; //
+ let qualifiedRate = parseFloat(qualifiedRateString); // 杞崲涓烘暟瀛�
+ HQtyNum[monthIndex] = qualifiedRate;
+
+ // 澶勭悊鍏ㄦ鑹巼
+ let firstPassRateString = option.data[i].涓嶈壇鏁�; //
+ let firstPassRate = parseFloat(firstPassRateString); // 杞崲涓烘暟瀛�
+ HBadCount[monthIndex] = firstPassRate;
+ }
+ }
+ option_ZZT = {
+ title: {
+ text: HTitle,
+ 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 }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '鐢熶骇鎬绘暟',
+ type: 'bar',
+ barGap: 0,
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HQtySumNum
+ },
+ {
+ name: '鑹搧鏁�',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HQtyNum
+ },
+ {
+ name: '涓嶈壇鏁�',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HBadCount
+ }
+ ]
+ };
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#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 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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 badff8d..f6139a7 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"
@@ -206,10 +206,10 @@
<div class="layui-inline">
<label class="layui-form-label">浠樻浜嬬敱</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HReason" value="" id="HReason" autocomplete="off" >
+ <input class="layui-input" name="HReason" value="" id="HReason" autocomplete="off">
</div>
</div>
-
+
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -307,11 +307,16 @@
</div>
</div>
</div>
+
+ <table id="mainTable" lay-filter="mainTable" ></table>
+
</form>
</div>
</div>
</div>
-
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script>
layui.config({
@@ -336,6 +341,9 @@
//#endregion
+ //瀛愯〃娓叉煋鍙傛暟
+ var option = {};
+ var tableShow = false;
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
@@ -366,9 +374,13 @@
//涓氬姟鍛樸�侀儴闂ㄥ垵濮嬪寲
getCzyglByUser();
+ //鍒濆鍖栧瓙琛�
+ set_InitGrid();
}
else if (OperationType == 3) { //缂栬緫
$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
+ //鍒濆鍖栧瓙琛�
+ set_InitGrid()
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
}
@@ -379,6 +391,12 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+ //#endregion
//#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
//#region 閫夋嫨閮ㄩ棬鎸夐挳
@@ -533,7 +551,7 @@
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
//if (AllowLoadData(data)) {
- set_AddNew(data);
+ set_AddNew(data);
//}
});
//#endregion
@@ -646,6 +664,71 @@
}
//#endregion
+
+ //#region 瀛愯〃鍒濆鍖�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, style: 'background-color:#efefef4d;'}
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;'}
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillEntryID', title: '鎺ユ敹婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HReceiveBillNo', title: '鎺ユ敹婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceDate', title: '婧愬崟鏃ユ湡', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceMoney', title: '婧愬崟閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceMoneyBB', title: '婧愬崟閲戦鏈綅甯�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HInovceExRate', title: '褰撴湡姹囩巼', width: 100, style: 'background-color:#efefef4d;'}
+ //, { field: 'HReadyCheckMoney', title: '宸叉牳閿�閲戦', width: 100 }
+ //, { field: 'HUnCheckMoney', title: '鏈牳閿�閲戦', width: 100 }
+ //, { field: 'HCheckMoney', title: '鏈鏍搁攢閲戦', width: 100}
+ //, { field: 'HCheckMoneyBB', title: '鏈鏍搁攢閲戦', width: 100}
+ , { field: 'HSourceRemark', title: '婧愬崟澶囨敞', width: 100 }
+
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ //, { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractInterID', title: '閲囪喘鍚堝悓鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractEntryID', title: '閲囪喘鍚堝悓瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HPOContractBillNo', title: '閲囪喘鍚堝悓鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ //, { field: 'HSeContractInterID', title: '閿�鍞悎鍚屽唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HSeContractEntryID', title: '閿�鍞悎鍚屽瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ //, { field: 'HSeContractBillNo', title: '閿�鍞悎鍚屽彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+ }
+ //#endregion
+
+
//#region 鏃堕棿缁勪欢鍒濆鍖�
function set_InitDate() {
var dateList = ["#HAccDate"];
@@ -683,6 +766,27 @@
});
}
//#endregion
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
//#region 寮圭獥椤甸潰鏂规硶
//#region 閫夋嫨閮ㄩ棬
function get_checkDept() {
@@ -695,21 +799,21 @@
, content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
- function get_checkEmp() {
+ function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -816,7 +920,7 @@
//table.reload(layTableId, {
// data: ajaxReturnData
//});
- },error: function (err) {
+ }, error: function (err) {
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
@@ -835,44 +939,114 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '婧愬崟-搴斾粯鍗�' + + '鍒楄〃'//鏍囬
+ , title: '婧愬崟-搴斾粯鍗�' + '鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: [url, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length != 1) {
- return layer.msg('璇烽�夋嫨涓�琛屾暟鎹�');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
}
- checkStatus = checkStatus.data;
- console.log(checkStatus);
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMainSourceInterID": checkStatus[0].hmainid
- , "HMainSourceEntryID": checkStatus[0].hsubid
- , "HMainSourceBillNo": checkStatus[0].鍗曟嵁鍙�
- , "HMainSourceBillType": '1114'
+ setPayableBill(checkStatus);
- , "HDeptID": checkStatus[0].HDeptID
- , "HDeptName": checkStatus[0].閮ㄩ棬
- , "HEmpID": checkStatus[0].HEmpID
- , "HEmpName": checkStatus[0].涓氬姟鍛�
- , "HCurID": checkStatus[0].HCurID
- , "HCurName": checkStatus[0].甯佸埆
- , "HExRate": checkStatus[0].绋庣巼
- , "HSSID": checkStatus[0].HSSID
- , "HSupID": checkStatus[0].HSupID
- , "HSupName": checkStatus[0].渚涘簲鍟�
- , "HSSName": checkStatus[0].缁撶畻鏂瑰紡
- /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
- , "HAccSupID": checkStatus[0].HSupID
- , "HAccSupName": checkStatus[0].渚涘簲鍟�
- , "HSumMoney": checkStatus[0].閲戦
- });
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
+ }
+ //#endregion
+
+
+ //#region 閫夋嫨婧愬崟-浠樻鍗�
+ function setPayableBill(checkStatus) {
+ var dataArray = [];
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = checkStatus.data[i];
+ if (temp != "none") {
+ if (temp.鍗曟嵁鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ return;
+ }
+ //if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ // layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ // return;
+ //}
+ dataArray.push(temp);
+ } else {
+ return;
+ }
+ }
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": 0
+ , "HMainSourceEntryID": 0
+ , "HMainSourceBillNo": ''
+ , "HMainSourceBillType": '1114'
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].绋庣巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
+ , "HAccSupID": dataArray[0].HSupID
+ , "HAccSupName": dataArray[0].渚涘簲鍟�
+ , "HSumMoney": dataArray[0].閲戦
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HReceiveBillInterID": dataArray[i].hmainid
+ , "HReceiveBillEntryID": dataArray[i].hsubid
+ , "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceDate": Format(dataArray[i].鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , "HInovceExRate": dataArray[i].姹囩巼
+
+ , "HSourceRemark": dataArray[i].琛ㄤ綋澶囨敞
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': dataArray[i].HPOOrderInterID
+ , 'HPOOrderEntryID': dataArray[i].HPOOrderEntryID
+ , 'HPOOrderBillNo': dataArray[i].HPOOrderBillNo
+
+ , "HSeOrderInterID": dataArray[i].HSeOrderInterID
+ , "HSeOrderEntryID": dataArray[i].HSeOrderEntryID
+ , "HSeOrderBillNo": dataArray[i].HSeOrderBillNo
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ tableShow = true;
}
//#endregion
@@ -999,11 +1173,23 @@
layer.msg("璇烽�夋嫨缁撶畻鍗曚綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
+
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
- var sSubStr = JSON.stringify([]); //瀛愯〃鏁版嵁
+ //瀛愯〃鏁版嵁
+ if (tableShow == true) {
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ var sSubStr = JSON.stringify(num);
+ } else {
+ var sSubStr = JSON.stringify([]);
+ }
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
@@ -1060,13 +1246,13 @@
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID
, "HDeptName": data.閮ㄩ棬
- , "HEmpID": data.hempid
+ , "HEmpID": data.HEmpID
, "HEmpName": data.涓氬姟鍛�
- , "HCurID": data.hcurid
+ , "HCurID": data.HCurID
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
- , "HSSID": data.hssid
- , "HSupID": data.hsupid
+ , "HSSID": data.HSSID
+ , "HSupID": data.HSupID
, "HSupName": data.涓氬姟鍗曚綅
, "HSSName": data.缁撶畻鏂瑰紡
, "HSSNum": data.缁撶畻鍙�
@@ -1097,6 +1283,53 @@
HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
+ if (data.hsubid != null) {
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i].瀛愯〃涓婚敭 == null ? 0 : result.data[i].瀛愯〃涓婚敭
+ , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": result.data[i].HUnitID == null ? 0 : result.data[i].HUnitID
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅鍚嶇О
+ , "HQty": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(result.data[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(result.data[i].缁撶畻閲戦, 2)
+ , "HReceiveBillInterID": result.data[i].婧愬崟涓诲唴鐮�
+ , "HReceiveBillEntryID": result.data[i].婧愬崟瀛愬唴鐮�
+ , "HReceiveBillNo": result.data[i].婧愬崟鍗曞彿
+ , "HSourceDate": Format(result.data[i].婧愬崟鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(result.data[i].婧愬崟閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(result.data[i].婧愬崟閲戦鏈綅甯�, 2)
+ , "HInovceExRate": result.data[i].褰撴湡姹囩巼
+
+ , "HSourceRemark": result.data[i].婧愬崟澶囨敞
+
+ , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�
+ , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�
+ , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
+ , "HSourceBillType": 1114
+ , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
+ , "HRelationMoney": result.data[i].鍏宠仈閲戦
+
+ , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟涓诲唴鐮�
+ , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
+ , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
+
+ , "HSeOrderInterID": result.data[i].閿�鍞鍗曚富鍐呯爜
+ , "HSeOrderEntryID": result.data[i].閿�鍞鍗曞瓙鍐呯爜
+ , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ tableShow = true;
+ }
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1118,8 +1351,8 @@
var ref1 = /^\d+$/; //鍒ゆ柇鏄惁鏄潪璐熸暣鏁�
var value1 = ["#HWantPay"]; //瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗�
var value1_ = ["鏈熸湜钖按"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- var value2 = ["#HAge","#HContractYear"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
- var value2_ = ["骞撮緞","鍚堝悓鏈熼檺"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
+ var value2 = ["#HAge", "#HContractYear"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
+ var value2_ = ["骞撮緞", "鍚堝悓鏈熼檺"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
var value3 = []; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
var value3_ = []; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
//#endregion
@@ -1159,6 +1392,42 @@
return true;
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
//#endregion
//#endregion
@@ -1177,26 +1446,26 @@
$("#HBankID").val(obj[0].HItemID);
}
-
+
function GetHSupNameValue(obj) //杩斿洖渚涘簲鍟�
- {
+ {
$("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
$("#HSupID").val(obj[0].HItemID);
- }
+ }
- function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
+ function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
$("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
- function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
- {
- $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
- $("#HDeptID").val(obj[0].HItemID);
- }
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
- function GetHAccSupNameValue(obj) //杩斿洖缁撶畻鍗曚綅
+ function GetHAccSupNameValue(obj) //杩斿洖缁撶畻鍗曚綅
{
$("#HAccSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
$("#HAccSupID").val(obj[0].HItemID);
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 fd93baf..709beb7 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"
@@ -81,9 +81,9 @@
<!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
- <option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
+ <option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -100,14 +100,14 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline"style="width:625px">
+ <div class="layui-inline" style="width:625px">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -305,22 +305,38 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li style="padding:1px;" class="layui-this">姹囨�昏〃鏍�</li>
+ <li style="padding:1px;">鏄庣粏琛ㄦ牸</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ {{# if(haveSource == false){ }}
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+ {{# } }}
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTableEntry" lay-filter="mainTableEntry"></table>
+ </div>
</div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ </div>
+
</form>
</div>
</div>
@@ -332,6 +348,8 @@
<script>
//#region 鎶樺彔娉ㄩ噴
//#endregion
+ //鏄惁鏈夋簮鍗�
+ var haveSource = false;
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -352,10 +370,11 @@
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
+
//瀛愯〃娓叉煋鍙傛暟
var option = {};
+ var optionEntry = {};
//#endregion
-
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -1057,7 +1076,51 @@
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
+ optionEntry = {
+ elem: '#mainTableEntry'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, style: 'background-color:#efefef4d;'}
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;'}
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxRate', title: '绋庣巼', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ ]]
+ }
var rowdata = [{
"HMaterID": "0"
, "鐗╂枡浠ｇ爜": ""
@@ -1096,7 +1159,58 @@
}];
option.data = rowdata;
+
table.render(option);
+ table.render(optionEntry);
+ }
+ function set_InitGridHaveSource() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+ , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
+ , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
+ , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
}
//#endregion
@@ -1332,6 +1446,10 @@
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd HH:mm:ss")
});
+ if (data.HMainSourceBillType != "") {
+ haveSource = true;
+ }
+
HOrgIDBar = 0;
//瀛愯〃 璧嬪��
@@ -1378,6 +1496,13 @@
}
option.data = rowdata;
table.render(option);
+
+ //瀛愯〃 璧嬪��
+ var rowdata = result.list[0];
+ optionEntry.data = rowdata;
+ table.render(optionEntry);
+
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1597,7 +1722,20 @@
}
}
var sSubStr = JSON.stringify(num);
-
+ var sSubStr2;
+ if (haveSource == true) {
+ //鑾峰彇瀛愯〃2鏁版嵁
+ var num = [];
+ for (var i = 0; i < table.cache["mainTableEntry"].length; i++) {
+ if (table.cache["mainTableEntry"][i] != "") {
+ table.cache["mainTableEntry"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTableEntry"][i])
+ }
+ }
+ sSubStr2 = JSON.stringify(num);
+ } else {
+ sSubStr2 = JSON.stringify([]);
+ }
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -1607,7 +1745,7 @@
refSav = "Update";
}
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ';'+ refSav + ';' + sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -1754,11 +1892,12 @@
//浠风◣鍚堣鏍煎紡鏍￠獙
temp = option.data[i]["HTaxMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ //if (temp == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+ // return false;
+ //} else
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
}
}
@@ -1869,7 +2008,10 @@
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
+ } else if (haveSource == true) {
+ layer.msg('鏈夋簮鍗曟棤娉曞垹闄わ紒锛侊紒');
+ }
+ else {
obj.del();
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
@@ -2210,24 +2352,24 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
});
- //瀛愯〃 璧嬪��
- var rowdata = [];
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
+ rowdataEntry.push(
{
- "HMaterID": dataArray[i].HMaterID
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate':"0" //
+ , 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney':"0" //
+ , 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
, 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
, 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
@@ -2252,7 +2394,28 @@
}
);
}
- option.data = rowdata;
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
table.render(option);
}
//#endregion
@@ -2303,10 +2466,10 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
});
- //瀛愯〃 璧嬪��
- var rowdata = [];
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
+ rowdataEntry.push(
{
"HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
@@ -2314,14 +2477,14 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
- , "HMoney":dataArray[i].閲戦
+ , "HMoney": dataArray[i].閲戦
, "HRemark": ""
, "HSourceInterID": dataArray[i].hmainid
@@ -2335,15 +2498,36 @@
, 'HPOOrderEntryID': "0"
, 'HPOOrderBillNo': ""
- // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID: "0"
+ // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
}
);
}
- option.data = rowdata;
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
table.render(option);
+
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 992a502..d22a0a6 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"
@@ -270,6 +270,16 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃壒娴�</label>
+ <div class="layui-input-block">
+ <select name="HCheckFlowList" id="HCheckFlowList" class="ForFilteringSchemes" lay-filter="HCheckFlowList" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
@@ -294,6 +304,10 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOInStockBackBills" id="btn-PushPOInStockBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閫�鏂欓�氱煡鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -361,6 +375,9 @@
//#endregion
+ //#region 鍔犺浇瀹℃壒娴�
+ HCheckFlowList_Filter();
+ //#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
set_ClearBill();
@@ -411,6 +428,18 @@
break;
//鍙嶅鏍�
case 'set_AbandonCheck': set_CheckBill(1);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill();
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo();
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
break;
//鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn-Close':
@@ -1255,6 +1284,124 @@
}
//#endregion
+ //#region 鍙戣捣瀹℃壒
+ function set_startCheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var HCheckFlowID = $("#HCheckFlowList").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_POOrderBill/StartCheckFlow_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HCheckFlowID_select": HCheckFlowID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+
+
+
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function get_CheckFlowInfo() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_POOrderBill/AuditXs_POOrderBill_Flow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
//#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
@@ -2149,6 +2296,34 @@
}
//#endregion
+ //#region 瀹℃壒娴佹樉绀轰笅鎷夋
+ function HCheckFlowList_Filter() {
+ sWhere_CheckFlowList = " and a.HBillTypeID='" + HBillType + "' and c.HUserID = '" + sessionStorage["Czybm"] + "' ";
+ $.ajax({
+ url: GetWEBURL() + '/Xt_CheckFlowProgressBill/getList_CheckFlowList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere_CheckFlowList, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var data = data1.data;
+ if (data1.count == 1) {
+ var Organization = '<option value="' + data[0]["HInterID"] + '" selected="selected" >' + data[0]["瀹℃壒娴�"] + '</option>';
+ for (var i = 1; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i]["HInterID"] + '">' + data[i]["瀹℃壒娴�"] + '</option>';
+ }
+ $("#HCheckFlowList").empty();
+ $("#HCheckFlowList").append(Organization);
+ form.render('select');
+ } else {
+
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 92580d7..0711ad8 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -186,6 +186,15 @@
<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曚环绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
+ <option value="鎴愭湰浠�" selected="selected">鎴愭湰浠�</option>
+ <option value="缁撶畻浠�">缁撶畻浠�</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -305,22 +314,37 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li style="padding:1px;" class="layui-this">姹囨�昏〃鏍�</li>
+ <li style="padding:1px;">鏄庣粏琛ㄦ牸</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ {{# if(haveSource == false){ }}/
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+ {{# } }}
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTableEntry" lay-filter="mainTableEntry"></table>
+ </div>
</div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ </div>
</form>
</div>
</div>
@@ -332,6 +356,8 @@
<script>
//#region 鎶樺彔娉ㄩ噴
//#endregion
+ //鏄惁鏈夋簮鍗�
+ var haveSource = false;
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -385,6 +411,11 @@
//鍒濆鍖栧瓙琛�
set_InitGrid();
+ //鍒濆鍖栫粍缁�
+ Organ();
+
+ //鑾峰彇婧愬崟绫诲瀷
+ HBillType();
//#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
if (OperationType == 1) { //鏃犳簮鍗曟柊澧�
/* $("#HItemID").val(0);*/
@@ -417,11 +448,7 @@
DisPlay_HideColumn();
- //鍒濆鍖栫粍缁�
- Organ();
-
- //鑾峰彇婧愬崟绫诲瀷
- HBillType();
+
//#endregion
@@ -1255,9 +1282,103 @@
, "HSeOrderEntryID": "0"
, "HSeOrderBillNo": ""
}];
+ optionEntry = {
+ elem: '#mainTableEntry'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxRate', title: '绋庣巼', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ ]]
+ }
option.data = rowdata;
table.render(option);
+ table.render(optionEntry);
+ }
+ function set_InitGridHaveSource() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
+ , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
+ , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+
+ , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
}
//#endregion
@@ -1284,7 +1405,7 @@
, "HMainSourceEntryID": data.HMainSourceEntryID
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceBillType": data.HMainSourceBillType
-
+ , "HPriceType": data.鍗曚环绫诲瀷
, "HDeptID": data.HDeptID
, "HDeptName": data.閮ㄩ棬
, "HMangerID": data.HMangerID
@@ -1316,6 +1437,11 @@
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
+
+ if (data.HMainSourceBillType != "") {
+ haveSource = true;
+ $("#BillType").val(data.HMainSourceBillType);
+ }
HOrgIDBar = sessionStorage["OrganizationID"];
@@ -1363,6 +1489,12 @@
}
option.data = rowdata;
table.render(option);
+
+ //瀛愯〃 璧嬪��
+ var rowdata = result.list[0];
+ optionEntry.data = rowdata;
+ table.render(optionEntry);
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1582,6 +1714,20 @@
}
}
var sSubStr = JSON.stringify(num);
+ var sSubStr2;
+ if (haveSource == true) {
+ //鑾峰彇瀛愯〃2鏁版嵁
+ var num = [];
+ for (var i = 0; i < table.cache["mainTableEntry"].length; i++) {
+ if (table.cache["mainTableEntry"][i] != "") {
+ table.cache["mainTableEntry"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTableEntry"][i])
+ }
+ }
+ sSubStr2 = JSON.stringify(num);
+ } else {
+ sSubStr2 = JSON.stringify([]);
+ }
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
@@ -1592,7 +1738,7 @@
refSav = "Update";
}
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ';' + refSav + ';' + sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -1859,7 +2005,9 @@
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
+ } else if (haveSource == true) {
+ layer.msg('鏈夋簮鍗曟棤娉曞垹闄わ紒锛侊紒');
+ }else {
obj.del();
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
@@ -2233,49 +2381,115 @@
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- //瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate':"0" //
- , 'HRelTaxPrice': "0"
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney':"0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
+ , 'HDiscountRate': "0" //
+ , 'HRelTaxPrice': "0"
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ } else {
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "0" //
+ , 'HRelTaxPrice': "0"
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
}
- option.data = rowdata;
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
table.render(option);
}
//#endregion
@@ -2336,50 +2550,116 @@
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
+ if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].hmaterid
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "0" //
+ , 'HRelTaxPrice': "0"
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- //瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID: "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
}
- option.data = rowdata;
+ else {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].hmaterid
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "0" //
+ , 'HRelTaxPrice': "0"
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ }
+
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
table.render(option);
}
//#endregion
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index fe67f24..b9fe495 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -1662,7 +1662,7 @@
var hID = data[0].hmainid.toString();
layer.open({
type: 2
- , area: ['100%', '100%']
+ , area: ['70%', '70%']
, title: '鍗曟嵁瀹℃壒杩涘害'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
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 3c4807f..965505b 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"
@@ -1127,7 +1127,7 @@
url: GetWEBURL() + "/Kf_SellOutBill/AuditKf_SellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
- if (result.count == 1) {
+ if (result.code == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -1138,7 +1138,7 @@
});
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ ayer.msg("閿欒:" + result.code + result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
--
Gitblit v1.9.1