From 2f1f90ffe0a142bf02c28b9a450e36d20c0b79b9 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 05 八月 2025 15:08:39 +0800
Subject: [PATCH] pda 界面 需要把样品销售出库单和缓存（新增进去左上角把样品加上）网页端 价目表 价目表新添加的价目显示在最后一页，查阅不方便，需要改一下排序网页端 价目表 价目表页面没有”按钮设置“选项。没有导出功能，需要添加。PDA 其他出库 其他出库单里“退出“按键报错，网页端 用户列表 编辑完信息点保存后，页面会崩掉网页端 价目表 价目表编辑里的仓库改为必填项，不填写不让保存。
---
WebTM/views/基础资料/基础资料/Gy_MatePrice.html | 56 ++++++++++++++++++++++------
WebTM/views/系统管理/用户管理/Xt_UserList.html | 3 +
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html | 19 ++++++++-
WebTM/views/home/console_Mobile.html | 18 +++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 5 +-
5 files changed, 83 insertions(+), 18 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f675dce..0aaf61f 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,11 +6,12 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index f984714..7015324 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -219,6 +219,18 @@
<cite style="white-space:pre-wrap">杞﹂棿瀹氫綅搴撳瓨鏌ヨ</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_YP_QiaoYi_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite style="white-space:pre-wrap">鏍峰搧閿�鍞嚭搴撳崟</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">璋冩嫧</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -438,6 +450,12 @@
<cite style="white-space:pre-wrap">杞﹂棿涓嬫灦鍗曠紦瀛�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_YP_QiaoYi_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-down"></i>
+ <cite style="white-space:pre-wrap">鏍峰搧鍑哄簱鍗曠紦瀛�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
index b91d691..a4723a2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
@@ -9,6 +9,15 @@
<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/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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/QueryScheme.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -134,7 +143,9 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -146,13 +157,7 @@
</div>
</div>
</div>
- <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/SetColumn.js"></script>
- <script src="../../../layuiadmin/QueryScheme.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -171,7 +176,9 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"];
+ var HBillType = "Gy_MaterPrice";
var HModName = "Gy_MaterPrice";
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "HMaterID", "HUnitID", "HRelationID"];
@@ -226,6 +233,13 @@
case 'set_HideColumn':
get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "7505";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
break;
@@ -234,6 +248,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
//閫�鍑烘寜閽�
case 'btn-Close':
@@ -379,8 +396,11 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
ins = table.render(option);
- layer.close(ajaxLoad);
-
+ ///鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "7505";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
ColFilter();
get_DefaultModule();//鍔犺浇鏂规
@@ -477,9 +497,6 @@
if (HNumber) {
sWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
}
- //if (HName) {
- // sWhere += " and 鍚嶇О like '%" + HName + "%'";
- //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -873,7 +890,22 @@
}
}
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//璇诲彇鏂规
function set_ReadScheme() {
var HIsClose_Manual = false;
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_UserList.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_UserList.html"
index 6470717..f32a406 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_UserList.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_UserList.html"
@@ -427,7 +427,8 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ layer.closeAll("loading");
+ //location.reload();
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index 3e21cd2..cf3afc8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -202,7 +202,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="ExitButton" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
@@ -358,6 +358,9 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
break;
//鏄庣粏
case 'btn-WmsSub':
@@ -1228,8 +1231,18 @@
}
//#endregion
- //#region 銆愯繃婊ゆ柟妗堛��
-
+ //#region 銆愯繃婊ゆ柟妗堛�戙��
+ //閫�鍑�
+ function Pub_Close(closeType) {
+ if (closeType == 1) {
+ //鍏抽棴寮圭獥
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (closeType == 2) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
+ }
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
function get_DefaultModule() {
$.ajax({
--
Gitblit v1.9.1