From 00d15e193b7064d68f38489a23948350a20ce0ee Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期三, 01 十一月 2023 11:09:42 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 2
WebTM/Files/XMJDHB00000205/b31fe29b30967b93bb7025e2520f5a5.jpg | 0
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Customer.html | 318 ++
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckReport_ZTFB.html | 1031 ++++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 289 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html | 4
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 18
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 22
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 740 ++++++
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Emp.html | 677 +++++
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Sum.html | 221 +
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Dept.html | 581 ++++
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 3
WebTM/views/WMS扫码模块/生产管理/删托单/Sc_DeletePackUnionBill_PDA.html | 3
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html | 4
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_BadClass.html | 533 ++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 21
WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html | 896 +++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 6
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckReport_ZDQX.html | 850 ++++++
WebTM/views/index.html | 14
WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Material.html | 636 +++++
WebTM/views/生产管理/齐套分析/JIT_CompleteMaterlDetailList.html | 487 +++
WebTM/WebTM.csproj | 9
24 files changed, 7,199 insertions(+), 166 deletions(-)
diff --git a/WebTM/Files/XMJDHB00000205/b31fe29b30967b93bb7025e2520f5a5.jpg b/WebTM/Files/XMJDHB00000205/b31fe29b30967b93bb7025e2520f5a5.jpg
new file mode 100644
index 0000000..f0ded3a
--- /dev/null
+++ b/WebTM/Files/XMJDHB00000205/b31fe29b30967b93bb7025e2520f5a5.jpg
Binary files differ
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 52a8620..3611b1d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -228,6 +228,10 @@
<Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Dept.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Customer.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Sum.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
@@ -277,6 +281,8 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OrderStateDistribution.html" />
+ <Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
@@ -289,6 +295,9 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZTFB.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c5c8a65..f0d2214 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\涔斾竴璁￠噺鍗曚綅鍒楄〃\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
index 29a970a..d0d501a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
@@ -273,13 +273,14 @@
//#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
form.on('submit(cmdLoadData)', function (data) {
+ HBarCode_Pack = $('#HBarCode_Pack').val()
document.getElementById("cmdLoadData").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
$.ajax(
{
type: "GET",
url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker },
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 99a8681..4071af0 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -338,6 +338,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
<!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
<dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html" style="margin: 0 0 0 13px;">榻愬鐗╂枡淇℃伅鏄庣粏鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html" style="margin: 0 0 0 13px;">宸ュ巶鏃ュ巻</a></dd>
</dl>
@@ -463,7 +464,12 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
</dl>
</dd>
-
+ <dd>
+ <a>璁惧鐘舵�佸垎甯�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/璁㈠崟鐘舵�佸垎甯�/Sc_OrderStateDistribution.html">璁惧鐘舵�佸垎甯�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>-->
<!-- 杞﹂棿绠＄悊 -->
@@ -585,6 +591,12 @@
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>鍗曞搧杩囩珯</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html">宸ュ簭鍗曞搧涓嶈壇閲囬泦</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 璐ㄩ噺绠＄悊 -->
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html"
new file mode 100644
index 0000000..8f31cbb
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html"
@@ -0,0 +1,533 @@
+锘�<!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>
+ <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">
+ <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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+ </div>
+ <div style="width:99%;height:calc(33vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_CustomerAppealReport_BadClass";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#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: app.config.position,
+ distance: app.config.distance,
+ align: app.config.align,
+ verticalAlign: app.config.verticalAlign,
+ rotate: app.config.rotate,
+ formatter: '{c} {name|{a}}',
+ fontSize: 16,
+ rich: {
+ name: {}
+ }
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var HCusName = [];//瀹㈡埛鍚嶇О
+ var Hseries = []; //x杞存暟鎹紙鎬讳綋锛�
+ var option_X = []; //x杞存暟鎹槑缁�
+ var HProblemType = [];//闂绫诲瀷
+
+ for (let i = 2; i < option.cols[0].length - 1;i++) {
+ HCusName.push(option.cols[0][i].title);
+ }
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length; i++) {
+ HProblemType.push(option.data[i].閿欒绫诲瀷);
+ option_X = [];
+
+ for (let j = 0; j < option.data.length; j++) {
+ option_X.push(option.data[i][HCusName[j]]);
+ }
+
+ Hseries.push({
+ name: option.data[i].閿欒绫诲瀷,
+ type: 'bar',
+ barGap: 0,
+ label: {
+ show: true,
+ position: 'top'
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: option_X
+ });
+ }
+ }
+
+ option_ZZT = {
+ grid: {
+ x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: HProblemType
+ },
+ 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: true },
+ data: HCusName
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: Hseries
+ };
+ option_ZZT && myChart.setOption(option_ZZT,true);
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ //鍒濆鍖栨棩鏈�
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ set_Graphics();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-450'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ }
+ }
+
+ //骞�
+ 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) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/ProblemType',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ set_Graphics();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
index 0bd9e1e..0cb535f 100644
--- "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.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;
@@ -23,7 +24,7 @@
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
+ <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">
@@ -52,7 +53,14 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div>
+ <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+ </div>
+ <div style="width:99%;height:calc(33vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -60,12 +68,13 @@
</div>
</script>
</form>
- </div>
+ </div>
</div>
</div>
</div>
<script>
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -85,14 +94,298 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "QC_CustomerAppealReport_Sum";
+ var HModName = "QC_CustomerAppealReport_Customer";
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //#endregion
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#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: app.config.position,
+ distance: app.config.distance,
+ align: app.config.align,
+ verticalAlign: app.config.verticalAlign,
+ rotate: app.config.rotate,
+ formatter: '{c} {name|{a}}',
+ fontSize: 16,
+ rich: {
+ name: {}
+ }
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var HCusName = [];//瀹㈡埛鍚嶇О
+ var HJanuary = []; //涓�鏈堜唤鏁版嵁
+ var HFebruary = []; //浜屾湀浠芥暟鎹�
+ var HMarch = []; //涓夋湀浠芥暟鎹�
+ var HApril = []; //鍥涙湀浠芥暟鎹�
+ var HMay = []; //浜旀湀浠芥暟鎹�
+ var HJune = []; //鍏湀浠芥暟鎹�
+ var HJuly = []; //涓冩湀浠芥暟鎹�
+ var HAugust = []; //鍏湀浠芥暟鎹�
+ var HSeptember = []; //涔濇湀浠芥暟鎹�
+ var HOctober = []; //鍗佹湀浠芥暟鎹�
+ var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+ var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+ HCusName.push(option.data[i].瀹㈡埛);
+ HJanuary.push(option.data[i]['1鏈�']);
+ HFebruary.push(option.data[i]['2鏈�']);
+ HMarch.push(option.data[i]['3鏈�']);
+ HApril.push(option.data[i]['4鏈�']);
+ HMay.push(option.data[i]['5鏈�']);
+ HJune.push(option.data[i]['6鏈�']);
+ HJuly.push(option.data[i]['7鏈�']);
+ HAugust.push(option.data[i]['8鏈�']);
+ HSeptember.push(option.data[i]['9鏈�']);
+ HOctober.push(option.data[i]['10鏈�']);
+ HNovember.push(option.data[i]['11鏈�']);
+ HDecember.push(option.data[i]['12鏈�']);
+ }
+ option_ZZT = {
+ grid: {
+ x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+ },
+ 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: true },
+ data: HCusName
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '1鏈�',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJanuary
+ },
+ {
+ name: '2鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HFebruary
+ },
+ {
+ name: '3鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMarch
+ },
+ {
+ name: '4鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HApril
+ },
+ {
+ name: '5鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMay
+ },
+ {
+ name: '6鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJune
+ },
+ {
+ name: '7鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJuly
+ },
+ {
+ name: '8鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HAugust
+ },
+ {
+ name: '9鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSeptember
+ },
+ {
+ name: '10鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HOctober
+ },
+ {
+ name: '11鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HNovember
+ },
+ {
+ name: '12鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HDecember
+ }
+ ]
+ };
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -116,7 +409,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
- });
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -133,6 +426,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
+ set_Graphics();
}
//鍒濆鍖栬〃鏍�
@@ -147,13 +441,13 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 'full-450'
, page: true
, totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
+
}
}
@@ -176,6 +470,7 @@
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/Customer',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
var col = [];
@@ -202,8 +497,10 @@
}
}
}
+
option.cols = [col];
option.data = data1.data;
+
table.render(option);
layer.close(wait);
} else {
@@ -220,23 +517,24 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();
- var HEndDate = $("#HEndDate").val();
+ var HEndDate = $("#HEndDate").val();
sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
+ set_Graphics();
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
sWhere = " ";
get_FastQuery();
}
-
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html"
new file mode 100644
index 0000000..130cfac
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html"
@@ -0,0 +1,581 @@
+锘�<!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>
+ <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">
+ <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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div style="width:99.5%;height:calc(70vh);margin-top:10px;">
+ <div id="histogram" style="width:60%;height:calc(70vh);float:left">
+
+ </div>
+ <div id="PieChart" style="width:39%;height:calc(70vh);float:left;margin-left:5px;">
+
+ </div>
+ </div>
+ <div style="width:99%;height:calc(50vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_CustomerAppealReport_Dept";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愬浘褰€��
+ function set_Graphics() {
+ //#region 銆愭煴鐘跺浘銆�
+ var app = {};
+
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#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
+ }
+ ]
+ });
+ }
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
+ var HDeptName = [];//閮ㄩ棬鍚嶇О
+ var HJanuary = []; //涓�鏈堜唤鏁版嵁
+ var HFebruary = []; //浜屾湀浠芥暟鎹�
+ var HMarch = []; //涓夋湀浠芥暟鎹�
+ var HApril = []; //鍥涙湀浠芥暟鎹�
+ var HMay = []; //浜旀湀浠芥暟鎹�
+ var HJune = []; //鍏湀浠芥暟鎹�
+ var HJuly = []; //涓冩湀浠芥暟鎹�
+ var HAugust = []; //鍏湀浠芥暟鎹�
+ var HSeptember = []; //涔濇湀浠芥暟鎹�
+ var HOctober = []; //鍗佹湀浠芥暟鎹�
+ var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+ var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+ var Hseries = [];
+ var option_X = [];
+ if (option.data.length>0) {
+ for (let i = 0; i < option.data.length; i++) {
+ HDeptName.push(option.data[i].璐ｄ换閮ㄩ棬);
+ option_X = [];
+
+ for (let j = 1; j <= 12; j++) {
+ option_X.push(option.data[i][j + "鏈�"]);
+ }
+ Hseries.push({
+ name: option.data[i].璐ｄ换閮ㄩ棬,
+ type: 'bar',
+ barGap: 0,
+ label: {
+ show: true,
+ position: 'top'
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: option_X
+ });
+ }
+ }
+ option_ZZT = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ //澶撮儴鍙�夊睆钄芥爣棰�
+ data: HDeptName
+ },
+ 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 }
+ }
+ },
+ //X杞�
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: true },
+ data: H_X
+ }
+ ],
+ //Y杞�
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ //X杞存暟鎹�
+ series: Hseries
+ };
+ option_ZZT && myChart.setOption(option_ZZT,true);
+ //#endregion
+
+ //#region 銆愰ゼ鍥俱��
+ var chartDom = document.getElementById('PieChart');
+ var myChart = echarts.init(chartDom);
+ var option_BT;
+
+ var option_BT_XData = [];
+ for (let i = 0; i < option.data.length; i++) {
+ option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].璐ｄ换閮ㄩ棬 });
+ }
+
+ option_BT = {
+ title: {
+ text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈堝璇夐棶棰樿矗浠诲崰姣斿浘',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ orient: 'vertical',
+ left: 'left'
+ },
+ series: [
+ {
+ name: '瀹㈣瘔鏁伴噺',
+ type: 'pie',
+ radius: '50%',
+ data: option_BT_XData,
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+
+ option_BT && myChart.setOption(option_BT);
+ //#endregion
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ //鍒濆鍖栨棩鏈�
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ set_Graphics();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cellMinWidth: 120
+ // , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ // , height: 'full-70'
+ //};
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-320'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ }
+ }
+
+ //骞�
+ 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) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Dept',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ set_Graphics();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html"
new file mode 100644
index 0000000..5d899ee
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html"
@@ -0,0 +1,677 @@
+锘�<!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>
+ <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">
+ <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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div style="width:99.5%;height:calc(70vh);margin-top:10px;">
+ <div id="histogram" style="width:60%;height:calc(70vh);float:left">
+
+ </div>
+ <div id="PieChart" style="width:39%;height:calc(70vh);float:left;margin-left:5px;">
+
+ </div>
+ </div>
+ <div style="width:99%;height:calc(50vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_CustomerAppealReport_Emp";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愬浘褰€��
+ function set_Graphics() {
+ //#region 銆愭煴鐘跺浘銆�
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#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'
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var HCusName = [];//瀹㈡埛鍚嶇О
+ var HJanuary = []; //涓�鏈堜唤鏁版嵁
+ var HFebruary = []; //浜屾湀浠芥暟鎹�
+ var HMarch = []; //涓夋湀浠芥暟鎹�
+ var HApril = []; //鍥涙湀浠芥暟鎹�
+ var HMay = []; //浜旀湀浠芥暟鎹�
+ var HJune = []; //鍏湀浠芥暟鎹�
+ var HJuly = []; //涓冩湀浠芥暟鎹�
+ var HAugust = []; //鍏湀浠芥暟鎹�
+ var HSeptember = []; //涔濇湀浠芥暟鎹�
+ var HOctober = []; //鍗佹湀浠芥暟鎹�
+ var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+ var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+ HCusName.push(option.data[i].璐ｄ换浜�);
+ HJanuary.push(option.data[i]['1鏈�']);
+ HFebruary.push(option.data[i]['2鏈�']);
+ HMarch.push(option.data[i]['3鏈�']);
+ HApril.push(option.data[i]['4鏈�']);
+ HMay.push(option.data[i]['5鏈�']);
+ HJune.push(option.data[i]['6鏈�']);
+ HJuly.push(option.data[i]['7鏈�']);
+ HAugust.push(option.data[i]['8鏈�']);
+ HSeptember.push(option.data[i]['9鏈�']);
+ HOctober.push(option.data[i]['10鏈�']);
+ HNovember.push(option.data[i]['11鏈�']);
+ HDecember.push(option.data[i]['12鏈�']);
+ }
+ option_ZZT = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+ },
+ 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: true },
+ data: HCusName
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '1鏈�',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJanuary
+ },
+ {
+ name: '2鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HFebruary
+ },
+ {
+ name: '3鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMarch
+ },
+ {
+ name: '4鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HApril
+ },
+ {
+ name: '5鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMay
+ },
+ {
+ name: '6鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJune
+ },
+ {
+ name: '7鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJuly
+ },
+ {
+ name: '8鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HAugust
+ },
+ {
+ name: '9鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSeptember
+ },
+ {
+ name: '10鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HOctober
+ },
+ {
+ name: '11鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HNovember
+ },
+ {
+ name: '12鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HDecember
+ }
+ ]
+ };
+ option_ZZT && myChart.setOption(option_ZZT);
+ //#endregion
+
+ //#region 銆愰ゼ鍥俱��
+ var chartDom = document.getElementById('PieChart');
+ var myChart = echarts.init(chartDom);
+ var option_BT;
+
+ var option_BT_XData = [];
+ for (let i = 0; i < option.data.length; i++) {
+ option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].璐ｄ换浜� });
+ }
+
+ option_BT = {
+ title: {
+ text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈堜唤璐ｄ换浜哄垎甯冨浘',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ top: 'bottom'
+ },
+ series: [
+ {
+ name: '瀹㈣瘔鏁伴噺',
+ type: 'pie',
+ radius: '50%',
+ data: option_BT_XData,
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+
+ option_BT && myChart.setOption(option_BT);
+ //#endregion
+ }
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ //鍒濆鍖栨棩鏈�
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ set_Graphics();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cellMinWidth: 120
+ // , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ // , height: 'full-70'
+ //};
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-320'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ }
+ }
+
+ //骞�
+ 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) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Emp',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ set_Graphics();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html"
new file mode 100644
index 0000000..5a4c5d4
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html"
@@ -0,0 +1,636 @@
+锘�<!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>
+ <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">
+ <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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+ </div>
+ <div style="width:99%;height:calc(50vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_CustomerAppealReport_Material";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愭煴鐘跺浘銆�
+ function set_Graphics() {
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#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'
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var HCusName = [];//瀹㈡埛鍚嶇О
+ var HJanuary = []; //涓�鏈堜唤鏁版嵁
+ var HFebruary = []; //浜屾湀浠芥暟鎹�
+ var HMarch = []; //涓夋湀浠芥暟鎹�
+ var HApril = []; //鍥涙湀浠芥暟鎹�
+ var HMay = []; //浜旀湀浠芥暟鎹�
+ var HJune = []; //鍏湀浠芥暟鎹�
+ var HJuly = []; //涓冩湀浠芥暟鎹�
+ var HAugust = []; //鍏湀浠芥暟鎹�
+ var HSeptember = []; //涔濇湀浠芥暟鎹�
+ var HOctober = []; //鍗佹湀浠芥暟鎹�
+ var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+ var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+ HCusName.push(option.data[i].缂栫爜);
+ HJanuary.push(option.data[i]['1鏈�']);
+ HFebruary.push(option.data[i]['2鏈�']);
+ HMarch.push(option.data[i]['3鏈�']);
+ HApril.push(option.data[i]['4鏈�']);
+ HMay.push(option.data[i]['5鏈�']);
+ HJune.push(option.data[i]['6鏈�']);
+ HJuly.push(option.data[i]['7鏈�']);
+ HAugust.push(option.data[i]['8鏈�']);
+ HSeptember.push(option.data[i]['9鏈�']);
+ HOctober.push(option.data[i]['10鏈�']);
+ HNovember.push(option.data[i]['11鏈�']);
+ HDecember.push(option.data[i]['12鏈�']);
+ }
+ option_ZZT = {
+ grid: {
+ x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+ },
+ 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: true },
+ data: HCusName
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '1鏈�',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJanuary
+ },
+ {
+ name: '2鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HFebruary
+ },
+ {
+ name: '3鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMarch
+ },
+ {
+ name: '4鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HApril
+ },
+ {
+ name: '5鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMay
+ },
+ {
+ name: '6鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJune
+ },
+ {
+ name: '7鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJuly
+ },
+ {
+ name: '8鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HAugust
+ },
+ {
+ name: '9鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSeptember
+ },
+ {
+ name: '10鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HOctober
+ },
+ {
+ name: '11鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HNovember
+ },
+ {
+ name: '12鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HDecember
+ }
+ ]
+ };
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ //鍒濆鍖栨棩鏈�
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ set_Graphics();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cellMinWidth: 120
+ // , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ // , height: 'full-70'
+ //};
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-320'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ }
+ }
+
+ //骞�
+ 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) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Material',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ set_Graphics();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
index 8784860..df4b792 100644
--- "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.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;
@@ -21,40 +22,45 @@
</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-fluid" style="width:100%;height:100%;">
+ <div class="layui-col-md12" style="width:100%;height:100%;">
+ <div class="layui-card" style="padding: 1px;width:100%;height:100%;">
+ <div class="layui-card-body" style="padding: 1px;width:100%;height:100%;">
+ <form class="layui-form" action="" lay-filter="component-form-group" style="width:100%;height:100%;">
<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;">
- <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
- </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
+ <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%;">
-
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-exit" id="btn-exit" style="padding:0 5px">閫�鍑�</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn" style="padding:0 5px">闅愯棌鍒楄缃�</button>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div>
+ <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+ </div>
+ <div style="width:99%;height:calc(30vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -97,6 +103,125 @@
//#endregion
+
+ //#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鏈�'];//X杞存爣棰�
+ var HSum = [];//鎬绘暟閲�
+ var HLot = [];//鎵归噺闂鏁伴噺
+ var HProp = [];//鎵归噺闂姣斾緥
+ if (option.data.length>0) {
+ for (let i = 1; i <= 12; i++) {
+ HSum.push(option.data[0][i + "鏈�"]);
+ HLot.push(option.data[1][i + "鏈�"]);
+ HProp.push(option.data[2][i + "鏈�"].replace('%', ''));
+ }
+ }
+
+ option_ZZT = {
+ grid: {
+ x: '2%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ crossStyle: {
+ color: '#999'
+ }
+ }
+ },
+ toolbox: {
+ feature: {
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ['line', 'bar'] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ },
+ x: 'right',
+ orient: "vertical",//宸ュ叿鏍廼con鐨勫竷灞�鏈濆悜鈥榟orizontal鈥�'vertical'
+ },
+ legend: {
+ data: ['鎬绘暟閲�', '鎵归噺闂鏁伴噺', '鎵归噺闂姣斾緥']
+ },
+ xAxis: [
+ {
+ type: 'category',
+ data: H_X,
+ axisPointer: {
+ type: 'shadow'
+ }
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ name: '鎵归噺闂鏁伴噺',
+ //min: 0,
+ //max: 150,
+ //interval: 50,
+ //axisLabel: {
+ // formatter: '{value}'
+ //}
+ },
+ {
+ type: 'value',
+ name: '鎵归噺闂姣斾緥%',
+ //min: 0,
+ //max: 100,
+ //interval: 10,
+ axisLabel: {
+ formatter: '{value} ' + '%'
+ }
+ }
+ ],
+ series: [
+ {
+ name: '鎬绘暟閲�',
+ type: 'bar',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HSum
+ },
+ {
+ name: '鎵归噺闂鏁伴噺',
+ type: 'bar',
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HLot
+ },
+ {
+ name: '鎵归噺闂姣斾緥',
+ type: 'line',
+ yAxisIndex: 1,
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + ' ';
+ }
+ },
+ data: HProp
+ }
+ ]
+ };
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -118,13 +243,24 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
- });
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btn-exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒楄缃寜閽�
+ form.on('submit(HideColumn)', function (data) {
+ get_HideColumn();
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Year();
//鍒濆鍖栨棩鏈�
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -134,6 +270,20 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
+ }
+
+ //骞�
+ 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');
}
//鍒濆鍖栬〃鏍�
@@ -148,22 +298,24 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 'full-490'
, page: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
+
}
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
+ sWhere = $("#HYear").val();
var wait = layer.load();//閬僵
$.ajax({
- url: GetWEBURL() + '/',
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Sum',
type: "GET",
- data: { "sWhere": sWhere },
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -172,6 +324,7 @@
for (var key in data1.list) {
data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
//鍒ゆ柇鏄惁鏄函鑻辨枃
var patrn = new RegExp("[\u4E00-\u9FA5]+");
for (var i = 0; i < data.length; i++) {
@@ -184,12 +337,26 @@
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: 120 });
break;
default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
}
}
+ if (data1.data.length>0) {
+ for (let i = 1; i <= 12; i++) {
+ if (data1.data[0][i + "鏈�"] != 0) {
+ data1.data[2][i + "鏈�"] = (data1.data[1][i + "鏈�"] * 100 / data1.data[0][i + "鏈�"]).toFixed(2) + '%'
+ }
+ else {
+ data1.data[2][i + "鏈�"] = (0.00).toFixed(2) + '%'
+ }
+ }
+ data1.data[2].鍚堣 = (data1.data[1].鍚堣 * 100 / data1.data[0].鍚堣).toFixed(2) + '%'
+ }
+
+
option.cols = [col];
option.data = data1.data;
+
table.render(option);
layer.close(wait);
} else {
@@ -206,23 +373,25 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();
- var HEndDate = $("#HEndDate").val();
+ var HEndDate = $("#HEndDate").val();
sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
+ //鍔犺浇鏌辩姸鍥�
+ set_Graphics();
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
sWhere = " ";
get_FastQuery();
}
-
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
index 543594b..a6a3528 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
@@ -128,6 +128,11 @@
});
//#endregion
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -211,7 +216,7 @@
if (NumCount > parseFloat(item[dateNowTime])) {
NumCount -= parseFloat(item[dateNowTime]);
} else {
- var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ var num = 7;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
rq = tr.children()[num + 1 + i];
rq.style.color = '#f66161';//鐒跺悗鍙樿壊
@@ -227,6 +232,21 @@
}
//#endregion
+ //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
+ function btnrowDouble(obj) {
+
+ var HMaterID = obj["鐗╂枡ID"];
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , area: ['90%', '90%']//澶у皬
+ , title: '榻愬鐗╂枡鍒嗘瀽鏄庣粏琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html?OperationType=1&HMaterID=' + HMaterID, 'yes']
+ })
+ }
//鑾峰彇缁勭粐
function Organ() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
index a667332..81ffdf1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -344,7 +344,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , title: '鐢熶骇宸ヤ綅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: './Gy_SourceWorkStationSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
})
@@ -364,7 +364,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'DeltetGy_PackType',
+ url: GetWEBURL() + 'DeltetGy_SourceWorkStation',
type: "GET",
data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index c7eb2fe..71fd1b9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -229,7 +229,7 @@
var sWhere = "";
var option = [];
var HModName = "JIT_DayPlanPlatForm";
-
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -241,7 +241,7 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //琛屽唴榧犳爣绂诲紑浜嬩欢
+ //琛屽唴榧犳爣绂诲紑浜嬩欢
table.on('edit(mainTable)', function (obj) {
var myDate = new Date();
var yyyy = myDate.getFullYear();
@@ -249,13 +249,14 @@
var dd = myDate.getDate();
var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
var dateHQty = 0;
+ var SumHQty = 0;//鎷嗗崟鏁伴噺
for (var i = 0; i <= (SumMonth - dd); i++) {
if (obj.field == "鐢熶骇璧勬簮") {
return;
}
if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
- dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]) ;
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
}
}
for (var i = 1; i < dd; i++) {
@@ -264,16 +265,38 @@
}
}
+ //鏌ヨ鎵�鏈夋暟鎹浉鍚岀殑璁㈠崟
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["鐢熶骇璁㈠崟鍙�"] == option.data[i]["鐢熶骇璁㈠崟鍙�"] && obj.data["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] == option.data[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+ SumHQty += parseInt(option.data[i]["鎷嗗崟鏁伴噺"]);
+ }
+ }
+
+ if (obj.value == "0" && obj.field == "鎷嗗崟鏁伴噺") {
+ return layer.msg("鎷嗗崟鏁伴噺涓嶈兘涓�0!");
+ }
+
+ if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ obj.update({
+ "鎷嗗崟鏁伴噺": "0"
+ });
+ return layer.msg("鎷嗗崟鏁伴噺澶т簬璁㈠崟鏁伴噺!");
+ }
+
+ var NowDate = obj.field;
if (dateHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty - obj.value,
+ [NowDate]: 0
});
return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
}
+
+
//淇敼鏁版嵁
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty,
});
})
@@ -282,45 +305,8 @@
btnrowDouble(obj.data);
})
- var objData = "";
//鐐瑰嚮琛岄�変腑鏁版嵁
table.on('row(mainTable)', function (obj) {
-
- //if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
- // objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // objData.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // layui.each(table.cache.mainTable, function (i, l) {
- // if (objData.tr.index() == l.LAY_TABLE_INDEX) {
- // l.LAY_CHECKED = false;
- // }
- // });
- //}
-
- //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'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- //} else {
- // obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // obj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- //}
- ////mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- //layui.each(table.cache.mainTable, function (i, l) {
- // if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- // l.LAY_CHECKED = flag;
- // }
- //});
-
- //for (var i = 0; i < table.cache["mainTable"].length; i++) {
- // if (table.cache["mainTable"][i]["鐢熶骇璁㈠崟鍙�"] != obj.data["鐢熶骇璁㈠崟鍙�"]) {
- // table.cache["mainTable"][i].LAY_CHECKED = false;
- // }
- //}
- //option.data = table.cache["mainTable"];
- //table.render(option);
-
-
- //objData = obj;
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
@@ -357,6 +343,40 @@
data[0]["HSourceID"] = "";
data[0]["hmainid"] = "";
data[0]["鍗曟嵁鍙�"] = "";
+ data[0]["鎷嗗崟鏁伴噺"] = 0;
+
+ var myDate = new Date();
+ //鑾峰彇骞�
+ var yyyy = myDate.getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = myDate.getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = myDate.getDate(); //鑾峰彇褰撳ぉ鏃ユ湡澶╂暟
+ var columns = []
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (30 - k); j++) {
+
+ data[0][Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')] = "";
+
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
+ }
+
var copydata = JSON.stringify(data);
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
@@ -389,7 +409,7 @@
case 'set_ReadyAsc':
set_ReadyAsc();
break;
-
+
}
});
@@ -400,7 +420,7 @@
//淇濆瓨
form.on('submit(btnSave)', function (data) {
- var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+ var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else if (table.cache["mainTable"].length == 0) {
@@ -538,7 +558,7 @@
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
}
- //#endregion
+ //#endregion
//鑾峰彇缁勭粐
function Organ() {
@@ -595,127 +615,158 @@
columns.push({
field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({
field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
- } })//0
+ }
+ })//0
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
@@ -827,7 +878,7 @@
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
async: false,
- data: { "sWhere": HinterID_S.toString(),"num":1 },
+ data: { "sWhere": HinterID_S.toString(), "num": 1 },
success: function (data1) {
if (data1.count == 1) {
for (var i = 0; i < 31; i++) {
@@ -1048,7 +1099,7 @@
//娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
localStorage.removeItem("JIT_DayPlanPlatForm_HWorkShop");
var data = {
- HWorkShopID: $("#HWorkShopID").val()
+ HWorkShopID: $("#HWorkShopID").val()
, HWorkShopIDName: $("#HWorkShopIDName").val()
}
//鏈湴瀛樺偍
@@ -1136,7 +1187,7 @@
, area: ['90%', '90%']//澶у皬
, title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID + '&HMainICMOInterID=' + HMainICMOInterID + '&HICMOInterID=' + HICMOInterID, 'yes']
})
}
@@ -1222,7 +1273,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- }
+ }
//鐢熶骇璁㈠崟閫夊崟
function get_btnICMOBill() {
@@ -1245,7 +1296,7 @@
var hmainid = [];
//var HEntryID = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid)==-1) {
+ if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
}
}
@@ -1267,7 +1318,10 @@
if (isNaN(data[i]["HICMOInterID"])) {
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
- HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
+ if (isNaN(data[i]["HSourceID"])) {
+ return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ }
+ HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
}
$('#HProgressBar').html(`
<div class="layui-progress" lay-filter="demo-filter-progress">
@@ -1279,7 +1333,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
type: "GET",
- data: { "HICOMNum": HICOMNum.toString() },
+ data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
for (var i = 0; i < data1.data.length; i++) {
@@ -1329,7 +1383,7 @@
$('#HProgressBar').html('')
table.render(option);
-
+
} else {
//layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1408,7 +1462,7 @@
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
-
+
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -1445,7 +1499,7 @@
sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
- sPlanQty = option.data[i]["璁㈠崟鍙帓鏁伴噺"];
+ sPlanQty = option.data[i]["鎷嗗崟鏁伴噺"];
lHGroupID = option.data[i]["HGroupID"];
sGroupName = option.data[i]["HGroupName"];
lMaterID = option.data[i]["HMaterID"];
@@ -1693,7 +1747,7 @@
}
var TableData = [];
- function get_HFData(num,nums) {
+ function get_HFData(num, nums) {
if (num == 0) {
TableData = option.data;
} else {
@@ -1782,7 +1836,7 @@
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
@@ -1863,9 +1917,17 @@
//}
}
else {
- if (sLeftQty > parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"])) {
- grd.data[iRow][grd.cols[0][j].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
- sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
+ var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
+ var Numzu = dayWorkQty.toString().split(".");
+ if (Numzu.length > 1) {
+ dayWorkQty = parseInt(Numzu[0]) + 1;
+ } else {
+ dayWorkQty = parseInt(Numzu[0]);
+ }
+
+ if (sLeftQty > dayWorkQty) {
+ grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
+ sLeftQty = sLeftQty - dayWorkQty;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
@@ -1876,7 +1938,7 @@
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
//option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
//oSub = new ClsGridValues();
@@ -2081,7 +2143,7 @@
function set_Priority() {
var data = table.cache["mainTable"];
for (var i = 0; i < data.length; i++) {
- data[i]["浼樺厛绾�"] = (i + 1);
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
}
option.data = data;
table.render(option);
@@ -2089,7 +2151,41 @@
//鍑嗗鎺掑簭
function set_ReadyAsc() {
+ if (option.data.length != 0) {
+ for (var i = 0; i < option.data.length - 1; i++) {
+ for (var j = 0; j < option.data.length - i - 1; j++) {
+ var tables = [];
+ //鎸夌収璁″垝缁撴潫鏃ユ湡 鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟鏄庣粏琛屽彿鐨勯『搴忓幓鎺�
+ if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] > option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] == option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鍙�"] > option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["鐢熶骇璁㈠崟鍙�"] == option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] > option.data[j + 1]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ }
+ }
+ }
+ }
+ }
+ table.render(option);
+ }
+ else {
+ return layer.msg("鏃犳暟鎹�!")
+ }
}
//淇濆瓨
@@ -2099,8 +2195,11 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
- if (parseFloat(table.cache["mainTable"][i]["璁㈠崟鍙帓鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
- return layer.msg("绗�" + (i + 1) + "琛屾帓浜ф暟閲忚秴鍑鸿鍗曟暟閲�!");
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
+ return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
+ }
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
+ return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
new file mode 100644
index 0000000..a00c1ab
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -0,0 +1,896 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/echarts.min.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+
+ .cnt {
+ border: 1px solid #5FB878;
+ height: 50px;
+ border-radius: 5px;
+ /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/ /*璋锋瓕*/
+ }
+
+ .bottomright {
+ cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
+ transition: all 0.6s; /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
+ }
+
+ .bottomright:hover {
+ transform: scale(1.3); /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
+ }
+
+ .imgicon {
+ /*width: 50%;
+ height: 50px;*/
+ /*display: block;*/
+ /*text-align: center;
+ line-height: 50px;
+ float: left;*/
+ }
+
+ .imgtitle {
+ width: 70%;
+ height: 50px;
+ text-align: center;
+ display: block;
+ font-size: 15px;
+ float: left;
+ line-height: 50px;
+ }
+
+ .cns {
+ border: 1px solid #5FB878;
+ height: 130px;
+ border-radius: 5px;
+ }
+
+ .cns p {
+ font-size: 12px;
+ line-height: 18px;
+ margin: 0 5px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
+ .check1 {
+ cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
+ -webkit-transition: border linear .1s,-webkit-box-shadow linear .5s;
+ border-color: rgba(0,148, 255,.75);
+ -webkit-box-shadow: 0 0 18px rgba(0,148,255);
+ }
+
+ .prs {
+ font-family: "寰蒋闆呴粦";
+ font-weight: bold;
+ line-height: 30px;
+ margin: 0 0px 0px 10px;
+ float: left;
+ }
+
+ .layui-progress {
+ width: 45%;
+ float: left;
+ top: 6px;
+ }
+
+ .tr1-1, .tr1-2, .tr1-3, .tr1-4 {
+ margin-left: 3%;
+ margin-top: 4%;
+ height: 310px;
+ /*background-color: #99f6a733;*/
+ border: 1px solid rgb(0 0 0 / 10%);
+ width: 95%;
+ }
+ .btnM {
+ width: 30%;
+ height: 50px;
+ line-height: 50px;
+ float: left;
+ text-align:right;
+ }
+ </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-row">
+ <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 600px; overflow: scroll;"></div>
+ </div>
+ <div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
+
+ </div>
+ </div>
+ <div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <fieldset style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
+ <legend style="color: #5FB878">鎿嶄綔鍙�</legend>
+ <div class="content4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="OpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">寮�鏈�</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="OpenReport(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-list imgicon"></span>
+ </div>
+ <span class="imgtitle">鏁呴殰鐧昏</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="OpenEnd(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-logout imgicon"></span>
+ </div>
+ <span class="imgtitle">缁翠慨</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">鍋滄満</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">灞ュ巻</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">宸ヨ壓</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3 layui-inline">
+ <div class="tr1-1" id="mychart1"> </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <div class="tr1-2" id="mychart2"> </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <div class="tr1-3" id="mychart3"> </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <div class="tr1-4" id="mychart4"> </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], 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
+ , tree = layui.tree
+ var sWhere = "";
+ var wktag = 0;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ var mychart1 = echarts.init(document.getElementById('mychart1'));
+ var mychart2 = echarts.init(document.getElementById('mychart2'));
+ var mychart3 = echarts.init(document.getElementById('mychart3'));
+ var mychart4 = echarts.init(document.getElementById('mychart4'));
+ get_Histogram1(mychart1);//鏌辩姸鍥�1
+ get_LineChart(mychart2);//鎶樼嚎
+ get_Statistics(mychart3);//楗煎浘
+ get_Histogram4(mychart4);//鏌辩姸鍥�4
+
+ //鏌ヨ
+ get_Display_Tree();
+
+ }
+ //#endregion
+
+ function Check(sWhere) {
+ wktag = 0;
+ $("#btomleft").html("");
+ $.ajax({
+ url: GetWEBURL() + '/Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data) {
+
+ //var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
+ var LoadData1 = data.data.h_p_sc_HDeptSouceMOList;
+ //var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
+ if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
+ {
+
+ for (var i = 0; i < LoadData1.length; i++) {
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 6px;width: 135px;">';
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
+ html1 += '<dl>';
+ html1 += '<dd class="tcenter">';
+ html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
+ //HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp HInterID锛堝崟鎹富ID锛�
+ html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
+
+
+ html1 += '<p><span>浜х嚎锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].浜х嚎 + '</span></p>';
+ html1 += '<p><span>褰撳墠璁㈠崟锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].璁㈠崟 + '</span></p>';
+ html1 += '<p><span>浜ч噺锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
+ html1 += '<p><span>鐘舵�侊細</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
+ html1 += '<p><span>杩愯鏃堕暱锛�</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
+ html1 += '<p><span>缁翠慨鏃堕暱锛�</span><span>' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
+ html1 += '<p><span>绋煎姩鐜囷細</span><span>35%</span></p>';
+ html1 += '</dd>';
+ html1 += '</dl>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#btomleft").append(html1);
+ }
+ }
+ //if (LoadData2.length > 0) //褰撳墠鐘舵�佹暟鎹�
+ //{
+ // for (var i = 0; i < LoadData2.length; i++) {
+ // var html1 = '';
+ // html1 += '<div class="layui-col-sm12 layui-col-md12">';
+ // html1 += '<dl class="topright">;'
+ // html1 += '<dt>';
+ // html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
+ // html1 += '</dt>';
+ // html1 += '<dd>';
+ // html1 += '<h1><span>褰撳墠璁惧锛�</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
+ // html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span></h1>';
+ // html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span></h1>';
+ // html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span></h1>';
+ // html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
+ // if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
+ // html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
+ // }
+ // else {
+ // html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span></h1>';
+ // }
+ // html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
+ // html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
+ // html1 += '</dd>';
+ // html1 += '</dl>';
+ // html1 += '</div>';
+ // $("#topright").append(html1);
+ // }
+ //}
+ },
+ error: function (err) {
+ layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+ return false;
+ }
+ });
+
+
+ }
+
+
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
+ data: { "sWhere": sWhere },
+ type: "GET",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var HDeptID = 0;
+ if (data.id == "0") {
+
+ } else {
+ HDeptID = data.id ;
+ }
+ Check(HDeptID);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+
+ //鏌辩姸鍥�1
+ function get_Histogram1(mychart1) {
+
+ //鐢熶骇璐熻嵎
+ var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+ //$.ajax({
+ // url: GetWEBURL() + "/loaddata/KB_scfh",
+ // dataType: "JSON",
+ // async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ // type: "Get",
+ // data: { "LineCode": "1" },
+ // success: function (res) {
+
+ // for (var i = 0; i < res.data[0].length; i++) {
+ // if (res.data[0][i].HProcID == 191) {//缂稿巶
+ // optionData[0] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
+ // optionData[1] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
+ // optionData[2] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
+ // optionData[3] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
+ // optionData[4] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 197) {//琛ュ埛
+ // optionData[5] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
+ // optionData[6] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
+ // optionData[7] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
+ // optionData[8] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
+ // optionData[9] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // }
+ // }
+ //})
+
+ var option = {
+ xAxis: {
+ type: 'category',
+ data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ axisLabel: {
+ show: true,
+ interval: 0,
+ color: '#15b1fa',
+ formatter: function (value) {
+ var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+ var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
+ var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+ var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+ if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+ {
+ for (var i = 0; i < rowN; i++) {
+ var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
+ var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
+ var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
+ //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+ temp = value.substring(start, end) + "\n";
+ ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+ }
+ return ret;
+ }
+ else {
+ return value;
+ }
+ }
+ },
+ series: [
+ {
+ //data: optionData,
+ data: [23,14,45,56,12,35,64,34,62,75],
+ type: 'bar',
+ label: {
+ normal: {
+ show: true,
+ position: 'top',
+ formatter: function (params) {
+ return echarts.format.addCommas(params.value);
+ }
+ }
+ }
+ , itemStyle: {
+ // 璁剧疆鏌卞舰鐨勯鑹�
+ normal: {
+ color: '#15b1fa',
+ label: {
+ show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
+ }
+ },
+ }
+ }
+ ]
+ };
+ mychart1.setOption(option);
+ }
+
+ //鎶樼嚎鍥�
+ function get_LineChart(mychart2) {
+
+ //鐢熶骇鏁堢巼
+ //var res = PubRes;
+ var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //for (var i = 0; i < res.data[0].length; i++) {
+ // if (res.data[0][i].HProcID == 191) {//缂稿巶
+ // optionData[0] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
+ // optionData[1] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
+ // optionData[2] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
+ // optionData[3] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
+ // optionData[4] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 197) {//琛ュ埛
+ // optionData[5] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
+ // optionData[6] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
+ // optionData[7] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
+ // optionData[8] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
+ // optionData[9] = (res.data[0][i].OutHQty / 1000).toFixed(0);
+ // }
+ //}
+ ////鎵撳寘鍏ュ簱
+ //optionData[10] = (res.data[1][0].HQty / 1000).toFixed(0);
+
+ var option = {
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�', '鎵撳寘鍏ュ簱']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ legend: {
+ orient: 'vertical',
+ data: ['12', '43'],//璁剧疆绾挎潯鐨勫悕瀛�
+ right: 0,
+ top: 15,
+ textStyle: {
+ color: '#15b1fa' //璁剧疆瀛椾綋棰滆壊
+ }
+ },
+ axisLabel: {
+ show: true,
+ interval: 0,
+ color: '#15b1fa',
+ formatter: function (value) {
+ var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+ var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
+ var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+ var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+ if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+ {
+ for (var i = 0; i < rowN; i++) {
+ var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
+ var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
+ var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
+ //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+ temp = value.substring(start, end) + "\n";
+ ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+ }
+ return ret;
+ }
+ else {
+ return value;
+ }
+ }
+ },
+ series: [
+ {
+ name: '12',//涓巐egend瀵瑰簲
+ //data: optionData,
+ data: [23,43,56,45,67,46,35,46,23,34,35],
+ type: 'line',
+ label: {
+ normal: {
+ show: true,
+ position: 'top',
+ formatter: function (params) {
+ return echarts.format.addCommas(params.value);
+ }
+ }
+ },
+ smooth: true,//smooth灞炴�ч粯璁ゆ槸false false灏辨槸鐩寸嚎 true灏辨槸鏇茬嚎
+ lineStyle: {
+ color: '#15b1fa'
+ }
+ , itemStyle: {
+ // 璁剧疆绾挎潯涓婄偣鐨勯鑹诧紙鍜屽浘渚嬬殑棰滆壊锛�
+ normal: {
+ color: '#15b1fa',
+ label: {
+ show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
+ }
+ },
+ }, areaStyle: {}
+ },
+ {
+ name: '43',
+ data: [10, 10, 10, 10, 10, 10, 10, 10],
+ type: 'line',
+ smooth: true,//smooth灞炴�ч粯璁ゆ槸false false灏辨槸鐩寸嚎 true灏辨槸鏇茬嚎
+ lineStyle: {
+ color: '#90f083'
+ }
+ , itemStyle: {
+ // 璁剧疆绾挎潯涓婄偣鐨勯鑹诧紙鍜屽浘渚嬬殑棰滆壊锛�
+ normal: {
+ color: '#90f083',
+ label: {
+ show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
+ }
+ },
+ }, areaStyle: {}
+ }
+ ]
+ };
+
+
+ mychart2.setOption(option);
+ }
+
+ //楗煎浘
+ function get_Statistics(mychart3) {
+
+ const colorList = ['#5470c6', '#91cc75', '#fac858', '#ee6666'];
+ var option = {
+ title: [
+ {
+ text: '寮�鏈虹巼',
+ //subtext: NetQtys + '%',
+ subtext: 45 + '%',
+ textStyle: {
+ fontSize: 16,
+ color: '#999',
+ lineHeight: 20
+ },
+ subtextStyle: {
+ fontSize: 28,
+ color: '#00c6ff'
+ },
+ textAlign: 'center',
+ left: '50%',
+ top: '78%'
+ },
+ {
+ show: true,
+ text: '鐘舵�佸姣斿垎鏋�',
+ textStyle: {
+ color: '#00c6ff',
+ fontSize: '16',
+ },
+ textAlign: 'center',
+ left: '50%',
+ top: '0%'
+ }
+ ],
+ tooltip: {
+ trigger: 'item',
+ },
+ legend: {
+ type: 'scroll',
+ icon: 'pin',
+ top: '15%',
+ left: 'center',
+ textStyle: {
+ color: '#09d1ea'
+ }
+ },
+ color: colorList,
+ series: [
+ {
+ name: '鍗犳瘮',
+ type: 'pie',
+ radius: '50%',
+ center: ['50%', '50%'],
+ avoidLabelOverlap: false,
+ label: {
+ show: false
+ },
+ labelLine: {
+ show: false
+ },
+ data: [
+ { name: '寮�鏈�', value: 14 },
+ { name: '寮�宸�', value: 16 },
+ { name: '寰呮満', value: 23 },
+ { name: '缁翠慨涓�', value: 43 }
+ ],
+ }
+ ]
+ };
+
+ mychart3.setOption(option);
+ }
+
+ //鏌辩姸鍥�4
+ function get_Histogram4(mychart1) {
+
+ //鐢熶骇璐熻嵎
+ var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+ //$.ajax({
+ // url: GetWEBURL() + "/loaddata/KB_scfh",
+ // dataType: "JSON",
+ // async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ // type: "Get",
+ // data: { "LineCode": "1" },
+ // success: function (res) {
+
+ // for (var i = 0; i < res.data[0].length; i++) {
+ // if (res.data[0][i].HProcID == 191) {//缂稿巶
+ // optionData[0] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // } else if (res.data[0][i].HProcID == 193) {//鐑樺共瀹氬瀷
+ // optionData[1] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 194) {//涓婃祮瀹氬瀷
+ // optionData[2] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 198) {//鑹插澂鐑厜
+ // optionData[3] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 204) {//棰勭儷鍓�
+ // optionData[4] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 197) {//琛ュ埛
+ // optionData[5] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 201) {//鍗版瘺灏�
+ // optionData[6] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 200) {//鎷夊箙瀹氬瀷
+ // optionData[7] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 206) {//鐭嚎鐑�
+ // optionData[8] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // else if (res.data[0][i].HProcID == 205) {//闀跨嚎鐑�
+ // optionData[9] = (res.data[0][i].HQty / 1000).toFixed(0);
+ // }
+ // }
+ // }
+ //})
+
+ var option = {
+ xAxis: {
+ type: 'category',
+ data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ axisLabel: {
+ show: true,
+ interval: 0,
+ color: '#15b1fa',
+ formatter: function (value) {
+ var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+ var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
+ var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+ var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+ if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+ {
+ for (var i = 0; i < rowN; i++) {
+ var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
+ var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
+ var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
+ //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+ temp = value.substring(start, end) + "\n";
+ ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+ }
+ return ret;
+ }
+ else {
+ return value;
+ }
+ }
+ },
+ series: [
+ {
+ //data: optionData,
+ data: [23, 14, 45, 56, 12, 35, 64, 34, 62, 75],
+ type: 'bar',
+ label: {
+ normal: {
+ show: true,
+ position: 'top',
+ formatter: function (params) {
+ return echarts.format.addCommas(params.value);
+ }
+ }
+ }
+ , itemStyle: {
+ // 璁剧疆鏌卞舰鐨勯鑹�
+ normal: {
+ color: '#15b1fa',
+ label: {
+ show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
+ }
+ },
+ }
+ }
+ ]
+ };
+ mychart1.setOption(option);
+ }
+
+ });
+ //#endregion
+
+ //宸ュ崟鍒楄〃閫変腑
+ function CheckBtom(obj, i) {
+ //var partid = $(obj).parent().attr("id"); //鑾峰彇鐖剁骇id
+ workcode = $("#wk" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
+ HBillType = $("#ty" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(鍗曟嵁绫诲瀷)
+ HSourceInterID = $("#sm" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟涓诲唴鐮�)
+ HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
+ HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
+ HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
+ HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+ HMaterName = $("#ptn" + i + "").html(); //浜у搧鍚嶇О
+
+ $('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ $("#bs" + i + "").addClass('check1'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
+ if (workcode != "" && workcode != null) {
+ wktag = 1;
+ }
+ }
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index 0685ca1..b3fd9c1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -376,6 +376,9 @@
}
+
+
+
//闅愯棌鍒楄缃�
function get_HideColumn(value) {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html"
new file mode 100644
index 0000000..9ba7f25
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html"
@@ -0,0 +1,487 @@
+锘�<!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">
+ <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>
+</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" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" 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" style="margin-left:30px">
+ <label class="layui-form-label">榻愬鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HComplete" id="HComplete" lay-filter="HComplete">
+ <option value="">鍏ㄩ儴</option>
+ <option value="榻愬">榻愬</option>
+ <option value="鏈綈濂�">鏈綈濂�</option>
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掓棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
+ </div>
+ </div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--<div class="layui-row" style="margin-top:10px;">
+ <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" style="display: inline-block;">
+ </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="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 100px;">鏈夋棤閲囪喘璁㈠崟</label>
+ <div class="layui-input-block" style="width: 190px; margin-left: 130px;">
+ <select name="" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="鏈夐噰璐鍗�">鏈夐噰璐鍗�</option>
+ <option value="鏃犻噰璐鍗�">鏃犻噰璐鍗�</option>
+ </select>
+ </div>
+ </div>
+ </div>-->
+ <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <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="HMaterModel" id="HMaterModel" style="display: inline-block;">
+ </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="" id="">
+ </div>
+ </div>
+ </div>-->
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], 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
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ var HMaterID = 0;//鐗╂枡
+ var HModName = "JIT_CompleteMaterlDetailList";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HMaterID = params[params[1]];
+ }
+
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鐗╂枡
+ form.on('submit(btnHMaterNumber)', function (data) {
+ btnHMaterNumber();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ //鏌ヨ
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Complete/JIT_CompleteMaterlDetailList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(ajaxLoad);
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ 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 });
+ }
+ }
+ }
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ //for (var i in res.data) {
+ // var item = res.data[i];
+
+ // if (item["榻愬鐘舵��"] == "鏈綈濂�") {
+ // $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ // }
+ //}
+ }
+ };
+ option.cols = [col];
+ option.data = result.data;
+ table.render(option);
+
+ DisPlay_HideColumn();
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HMaterID = $("#HMaterID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterModel = $("#HMaterModel").val();
+ var HComplete = $("#HComplete").val();
+ var HPlanDate = $("#HPlanDate").val();
+ var HICMOBillNo = $("#HICMOBillNo").val();
+
+ if (HMaterID!="0") {
+ sWhere += HMaterID;
+ }
+ //if (HMaterNumber) {
+ // sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ //}
+ //if (HMaterName) {
+ // sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ //}
+ //if (HMaterModel) {
+ // sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
+ //}
+ //if (HComplete) {
+ // sWhere += " and 榻愬鐘舵�� = '" + HComplete + "'";
+ //}
+ //if (HPlanDate) {
+ // sWhere += " and 鏃ヨ鍒掓棩鏈� = '" + HPlanDate + "'";
+ //}
+ //if (HICMOBillNo) {
+ // sWhere += " and 鐢熶骇璁㈠崟鍙� = '" + HICMOBillNo + "'";
+ //}
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMaterID").val("0");
+ $("#HMaterNumber").val("");
+ $('#HComplete').val("");
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鐗╂枡鍒楄〃
+ function btnHMaterNumber() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn(value) {
+ var colName = "";
+
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ var contentUrl = "";
+ 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);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹� 鐗╂枡淇℃伅
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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 });
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ 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/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 6729c89..1efd432 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"
@@ -662,6 +662,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
+ debugger;
var rowdata = [];
var option = [];
@@ -1750,7 +1751,7 @@
table.render(option);
//妫�楠屽��
option_Value.data = rowdata_Value;
- console.log(JSON.stringify(option_Value.data));
+ //console.log(JSON.stringify(option_Value.data));
table.render(option_Value);
//================================================
for (var i = 1; i <= result.data.length; i++) {
@@ -2310,21 +2311,15 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
-
- //set_SaveValue(dataindex + 1);
- //if (isHavingCount == false) {
- // //鍒锋柊妫�楠屽�艰〃鏍�
- // option_Value.data = [{
- // "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- // }];
- // table.render(option_Value);
- //}
-
+
if (OperationType == 3) {
set_SaveValue(Number(nowindex) + Number(1));
} else {
set_SaveValue(dataindex + 1);
}
+
+ //璧嬪�间笌鍥炴樉
+ Assignment(nowindex, dataindex);
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -2335,11 +2330,7 @@
//鍒锋柊妫�楠屽�艰〃鏍�
option_Value.data = row_value;
table.render(option_Value);
- console.log(option_Value.data);
}
-
- //璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 3f7283c..228c98e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1863,7 +1863,7 @@
table.render(option);
//妫�楠屽��
option_Value.data = rowdata_Value;
- console.log(JSON.stringify(option_Value.data));
+ //console.log(JSON.stringify(option_Value.data));
table.render(option_Value);
//================================================
for (var i = 1; i <= result.data.length; i++) {
@@ -2445,6 +2445,8 @@
} else {
set_SaveValue(dataindex + 1);
}
+ //璧嬪�间笌鍥炴樉
+ Assignment(nowindex, dataindex);
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -2456,8 +2458,6 @@
option_Value.data = row_value;
table.render(option_Value);
}
- //璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html"
new file mode 100644
index 0000000..5b3034a
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html"
@@ -0,0 +1,850 @@
+锘�<!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>
+ <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">
+ <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="date" class="layui-input" id="HBeginDate" style="width:160px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:160px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭</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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <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="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
+ </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="HUpLoad" id="HUpLoad">
+ </div>
+ </div>
+ </div>
+ <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="HCheckItem" id="HCheckItem">
+ </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" id="HUnitName">
+ </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" id="HStandard" >
+ </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" id="HDownLoad">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px;display:none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="histogram_Avg" style="width:99.5%;height:calc(35vh);margin-top:5px;">
+
+ </div>
+ <div id="histogram_Diff" style="width:99.5%;height:calc(35vh);margin-top:5px;">
+
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_FirstPieceCheckReport_ZDQX";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region銆愭姌绾垮浘銆�
+ //骞冲潎鍊�
+ var chartDom = document.getElementById('histogram_Avg');
+ var myChart = echarts.init(chartDom);
+ var option_ZXT_Avg;
+
+ let H_X = [];//x杞存爣棰�
+ let HAvg = [];//骞冲潎鍊�
+
+ for (let i = 1; i <= 25; i++) {
+ H_X.push(i);
+ }
+
+ for (let j = 1; j <= 25; j++) {
+ var avg = 0;
+ for (let i = 0; i < option.data.length; i++) {
+ avg += Number(option.data[i][j]);
+ }
+ avg = avg / option.data.length;
+ HAvg.push(avg.toFixed(2));
+ }
+
+ option_ZXT_Avg = {
+ grid: {
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: H_X
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: HAvg,
+ type: 'line',
+ areaStyle: {//濉厖鐨勯鑹�
+ color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
+ type: 'linear',
+ x: 0,
+ y: 1,
+ x2: 0,
+ y2: 0,
+ colorStops: [{
+ offset: 0, color: 'rgba(232,247,247)' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: 'rgba(183,252,252)' // 100% 澶勭殑棰滆壊
+ }],
+ globalCoord: false// 缂虹渷涓� false
+ }
+ },
+ markLine: {
+ symbol: 'none',//鍘绘帀绠ご
+ data: [
+ { type: 'max', name: 'Max', lineStyle: { color: 'red' }},
+ { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
+ { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
+ ]
+ },
+ }
+ ]
+ };
+ option_ZXT_Avg && myChart.setOption(option_ZXT_Avg);
+
+ //宸��
+ var chartDom = document.getElementById('histogram_Diff');
+ var myChart = echarts.init(chartDom);
+ var option_ZXT_Diff;
+
+ let HDifference = [];//宸��
+ var HArr = []; //瑁呮楠屽��
+
+ for (let j = 1; j <= 25; j++) {
+ HArr = [];
+ for (let i = 0; i < option.data.length; i++) {
+ HArr.push(option.data[i][j]);
+ }
+ var HMaxValue = Math.max(...HArr);//鑾峰彇鏁扮粍涓殑鏈�澶у��
+ var HMinValue = Math.min(...HArr);//鑾峰彇鏁扮粍涓殑鏈�灏忓��
+ HDifference.push(Number(HMaxValue) - Number(HMinValue));
+ }
+
+
+ option_ZXT_Diff = {
+ grid: {
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: H_X
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: HDifference,
+ type: 'line',
+ areaStyle: {//濉厖鐨勯鑹�
+ color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
+ type: 'linear',
+ x: 0,
+ y: 1,
+ x2: 0,
+ y2: 0,
+ colorStops: [{
+ offset: 0, color: 'rgba(255,240,170,0)' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: 'rgba(255,240,170,1)' // 100% 澶勭殑棰滆壊
+ }],
+ globalCoord: false// 缂虹渷涓� false
+ }
+ },
+ markLine: {
+ symbol: 'none',//鍘绘帀绠ご
+ data: [
+ { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
+ { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
+ { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
+ ]
+ },
+ }
+ ]
+ };
+ option_ZXT_Diff && myChart.setOption(option_ZXT_Diff);
+
+ //#endregion
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+
+ //杞﹂棿寮圭獥
+ form.on('submit(HWorkShopList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '杞﹂棿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWorkShopName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ ////鐗╂枡
+ //form.on('submit(btnHMaterID)', function (data) {
+ // get_btnHMaterID();
+ //});
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Dept();
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ //get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-430'
+ //, page: true
+ , totalRow: true
+ , cellMinWidth: 70
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鈭慩' }
+ ,{ field: 'xh', title: '搴忓彿' }
+ , { field: '1', title: '1' , totalRow: true}
+ , { field: '2', title: '2' , totalRow: true}
+ , { field: '3', title: '3' , totalRow: true}
+ , { field: '4', title: '4' , totalRow: true}
+ , { field: '5', title: '5' , totalRow: true}
+ , { field: '6', title: '6' , totalRow: true}
+ , { field: '7', title: '7' , totalRow: true}
+ , { field: '8', title: '8' , totalRow: true}
+ , { field: '9', title: '9', totalRow: true}
+ , { field: '10', title: '10' , totalRow: true}
+ , { field: '11', title: '11' , totalRow: true}
+ , { field: '12', title: '12' , totalRow: true}
+ , { field: '13', title: '13' , totalRow: true}
+ , { field: '14', title: '14' , totalRow: true}
+ , { field: '15', title: '15' , totalRow: true}
+ , { field: '16', title: '16' , totalRow: true}
+ , { field: '17', title: '17' , totalRow: true}
+ , { field: '18', title: '18' , totalRow: true}
+ , { field: '19', title: '19' , totalRow: true}
+ , { field: '20', title: '20' , totalRow: true}
+ , { field: '21', title: '21' , totalRow: true}
+ , { field: '22', title: '22' , totalRow: true}
+ , { field: '23', title: '23' , totalRow: true}
+ , { field: '24', title: '24' , totalRow: true}
+ , { field: '25', title: '25', totalRow: true}
+ ]]
+ , data: []
+ }
+ var sj = [];
+ for (let i = 0; i < 5; i++) {
+ var obj = {
+ xh : i+1,
+ 1: (Math.random() * (15 - 13) ).toFixed(2),
+ 2: (Math.random() * (15 - 13) ).toFixed(2),
+ 3: (Math.random() * (15 - 13) ).toFixed(2),
+ 4: (Math.random() * (15 - 13) ).toFixed(2),
+ 5: (Math.random() * (15 - 13) ).toFixed(2),
+ 6: (Math.random() * (15 - 13) ).toFixed(2),
+ 7: (Math.random() * (15 - 13) ).toFixed(2),
+ 8: (Math.random() * (15 - 13) ).toFixed(2),
+ 9: (Math.random() * (15 - 13) ).toFixed(2),
+ 10: (Math.random() * (15 - 13) ).toFixed(2),
+ 11: (Math.random() * (15 - 13) ).toFixed(2),
+ 12: (Math.random() * (15 - 13) ).toFixed(2),
+ 13: (Math.random() * (15 - 13) ).toFixed(2),
+ 14: (Math.random() * (15 - 13) ).toFixed(2),
+ 15: (Math.random() * (15 - 13) ).toFixed(2),
+ 16: (Math.random() * (15 - 13) ).toFixed(2),
+ 17: (Math.random() * (15 - 13) ).toFixed(2),
+ 18: (Math.random() * (15 - 13) ).toFixed(2),
+ 19: (Math.random() * (15 - 13) ).toFixed(2),
+ 20: (Math.random() * (15 - 13) ).toFixed(2),
+ 21: (Math.random() * (15 - 13) ).toFixed(2),
+ 22: (Math.random() * (15 - 13) ).toFixed(2),
+ 23: (Math.random() * (15 - 13) ).toFixed(2),
+ 24: (Math.random() * (15 - 13) ).toFixed(2),
+ 25: (Math.random() * (15 - 13) ).toFixed(2)
+ };
+ sj.push(obj);
+ }
+ //var FH = ['鈭慩','X','R']
+ //for (let i = 0; i < 3;i++) {
+ // var obj = {
+ // xh: FH[i],
+ // 1: (Math.random() * (15 - 13)).toFixed(2),
+ // 2: (Math.random() * (15 - 13)).toFixed(2),
+ // 3: (Math.random() * (15 - 13)).toFixed(2),
+ // 4: (Math.random() * (15 - 13)).toFixed(2),
+ // 5: (Math.random() * (15 - 13)).toFixed(2),
+ // 6: (Math.random() * (15 - 13)).toFixed(2),
+ // 7: (Math.random() * (15 - 13)).toFixed(2),
+ // 8: (Math.random() * (15 - 13)).toFixed(2),
+ // 9: (Math.random() * (15 - 13)).toFixed(2),
+ // 10: (Math.random() * (15 - 13)).toFixed(2),
+ // 11: (Math.random() * (15 - 13)).toFixed(2),
+ // 12: (Math.random() * (15 - 13)).toFixed(2),
+ // 13: (Math.random() * (15 - 13)).toFixed(2),
+ // 14: (Math.random() * (15 - 13)).toFixed(2),
+ // 15: (Math.random() * (15 - 13)).toFixed(2),
+ // 16: (Math.random() * (15 - 13)).toFixed(2),
+ // 17: (Math.random() * (15 - 13)).toFixed(2),
+ // 18: (Math.random() * (15 - 13)).toFixed(2),
+ // 19: (Math.random() * (15 - 13)).toFixed(2),
+ // 20: (Math.random() * (15 - 13)).toFixed(2),
+ // 21: (Math.random() * (15 - 13)).toFixed(2),
+ // 22: (Math.random() * (15 - 13)).toFixed(2),
+ // 23: (Math.random() * (15 - 13)).toFixed(2),
+ // 24: (Math.random() * (15 - 13)).toFixed(2),
+ // 25: (Math.random() * (15 - 13)).toFixed(2)
+ // };
+ // sj.push(obj);
+ //}
+ option.data = sj;
+
+
+ table.render(option);
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/ProblemType',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
+ var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
+ var HWorkShopID = $("#HDeptName").val();//杞﹂棿
+ var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HState = $("#HState").val();//鐘舵��
+ var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
+ var HOrgID = sessionStorage["OrganizationID"];
+ var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var sWhere1 = "";
+ 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;
+ }
+ sWhere1 += " and " + ColName + " " + com;
+ }
+
+ if (checkWRuku) {
+ checkWRuku = 1;
+ } else {
+ checkWRuku = 0;
+ }
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HICMOBillNo: HICMOBillNo
+ , HWorkShopID: HWorkShopID
+ , F_BSV_WYID: F_BSV_WYID
+ , HMaterNumber: HMaterNumber
+ , HOrgID: HOrgID
+ , HBillNo: HBillNo
+ , IsTrue: checkWRuku
+ , HState: HState
+ , HSTATUS: HSTATUS
+ , sWhere1: sWhere1
+ }
+
+ //get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ $("#HICMOBillNo").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HName").val("");
+ $("#HBillNo").val("");
+ $("#HMaterNumber").val("");
+ $("#F_BSV_WYID").val("");
+ $("#HState").val("0")
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("input[name='checkWRuku']").prop("checked", false);
+ form.render()
+ sWhere = "";
+ }
+
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (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 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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');
+ }
+
+
+ //#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/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZTFB.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZTFB.html"
new file mode 100644
index 0000000..bb54e97
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZTFB.html"
@@ -0,0 +1,1031 @@
+锘�<!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>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+ <script src="https://unpkg.com/mathjs/lib/browser/math.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">
+ <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="date" class="layui-input" id="HBeginDate" style="width:160px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:160px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭</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:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <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="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
+ </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="HUpLoad" id="HUpLoad">
+ </div>
+ </div>
+ </div>
+ <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="HCheckItem" id="HCheckItem">
+ </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" id="HUnitName">
+ </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" id="HStandard">
+ </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" id="HDownLoad">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px;display:none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div style="width:99.5%;height:calc(26vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="histogram_Avg" style="width:99.5%;height:calc(50vh);margin-top:5%;">
+
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = "QC_FirstPieceCheckReport_ZTFB";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region銆愭煴鐘跺浘銆�
+ var chartDom = document.getElementById('histogram_Avg');
+ var myChart = echarts.init(chartDom);
+ var option_ZXT_Avg;
+
+ var app = {};
+
+ //姝ｆ�佸垎甯冭绠�
+ function func(x, u, a) {
+ return (
+ (1 / Math.sqrt(2 * Math.PI)) *
+ a *
+ Math.exp((-1 * ((x - u) * (x - u))) / (2 * a * a))
+ );
+ }
+
+ var data = [];
+ //for (let j = 1; j <= 25; j++) {
+ // var avg = 0;
+ // for (let i = 0; i < option.data.length; i++) {
+ // avg += Number(option.data[i][j]);
+ // }
+ // //avg = avg / option.data.length;
+ // data.push(avg.toFixed(2));
+ //}
+
+ for (let i = 0; i < option.data.length;i++) {
+ for (let j = 1; j <= 25; j++) {
+ data.push(option.data[i][j])
+ }
+ }
+
+ //console.log("Min:" + Math.min(...data));
+ //console.log("Max:" + Math.max(...data));
+ var xMin = Math.trunc(Math.min(...data)); //LowLimit
+ var xMax = Math.max(...data) + 1; //UpLimit
+ var mean = math.mean(data); //骞冲潎鍊� 璁＄畻鏂规硶鏉ヨ嚜math.js
+ var stdev = math.std(data); //鏂瑰樊
+ var threeSigLow = mean - 3 * stdev;
+ var threeSigUp = mean + 3 * stdev;
+
+ //鏁版嵁鍗囧簭鎺掑簭
+ const dataSec = data.sort((a, b) => {
+ return a - b;
+ });
+ //璁＄畻棰戞暟
+ var resNum = {};
+ for (var m = 0; m < dataSec.length; m++) {
+ var key = parseFloat(dataSec[m]);
+ if (parseFloat(key) === 0) continue;
+ if (resNum[key]) resNum[key] += 1;
+ else resNum[key] = 1;
+ }
+ var xArr = []; //妯潗鏍囧��
+ var fArr = []; //棰戞暟
+ var yArr = []; //姝ｆ�佸��
+
+ for (var k in resNum) {
+ xArr.push(parseFloat(k));
+ }
+ xArr = xArr.sort((a, b) => {
+ return a - b;
+ });
+ //console.log(xArr);
+
+ //璁＄畻x鍊煎搴旂殑棰戞暟
+ for (var i = 0; i < xArr.length; i++) {
+ var xNy = [xArr[i], resNum[xArr[i]]];
+ fArr.push(xNy);
+ }
+
+ //璁＄畻x鍊煎搴旂殑姝ｆ�佸垎甯冨��
+ var distance = xMax - xMin; //涓轰簡鏇村ソ鐪嬶紝璁剧疆姝ｆ�佹洸绾胯捣姝綅缃�
+ for (var j = xMin ; j < xMax ; j += 0.01) {
+ var xy = [j, func(j, mean, stdev)];
+ yArr.push(xy);
+ }
+
+ option_ZXT_Avg = {
+ //backgroundColor: "#12141e",
+ tooltip: {
+ trigger: "axis",
+ axisPointer: {
+ type: "shadow"
+ }
+ },
+ legend: {
+ orient: "vertical",
+ x: "right",
+ y: "top",
+ top: "5px",
+ data: ["棰戞暟", "姝ｆ�佸垎甯�"],
+ //textStyle: {
+ // color: "rgba(255,255,255,1)",
+ // fontSize: "12"
+ //}
+ },
+ grid: {
+ left: "2%",
+ top: "18px",
+ right: "2%",
+ bottom: "2%",
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: "value",
+ min: xMin,
+ max: xMax,
+ //axisLabel: {
+ // textStyle: {
+ // color: "rgba(255,255,255,1)",
+ // fontSize: 10
+ // }
+ //},
+ //axisLine: {
+ // show: true,
+ // lineStyle: {
+ // color: "rgba(255,255,255,1)"
+ // }
+ //},
+ splitLine: {
+ show: false
+ }
+ }
+ ],
+ yAxis: [
+ {
+ type: "value", //鏁板�艰酱
+ name: "姝ｆ�佹洸绾�",
+ position: "right",
+ axisTick: { show: true },
+ //axisLine: {
+ // show: false,
+ // lineStyle: {
+ // color: "rgba(255,255,255,1)"
+ // }
+ //},
+ //axisLabel: {
+ // show: true,
+ // textStyle: {
+ // color: "rgba(255,255,255,1)",
+ // fontSize: 10
+ // }
+ //},
+ splitLine: {
+ show: false
+ }
+ },
+ {
+ type: "value",
+ name: "棰戞暟",
+ position: "left",
+ //axisLabel: {
+ // //formatter: '{value} %'
+ // show: true,
+ // textStyle: {
+ // color: "rgba(255,255,255,1)",
+ // fontSize: "12"
+ // }
+ //},
+ axisTick: {
+ show: true
+ },
+ //axisLine: {
+ // show: true,
+ // lineStyle: {
+ // color: "rgba(0,0,0,.1)",
+ // width: 1,
+ // type: "solid"
+ // }
+ //},
+ splitLine: {
+ lineStyle: {
+ color: "rgba(255,255,255,.3)"
+ }
+ }
+ }
+ ],
+ series: [
+ //鏇茬嚎
+ {
+ name: "姝ｆ�佸垎甯�",
+ type: "line",
+ smooth: true,
+ yAxisIndex: 0,
+ symbol: "circle",
+ symbolSize: 5,
+ showSymbol: false,
+ lineStyle: {
+ normal: {
+ color: "red",
+ width: 2
+ }
+ },
+
+ itemStyle: {
+ normal: {
+ color: "#ceb664",
+ borderColor: "rgba(221, 220, 107, .1)",
+ borderWidth: 10
+ }
+ },
+ data: yArr,
+ markLine: {
+ symbol: ["none"],
+ lineStyle: {
+ type: "dotted",
+ color: "red"
+ },
+ itemStyle: {
+ normal: {
+ show: true,
+ color: "black"
+ }
+ },
+ label: {
+ show: true,
+ position: "end"
+ },
+ data: [
+ {
+ name: "Lower Spec",
+ xAxis: threeSigLow.toFixed(2),
+ label: {
+ show: true,
+ formatter: "Lower Spec"
+ },
+ lineStyle: {
+ opacity: (xMin > threeSigLow) ? 0 : 1
+ }
+ },
+ {
+ name: "Upper Spec",
+ xAxis: threeSigUp.toFixed(2),
+ label: {
+ show: true,
+ formatter: "Upper Spec"
+ },
+ lineStyle: {
+ opacity: (xMax < threeSigUp) ? 0 : 1
+ }
+ }
+ ]
+ }
+ },
+ //鏌辩姸鍥�
+ {
+ name: "棰戞暟",
+ type: "bar",
+ yAxisIndex: 1,
+ xAxisIndex: 0,
+ barWidth: 10,
+ barGap: 1,
+ symbol: "solid",
+ symbolSize: 5,
+ showSymbol: true,
+ itemStyle: {
+ normal: {
+ color: "#0184d5",
+ opacity: 1,
+ barBorderRadius: 3
+ }
+ },
+ data: fArr,
+ markLine: {
+ symbol: ["none"],
+ lineStyle: {
+ type: "dotted",
+ color: "red"
+ },
+ itemStyle: {
+ normal: {
+ show: true,
+ color: "black"
+ }
+ },
+ label: {
+ show: true,
+ position: "middle"
+ },
+ data: [
+ {
+ name: "LowLimit",
+ xAxis: xMin.toFixed(2),
+ label: {
+ show: true,
+ formatter: "Low"
+ }
+ },
+ {
+ name: "High",
+ xAxis: xMax.toFixed(2),
+ label: {
+ show: true,
+ formatter: "High"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ };
+
+ option_ZXT_Avg && myChart.setOption(option_ZXT_Avg);
+ //#endregion
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ 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();
+ });
+
+ //杞﹂棿寮圭獥
+ form.on('submit(HWorkShopList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '杞﹂棿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWorkShopName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ ////鐗╂枡
+ //form.on('submit(btnHMaterID)', function (data) {
+ // get_btnHMaterID();
+ //});
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Dept();
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ //get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-520'
+ //, page: true
+ , totalRow: true
+ , cellMinWidth: 70
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鈭慩' }
+ ,{ field: 'xh', title: '搴忓彿' }
+ , { field: '1', title: '1' , totalRow: true}
+ , { field: '2', title: '2' , totalRow: true}
+ , { field: '3', title: '3' , totalRow: true}
+ , { field: '4', title: '4' , totalRow: true}
+ , { field: '5', title: '5' , totalRow: true}
+ , { field: '6', title: '6' , totalRow: true}
+ , { field: '7', title: '7' , totalRow: true}
+ , { field: '8', title: '8' , totalRow: true}
+ , { field: '9', title: '9', totalRow: true}
+ , { field: '10', title: '10' , totalRow: true}
+ , { field: '11', title: '11' , totalRow: true}
+ , { field: '12', title: '12' , totalRow: true}
+ , { field: '13', title: '13' , totalRow: true}
+ , { field: '14', title: '14' , totalRow: true}
+ , { field: '15', title: '15' , totalRow: true}
+ , { field: '16', title: '16' , totalRow: true}
+ , { field: '17', title: '17' , totalRow: true}
+ , { field: '18', title: '18' , totalRow: true}
+ , { field: '19', title: '19' , totalRow: true}
+ , { field: '20', title: '20' , totalRow: true}
+ , { field: '21', title: '21' , totalRow: true}
+ , { field: '22', title: '22' , totalRow: true}
+ , { field: '23', title: '23' , totalRow: true}
+ , { field: '24', title: '24' , totalRow: true}
+ , { field: '25', title: '25', totalRow: true}
+ ]]
+ , data: []
+ }
+ var sj = [];
+ for (let i = 0; i < 5; i++) {
+ var obj = {
+ xh: i + 1,
+ 1:fullClose(5.25, 6.39).toFixed(2),
+ 2:fullClose(5.25, 6.39).toFixed(2),
+ 3:fullClose(5.25, 6.39).toFixed(2),
+ 4:fullClose(5.25, 6.39).toFixed(2),
+ 5:fullClose(5.25, 6.39).toFixed(2),
+ 6:fullClose(5.25, 6.39).toFixed(2),
+ 7:fullClose(5.25, 6.39).toFixed(2),
+ 8:fullClose(5.25, 6.39).toFixed(2),
+ 9:fullClose(5.25, 6.39).toFixed(2),
+ 10:fullClose(5.25, 6.39).toFixed(2),
+ 11:fullClose(5.25, 6.39).toFixed(2),
+ 12:fullClose(5.25, 6.39).toFixed(2),
+ 13:fullClose(5.25, 6.39).toFixed(2),
+ 14:fullClose(5.25, 6.39).toFixed(2),
+ 15:fullClose(5.25, 6.39).toFixed(2),
+ 16:fullClose(5.25, 6.39).toFixed(2),
+ 17:fullClose(5.25, 6.39).toFixed(2),
+ 18:fullClose(5.25, 6.39).toFixed(2),
+ 19:fullClose(5.25, 6.39).toFixed(2),
+ 20:fullClose(5.25, 6.39).toFixed(2),
+ 21:fullClose(5.25, 6.39).toFixed(2),
+ 22:fullClose(5.25, 6.39).toFixed(2),
+ 23:fullClose(5.25, 6.39).toFixed(2),
+ 24:fullClose(5.25, 6.39).toFixed(2),
+ 25:fullClose(5.25, 6.39).toFixed(2)
+ };
+ sj.push(obj);
+ }
+ //var FH = ['鈭慩','X','R']
+ //for (let i = 0; i < 3;i++) {
+ // var obj = {
+ // xh: FH[i],
+ // 1: (Math.random() * (15 - 13)).toFixed(2),
+ // 2: (Math.random() * (15 - 13)).toFixed(2),
+ // 3: (Math.random() * (15 - 13)).toFixed(2),
+ // 4: (Math.random() * (15 - 13)).toFixed(2),
+ // 5: (Math.random() * (15 - 13)).toFixed(2),
+ // 6: (Math.random() * (15 - 13)).toFixed(2),
+ // 7: (Math.random() * (15 - 13)).toFixed(2),
+ // 8: (Math.random() * (15 - 13)).toFixed(2),
+ // 9: (Math.random() * (15 - 13)).toFixed(2),
+ // 10: (Math.random() * (15 - 13)).toFixed(2),
+ // 11: (Math.random() * (15 - 13)).toFixed(2),
+ // 12: (Math.random() * (15 - 13)).toFixed(2),
+ // 13: (Math.random() * (15 - 13)).toFixed(2),
+ // 14: (Math.random() * (15 - 13)).toFixed(2),
+ // 15: (Math.random() * (15 - 13)).toFixed(2),
+ // 16: (Math.random() * (15 - 13)).toFixed(2),
+ // 17: (Math.random() * (15 - 13)).toFixed(2),
+ // 18: (Math.random() * (15 - 13)).toFixed(2),
+ // 19: (Math.random() * (15 - 13)).toFixed(2),
+ // 20: (Math.random() * (15 - 13)).toFixed(2),
+ // 21: (Math.random() * (15 - 13)).toFixed(2),
+ // 22: (Math.random() * (15 - 13)).toFixed(2),
+ // 23: (Math.random() * (15 - 13)).toFixed(2),
+ // 24: (Math.random() * (15 - 13)).toFixed(2),
+ // 25: (Math.random() * (15 - 13)).toFixed(2)
+ // };
+ // sj.push(obj);
+ //}
+ option.data = sj;
+
+
+ table.render(option);
+ }
+
+ //鍙栧緱[n,m]鑼冨洿闅忔満鏁�
+ function fullClose(n, m) {
+ var result = Math.random() * (m + 1 - n) + n;
+ while (result > m) {
+ result = Math.random() * (m + 1 - n) + n;
+ }
+ return result;
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/ProblemType',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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 });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
+ var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
+ var HWorkShopID = $("#HDeptName").val();//杞﹂棿
+ var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HState = $("#HState").val();//鐘舵��
+ var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
+ var HOrgID = sessionStorage["OrganizationID"];
+ var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var sWhere1 = "";
+ 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;
+ }
+ sWhere1 += " and " + ColName + " " + com;
+ }
+
+ if (checkWRuku) {
+ checkWRuku = 1;
+ } else {
+ checkWRuku = 0;
+ }
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HICMOBillNo: HICMOBillNo
+ , HWorkShopID: HWorkShopID
+ , F_BSV_WYID: F_BSV_WYID
+ , HMaterNumber: HMaterNumber
+ , HOrgID: HOrgID
+ , HBillNo: HBillNo
+ , IsTrue: checkWRuku
+ , HState: HState
+ , HSTATUS: HSTATUS
+ , sWhere1: sWhere1
+ }
+
+ //get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ $("#HICMOBillNo").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HName").val("");
+ $("#HBillNo").val("");
+ $("#HMaterNumber").val("");
+ $("#F_BSV_WYID").val("");
+ $("#HState").val("0")
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("input[name='checkWRuku']").prop("checked", false);
+ form.render()
+ sWhere = "";
+ }
+
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (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 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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');
+ }
+
+
+ //#endregion
+ });
+ </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\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
new file mode 100644
index 0000000..225bde8
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -0,0 +1,740 @@
+锘�<!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">
+ <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>
+</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="set_AddNew" id="set_AddNew">鏂板</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave_BL" id="btnSave_BL">涓嶈壇鍝佷繚瀛�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave_BF" id="btnSave_BF">鎶ュ簾淇濆瓨</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">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HBarCodeSN" lay-verify="HBarCodeSN" id="HBarCodeSN" style="width:500px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">褰撳墠杞﹂棿<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇鍘熷洜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HBadReasonName" name="HBadReasonName" id="HBadReasonName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HBadReasonID" name="HBadReasonID" id="HBadReasonID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadReason" id="btnHBadReason" 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" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" 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 class="layui-row">
+ <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HBillNo_bak" id="HBillNo_bak" lay-verify="HBillNo_bak">
+ </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="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐ㄦ鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" 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 class="layui-row">
+ <!--<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" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0">
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HAddr" name="HAddr" id="HAddr" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧SN</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
+ <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0" >
+ </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="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+ <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" 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 class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
+ <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
+ </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" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HModel" id="HModel" lay-verify="HModel" placeholder="璇疯緭鍏ュ唴瀹�" >
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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="HMaker" id="HMaker" style="background-color:#efefef4d;" 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="hchecker" id="hchecker" style="background-color:#efefef4d;" 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="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="hmakedate" id="hmakedate" style="background-color:#efefef4d;" 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="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" 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="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="" id="" style="background-color:#efefef4d;" 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="hupdater" id="hupdater" style="background-color:#efefef4d;" 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="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="" id="" style="background-color:#efefef4d;" 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="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" 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="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃堕棿鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
+ <option value="灏忔椂">灏忔椂</option>
+ <option value="澶�">澶�</option>
+ <option value="澶�">澶�</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="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
+ </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" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" 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;">鎴愬搧缂栧彿</label>
+ <div class="layui-input-block" style="margin-left: 115px;">
+ <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 185px;">
+ <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+ <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </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-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="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="btn_Refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊娴佹按鍙�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+
+ 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 HModName = "Cj_CollectionOfSingleProductDefects";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HBillSubType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //$("#HIDDEN").hide();
+ OperationType = 1;
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3717' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HBillNo_bak").val(d.data[0].HBillNo);
+ }
+ });
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ } else if (OperationType == 2) {
+ //绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3717' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HBillNo_bak").val(d.data[0].HBillNo);
+ }
+ });
+ }
+
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCodeSN').on('keydown', function (event) {
+ var HBarCode = $('#HBarCodeSN').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ //閫夋嫨涓嶈壇鍘熷洜
+ form.on('submit(btnHBadReason)', function () {
+ btnHBadReason();
+ });
+
+ //閫夋嫨璐ㄦ鍛�
+ form.on('submit(btnHEmp)', function () {
+ btnHEmp();
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
+ });
+
+ //閫夋嫨鐢熶骇鐝粍鎸夐挳
+ form.on('submit(btnHGroup)', function () {
+ btnHGroup();
+ });
+
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave_BL)', function (data) {//鎻愪氦
+ if (AllowLoadData(data)) {
+ set_AddNew(data,"涓嶈壇");
+ }
+ });
+
+ form.on('submit(btnSave_BF)', function (data) {//鎻愪氦
+ if (AllowLoadData(data)) {
+ set_AddNew(data,"鎶ュ簾");
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Display();
+ }
+
+ //鏌ヨ
+ function get_Display() {
+ var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"]+"'";
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ $("#HDeptID").val(data1.data[0]["HDeptID"]);
+ $("#HDeptName").val(data1.data[0]["杞﹂棿"]);
+ $("#HProName").val(data1.data[0]["宸ュ簭"]);
+ $("#HSourceID").val(data1.data[0]["HSourceID"]);
+ $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
+ $("#HEmpID").val(data1.data[0]["HEmpID"]);
+ $("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
+ $("#HGroupID").val(data1.data[0]["HGroupID"]);
+ $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+
+ });
+ }
+
+ //鏉＄爜鍥炶溅鏌ヨ
+ function txtHBarCode_KeyDown(HBarCode) {
+
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
+ async: true,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
+ $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
+ $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+ $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
+ $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
+ $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
+ $("#HMaterID").val(data1.data[0]["HMaterID"]);
+ $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+ $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
+ $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
+
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //涓嶈壇鍘熷洜閫夋嫨椤甸潰
+ function btnHBadReason() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '涓嶈壇鍘熷洜鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HBadReasonID").val(checkStatus.data[0].HItemID);
+ $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //璐ㄦ鍛橀�夋嫨椤甸潰
+ function btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐ㄦ鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //鐢熶骇璧勬簮閫夋嫨椤甸潰
+ function btnHSource() {
+ 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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇鐝粍閫夋嫨椤甸潰
+ function btnHGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
+ //淇濆瓨HMaker
+ function set_AddNew(data, HResult) {
+
+ var sMainStr = JSON.stringify(data.field);
+
+ var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+
+ var HBarCode = $("#HBarCode").val();
+ if (HBarCode == "") {
+ layer.msg("浜у搧SN涓嶈兘涓虹┖!")
+ return false;
+ }
+
+ var HBadReasonID = $("#HBadReasonID").val();
+ if (HBadReasonID == 0) {
+ layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+ return false;
+ }
+ return true;
+ }
+
+ //#endregion
+
+ });
+</script>
\ 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\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
index c7658ff..d0418b9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
@@ -115,7 +115,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>鍙栨秷鎺掔几</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>鍙栨秷鎺掑崟</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_print"><i class="layui-icon layuiiconform"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -123,7 +123,7 @@
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>鎺掔几</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>鎺掑崟</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 7a50439..bec71a8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1069,7 +1069,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 780
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -1371,10 +1371,10 @@
table.render(option);
}
- $(".laytable-cell-" + table.index + "-0-0").css({
- "height": "25px",
- "width": "48px;"
- });
+ //$(".layui-table-cell").css({
+ // "height": "21px",
+ // "line-height": "21px;"
+ //});
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -1467,10 +1467,10 @@
table.render(option2);
}
- $(".laytable-cell-" + table.index + "-0-0").css({
- "height": "25px",
- "width": "48px;"
- });
+ //$(".layui-table-cell").css({
+ // "height": "32px",
+ // "line-height": "32px;"
+ //});
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
--
Gitblit v1.9.1