From a912f4944c5028cc0700c6d189bb3a7c728551b3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 17 十二月 2024 15:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMain.html | 8 +
WebTM/views/indexMenu.html | 2
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 11 +
WebTM/views/系统管理/用户管理/Xt_UserGroupList.html | 37 +++++-
WebTM/views/系统管理/菜单自定义/Xt_DefineMenuDisplay.html | 67 ++++++++---
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 196 ++++++--------------------------
WebTM/views/IpadIndex.html | 9 +
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 4
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 1
10 files changed, 150 insertions(+), 187 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8233a56..8f1260e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index d05528c..55f8554 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -288,12 +288,18 @@
html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span><div style="margin-left:25px;float:right"><span >宸℃娆℃暟锛�</span><span>' + LoadData2[i].宸℃娆℃暟 + '</span></div></h1>';
html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span><div style="margin-left:25px;float:right"><span >杩囩▼妫�娆℃暟锛�</span><span>' + LoadData2[i].杩囩▼妫�娆℃暟 + '</span></div></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span><div style="margin-left:25px;float:right"><span >褰撴棩鐐规鏃堕棿锛�</span><span>' + LoadData2[i].褰撴棩鐐规鏃堕棿 + '</span></div></h1>';
- html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >鏈�鍚庝繚鍏绘椂闂达細</span><span>' + LoadData2[i].鏈�鍚庝繚鍏绘椂闂� + '</span></div></h1>';
+ html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >鏈�鍚庝繚鍏绘椂闂达細</span><span>' + LoadData2[i].鏈�鍚庝繚鍏绘椂闂� + '</span></div></h1>';
if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
html1 += '<h1><span>杩涘害锛�</span><span>0%</span><div style="margin-left:25px;float:right"><span >鐐规瀹屾垚鎯呭喌锛�</span><span>' + LoadData2[i].褰撴棩鐐规瀹屾垚鎯呭喌 + '</span></div></h1>';
}
else {
html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span><div style="margin-left:25px;float:right"><span >鐐规瀹屾垚鎯呭喌锛�</span><span>' + LoadData2[i].褰撴棩鐐规瀹屾垚鎯呭喌 + '</span></div></h1>';
+ }
+ if (LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� == 0 || LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� == null) {
+ html1 += '<h1><span>寮傚父鍙嶉鏈獙鏀讹細</span><span class="gj_icon color_border4"></span><span>' + LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� + '</span></h1>';
+ }
+ else {
+ html1 += '<h1><span>寮傚父鍙嶉鏈獙鏀讹細</span><span class="gj_icon color_border5"></span><span>' + LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� + '</span></h1>';
}
html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
@@ -397,6 +403,7 @@
return false;
}
else {
+ layer.close(index);
layer.alert(data.Message, { icon: 5 });
return false;
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 7b6ec5c..b7acc4e 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -283,7 +283,7 @@
Ul.addEventListener("click", function (event) {
layer.open({
type: 2
- , area: ['90%', '90%']
+ , area: ['70%', '70%']
, title: '鑿滃崟鑷畾涔�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 52ab8cd..d2ea578 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -82,6 +82,17 @@
<input type="text" class="layui-input" id="HName" name="HName" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 185px;">
+ <select name="HType" lay-filter="HType" id="HType">
+ <option value="SOP">SOP</option>
+ <option value="SIP">SIP</option>
+ <option value="璁惧瀹夊叏鎿嶄綔瑙勭▼">璁惧瀹夊叏鎿嶄綔瑙勭▼</option>
+ <option value="璐ㄩ噺鎶ヨ鍗�">璐ㄩ噺鎶ヨ鍗�</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 31d976d..ee31911 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -925,7 +925,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
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_MouldFileList.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_MouldFileList.html"
index c7d1683..ead384d 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_MouldFileList.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_MouldFileList.html"
@@ -257,6 +257,7 @@
, { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
, { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
, { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true }
+ , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true }
, { field: '绌存暟', title: '绌存暟', sort: true }
, { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true }
, { field: '鐩村緞', title: '鐩村緞', sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 02f3b60..3e62b4c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -42,28 +42,41 @@
<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">-->
+ <form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
<!--top-->
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393" onclick="Exit(event,this)">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393" onclick="Exit(event,this)" >閫�鍑�</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto" onclick="Autoplay(event,this)">鑷姩鎾斁</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto" onclick="Autoplay(event,this)" disabled>鑷姩鎾斁</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo" onclick="HideVideo(event,this)">闅愯棌瑙嗛</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo" onclick="HideVideo(event,this)" disabled>闅愯棌瑙嗛</button>
</div>
<div class="layui-inline">
<h1 style="text-align: center;margin-left:100px"><b>宸ヤ綅浣滀笟鎸囧涔�</b></h1>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="CheckTask" style="background-color:#959393;margin-left:55px" id="auto">閫夊伐鍗�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="CheckTask" style="background-color:#959393;margin-left:55px" id="auto" disabled>閫夊伐鍗�</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="SetUp" style="background-color:#959393;margin-left:15px" id="auto">璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="SetUp" style="background-color:#959393;margin-left:15px" id="auto" disabled>璁剧疆</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="HType" lay-filter="HType" id="HType">
+ <option value="SOP">SOP</option>
+ <option value="SIP">SIP</option>
+ <option value="璁惧瀹夊叏鎿嶄綔瑙勭▼">璁惧瀹夊叏鎿嶄綔瑙勭▼</option>
+ <option value="璐ㄩ噺鎶ヨ鍗�">璐ㄩ噺鎶ヨ鍗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="getHType" id="getHType" style="background-color:#959393">鏌ヨ</button>
</div>
<div class="layui-inline" style="margin-left:200px">
<ul>
@@ -72,20 +85,20 @@
<ul>
<li id="Week"></li>
</ul>
- </div>
+ </div>
</div> <!--top-end-->
<div style="width:98%;height:calc(90vh);min-height:300px;position: relative;">
<!--//杞挱鍥�-->
- <div class="layui-carousel" id="test1" style="position:absolute;"><!--閫忔槑搴� opacity: 0.2-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <!--閫忔槑搴� opacity: 0.2-->
<div carousel-item id="file">
-
- </div>
+
+ </div>
</div>
<!--//瑙嗛-->
<div class="layui-colla-item" id="IsHide" style="z-index: 50;margin-left:912px;padding-top:385px;">
<video controls width="290" height="180" id="video">
<!--<source src="../../../Files/flower.webm" type="video/webm" />-->
-
<!--<source src="../../../Files/yyh.qlv" type="video/mp4" />
Download the
@@ -97,10 +110,9 @@
</div>
- </div>
+ </div>
</div>
- <!--</form>-->
- </div>
+ </form>
</div>
</div>
</div>
@@ -181,10 +193,6 @@
});
//#endregion
- //var vvv = '';
- //vvv += '<source src="../../../Files/flower.webm" type="video/webm" />'
- ////$("#video").append(vvv);
-
//#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌＄敤鍒�)
if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -204,13 +212,18 @@
document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
//get_SopFile(HMaterID, HSourceNo);// 鐗╂枡
- get_SopFile2(HMaterID, HProcID); //鐗╂枡+宸ュ簭
- return;
+ get_SopFile2(HMaterID, HProcID, $("#HType").val()); //鐗╂枡+宸ュ簭
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
//#endregion
+
+ form.on('submit(getHType)', function (event) {
+ console.log("1");
+ // 鎵ц鏌ヨ鎿嶄綔
+ get_SopFile2(HMaterID, HProcID, $("#HType").val());
+ });
var video = document.querySelector("video");
@@ -222,10 +235,7 @@
video.addEventListener("pause", (event) => {
$('#test1').css('opacity', 1);
});
-
- //鑾峰彇褰撳墠鐢熶骇璧勬簮鐨勭敓浜ц鍗�
- get_Display(sWhere, HID);
-
+
//#region 閫夊崟鍙�
form.on('submit(CheckTask)', function (data) {
layer.open({
@@ -294,87 +304,9 @@
});
//#endregion
- //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛� 锛堣繖閲屾病鐢ㄥ埌锛�
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
- //鏂板涓�琛�
- case 'btn-AddLine': btnAddLine(NewRow);
- break;
- }
- });
- //#endregion
-
- //#endregion
-
- //#region 鏍规嵁鐗╂枡鍔犺浇鍥剧墖
- function get_SopFile(HMaterID, HSourceNo) {
- var wait = layer.load();//閬僵
- $("#file").html("");
- $(".layui-carousel-ind").html("");
-
- $.ajax({
- url: GetWEBURL() + '/Gy_SopBill/getListByMaterID',
- type: "GET",
- data: { "HMaterID": HMaterID, "HSourceNo": HSourceNo },
-
- success: function (data1) {
- if (data1.count == 1) {
- if (data1.data[0]) {
- HInterID = data1.data[0].HInterID
- }
- option.data = data1.data;
- table.render(option);
- //鏀寔鎾斁鐨勮棰戞牸寮�
- var videoExtensions = ['.mp4', '.webm', '.Ogg'];
-
- for (let i = 0; i < data1.data.length; i++) {
- var html = '';
- if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
- var FileName = data1.data[i].鏂囦欢鍚嶇О;
- var FilePath = data1.data[i].鏂囦欢鍦板潃;
- //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
- html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
- $("#file").append(html);
- }
- if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
- var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
- var FilePath2 = data1.data[i].鏂囦欢鍦板潃;
- //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
- html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
- $("#file").append(html);
- }
- if (videoExtensions.includes(data1.data[i].鏂囦欢绫诲瀷)) {
- var FileName3 = data1.data[i].鏂囦欢鍚嶇О;
- var FilePath3 = data1.data[i].鏂囦欢鍦板潃;
- var vvv = '';
- vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
- $("#video").append(vvv);
- }
-
- }
-
- if (data1.data.length == 0) {
- var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
- $("#file").append(html2);
- }
- ins.reload({ autoplay: false })
-
- layer.close(wait);
- } else {
- layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //#endregion
//#region 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇浣滀笟鎸囧涔�
- function get_SopFile2(HMaterID, HProcID) {
+ function get_SopFile2(HMaterID, HProcID, HType) {
var wait = layer.load();//閬僵
$("#file").html("");
$(".layui-carousel-ind").html("");
@@ -382,15 +314,13 @@
$.ajax({
url: GetWEBURL() + '/Gy_SopBill/getListByMaterProc',
type: "GET",
- data: { "HMaterID": HMaterID, "HProcID": HProcID },
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HType": HType },
success: function (data1) {
if (data1.count == 1) {
if (data1.data[0]) {
HInterID = data1.data[0].HInterID
}
- option.data = data1.data;
- table.render(option);
//鏀寔鎾斁鐨勮棰戞牸寮�
var videoExtensions = ['.mp4', '.webm', '.Ogg'];
@@ -439,58 +369,6 @@
}
//#endregion
- //#region 鍔犺浇缃戞牸
- function get_Display(HSourceID, HID) {
- var wait = layer.load();//閬僵
- $("#file").html("");
- $(".layui-carousel-ind").html("");
-
- $.ajax({
- url: GetWEBURL() + '/Sc_ICMOBill/list2',
- type: "GET",
- data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"], "HMainID": HID },
-
- success: function (data1) {
- if (data1.count == 1) {
- if (data1.data[0]) {
- HInterID = data1.data[0].HInterID
- }
- option.data = data1.data;
- table.render(option);
-
- for (let i = 0; i < data1.data.length; i++) {
- var html = '';
- if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
- var FileName = data1.data[i].鏂囦欢鍚嶇О;
- //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
- html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
- $("#file").append(html);
- }
- if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
- var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
- //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
- html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
- $("#file").append(html);
- }
- }
- if (data1.data.length == 0) {
- var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
- $("#file").append(html2);
- }
- ins.reload({ autoplay: false })
-
- layer.close(wait);
- } else {
- layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //#endregion
//瀹氫箟涓哄叏灞�鍙橀噺
window.get_Display_All = function (HSourceID, HMainID) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
index 1977202..584d800 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
@@ -1154,6 +1154,14 @@
}
$("#HandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HHandleEmpID").val(checkStatus.data[0].HItemID);
+
+ // 鑾峰彇褰撳墠鐨勫��
+ var currentValue = $("#HandleEmpName").val();
+
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔壘鍒� "瀵瑰簲澶勭悊浜�:" 鍚庨潰鐨勪汉鍚嶅苟鏇挎崲
+ var updatedValue = currentValue.replace(/瀵瑰簲澶勭悊浜�:[^,]*/, "瀵瑰簲澶勭悊浜�:" + $("#HandleEmpName").val());
+ // 灏嗘洿鏂板悗鐨勫�艰缃洖杈撳叆妗�
+ $("#HDescription").val(updatedValue);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupList.html"
index 8c2f39a..ff5108d 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupList.html"
@@ -137,6 +137,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_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>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Menu"><i class="layui-icon layui-icon-form"></i>鑿滃崟璁剧疆</button>
</div>
</script>
</form>
@@ -185,8 +186,7 @@
case 'set_AddNew': set_AddNew();
break;
//澶嶅埗
- case 'btn-Copy':
- set_Copy();
+ case 'btn-Copy':set_Copy();
break;
//缂栬緫
case 'set_Edit': set_Edit();
@@ -198,14 +198,15 @@
case 'btn-Power': set_PowerBill();
break;
//瀵煎嚭excel
- case 'get_export':
- get_Export();
+ case 'get_export':get_Export();
break;
//閫�鍑烘寜閽�
case 'set_Exit': Pub_Close(2);
//闅愯棌鍒楄缃�
- case 'HideColumn':
- get_HideColumn();
+ case 'HideColumn':get_HideColumn();
+ break;
+ //鑿滃崟璁剧疆
+ case 'btn-Menu':get_Menu();
break;
};
});
@@ -243,6 +244,7 @@
});
})
//#endregion
+
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
@@ -453,6 +455,29 @@
}
}
+ // 鑿滃崟璁剧疆
+ function get_Menu() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HName = data[0].瑙掕壊;
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '瑙掕壊缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鑿滃崟鑷畾涔�/Xt_DefineMenuDisplay.html?OperationType=3&HName=' + HName + ''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+
// 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HNumber").val("");
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
index 34c0f31..79df1dc 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
@@ -34,6 +34,13 @@
var HType = "PC";
//#endregion
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) != "undefined") {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HName = decodeURI(params[params[1]]);//瑙掕壊鍚嶇О
+ }
+
//#region 鍒濆鍖栭〉闈�
set_ClearBill(); //璋冪敤鍒濆鍖栫晫闈㈡柟娉曪紝瀹屾垚鐣岄潰鐨勫垵濮嬪寲
//#endregion
@@ -84,8 +91,11 @@
var checkedData = tree.getChecked('demo-id-1'); // 鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
saveData = []; //娓呯┖淇濆瓨鑷畾涔夋暟鎹殑鍒楄〃鐨勬暟鎹�
getSelectedData(checkedData); //灏嗛�変腑鐨勮妭鐐圭殑淇℃伅浠ュ垪琛ㄧ殑褰㈠紡淇濆瓨鍦╯aveData涓�
-
- var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType;
+ if (OperationType == "3") {
+ var sMainSub = JSON.stringify(saveData) + ";" + HName + ";" + HType;
+ } else{
+ var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType;
+ }
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Web/SaveMenuDefineSet",
@@ -123,23 +133,44 @@
//#region 鏄剧ず鐩綍鐨勬爲缁勪欢
//浼樺寲鑷畾涔夎彍鍗曟樉绀虹殑瀹為獙
function get_Display() {
- $.ajax({
- url: GetWEBURL() + "/Web/MenuDefineSet",
- type: "GET",
- async: false,
- data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
- success: function (res) {
- var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌
- var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐�
- menuDefineData = trees; //鑾峰彇鏍戠粍浠剁殑鏍硅妭鐐癸紝骞堕�氳繃鏂规硶getDefineData()閫掑綊娣诲姞dt涓叾瀹冪殑瀛愯妭鐐癸紝骞惰缃悇鑺傜偣鐨勯�変腑鎯呭喌
- getDefineData(dt, menuDefineData); //涓烘牴鑺傜偣娣诲姞鍏跺畠瀛愯妭鐐圭殑鏁版嵁
- option.data = menuDefineData; //涓烘爲缁勪欢鐨勬覆鏌撳弬鏁版坊鍔犺妭鐐规暟鎹�
- tree.render(option); //娓叉煋鏍戠粍浠�
- },
- error: function (err) {
+ if (OperationType == "3") {
+ $.ajax({
+ url: GetWEBURL() + "/Web/MenuDefineSet",
+ type: "GET",
+ async: false,
+ data: { "HMakeName": HName, "HType": HType },
+ success: function (res) {
+ var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌
+ var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐�
+ menuDefineData = trees; //鑾峰彇鏍戠粍浠剁殑鏍硅妭鐐癸紝骞堕�氳繃鏂规硶getDefineData()閫掑綊娣诲姞dt涓叾瀹冪殑瀛愯妭鐐癸紝骞惰缃悇鑺傜偣鐨勯�変腑鎯呭喌
+ getDefineData(dt, menuDefineData); //涓烘牴鑺傜偣娣诲姞鍏跺畠瀛愯妭鐐圭殑鏁版嵁
+ option.data = menuDefineData; //涓烘爲缁勪欢鐨勬覆鏌撳弬鏁版坊鍔犺妭鐐规暟鎹�
+ tree.render(option); //娓叉煋鏍戠粍浠�
+ },
+ error: function (err) {
- }
- });
+ }
+ });
+ } else {
+ $.ajax({
+ url: GetWEBURL() + "/Web/MenuDefineSet",
+ type: "GET",
+ async: false,
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ success: function (res) {
+ var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌
+ var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐�
+ menuDefineData = trees; //鑾峰彇鏍戠粍浠剁殑鏍硅妭鐐癸紝骞堕�氳繃鏂规硶getDefineData()閫掑綊娣诲姞dt涓叾瀹冪殑瀛愯妭鐐癸紝骞惰缃悇鑺傜偣鐨勯�変腑鎯呭喌
+ getDefineData(dt, menuDefineData); //涓烘牴鑺傜偣娣诲姞鍏跺畠瀛愯妭鐐圭殑鏁版嵁
+ option.data = menuDefineData; //涓烘爲缁勪欢鐨勬覆鏌撳弬鏁版坊鍔犺妭鐐规暟鎹�
+ tree.render(option); //娓叉煋鏍戠粍浠�
+ },
+ error: function (err) {
+
+ }
+ });
+ }
+
}
//鏍规嵁鍚庣浼犻�掔殑鑿滃崟娓呭崟鍒楄〃鍜屾牴鐩綍鍒楄〃锛岄�掑綊
function getDefineData(dt, tree) {
--
Gitblit v1.9.1