From 59c0a65a973f9809213e39007d54db73cbcbb375 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 12 六月 2024 14:26:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 820 +++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 79 ++++
WebTM/views/user/login.html | 1
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 68 ---
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 2
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 96 +++++
WebTM/views/index.html | 6
WebTM/WebTM.csproj | 4
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 4
9 files changed, 1,012 insertions(+), 68 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7ad8bec..2f91a8b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -359,6 +359,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
@@ -375,6 +376,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckOtherBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\222.jpg" />
@@ -400,6 +402,7 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
@@ -1513,7 +1516,6 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index c83f482..064a07f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -705,6 +705,12 @@
<dd><a lay-href="鍝佽川绠＄悊/瀹㈣瘔澶勭悊/Crm_CustomerAppealBillList.html">瀹㈣瘔澶勭悊鍗曠淮鎶�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>璐ㄩ噺鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_InspectionFormReport.html">SPC妫�楠屽崟鍒嗘瀽</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!--鍣ㄥ叿绠＄悊-->
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 8d7f269..d668963 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -365,6 +365,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(result.Message, { icon: 1 });
//sessionStorage["HUserName"] = user.username;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
sessionStorage["HUserName"] = result.data[0].Czymc;
sessionStorage["HBillerID"] = result.data[0].HK3UserID;
sessionStorage["SourceFlag"] = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index 8d87e20..d018727 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -522,11 +522,6 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
- var BillNoType2 = HBarCode.substr(0, 2);
- var BillNoType3 = HBarCode.substr(0, 3);
- var BillNoType4 = HBarCode.substr(0, 4);
- var BillNoType5 = HBarCode.substr(0, 8);
- var BillNoType6 = HBarCode.substr(0, 5);
var index = layer.load();
$.ajax({
@@ -537,31 +532,23 @@
if (result.count == 1) {
var data = result.data[0];
- switch (BillNoType2) {
- //鐢熶骇璧勬簮
- case "BM":
- case "SS":
- case "10":
+ var num = data["Num"];
+
+ switch (num) {
+ case 1:
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HSourceID": data.HItemID,
"HSourceName": data.HName,
});
break;
- //鐢熶骇璁㈠崟
- case "MO":
+ case 2:
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOBillNo": data.鍗曟嵁鍙�,
"HICMOInterID": data.hmainid,
"HICMOEntryID": data.HEntryID
});
break;
- }
-
-
- switch (BillNoType3) {
- //鍣ㄥ叿妗ｆ
- case "MJD":
- case "PAK":
+ case 3:
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMouldID": data.hmainid,
"HMouldNumber": data.妯″叿缂栧彿,
@@ -570,30 +557,7 @@
"HQty": 1,
});
break;
- case "CMR":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HSourceID": data.HItemID,
- "HSourceName": data.HName,
- });
- break;
- }
-
- switch (BillNoType6) {
- //鍣ㄥ叿妗ｆ
- case "https":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hmainid,
- "HMouldNumber": data.妯″叿缂栧彿,
- "HMouldName": data.妯″叿鍚嶇О,
- "HMouldModel": data.妯″叿鍨嬪彿,
- "HQty": 1,
- });
- break;
- }
-
- switch (BillNoType4) {
- //娴佽浆鍗�
- case "GXLX":
+ case 4:
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HProcExchInterID": data.hmainid,
@@ -603,23 +567,7 @@
"HICMOEntryID": data.HICMOEntryID
});
break;
- }
-
-
-
- if (BillNoType5.length == 8) {
- BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
-
- if (isValidDate(BillNoType5)) {
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchInterID": data.hmainid,
- "HProcExchEntryID": data.HEntryID,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HICMOInterID": data.hicmointerid,
- "HICMOEntryID": data.HICMOEntryID
- });
- }
+ default:
}
$("#HBarCode").val("");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
new file mode 100644
index 0000000..abfd8e7
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -0,0 +1,820 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>SPC妫�楠屽崟鍒嗘瀽</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_InspectionFormReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#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) {
+
+ }
+ });
+ });
+
+ //#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_Display();
+ //get_FastQuery();
+ DisPlay_HideColumn();
+ set_Line();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ 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);
+ }
+ option.data = sj;
+
+
+ table.render(option);
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ sWhere = $("#HYear").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/QC_InspectionFormReport',
+ 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 set_Line() {
+ //#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
+
+ }
+
+ //鐢熶骇杞﹂棿
+ 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/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 9112a7d..91123ac 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -1058,9 +1058,9 @@
var report1 = "";
var parintName = $("#PrintName").val();
if (parintName == "鏂帿灏�") {
- report1 = urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+ report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
} else {
- report1 = urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
+ report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
}
var args = {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 414313c..86c5e8d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -470,7 +470,7 @@
var args = {
type: "print",
showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../views/grf/鐧芥爣鎵撳嵃.grf"),
+ report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
data: Customer
};
//var args = {
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_PG.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_PG.html"
index 3d02a14..e042661 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_PG.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_PG.html"
@@ -53,15 +53,43 @@
<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">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">鐢熶骇璧勬簮浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HSourceNumber" id="HSourceNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <label class="layui-form-label">鐢熶骇璧勬簮鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -232,6 +260,30 @@
return;
}
get_FastQuery();
+ }
+ });
+
+ //鐢熶骇璧勬簮浠ｇ爜 鍥炶溅
+ $('#HSourceNumber').on('keydown', function (event) {
+ var HSourceNumber = $('#HSourceNumber').val();
+ if (event.keyCode == 13) {
+ if (!HSourceNumber) {
+ layer.msg("鐢熶骇璧勬簮浠ｇ爜涓嶈兘涓虹┖锛�")
+ return;
+ }
+ get_Display_Tree();
+ }
+ });
+
+ //鐢熶骇璧勬簮 鍥炶溅
+ $('#HSourceName').on('keydown', function (event) {
+ var HSourceName = $('#HSourceName').val();
+ if (event.keyCode == 13) {
+ if (!HSourceName) {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�")
+ return;
+ }
+ get_Display_Tree();
}
});
@@ -496,6 +548,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
+ var HProcNumber = $("#HProcNumber").val();
+ var HProcName = $("#HProcName").val();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var HModel = $("#HModel").val();
@@ -523,6 +577,12 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+ if (HProcNumber) {
+ sWhere += " and 宸ュ簭浠ｇ爜 like '%" + HProcNumber + "%'";
+ }
+ if (HProcName) {
+ sWhere += " and 宸ュ簭 like '%" + HProcName + "%'";
}
if (HNumber) {
sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
@@ -640,6 +700,17 @@
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
var sql = " where 1=1 and HUSEORGID=" + sessionStorage["OrganizationID"];
+
+ var HSourceNumber = $('#HSourceNumber').val();
+ var HSourceName = $('#HSourceName').val();
+ if (HSourceNumber) {
+ sql += " and hnumber like '%" + HSourceNumber + "%'";
+ }
+ if (HSourceName) {
+ sql += " and hname like '%" + HSourceName + "%'";
+ }
+
+
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_Source/Gy_SourceTreeList',
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 4e4a0eb..da1e394 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -917,6 +917,7 @@
function txtHBarCode_KeyDown(HBarCode) {
var barNo = HBarCode.substr(0, 3);
+ var barNo2 = HBarCode.substr(0, 2);
if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
layer.close(index);
@@ -932,6 +933,101 @@
if (result.count == 1) {
var data = result.data[0];
+ switch (barNo2) {
+ case "20":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "lngICMOEntryID": data.lngICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "lngBillKey": data.hmainid,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrg": data.缁勭粐,
+ "HPRDOrgID": data.缁勭粐
+ });
+
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "In" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ data: { "HProcExchHinteID": HProcExchHinteID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [col]
+ , height: 500
+ }
+ table.render(option)
+ }
+ })
+ }
+
switch (barNo) {
case "HCX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
--
Gitblit v1.9.1