From 28ca4459d80039a98577233fcc1d4ec9c4ca121a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 12 六月 2025 13:54:00 +0800
Subject: [PATCH] 器具管理 添加模具状态分析页面
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 6
WebTM/WebTM.csproj.user | 2
/dev/null | 5
WebTM/layuiadmin/common.js | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 6
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 8
WebTM/views/模治具管理/模具状态分析/Sc_MouldStatusAnalysis.html | 537 +++++++++++++++++++++++++++++++++++++++++++----------
WebTM/WebTM.csproj | 1
8 files changed, 444 insertions(+), 123 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 06b88e0..0f17c71 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -587,6 +587,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBill_PDAEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐘舵�佸垎鏋怽Sc_MouldStatusAnalysis.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBillList_PDA.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8cc4879..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebTM/layuiadmin/common.js b/WebTM/layuiadmin/common.js
index 1923f5c..68b2fd1 100644
--- a/WebTM/layuiadmin/common.js
+++ b/WebTM/layuiadmin/common.js
@@ -79,4 +79,4 @@
// 鍒ゆ柇鏄惁鍏ㄦ槸鏁板瓧
function isAllDigits(str) {
return /^\d+$/.test(str);
-}
\ No newline at end of file
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 2c15334..d9d718e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -265,8 +265,8 @@
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
$("#HItemID").val(0);
- $("#HNumber").val('');
- $("#HName").val('');
+ //$("#HNumber").val('');
+ //$("#HName").val('');
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMakeEmp").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -401,7 +401,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "Gy_Warehouse/cx",
+ url: GetWEBURL() + "/Gy_Warehouse/cx",
type: "GET",
async: false,
data: {
@@ -520,7 +520,7 @@
//}
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
dataType: "json",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 9dc5590..5467a62 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -15,6 +15,7 @@
<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/common.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -770,13 +771,14 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==="") {
+ debugger
+ if (checkStatus.data.length === 1 && isEmpty(data[0]["瀹℃牳浜�"]) === true) { // 宸插鏍歌繃鐨勬暟鎹笉鑳藉垹闄�
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'DeltetGy_Warehouse',
+ url: GetWEBURL() + '/DeltetGy_Warehouse',
type: "GET",
data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis.html"
index 1365e48..0dccd68 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis.html"
@@ -13,7 +13,98 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
<script src="../../../layuiadmin/echarts.min.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />
+
+ <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.1s; /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
+ }
+
+ .bottomright:hover {
+ transform: scale(1.3); /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
+ }
+
+ .imgtitle {
+ width: 70%;
+ height: 50px;
+ text-align: center;
+ display: block;
+ font-size: 15px;
+ float: left;
+ line-height: 50px;
+ }
+
+ .cns {
+ border: 1px solid #5FB878;
+ height: auto;
+ 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;
+ border: 1px solid rgb(0 0 0 / 10%);
+ width: 95%;
+ }
+
+ .btnM {
+ width: 30%;
+ height: 50px;
+ line-height: 50px;
+ float: left;
+ text-align: right;
+ }
+
+ .layui-icon {
+ font-size: 20px;
+ }
+ </style>
</head>
<body>
@@ -23,132 +114,67 @@
<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>
+ style="height: 500px; 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 class="layui-col-xs10 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="btomleft" style="height:500px;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="PowerOn(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="PowerOff(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="DotCheck(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="FaultRegistration(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="Maintenance(event,this)">
- <div class="cnt bottomright">
- <div class="btnM">
- <span class="layui-icon layui-icon-form imgicon"></span>
- </div>
- <span class="imgtitle">缁翠慨</span>
- </div>
- </div>
- </div>
-
- <div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 " onclick="Resume(event,this)">
- <div class="cnt bottomright">
- <div class="btnM">
- <span class="layui-icon layui-icon-table imgicon"></span>
- </div>
- <span class="imgtitle">灞ュ巻</span>
- </div>
- </div>
- </div>
- <div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 " onclick="Process(event,this)">
- <div class="cnt bottomright">
- <div class="btnM">
- <span class="layui-icon layui-icon-file imgicon"></span>
- </div>
- <span class="imgtitle">宸ヨ壓</span>
- </div>
- </div>
- </div>
- <div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 " onclick="HStatus(event,this)">
- <div class="cnt bottomright">
- <div class="btnM">
- <span class="layui-icon layui-icon-set 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="mychart11"> </div>
+ <div class="layui-tab">
+ <ul class="layui-tab-title">
+ <li class="layui-this">灞ュ巻</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+
+ </div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <div class="tr1-2" id="mychart22"> </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 class="layui-col-xs3 layui-inline">
+ <div class="tr1-1" id="mychart11"> </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <div class="tr1-2" id="mychart22"> </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>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container my-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Search"><i class="layui-icon layui-icon-search"></i>鍒楄缃�</button>-->
+ </div>
+ </script>
</body>
</html>
<script>
+ var selectedMouldId = -1
+ var params = get_UrlVars();
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -159,6 +185,9 @@
, laypage = layui.laypage
, laydate = layui.laydate
, tree = layui.tree
+ , soulTable = layui.soulTable
+
+ var titleData = ["HInterID", "HBillType"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -170,17 +199,311 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- $('#btomleft').on('click', function () { // 鐩戝惉鍗＄墖瀹瑰櫒鐐瑰嚮浜嬩欢
-
- })
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ get_Display_Tree()
+
+ get_DisplayResume(selectedMouldId)
+ }
+
+ //鏌ヨ妯″叿娓呭崟 鐢熸垚鍗＄墖
+ function Check(HWHID) {
+ wktag = 0;
+ debugger
+ $("#btomleft").html("");
+ $.ajax({
+ url: GetWEBURL() + '/Web/Get_Sc_MouldStatusAnalysisList',
+ type: "GET",
+ data: { "sWhere": " and HWHID = " + HWHID , "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data) {
+ var LoadData1 = data.data;
+ 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: 180px;">';
+ html1 += '<div class="cns" data-index=' + (i + 1) + ' id="bs' + (i + 1) + '">';
+ html1 += '<dl>';
+ html1 += '<dd class="tcenter">';
+ html1 += '<h1 style="display:none;"><span>妯″叿ID锛�</span><span id="md' + (i + 1) + '">' + LoadData1[i].HInterID + '</span></h1>';
+ //html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].鐢熶骇璁㈠崟瀛愬唴鐮� + '</span></h1>';
+ //html1 += '<h1 style="display:none;"><span>浜х嚎ID锛�</span><span id="cs' + (i + 1) + '">' + LoadData1[i].HSourceID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>浠撳簱ID锛�</span><span id="wh' + (i + 1) + '">' + LoadData1[i].HWHID + '</span></h1>';
+
+ html1 += '<p><span>妯″叿缂栧彿锛�</span><span id="mdno' + (i + 1) + '">' + LoadData1[i].妯″叿缂栧彿 + '</span></p>';
+ html1 += '<p><span>妯″叿鍚嶇О锛�</span><span id="mdname' + (i + 1) + '">' + LoadData1[i].妯″叿鍚嶇О + '</span></p>';
+ html1 += '<p><span>浠撳簱锛�</span><span id="whname' + (i + 1) + '">' + LoadData1[i].浠撳簱 + '</span></p>';
+ html1 += '<p><span>浣跨敤鐘舵�侊細</span><span id="ustatus' + (i + 1) + '">' + LoadData1[i].浣跨敤鐘舵�� + '</span></p>';
+ html1 += '<p><span>璁捐瀵垮懡锛�</span><span id="dlife' + (i + 1) + '">' + LoadData1[i].璁捐瀵垮懡 + '</span></p>';
+ html1 += '<p><span>浣跨敤瀵垮懡锛�</span><span id="ulife' + (i + 1) + '">' + LoadData1[i].浣跨敤瀵垮懡 + '</span></p>';
+ html1 += '<p><span>鍓╀綑瀵垮懡锛�</span><span id="rlife' + (i + 1) + '">' + (LoadData1[i].璁捐瀵垮懡 - LoadData1[i].浣跨敤瀵垮懡) + '</span></p>';
+ switch (LoadData1[i].妯″叿鐘舵��) {
+ case "鍦ㄥ簱":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "鏁呴殰缁翠慨":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "棰嗗嚭":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "淇濆吇":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "缁翠慨涓�":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "鏁呴殰":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ case "缁翠慨瀹屾垚":
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border7"></span><span>' + LoadData1[i].妯″叿鐘舵�� + '</span></p>';
+ break;
+ default:
+ html1 += '<p><span>褰撳墠鐘舵�侊細</span><span></span><span>' + LoadData1[i].妯″叿鐘舵�� +'</span></p>';
+ break;
+
+ }
+ html1 += '</dd>';
+ html1 += '</dl>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#btomleft").append(html1);
+ }
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+ return false;
+ }
+ });
+ }
+
+ function set_InitGrid() {
+ optionResume = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-130'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cellMinWidth: 100
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ }
+
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ case "get_Refresh": set_Refresh(); break;
+ case "get_Exit": set_Exit(); break;
+ }
+ })
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+
+ //#region 鏌ヨ妯″叿灞ュ巻
+ function get_DisplayResume(HInterID) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.code == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ 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 if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } 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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ optionResume.cols = [col];
+ optionResume.data = data1.data;
+
+ table.render(optionResume);
+ 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 get_Display_Tree() {
+ //var sWhere = " and 浠撳簱绫诲瀷=N'妯″叿浠撳簱'";
+ let sWhere = ""
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Warehouse/listTree',
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ 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].Number + "-" + 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].Number + "-" + 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; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ HWHID = 0;
+ if (data.id == "0") {
+
+ } else {
+ HWHID = data.id;
+ }
+ Check(HWHID); // 鏌ヨ浠撳簱涓殑娓呭崟
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.Number + "-" + 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.Number + "-" + subMenu.Title + '", "id": "' + subMenu.Id + '"},';
+ }
+ return subStr;
}
//#endregion
+ function set_Exit() {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ let exitMode = isEmpty(params[params['openType']]) === false ? 1 : 2;
+ debugger
+ Pub_Close(exitMode);
+ });
+ }
+
+ function set_Refresh() {
+ get_DisplayResume(selectedMouldId)
+ }
+
+ $("#btomleft").on("click", function (e) {
+
+ let tar = e.target
+ let ct = $(tar).closest(".cns ")
+ if (ct.length > 0) {
+ let i = $(ct[0]).data('index');
+
+ selectedMouldId = $("#md" + i)[0].innerText
+
+ // 娣诲姞鏍峰紡
+ $('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ $("#bs" + i + "").addClass('check1'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
+
+ get_DisplayResume(selectedMouldId);
+ }
+ })
+
+
+
// 浠ヤ笂鏄痩ayui妯″潡
});
</script>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js"
deleted file mode 100644
index 866fd57..0000000
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js"
+++ /dev/null
@@ -1,5 +0,0 @@
-class Sc_MouldStatusAnalysis_Card extends HTMLElement {
- constructor() {
- super()
- }
-}
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index 35f5624..c03c1bd 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -427,7 +427,7 @@
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
}
- if (OperationType == 2) {//鏃犳簮鏂板
+ else if (OperationType == 2) {//鏃犳簮鏂板
set_EditFromGrid(linterid);
get_MAXNum();
@@ -604,7 +604,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -947,6 +947,7 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
+ Organ();
laydate.render({
elem: '#HDate'
});
@@ -1064,7 +1065,6 @@
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
//鍒濆鍖栫粍缁�
- Organ();
$.ajax({
url: GetWEBURL() + "/Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
type: "GET",
--
Gitblit v1.9.1