From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/home/console.html | 262 +++++++++++++++++++++++++---------------------------
1 files changed, 127 insertions(+), 135 deletions(-)
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 3c710da..edcba28 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -43,125 +43,32 @@
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
- <div class="layui-card-body">
- <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
- <!--蹇嵎鏂瑰紡-->
- <div class="FastMenu" carousel-item=""></div>
- <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ <div style="margin-left: 15px; padding-top: 15px; height: 28px; ">
+ <a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu">蹇嵎鏂瑰紡涓�</a>
+ <!--<a style="margin-left: 20px;">璁剧疆鍥炬爣</a>-->
+ <button type="button" style="margin-left: 20px;" value="0" id="HIcon" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon">寮�鍚浘鏍囪缃�</button>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <!--蹇嵎鏂瑰紡-->
+ <div class="FastMenu" carousel-item=""></div>
+ <!--<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>-->
+ </div>
</div>
</div>
</div>
- </div>
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div style="margin-left: 15px; padding-top: 15px; height: 28px; ">
+ <a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu_1">蹇嵎鏂瑰紡浜�</a>
+ <button type="button" style="margin-left: 20px;" value="0" id="HIcon_2" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon_2">寮�鍚浘鏍囪缃�</button>
+ </div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
- <div carousel-item="">
- <ul class="layui-row layui-col-space10 layui-this">
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-console"></i>
- <cite>澶栬喘鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-engine"></i>
- <cite>濮斿鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-template-1"></i>
- <cite>浜у搧鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-chart"></i>
- <cite>棰嗘枡鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-unlink"></i>
- <cite>濮斿鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-chat"></i>
- <cite>閿�鍞嚭搴�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-component"></i>
- <cite>璋冩嫧鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-app"></i>
- <cite>鏉＄爜鐢熸垚</cite>
- </a>
- </li>
- </ul>
- <ul class="layui-row layui-col-space10">
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-template"></i>
- <cite>涓婃灦褰掕繕鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
- <i class="layui-icon layui-icon-snowflake"></i>
- <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
- <i class="layui-icon layui-icon-transfer"></i>
- <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-light"></i>
- <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-senior"></i>
- <cite>鏉ユ枡妫�楠屽崟</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-cellphone"></i>
- <cite>鐢熶骇鎷嗙鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
- <i class="layui-icon layui-icon-dollar"></i>
- <cite>鐢熶骇姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-survey"></i>
- <cite>鐢熶骇閫�鏂欏崟</cite>
- </a>
- </li>
- </ul>
- </div>
- <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ <!--蹇嵎鏂瑰紡-->
+ <div class="FastMenu_1" carousel-item=""></div>
+ <!--<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>-->
</div>
</div>
</div>
@@ -286,30 +193,123 @@
//椤甸潰鍒濆鍖栨柟娉�
function set_ClearBill() {
- get_Display();
+ get_Display("FastMenu");
+ get_Display("FastMenu_1");
get_Notices();
getNeedCheckRouting();
}
//椤甸潰鍏跺畠鏂规硶
- function get_Display() {
+ function get_Display(HModelAtributos) {
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
$.ajax({
url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType, "HModelAtributos": HModelAtributos },
success: function (data) {
console.log(data.data);
- FastMenu(data.data);
+ FastMenu(data.data, HModelAtributos);
},
error: function (data) {
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
}
+ $('.FastMenu').on('click', 'ul li', function (event) {
+ // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮�
+ console.log('List item clicked:', $(this).text());
- function FastMenu(data) {
+ var HIcon = $("#HIcon").val();
+
+ if (HIcon == "1") {
+ openICON("FastMenu")
+ return false;
+ }
+ });
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓婚') {
+ var linterid = data.HInterID.toString();
+ var HEntryID = data.HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍏憡'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../绯荤粺绠＄悊/鍏憡/GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ }
+ })
+ }
+ });
+
+ $('.FastMenu_1').on('click', 'ul li', function (event) {
+ // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮�
+ console.log('List item clicked:', $(this).text());
+
+ var HIcon = $("#HIcon_2").val();
+
+ if (HIcon == "1") {
+ openICON("FastMenu_1")
+ return false;
+ }
+ });
+
+
+ //璁剧疆鍥炬爣
+ function openICON(HModelAtributos) {
+ // 鎵撳紑鍥炬爣璁剧疆瀛愮獥鍙�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "蹇嵎鏂瑰紡-鍥炬爣璁剧疆" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["30%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: '../绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html?HItemID=' + event.target.id
+ , btn: ["纭畾"]
+ , btn1: function (index, laero) {
+ //鍒锋柊蹇嵎鏂瑰紡
+ get_Display(HModelAtributos);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ form.on('submit(HIcon)', function (data) {
+ var HIcon = $("#HIcon").val();
+
+ if (HIcon == "0") {
+ $("#HIcon").val("1");
+ $("#HIcon").text("鍏抽棴鍥炬爣璁剧疆");
+ }
+ if (HIcon == "1") {
+ $("#HIcon").val("0");
+ $("#HIcon").text("寮�鍚浘鏍囪缃�");
+ }
+ })
+
+ form.on('submit(HIcon_2)', function (data) {
+ var HIcon = $("#HIcon_2").val();
+
+ if (HIcon == "0") {
+ $("#HIcon_2").val("1");
+ $("#HIcon_2").text("鍏抽棴鍥炬爣璁剧疆");
+ }
+ if (HIcon == "1") {
+ $("#HIcon_2").val("0");
+ $("#HIcon_2").text("寮�鍚浘鏍囪缃�");
+ }
+ })
+
+
+ function FastMenu(data, HModelAtributos) {
var liStr = '';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
@@ -322,6 +322,8 @@
HTranslationText = data[i].HTranslationText_English;
} else if (sessionStorage["HTranSlate"] == "3") {
HTranslationText = data[i].HTranslationText_Spain;
+ } else {
+ HTranslationText = data[i].HCaption;
}
if (i == 0) {
@@ -350,25 +352,8 @@
liStr += '</ul>';
}
};
- if (data.length % 8 == 0) {
- liStr += '<ul class="layui-row layui-col-space10">';
- liStr += '<li class="layui-col-xs3">';
- liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
- liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
- liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
- liStr += '</a>';
- liStr += '</li>';
- liStr += '</ul>';
- } else {
- liStr += '<li class="layui-col-xs3">';
- liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
- liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
- liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
- liStr += '</a>';
- liStr += '</li>';
- liStr += '</ul>';
- }
- $(".FastMenu").html(liStr);
+
+ $("." + HModelAtributos).html(liStr);
element.init();
//for (var i = 0; i < data.length; i++) {
@@ -419,6 +404,13 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
+ else if (data[i].name == '涓婚') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '涓婚', templet: function (d) {
+ return '<span style="color: blue;">' + d.涓婚 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
switch (data[i].Type) {
//int
--
Gitblit v1.9.1