From 7e8ebf852f6ebc05eddc0c45b427240f34323472 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 26 一月 2026 09:51:45 +0800
Subject: [PATCH] 出站单优化，模具管理证据字段负责人，报工台页面显示优化
---
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 59 ++++---
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 67 +++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 45 ++++
WebTM/views/IpadIndex.html | 187 +++++++++++++++-------
WebTM/layuiadmin/layui/css/ReportPlatform.css | 68 ++++++++
6 files changed, 324 insertions(+), 104 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..85c13d8 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:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index ba98113..61f5da8 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -228,3 +228,71 @@
float: left;
top: 6px;
}
+
+/* 璧勬簮缁戝畾鍖哄煙鐨勫鍣ㄦ牱寮� */
+.cnt1 {
+ border: 1px solid #5FB878;
+ height: 60px;
+ border-radius: 5px;
+ position: relative; /* 娣诲姞鐩稿瀹氫綅 */
+}
+
+/* 娣诲姞鎸夐挳锛�+锛夋牱寮� */
+.imgicon0 {
+ height: 100px;
+ display: block;
+ text-align: center;
+ margin: 0.2em auto;
+ width: 100px;
+ cursor: pointer; /* 榧犳爣鍙樻垚鎵嬫寚鏍峰紡 */
+}
+
+/* 閽堝鍗庤垷缁勭粐鐨勭壒娈婃牱寮� */
+.cnt1 .imgicon0 {
+ /* 璋冩暣浣嶇疆鍜屽ぇ灏忎互閫傚簲60px楂樺害鐨勫鍣� */
+ font-size: 40px; /* 鍑忓皬鍥炬爣澶у皬 */
+ height: 60px; /* 璋冩暣楂樺害 */
+ width: 60px; /* 璋冩暣瀹藉害 */
+ line-height: 60px; /* 鍨傜洿灞呬腑 */
+ margin: 0 auto; /* 姘村钩灞呬腑 */
+}
+
+/* 鍏朵粬缁勭粐鐨勬牱寮� */
+.cnt .imgicon0 {
+ /* 150px楂樺害瀹瑰櫒鐨勬牱寮� */
+ font-size: 60px;
+ height: 150px;
+ width: 150px;
+ line-height: 150px;
+ margin: 0 auto;
+}
+
+.imgicon0:hover {
+ cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
+ -webkit-transition: border linear .1s, -webkit-box-shadow linear .5s;
+ border-color: rgba(141, 39, 142, .75);
+ -webkit-box-shadow: 0 0 18px rgba(111, 1, 32, 3);
+ color: #5FB878; /* 鎮仠鏃舵敼鍙橀鑹� */
+ transform: scale(1.1); /* 鎮仠鏃惰交寰斁澶� */
+ transition: all 0.3s ease; /* 骞虫粦杩囨浮鏁堟灉 */
+}
+
+/* 鍙互娣诲姞涓�涓笓闂ㄧ殑鍔犲彿鎸夐挳鏍峰紡绫� */
+.add-icon-container {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 100%;
+ height: 100%;
+}
+
+ .add-icon-container .layui-icon-addition {
+ font-size: 40px;
+ color: #5FB878;
+ }
+
+ .add-icon-container:hover .layui-icon-addition {
+ color: #13ad4c;
+ transform: rotate(90deg); /* 鎮仠鏃舵棆杞晥鏋� */
+ transition: all 0.3s ease;
+ }
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 88f1d96..3c645ff 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -20,6 +20,7 @@
<script src="../layuiadmin/Scripts/webConfig.js"></script>
<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
<script>
var wktag = 0;
var workcode = ""; //宸ュ崟鍙�
@@ -89,71 +90,131 @@
{
HSBName = LoadData[0].HSourceName;
for (var i = 1; i <= LoadData.length + 1; i++) {
- if (i <= LoadData.length) {
- var html1 = '';
- html1 += '<div class="layui-col-sm12 layui-col-md3">';
- html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
- html1 += '<dl>';
- html1 += '<dd>';
- html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
- html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
- html1 += '<h1><span>璁惧浠ｇ爜锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
- html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
- html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
- //html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
- //html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
- //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
- html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
- switch (LoadData[i - 1].HStatus) {
- case "绌洪棽":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "寮�鏈�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "鍋滄満":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "鐢熶骇":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "缁翠慨杩涜涓�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "缁翠慨缁撴潫":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- case "缁翠慨缁堟":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
- break;
- default:
- }
- html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
- html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
- html1 += '</dd>';
- html1 += '</dl>';
- html1 += '</div>';
- html1 += '</div>';
- $("#topleft").append(html1);
- $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
+ if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ if (i <= LoadData.length) {
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md2">';
+ html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ html1 += '<dl>';
+ html1 += '<dd>';
+ html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
+ html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
+ html1 += '<h1><span>璁惧浠ｇ爜锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
+ switch (LoadData[i - 1].HStatus) {
+ case "绌洪棽":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "寮�鏈�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鍋滄満":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鐢熶骇":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨杩涜涓�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁撴潫":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁堟":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ default:
+ }
+ html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
+ html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
+ html1 += '</dd>';
+ html1 += '</dl>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#topleft").append(html1);
+ $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
- //鏍规嵁杩斿洖鐨� 閫変腑鏍囧織HNowFlag璁剧疆閫変腑鐨勮祫婧�
- if (LoadData[i - 1].HNowFlag) {
- $('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
- $("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
- Check(this, i);
+ //鏍规嵁杩斿洖鐨� 閫変腑鏍囧織HNowFlag璁剧疆閫変腑鐨勮祫婧�
+ if (LoadData[i - 1].HNowFlag) {
+ $('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ $("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
+ Check(this, i);
+ }
+ }
+ else {
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md2">';
+ html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#topleft").append(html1);
+
+ }
+ } else {
+ if (i <= LoadData.length) {
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md3">';
+ html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ html1 += '<dl>';
+ html1 += '<dd>';
+ html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
+ html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
+ html1 += '<h1><span>璁惧浠ｇ爜锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
+ html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
+ html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
+ html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
+ switch (LoadData[i - 1].HStatus) {
+ case "绌洪棽":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "寮�鏈�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鍋滄満":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鐢熶骇":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨杩涜涓�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁撴潫":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁堟":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ default:
+ }
+ html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
+ html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
+ html1 += '</dd>';
+ html1 += '</dl>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#topleft").append(html1);
+ $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
+
+ //鏍规嵁杩斿洖鐨� 閫変腑鏍囧織HNowFlag璁剧疆閫変腑鐨勮祫婧�
+ if (LoadData[i - 1].HNowFlag) {
+ $('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ $("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
+ Check(this, i);
+ }
+ }
+ else {
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md3">';
+ html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#topleft").append(html1);
+
}
}
- else {
- var html1 = '';
- html1 += '<div class="layui-col-sm12 layui-col-md3">';
- html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
- html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
- html1 += '</div>';
- html1 += '</div>';
- $("#topleft").append(html1);
- }
}
}
else {
@@ -926,7 +987,7 @@
end: function () {
},
- });
+ });
}
//SIP 浣滀笟鎸囧涔�
@@ -1689,7 +1750,7 @@
// break;
// case "鏂帿灏旀眹鎶�":
// sWhere = " where HSourceID='" + HSourceID1 + "' and HSourceBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
- // break;
+ // break;
//}
$.ajax({
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\347\256\241\347\220\206/Gy_MouldFile.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\347\256\241\347\220\206/Gy_MouldFile.html"
index 4a421e1..838a54d 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\347\256\241\347\220\206/Gy_MouldFile.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\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -71,6 +71,12 @@
<input type="text" class="layui-input" name="HBarCode" id="HBarCode" 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="HLocation" name="HLocation" id="HLocation" value="">
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:10px">
@@ -168,6 +174,16 @@
</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: 80px;">
+ <input type="text" class="layui-input" name="HManagerName" id="HManagerName" style="width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerList" id="btnHManagerList" 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" lay-verify="HBrand" name="HBrand" id="HBrand" value="">
@@ -181,12 +197,6 @@
<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" lay-verify="HLocation" name="HLocation" id="HLocation" value="">
</div>
</div>
</div>
@@ -1451,6 +1461,45 @@
});
+ //琛ㄥご淇℃伅閫夋嫨妫�楠屽憳寮圭獥
+ form.on('submit(btnHManagerList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浣跨敤浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HManagerID").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(HNowSupList)', function () {
var typeid = $("#HNowSupTypeID").val();//鑾峰彇铏氭嫙浠撶被鍨�
@@ -2020,6 +2069,8 @@
$("#HNextMainDate").val(d.data[0].鏍℃鏃ユ湡);
$("#HUserID").val(d.data[0].HUserID);
$("#HUserName").val(d.data[0].浣跨敤浜�);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].璐熻矗浜�);
$("#HBrand").val(d.data[0].鍝佺墝);
$("#HCalibrationType").val(d.data[0].鏍″噯绫诲瀷);
$("#HLocation").val(d.data[0].浣嶇疆);
@@ -2870,6 +2921,10 @@
$("#HUserName").val(obj[0].鑱屽憳鍚嶇О);
$("#HUserID").val(obj[0].HItemID);
}
+ function GetHManagerValue(obj) { //璐ㄦ鍛�
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
function GetGyMaterial(obj) { //鐗╂枡
$("#HName").val(obj.鐗╂枡鍚嶇О);
$("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 3e13176..7d020f2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -208,7 +208,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-row" style="margin-bottom: 15px; display:none">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 95px; width: 150px">
@@ -234,7 +234,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-row" style="margin-bottom: 15px; display: none">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">閬楀け鏁伴噺</label>
<div class="layui-input-block" style="margin-left: 95px;">
@@ -248,7 +248,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-row" style="margin-bottom: 15px; display: none">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">鎶ュ簾鏁伴噺</label>
<div class="layui-input-block" style="margin-left: 95px;">
@@ -262,7 +262,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-row" style="margin-bottom: 15px; display: none">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">宸ュ簾鏁伴噺</label>
<div class="layui-input-block" style="margin-left: 95px;">
@@ -276,7 +276,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-row" style="margin-bottom: 15px; ">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">妯″叿缂栧彿</label>
<div class="layui-input-block" style="margin-left: 95px;">
@@ -323,7 +323,15 @@
</div>
</div>
</div>
+ <div class="layui-row" style="margin-bottom: 15px; text-align: center;">
+ <div style="margin-top: 20px;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Add">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius" id="Exit">閫�鍑�</button>
+ </div>
+ </div>
</div>
+
</div>
<div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
<div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
@@ -345,7 +353,7 @@
<div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
</div>
</div>
- <div id="bottom" style="width: 100%; height: calc(20vh);">
+ <!--<div id="bottom" style="width: 100%; height: calc(20vh);">
<div id="bottom-left" style="width: 100%; height: calc(10vh);">
<div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px ">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius " style="margin-left: 20%;" id="Add">鏂板</button>
@@ -353,7 +361,7 @@
<button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius " style="margin-left: 5%; " id="Exit">閫�鍑�</button>
</div>
</div>
- </div>
+ </div>-->
</div>
<div id="center-right-maintable" style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -445,6 +453,29 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧� 2.鏈夋簮鍗曟柊澧� 3.缂栬緫 4.娴忚 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HInterID = params[params[1]];//鍗曟嵁鍐呯爜
+ var HEntry = params[params[2]];//鍗曟嵁瀛愬唴鐮�
+ }
+
+
+ var edit = function (data) {
+ HSourceInterID = data[0].HSourceInterID;
+ HSourceEntryID = data[0].HSourceEntryID;
+ HSourceBillNo = data[0].HSourceBillNo;
+ HSourceBillType = data[0].HSourceBillType;
+
+ }
+
+ if (OperationType==2) {
+ txtHBarCode_KeyDown(HSourceBillNo);
+ }
+
$("#HEquipName").text(HEquipName);//璁惧鍚嶇О
$("#HEquipCode").text(HEquipCode);//璁惧缂栧彿
$("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
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 6e7aa32..f68c18d 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"
@@ -68,11 +68,17 @@
浜х嚎鏌ヨ
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_cx" id="btnReSearch_cx" style="padding:0 5px">浜х嚎閲嶇疆</button>
- <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:10px;margin-left:100px">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <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">
@@ -733,16 +739,29 @@
, data = checkStatus.data;
if (checkStatus.data.length == 1) {
var linterid = data[0].hmainid.toString();
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Sc_ProcessExchangeArrangement', 'yes']
- , resize: false
- })
+ if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 3 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ } else {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + QJQD + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
@@ -1100,7 +1119,6 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
dataCol = data1.data[0].HGridString.split(',');
@@ -1121,13 +1139,7 @@
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;
@@ -1186,7 +1198,6 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
dataCol = data1.data[0].HGridString.split(',');
@@ -1207,13 +1218,7 @@
option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
option2.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(option2.cols[0][i + 1]["title"], titleData) == -1) {
option2.cols[0][i + 1]["hide"] = false;
--
Gitblit v1.9.1