From f65fe092c04cb3d18b7cb1cd511c19d408d59370 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 25 十二月 2024 09:31:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 72 +
WebTM/views/质量管理/质量报表/QC_PPMReport.html | 1346 +++++++++++++++-------------------
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量月度目标单/QC_MonthTarGetBill.html | 293 ++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 122 ++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_Sup.html | 411 ++++++++++
WebTM/WebTM.csproj | 1
7 files changed, 1,405 insertions(+), 842 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b79d0aa..d0bfab5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -651,6 +651,7 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1daf955..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-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/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 b6301c8..578e6a0 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"
@@ -987,15 +987,18 @@
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;
+ else {
+ return true;
}
- if (!ref.test(HTaxRate)) {
- layer.msg("绗�" + (i + 1) + "琛岋細澧炲�肩◣鐜囪杈撳叆澶т簬0鐨勬暟瀛楋紒");
- 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();
//if (HAddress == null || HAddress == undefined || HAddress == "") {
// layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
@@ -1007,33 +1010,34 @@
// layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return false;
//}
- if ($("#HCurName").val() == '') {
- layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSSName").val() == '') {
- layer.msg("娌℃湁閫夋嫨缁撶畻鏂瑰紡", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HCurName").val() == '') {
+ // layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HSSName").val() == '') {
+ // layer.msg("娌℃湁閫夋嫨缁撶畻鏂瑰紡", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
- var reg = /^0\d{2,3}-?\d{7,8}$/;
- if (reg.test($("#HLinkPhone").val()) == false && $("#HLinkPhone").val() != "") {
- layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
- 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() != "") {
- layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- else {
- return true;
- }
+ //var reg = /^0\d{2,3}-?\d{7,8}$/;
+ //if (reg.test($("#HLinkPhone").val()) == false && $("#HLinkPhone").val() != "") {
+ // layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
+ //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() != "") {
+ // layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //else {
+ // return true;
+ //}
+
}
//鑾峰彇鍒涘缓缁勭粐
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
index 505b035..e565ad3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
@@ -1,71 +1,63 @@
锘�<!DOCTYPE html>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta charset="utf-8" />
- <title>PPM缁╂晥瓒嬪娍鍥�</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>PPM鑰冩牳瓒嬪娍鍥�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <!--寮曠敤layui鏍峰紡鏂囦欢-->
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <!--寮曠敤layui js鏂囦欢-->
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/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/PubCustom.js"></script>
- <script src="../../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
- <style type="text/css">
- input.layui-input.layui-unselect {
- padding-right: 0;
- }
- </style>
</head>
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
+
<form class="layui-form" action="" lay-filter="component-form-group">
+
<div class="layui-collapse">
- <div class="layui-colla-item" style="margin-top: 10px; margin-bottom: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-block">
- <input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
+ <div 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">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
- 鍔ㄦ�佹覆鏌撶粍缁�
+ <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>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <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="">璇烽�夋嫨</option>
- <option value="1">閲忎骇</option>
- <option value="0">闈為噺浜�</option>
+ <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>
@@ -85,39 +77,73 @@
</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: 185px;">
+ <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
+ </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-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HSupName" name="HSupName" id="HSupName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSupID" lay-verify="HSupID" id="HSupID" value="">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSup" id="btnHSup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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;; margin-bottom: 100px;">
+ <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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <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', 'soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -127,120 +153,79 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
- , soulTable = layui.soulTable
- var HModName = "QC_PPMReport";
- var HBillType = "QC_PPMReport";
- var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
- var sDate = Format(new Date(), "yyyy-MM-dd")
+ //鏌ヨ鏉′欢
var sWhere = "";
- var ins; //鐢ㄤ簬瀵煎嚭excel
var option = [];
- var columns = "";
- var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var HModName = "QC_PPMReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
- //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
- //#endregion
- var totalArray = [];
-
- //#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //#region 鍒濆鍖栫晫闈�
-
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
set_ClearBill();
-
- function set_ClearBill() {
- //鑾峰彇缁勭粐
- //set_StockOrg();
- //鍒濆鍖栬〃鍗曟椂闂�
- set_InitDate();
- Get_HProject(); //鑾峰彇椤圭洰鍙�
- GetGy_Division();//鑾峰彇浜嬩笟閮�
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery()
- }
//#endregion
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
-
- //#region 鑾峰彇缁勭粐
- //function set_StockOrg() {
- // //鑾峰彇鐧诲綍椤电粍缁囧垪
- // $.ajax({
- // type: "GET",
- // url: GetWEBURL() + "/Web/GetOrganizations",
- // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- // success: function (result) {
- // var Organization = "";
- // Organization += '<option style="color:blue;" value="-1">鍏ㄩ儴</option>';
- // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // var data = result.data;
- // for (var i = 0; i < data.length; i++) {
- // Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
- // }
- // $("#HStockOrgID").append(Organization);
- // $("#HStockOrgID").val(HStockOrgID)
- // form.render('select');
- // }
- // layer.closeAll("loading");
- // },
- // complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- // })
- //}
- //#endregion
-
- //#region 鍒濆鍖栬〃鍗曟椂闂存彃浠�
- function set_InitDate() {
- //甯歌鐢ㄦ硶
- laydate.render({
- elem: '#HDate'
- , type: 'year'
- , value: new Date()
- , btns: ['now']
- , showBottom: false //鏄惁鏄剧ず搴曢儴鏍�
- , ready: function (date) {
- $("#layui-laydate").off('click', '.laydate-month-list li', function () {
- $("#layui-laydate").remove;
- });
- }
- //閫夋嫨骞翠唤鎴栨湀浠介兘浼氬叧闂�
- , change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
- lay('#HDate').val(value);
- if ($(".layui-laydate").length) {
- $(".layui-laydate").remove();
- }
- }
- });
- }
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , page: true
- //, totalRow: true
- , height: 'full-50'
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
+ //#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;
};
- }
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ //鍒锋柊鍒楄〃
+ get_FastQuery();
+ }
+ })
+ });
+ //#endregion
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -264,25 +249,460 @@
})
//#endregion
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year(); //鍒濆鍖栧勾
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
+ 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');
+ }
+
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮�
+ var HDivisionList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionName").append(HDivisionList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇椤圭洰鍙�
+ function Get_HProject() {
+ //鑾峰彇椤圭洰鍙�
+ var HProjectList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_HProject",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HProject").append(HProjectList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+
+ url: GetWEBURL() + '/QC_CustomerAppealReport/GetQC_PPMReport_Json',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere},
+ 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);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ } 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 HProject = $("#HProject").val();//椤圭洰鍙�
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+ var HSupID = $("#HSupID").val();
+ var HDeptID = $("#HDeptID").val();
+
+
+ sWhere = {
+ HYear: HYear
+ , HMonth: HMonth
+ , HSupID: HSupID
+ , HDivisionName: HDivisionName
+ , HProject: HProject
+ , HBatchWork: HBatchWork
+ , HDeptID: HDeptID
+ }
+ get_Display(JSON.stringify(sWhere));
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+ }
+
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HYear").val(new Date().getFullYear());
+ $("#HMonth").val(new Date().getMonth() + 1);
+ $("#HSupID").val("");
+ $("#HSupName").val("");
+ $("#HDeptID").val(0);
+ $("#HDeptName").val("");
+ $("#HDivisionName").val("");
+ $("#HProject").val("");
+ $("#HBatchWork").val("");
+ form.render('select');
+
+ sWhere = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //渚涘簲鍟�
+ form.on('submit(btnHSup)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = [];//X杞存爣棰�
+ var HBadCount = [];//涓嶈壇鏁伴噺
+ var PPM = [];//涓�娆″悎鏍�
+ var HProcPPMTarGetVal = [];//PPM鐩爣鍊�
+ var HTitle = "PPM鑰冩牳缁╂晥瓒嬪娍鍥�";//鍥惧舰鏍囬
+
+ 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++) {
+
+ HBadCount.push(option.data[i].涓嶈壇鎬绘暟);
+ PPM.push((option.data[i].PPM == null ? '0.00%' : option.data[i].PPM ).replace('%', ''));
+ HProcPPMTarGetVal.push(option.data[i].PPM鐩爣鍊�);
+ }
+ }
+ 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: [ '涓嶈壇鎬绘暟', 'PPM','PPM鐩爣鍊�'],
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
+ },
+ toolbox: {
+ show: true,
+ orient: 'vertical',
+ left: 'right',
+ top: 'center',
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ['line', 'bar', 'stack'] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ 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',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#FF0000' // 璁剧疆鏌辩姸鍥炬鑹�
+ },
+ data: HBadCount
+ },
+ {
+ name: 'PPM',
+ type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+ data: PPM,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ lineStyle: {
+ color: '#1E90FF' // 璁剧疆鎶樼嚎鍥鹃鑹茶摑鑹�
+ }
+ },
+ {
+ name: 'PPM鐩爣鍊�',
+ type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+ data: HProcPPMTarGetVal,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆鎶樼嚎鍥捐摑鑹�
+ }
+ }
+ ]
+ };
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#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({
- type: "GET",
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
async: false,
- data: { "HModName": HModName, "user": HMaker },
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var totalArray = [];
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
+ 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;
@@ -297,6 +717,12 @@
} 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;
@@ -337,11 +763,6 @@
} else {
table.render(option);
}
-
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HBillType, HModName, HMaker);
-
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
@@ -349,596 +770,19 @@
}
//#endregion
- //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
- //#region 閫夋嫨閮ㄩ棬鎸夐挳
- form.on('submit(btnHDept)', function () {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "閮ㄩ棬鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- , end: function () {
- //鍒锋柊鍒楄〃
- get_FastQuery();
- }
- })
- });
- //#endregion
-
- //#region 宸ュ叿鏍忎簨浠�
- table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
- //瀵煎嚭鎸夐挳
- case 'btn_Export': btn_Export();
- break;
- //鍒锋柊鎸夐挳
- case 'btn_Refresh': btn_Refresh();
- break;
- //閫�鍑烘寜閽�
- case 'btn_Exit': Pub_Close(2);
- break;
- //鍒楄缃�
- case 'btn_HideColumn': get_HideColumn();
- break;
- //鎸夐挳璁剧疆
- case 'btn_HideButton':
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- get_HideButton(btns, HBillType, HModName, HMaker);
- break;
- };
- });
- //#endregion
-
- //#region 瀵煎嚭Execel
- function btn_Export() {
- table.exportFile(ins.config.id, option.data, "xls");
- }
- //#endregion
-
- //#region 鍒锋柊
- function btn_Refresh() {
- get_FastQuery();
- }
- //#endregion
-
- //#region 鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
-
- //#endregion
-
- //#region 閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- //娓呯┖杩囨护鏉′欢
- set_ClearQuery();
- });
-
- //閲嶇疆杩囨护鏉′欢
- function set_ClearQuery() {
- $("#HDate").val(Format(new Date(), "yyyy"));
- sDate = Format(new Date(), "yyyy-MM-dd")
- $("#HDeptName").val("");
- //$("#HStockOrgID").val(HStockOrgID) //缁勭粐
- form.render('select');
- sWhere = "";
- }
-
- //#endregion
-
- //#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
- });
-
- //蹇�熸煡璇�
- function get_FastQuery() {
- //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
- if ($("#HDeptName").val() == '') {
- $("#HDeptID").val("0");
- }
- var HDeptID = $("#HDeptID").val()
- var HYear = $("#HDate").val(); //鏃ユ湡
- var HProject = $("#HProject").val();//椤圭洰鍙�
- var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
- var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
- sWhere = {
- HYear: HYear
- , HDeptID: HDeptID
- , HProject: HProject
- , HBatchWork: HBatchWork
- , HDivisionName: HDivisionName
- }
- get_Display(JSON.stringify(sWhere));
- //鍔犺浇鏌辩姸鍥�
- set_Graphics();
- }
-
- //#endregion
-
- //#region 鍒楄〃鍒锋柊
- function get_Display(sWhere) {
-
- var ajaxLoad = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + '/QC_QualityReportsController/GetQC_PPMReport_Json',
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sWhere": sWhere},
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- var totalArray = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
- }
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', hide: true }); //闅愯棌id鍒�
- }else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
- break;
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
- break;
- case 'Int32':
- col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
- break;
- default:
- if (data[i].name == '缁熻椤�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 200 });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 130 });
- }
- }
- }
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- //, totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
- columns = col;
-
- option.cols = [columns];
- option.data = data1.data;
- //option.totalRow = true;
- table.render(option);
- ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.Message, { icon: 5 });
- }
- },
- error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //#endregion
-
- //#region 鍔犺浇鍥捐〃
- function set_Graphics() {
- //#region 銆愭煴鐘跺浘銆�
- var app = {};
- var chartDom = document.getElementById('histogram');
- var myChart = echarts.init(chartDom);
- var option_mychart;
-
- //#region [鏌辩姸鍥惧竷灞�鏍峰紡]
- const posList = [
- 'left',
- 'right',
- 'top',
- 'bottom',
- 'inside',
- 'insideTop',
- 'insideLeft',
- 'insideRight',
- 'insideBottom',
- 'insideTopLeft',
- 'insideTopRight',
- 'insideBottomLeft',
- 'insideBottomRight'
- ];
- app.configParameters = {
- rotate: {
- min: -90,
- max: 90
- },
- align: {
- options: {
- left: 'left',
- center: 'center',
- right: 'right'
- }
- },
- verticalAlign: {
- options: {
- top: 'top',
- middle: 'middle',
- bottom: 'bottom'
- }
- },
- position: {
- options: posList.reduce(function (map, pos) {
- map[pos] = pos;
- return map;
- }, {})
- },
- distance: {
- min: 0,
- max: 100
- }
- };
- app.config = {
- rotate: 90,
- align: 'left',
- verticalAlign: 'middle',
- position: 'insideBottom',
- distance: 15,
- onChange: function () {
- const labelOption = {
- rotate: app.config.rotate,
- align: app.config.align,
- verticalAlign: app.config.verticalAlign,
- position: app.config.position,
- distance: app.config.distance
- };
- myChart.setOption({
- series: [
- {
- label: labelOption
- },
- {
- label: labelOption
- },
- {
- label: labelOption
- },
- {
- label: labelOption
- }
- ]
- });
- }
- };
- const labelOption = {
- show: true,
- position: 'top',
- textStyle: {
- //color: '#333', // 鏍囩瀛椾綋棰滆壊
- fontSize: 12, // 鏍囩瀛椾綋澶у皬
- //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
- //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
- //fontFamily: 'Arial' // 鏍囩瀛椾綋
- }
- };
- const labelOption1 = {
- show: true,
- position: 'right',
- textStyle: {
- //color: '#333', // 鏍囩瀛椾綋棰滆壊
- fontSize: 12, // 鏍囩瀛椾綋澶у皬
- //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
- //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
- //fontFamily: 'Arial' // 鏍囩瀛椾綋
- }
- }
- //#endregion
-
- //鏌辩姸鍥剧粦瀹氭暟鎹�
- var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
- var HBadQty = []; //y杞达細涓嶈壇鎬绘暟
- var HPPM = []; //y杞达細PPM
- var HTarget = []; //y杞达細鐩爣
- for (let i = 0; i < option.data.length; i++) {
- //鑾峰彇涓嶈壇鎬绘暟琛屾暟鍊�
- if (option.data[i].缁熻椤� == '涓嶈壇鎬绘暟') {
- for (let j = 1; j <= 12; j++) {
- HBadQty.push(option.data[i][j + "鏈�"]);
- }
- }
- //鑾峰彇PPM琛屾暟鍊�
- if (option.data[i].缁熻椤� == 'PPM') {
- for (let j = 1; j <= 12; j++) {
- HPPM.push(option.data[i][j + "鏈�"]);
- }
- }
- //鑾峰彇鐩爣琛屾暟鍊�
- if (option.data[i].缁熻椤� == '鐩爣') {
- for (let j = 1; j <= 12; j++) {
- HTarget.push(option.data[i][j + "鏈�"]);
- }
- }
- }
-
- option_mychart = {
- title: {
- text: 'PPM缁熻鍥捐〃',
- left: 'center'
- },
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow'
- }
- },
- legend: {
- data: ['涓嶈壇鎬绘暟', 'PPM', '鐩爣'],
- top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
- left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
- },
- //toolbox: { //宸ュ叿鏍�
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true }
- // }
- //},
- grid:
- {
- left: '5%',
- right: '5%',
- bottom: '10%',
- //top: '10%',
- containLabel: true
- },
- xAxis: [ //璁剧疆x杞村潗鏍�
- {
- type: 'category',
- axisTick: { show: true },
- data: H_X,
- axisLabel: {
- formatter: function (value) {
- var temp = "";
- var temp_len = 5;
- for (var i = 0; i < value.length; i = i + temp_len) {
- if (i + temp_len <= value.length) {
- temp += '\n' + value.slice(i, i + temp_len)
- } else {
- temp += '\n' + value.slice(i);
- }
- }
-
- return temp;
-
- // 浣跨敤 '\n' 瀹炵幇鎹㈣
- //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
- },
- width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛�
- }
- }
- ],
- yAxis: [ //璁剧疆y杞存暟鎹被鍨�
- {
- type: 'value',
- position: 'left',
- data: [HBadQty] // 宸︿晶Y杞寸殑鏁版嵁
- }, {
- type: 'value',
- position: 'right',
- data: [HPPM, HTarget], // 鍙充晶Y杞寸殑鏁版嵁
- axisLabel: {
- formatter: '{value}' // 鍙互娣诲姞鍗曚綅
- }
- }
- ],
- series: [ //璁剧疆y杞存暟鎹�
- {
- name: '涓嶈壇鎬绘暟',
- type: 'bar',
- barWidth: 30,
- barGap: 0,
- label: labelOption,
- emphasis: {
- focus: 'series'
- },
- itemStyle: {
- normal: {
- lineStyle: {
- color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
- },
- color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
- }
- },
- data: HBadQty
- },
- {
- name: 'PPM',
- type: 'line',
- yAxisIndex: 1,
- barWidth: 10,
- barGap: 0,
- label: labelOption1,
- emphasis: {
- focus: 'series'
- },
- itemStyle: {
- normal: {
- lineStyle: {
- color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
- },
- color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
- }
- },
- data: HPPM
- },
- {
- name: '鐩爣',
- type: 'line',
- barWidth: 10,
- barGap: 0,
- label: labelOption1,
- emphasis: {
- focus: 'series'
- },
- itemStyle: {
- normal: {
- lineStyle: {
- color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
- },
- color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
- }
- },
- data: HTarget
- }
- ]
- };
- option_mychart && myChart.setOption(option_mychart);
- //#endregion
- }
- ////#endregion
- //#endregion
-
- //#region 鑾峰彇椤圭洰鍙�
- function Get_HProject() {
- //鑾峰彇椤圭洰鍙�
- var HProjectList = '<option value="" style="color:red;" selected></option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Gy_Material/Get_HProject",
- async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
- }
- $("#HProject").append(HProjectList);
- form.render('select');
-
- }
- layer.closeAll("loading");
- }
- })
- }
- //#endregion
-
- //#region 鑾峰彇浜嬩笟閮�
- function GetGy_Division() {
- //鑾峰彇浜嬩笟閮�
- var HDivisionList = '<option value="" style="color:red;" selected></option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
- async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
- }
- $("#HDivisionName").append(HDivisionList);
- form.render('select');
-
- }
- layer.closeAll("loading");
- }
- })
- }
- //#endregion
- });
- //#endregion
-
- //浠ヤ笂鏄痩ayui妯″潡
-
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHSupNameValue(obj) //杩斿洖渚涘簲鍟�
+ {
+ $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(obj[0].HItemID);
+ }
//鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
-
</script>
-
</body>
-</html>
+</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\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBill.html"
index 5e47fd2..e6ad7f6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBill.html"
@@ -42,16 +42,8 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
- <!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >棰勮</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
-
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
- <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align: center; padding: 10px 0;"><b>璐ㄩ噺鏈堝害鐩爣鍗�</b></h1>
@@ -120,9 +112,9 @@
<div class="layui-input-inline">
<input class="layui-input" name="HProcTarGetVal" id="HProcTarGetVal" autocomplete="off" value="0">
</div>
- </div>
+ </div>
</div>
- <div class="layui-row">
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">骞�</label>
<div class="layui-input-inline">
@@ -264,10 +256,32 @@
</div>
</div>
</div>
+ <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>
var optiondata = [];
layui.config({
@@ -305,15 +319,13 @@
}
//#endregion
- //#region 鍒濆鍖栫粍缁�
- //Organ();
- //#endregion
-
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //鍒濆鍖栧彇鏍疯〃
+ get_InitGrid();
Organ();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -334,18 +346,17 @@
$("#HInspectOrgID").val(sessionStorage["OrganizationID"])
}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- ////绂佺敤缁勭粐閫夐」
- //$("#HInspectOrgID").attr("disabled", true);
- //鍒濆鍖栭」鐩樁娈佃〃
- Organ();
- RoadBillMain(linterid);
- }
- //#endregion
- //#endregion
+ //鍒濆鍖栧彇鏍疯〃
+ get_InitGrid();
+ Organ();
+ RoadBillMain(linterid);
+ }
+ //#endregion
+ //#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
- //#region 淇濆瓨鎻愪氦
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+ //#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
if (AllowLoadData(data)) {
set_AddNew(data);
@@ -364,18 +375,57 @@
//#endregion
//#endregion
- //
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
+
+ //#region 渚涘簲鍟嗛�佽揣琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 100
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupID', title: 'HSupID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', edit:'text', event: "HSupName" } //f7
+ , { field: 'HSupQty', title: '閫佽揣鏁伴噺', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HSupID": "0"
+ , "HSupNumber": ""
+ , "HSupName": ""
+ , "HSupQty": "0"
+ , "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ //#endregion
+
+
//閫夋嫨閮ㄩ棬鎸夐挳
form.on('submit(HDeptList)', function () {
get_checkDept();
});
-
-
//#region 鐩戝惉鎻愪氦
form.verify({
@@ -390,7 +440,148 @@
});
//#endregion
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow =
+ {
+ "HSupID": "0"
+ , "HSupNumber": ""
+ , "HSupName": ""
+ , "HSupQty": "0"
+ , "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ form.render('select');
+ form.render('checkbox');
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ form.render('select');
+ form.render('checkbox');
+ }
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up(data);
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under(data);
+ break;
+ }
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ for (var i = 0; i < oldData.length; i++) {
+ $('#HReceiveType' + (i + 1)).find("option[value='" + oldData[i].HReceiveType + "']").attr("selected", true);
+ }
+ form.render('select');
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == "HSupName") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ obj.update({
+ "HSupID": checkStatus.data[0].HItemID
+ , "HSupNumber": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+ , "HSupName": checkStatus.data[0].渚涘簲鍟嗗悕绉�
+
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ obj.update({
+ "HSupID": OptionData[0].HItemID
+ , "HSupNumber": OptionData[0].渚涘簲鍟嗕唬鐮�
+ , "HSupName": OptionData[0].渚涘簲鍟嗗悕绉�
+
+ })
+ OptionData = [];
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
//#endregion
@@ -444,7 +635,7 @@
success: function (result) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`count`瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
var data = result.data; //浠庡搷搴旀暟鎹腑鑾峰彇 data 灞炴�� 璧嬪�肩粰鍙橀噺
- for (var i = 0; i < data.length; i++) { // // 閬嶅巻 data 鏁扮粍
+ for (var i = 0; i < data.length; i++) { // // 閬嶅巻 data 鏁扮粍
// 瀵逛簬鏁扮粍涓殑姣忎竴椤癸紝鏋勫缓涓�涓� <option> 鏍囩鐨� HTML 瀛楃涓诧紝骞跺皢鍏惰拷鍔犲埌 Organization 鍙橀噺涓�傝繖涓� <option> 鏍囩鍖呭惈缁勭粐鐨� ID 浣滀负 value 鍜岀粍缁囩殑鍚嶇О浣滀负鏄剧ず鏂囨湰锛屼笖鏂囧瓧棰滆壊琚缃负钃濊壊
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
@@ -476,8 +667,18 @@
});
}
//#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ 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])
+ }
+ }
+
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
if (OperationType == 3) {
data.field.HUpdater = sessionStorage["HUserName"];
@@ -487,6 +688,9 @@
}
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
+ //瀛愯〃鏁版嵁搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
+
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -496,7 +700,7 @@
refSav = "Update";
}
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
- var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -534,6 +738,7 @@
data: { "HInterID": linterid },
success: function (result) {
var tableMain = result.data[0];
+ var tableSub = result.data;
var Year = parseInt(new Date().getFullYear());
var YearList = '';
YearList += '<option style="color:blue;" value="' + (Year - 2) + '">' + (Year - 2) + '</option>';
@@ -573,6 +778,19 @@
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HInspectOrgIDBar = tableMain["HInspectOrgID"]; //淇敼鍙橀噺璧嬪�硷紝纭繚浠庢暟缁勪腑鑾峰彇HOrgID
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < tableSub.length; i++) {
+ rowdata.push(
+ {
+ "HSupID": tableSub[i].HSupID, "HSupNumber": tableSub[i].渚涘簲鍟嗕唬鐮�, "HSupName": tableSub[i].渚涘簲鍟嗗悕绉� , "HSupQty": tableSub[i].閫佽揣鏁伴噺
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+
form.render('checkbox');
form.render('select');
}
@@ -604,7 +822,10 @@
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
-
+ //瀛愯〃f7 鐗╂枡浠ｇ爜
+ function GetHSupNameValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 43dccc9..379ba96 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -190,6 +190,7 @@
<li>鎿嶄綔鏃ュ織</li>
<li class="layui-this">SN搴忓垪鐮�</li>
<li>鎿嶄綔鍛樻竻鍗�</li>
+ <li>渚涘簲鍟嗘竻鍗�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item">
@@ -208,6 +209,10 @@
<!--鎿嶄綔鍛樻竻鍗�-->
<table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
</div>
+ <div class="layui-tab-item">
+ <!--渚涘簲鍟嗘竻鍗�-->
+ <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
+ </div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -223,6 +228,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">涓嬫帹涓嶈壇鍝佽瘎瀹″鐞嗗崟</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-QualityReport" id="btn-QualityReport">涓嬫帹璐ㄩ噺姹囨姤鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-SupReport" id="btn-SupReport">涓嬫帹PPM鏁版嵁褰曞叆鍗�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
@@ -256,6 +262,11 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete4" id="btn-Delete4"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn4" id="set_HideColumn4"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo5">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete5" id="btn-Delete5"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
</div>
</script>
</form>
@@ -293,6 +304,7 @@
var option2 = [];
var option3 = [];
var option4 = [];
+ var option5 = [];
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -459,6 +471,7 @@
SelectTechParam(HMainID,"Note"); //鎿嶄綔鏃ュ織
SelectTechParam(HMainID, "SN"); //SN搴忓垪鐮�
SelectTechParam(HMainID, "Emp"); //鎿嶄綔鍛樻竻鍗�
+ SelectTechParam(HMainID, "Sup"); //渚涘簲鍟嗘竻鍗�
});
//鏌ヨ宸ヨ壓鍙傛暟
@@ -506,6 +519,14 @@
//鏄庣粏鍒楄缃�
case 'set_HideColumn4': get_HideColumn_Emp();
break;
+ };
+ });
+ //鏌ヨ渚涘簲鍟嗘竻鍗�
+ table.on('toolbar(mainTable5)', function (obj) {
+ switch (obj.event) {
+ //鍒犻櫎
+ case 'btn-Delete5': btn_Delete5();
+ break;
};
});
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
@@ -655,6 +676,23 @@
table.render(option4);
DisPlay_HideColumn_Emp();
+ break;
+ case "Sup":
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option5 = {
+ elem: '#mainTable5'
+ , toolbar: '#toolbarDemo5'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option5);
+
break;
}
@@ -823,7 +861,10 @@
break;
//涓嬫帹璐ㄩ噺姹囨姤鍗�
case 'btn-QualityReport': set_QualityReport();
- break;
+ break;
+ //涓嬫帹PPM鏁版嵁褰曞叆鍗�
+ case 'btn-SupReport': set_SupReport();
+ break;
//棰勮
case 'btn-Cell': layer.msg('棰勮锛�');
break;
@@ -856,25 +897,7 @@
break;
};
});
-
- ////琛岀洃鍚簨浠�
- //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;
- // }
- // });
- //});
+
//鏉＄爜鍒犻櫎
function btn_Delete3() {
@@ -909,6 +932,41 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
+
+ //渚涘簲鍟嗗垹闄�
+ function btn_Delete5() {
+ var checkStatus = table.checkStatus('mainTable5')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('纭畾鍒犻櫎鍚楋紵', function (index) {
+ var HInterID = data[0].HInterID;
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/PPMSupDelete',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ SelectTechParam(HInterID, "Sup");
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//闅愯棌鍒楄缃� 涓昏〃
function get_HideColumn() {
@@ -1790,6 +1848,30 @@
}
}
+ //涓嬫帹PPM鎶ヨ〃鏁版嵁褰曞叆
+ function set_SupReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length ==1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: 'PPM鎶ヨ〃鏁版嵁-褰曞叆'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_Sup.html?OperationType=1&linterid=' + linterid.toString() + '&HEntry=', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+
//鏂板鍗曟嵁
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_Sup.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_Sup.html"
new file mode 100644
index 0000000..5c58d60
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_Sup.html"
@@ -0,0 +1,411 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>PPM鏁版嵁褰曞叆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .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" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 2px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>PPM鏁版嵁褰曞叆</b></h1>
+ </div>
+ <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">PPM褰曞叆</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>
+ var optiondata = [];
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ //璁板綍缁勭粐鐨勫��
+ var HInspectOrgIDBar = 0; //澹版槑浜嗕竴涓悕涓� HInspectOrgIDBar 鐨勫彉閲忥紝骞跺皢鍏跺垵濮嬪寲涓� 0
+ //妯″潡鍚�
+ var HModName = "Cj_StationOutBill_Sup";
+ //琛ㄦ牸娓叉煋鍙傛暟
+ var option = {}; //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+ if (OperationType == null || OperationType == 1) { //鏂板
+ OperationType = 1;
+
+ //鍒濆鍖栧彇鏍疯〃
+ get_InitGrid();
+
+ }
+ //#endregion
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+ //#region 淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+ });
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+ //#endregion
+ //#endregion
+
+
+ //#region 渚涘簲鍟嗛�佽揣琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 100
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HInterID', title: 'HInterID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupID', title: 'HSupID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', edit:'text', event: "HSupName" } //f7
+ , { field: 'HWasterQty_Mater', title: '鏂欏簾鏁伴噺', edit: 'text' }
+ , { field: 'HBackWorkQty', title: '杩斿伐鏁伴噺', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HInterID": linterid
+ ,"HSupID": "0"
+ , "HSupNumber": ""
+ , "HSupName": ""
+ , "HWasterQty_Mater": "0"
+ , "HBackWorkQty": "0"
+ , "HRemark": ""
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow =
+ {
+ "HInterID": linterid
+ , "HSupID": "0"
+ , "HSupNumber": ""
+ , "HSupName": ""
+ , "HWasterQty_Mater": "0"
+ , "HBackWorkQty": "0"
+ , "HRemark": ""
+
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ form.render('select');
+ form.render('checkbox');
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ form.render('select');
+ form.render('checkbox');
+ }
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up(data);
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under(data);
+ break;
+ }
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ for (var i = 0; i < oldData.length; i++) {
+ $('#HReceiveType' + (i + 1)).find("option[value='" + oldData[i].HReceiveType + "']").attr("selected", true);
+ }
+ form.render('select');
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == "HSupName") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ obj.update({
+ "HSupID": checkStatus.data[0].HItemID
+ , "HSupNumber": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+ , "HSupName": checkStatus.data[0].渚涘簲鍟嗗悕绉�
+
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ obj.update({
+ "HSupID": OptionData[0].HItemID
+ , "HSupNumber": OptionData[0].渚涘簲鍟嗕唬鐮�
+ , "HSupName": OptionData[0].渚涘簲鍟嗗悕绉�
+
+ })
+ OptionData = [];
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+
+ //#region 淇濆瓨HMaker
+ function set_AddNew(data) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ 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 refSav = "";
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ refSav = "Add";
+ }
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var sSubStr = sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationOutBill/PPMSupAddBill",
+ async: true,
+ data: { "sSubStr": sSubStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+ return true;
+ }
+ //#endregion
+
+ //#endregion
+
+ });
+ //瀛愯〃f7 鐗╂枡浠ｇ爜
+ function GetHSupNameValue(obj) {
+ OptionData = obj;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1