From f147cfa91feec613eb304c78fecafdf43286034a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 30 三月 2024 11:12:24 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Pda/View/HouseDataSetting/stockQuery.html | 19 ++
HTML/img/tuichu.png | 0
HTML/views/index2.html | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++
HTML/img/ruku.png | 0
HTML/img/touxiang.png | 0
5 files changed, 371 insertions(+), 5 deletions(-)
diff --git a/HTML/img/ruku.png b/HTML/img/ruku.png
new file mode 100644
index 0000000..a8a9a91
--- /dev/null
+++ b/HTML/img/ruku.png
Binary files differ
diff --git a/HTML/img/touxiang.png b/HTML/img/touxiang.png
new file mode 100644
index 0000000..0b08169
--- /dev/null
+++ b/HTML/img/touxiang.png
Binary files differ
diff --git a/HTML/img/tuichu.png b/HTML/img/tuichu.png
new file mode 100644
index 0000000..2cdbe72
--- /dev/null
+++ b/HTML/img/tuichu.png
Binary files differ
diff --git a/HTML/views/index2.html b/HTML/views/index2.html
new file mode 100644
index 0000000..70f158d
--- /dev/null
+++ b/HTML/views/index2.html
@@ -0,0 +1,357 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>浠撳偍绠＄悊绯荤粺</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../img/menuico/iconfont.css" media="all">
+ <!-- <link rel="icon" href="../img/favicon.ico" type="image/x-icon"> -->
+ </head>
+ <style type="text/css">
+ .menu{
+ width: 100%;height: 80px;margin-top: 5px;
+ }
+ .menudiv{
+ height: 80px;width: 80%;float: right;display: flex;flex-direction: column;align-items: center;justify-content: center;font-size: 14px;color: #fff;cursor: pointer;
+ }
+ .menudivChoose{
+ background-color: #3A3C40;
+ border-left:5px solid #E35715;
+ }
+ .fatherMenuDiv{
+ position: relative;height: 100%; width: 180px;overflow: auto;scrollbar-width: none;float: left;background-color: #24262A;
+ }
+ .fatherMenuTxDiv{
+ margin-top: 50px;height: 80px;width: 80%;display: flex;align-items: center;justify-content: center;float: right;font-size: 1px;color: #3A3C40;cursor: pointer;
+ }
+ .fatherMenuDiv2{
+ width: 100%;height: auto;display: flex;flex-direction: column;font-size: 14px;
+ }
+ .chiledMenuDiv{
+ position: relative;height: 100%; width: 140px;overflow: auto;scrollbar-width: none;float: left;background-color: #3A3C40; opacity: 0.9;
+ }
+ .chiledMenuDiv2{
+ width: 200px;height: auto;margin-left: 20px;margin-top: 140px;border-left:1px solid #737377;
+ }
+ .chiledMenuInfo{
+ width: 100px;height: auto;margin-top: 30px;display: flex;justify-content: center;color: #fff;
+ }
+ .chiledMenuInfoChoose{
+ color: #E35715;
+ cursor: pointer;
+ }
+ .chiledMenuInfoChooseW{
+ color: #fff;
+ cursor: pointer;
+ }
+ </style>
+ <body class="layui-layout-body">
+ <div id="LAY_app">
+ <div class="layui-layout layui-layout-admin">
+ <div class="layui-header">
+ <!-- 澶撮儴鍖哄煙 -->
+ <ul class="layui-nav layui-layout-left">
+ <!-- <li class="layui-nav-item layadmin-flexible" lay-unselect>
+ <a href="javascript:;" layadmin-event="flexible" title="渚ц竟浼哥缉">
+ <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+ </a>
+ </li> -->
+ <li class="layui-nav-item" lay-unselect>
+ <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
+ <i class="layui-icon layui-icon-refresh-3"></i>
+ </a>
+ </li>
+ </ul>
+ <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
+
+
+ <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <a href="javascript:;" layadmin-event="theme">
+ <i class="layui-icon layui-icon-theme"></i>
+ </a>
+ </li>
+ <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <a href="javascript:;" layadmin-event="note">
+ <i class="layui-icon layui-icon-note"></i>
+ </a>
+ </li>
+ <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <a href="javascript:;" layadmin-event="fullscreen">
+ <i class="layui-icon layui-icon-screen-full"></i>
+ </a>
+ </li>
+ <!-- <li class="layui-nav-item" lay-unselect>
+ <a href="javascript:;">
+ <cite >
+ <a href="javascript:;" id="username"></a>
+ </cite>
+ </a>
+ <dl class="layui-nav-child">
+ <!-- <dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd> -->
+ <dd><a lay-href="set/user/password.html" id="changePassword">淇敼瀵嗙爜</a></dd>
+ <hr>
+ <dd><a href="Login.html">閫�鍑�</a></dd>
+ </dl>
+ </li> -->
+ </ul>
+ </div>
+
+ <!-- 渚ц竟鑿滃崟 -->
+ <div class="layui-side" id="leftmenu" style="width: auto;">
+ <div class="fatherMenuDiv">
+ <div class="fatherMenuTxDiv">
+ <dd><a lay-href="set/user/password.html" id="changePassword">
+ <img src="/img/touxiang.png" style="width: 50px;">
+ 淇敼瀵嗙爜
+ </a></dd>
+ </div>
+ <div class="fatherMenuDiv2">
+ <div id="LAY-system-side-menu">
+
+ </div>
+ <div class="menu" style="position: relative;">
+ <div class="menudiv" onclick="loginOut()">
+ <img src="/img/tuichu.png" style="width: 32px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="chiledMenuDiv" hidden>
+ <div class="chiledMenuDiv2" id="LAY-system-side-menu2">
+
+ </div>
+ </div>
+ </div>
+
+ <!-- 椤甸潰鏍囩 -->
+ <div class="layadmin-pagetabs" id="LAY_app_tabs" style="left: 180px;">
+ <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
+ <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
+ <div class="layui-icon layadmin-tabs-control layui-icon-down">
+ <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
+ <li class="layui-nav-item" lay-unselect>
+ <a href="javascript:;"></a>
+ <dl class="layui-nav-child layui-anim-fadein">
+ <dd layadmin-event="closeThisTabs"><a href="javascript:;">鍏抽棴褰撳墠鏍囩椤�</a></dd>
+ <dd layadmin-event="closeOtherTabs"><a href="javascript:;">鍏抽棴鍏跺畠鏍囩椤�</a></dd>
+ <dd layadmin-event="closeAllTabs"><a href="javascript:;">鍏抽棴鍏ㄩ儴鏍囩椤�</a></dd>
+ </dl>
+ </li>
+ </ul>
+ </div>
+ <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
+ <ul class="layui-tab-title" id="LAY_app_tabsheader">
+ <li lay-id="" lay-attr="" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
+ </ul>
+ </div>
+ </div>
+
+ <!-- 涓讳綋鍐呭 home/console.html-->
+ <div class="layui-body" id="LAY_app_body" style="left: 180px;">
+ <div class="layadmin-tabsbody-item layui-show" id="bodyDIv">
+ <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+ </div>
+ </div>
+ <div class="layui-footer" style="height: 20px; z-index: 999;left: 180px;">
+ <!-- 搴曢儴鍥哄畾鍖哄煙 -->
+ <p>鐗堟湰v1.0</p>
+ </div>
+ <!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
+ <div class="layadmin-body-shade" layadmin-event="shade"></div>
+ </div>
+ </div>
+ <div id="">
+ df
+ </div>
+ <script src="../layuiadmin/layui/layui.js"></script>
+ <script src="../js/public.js"></script>
+ <script src="../js/jquery-3.5.1.min.js"></script>
+ <script src="../js/jquery.cookie.js"></script>
+ <!-- <script src="../layuiadmin/modules/console.js"></script> -->
+ <script>
+ var allList;
+ var chooseMenuId='';
+ var chooseChildMenuId='';
+ //鐐瑰嚮鑿滃崟浜嬩欢
+ function chooseMenu(menuId){
+ if(menuId!=null && menuId!=''){
+ $('.menudiv').removeClass('menudivChoose');
+ $('#'+menuId).addClass('menudivChoose');
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var list = allList.filter(item => item.ParentNo == menuId);
+ if(list.length>0){
+ $('.chiledMenuDiv').show();
+ $("#LAY-system-side-menu2").html('');
+ var html='';
+ for(var i=0;i<list.length;i++){
+ if(list[i].MenuNo == chooseChildMenuId){
+ html+='<div class="chiledMenuInfo">'+
+ '<dd><a lay-href="'+list[i].Url+'" id="'+list[i].MenuNo+'" class="chiledMenuInfoChoose" onclick="chooseChiledMenu('+list[i].MenuNo+')">'+list[i].MenuName+'</a></dd>'+
+ '</div>';
+ }else{
+ html+='<div class="chiledMenuInfo">'+
+ '<dd><a lay-href="'+list[i].Url+'" id="'+list[i].MenuNo+'" class="chiledMenuInfoChooseW" onclick="chooseChiledMenu('+list[i].MenuNo+')">'+list[i].MenuName+'</a></dd>'+
+ '</div>';
+ }
+ }
+ $("#LAY-system-side-menu2").append(html);
+ }else{
+ $('.chiledMenuDiv').hide();
+ }
+ chooseMenuId=menuId;
+ }
+ }
+ //鐐瑰嚮瀛愯彍鍗曚簨浠�
+ function chooseChiledMenu(menuId){
+ $('.chiledMenuInfo').find('a').removeClass('chiledMenuInfoChoose');
+ $('.chiledMenuInfo').find('a').addClass('chiledMenuInfoChooseW');
+ $('#'+menuId).removeClass('chiledMenuInfoChooseW');
+ $('#'+menuId).addClass('chiledMenuInfoChoose');
+ chooseChildMenuId=menuId;
+ }
+ function loginOut(){
+ window.location.href = "Login.html";
+ }
+ //榧犳爣绂诲紑瀛愯彍鍗曚簨浠�
+ $('#leftmenu').mouseleave(function(){
+ $('.chiledMenuDiv').hide();
+ });
+ // 缁戝畾tab鏍囩鐐瑰嚮浜嬩欢
+ $('#LAY_app_tabsheader').on('click', 'li', function(){
+ var url = $(this).attr('lay-id');
+ var chiledMenuInfo = allList.filter(item => item.Url == url)[0];
+ chooseChildMenuId=chiledMenuInfo.MenuNo;
+ $('.chiledMenuInfo').find('a').removeClass('chiledMenuInfoChoose');
+ $('.chiledMenuInfo').find('a').addClass('chiledMenuInfoChooseW');
+ $('#'+chooseChildMenuId).removeClass('chiledMenuInfoChooseW');
+ $('#'+chooseChildMenuId).addClass('chiledMenuInfoChoose');
+
+ chooseMenuId=chiledMenuInfo.ParentNo;
+ $('.menudiv').removeClass('menudivChoose');
+ $('#'+chooseMenuId).addClass('menudivChoose');
+ });
+ layui.config({
+ base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['element', 'index'], function() {
+
+ if (!$.cookie('token')) {
+ layer.msg('鐧婚檰澶辨晥锛岃閲嶆柊鐧婚檰', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ location.href = "Login.html";
+ });
+ }else{
+ $("#token").text($.cookie('token'));
+ }
+ var element = layui.element;
+
+ getMenuInfo();
+ var xml='';
+ function getMenuInfo(){
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ allList=res.data;
+ var list = allList.filter(item => item.level == "0");
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ if (list[i].MenuNo == "9000") { //鍒ゆ柇鏄惁鏄痯da鐨勬潈闄� 鏄細璺宠繃
+ continue;
+ }
+ if(i==0){
+ xml+='<div class="menu">'+
+ '<div class="menudiv menudivChoose" id="'+ list[i].MenuNo +'" onclick="chooseMenu('+list[i].MenuNo+')">'+
+ '<img src="/img/ruku.png" style="width: 25px;">'+
+ '<p style="margin-top: 15px;">'+list[i].MenuName+'</p>'+
+ '</div>'+
+ '</div>'
+ }else{
+ xml+='<div class="menu">'+
+ '<div class="menudiv" id="'+ list[i].MenuNo +'" onclick="chooseMenu('+list[i].MenuNo+')">'+
+ '<img src="/img/ruku.png" style="width: 25px;">'+
+ '<p style="margin-top: 15px;">'+list[i].MenuName+'</p>'+
+ '</div>'+
+ '</div>'
+ }
+ }
+ }
+ $("#LAY-system-side-menu").append(xml);
+ element.render("#leftmenu");
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇褰撳墠鐧诲綍浜烘潈闄愪俊鎭け璐�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ });
+ }
+ });
+ }
+
+ sendData(IP + "/Basis/IsPassWordTime", "", 'get', function(res) {
+ if (res.code == 0 && res.data == 1) { //鎴愬姛
+ layer.open({
+ type: 2,
+ title: '瀵嗙爜宸茶繃鏈燂紝璇蜂慨鏀瑰瘑鐮�',
+ content: 'set/user/password.html',
+ maxmin: true,
+ closeBtn: 0,
+ maxmin: false,
+ area: ['500px', '30%']
+ });
+ }
+ });
+ // var dataList;
+ // sendData(IP + "/IndexEchar/ImportTaskDayList", param, 'post', function(res) {
+ // if (res.code == 0) { //鎴愬姛
+ // var list=res.data;
+ // $.cookie('list',JSON.stringify(list));
+ // dataList= list;
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // }
+ // });
+
+
+ // sendData(IP + "/IndexEchar/ExportTaskDayList", param, 'post', function(res) {
+ // if (res.code == 0) { //鎴愬姛
+ // var Exlist=res.data;
+ // $.cookie('Exlist',JSON.stringify(Exlist));
+ // // initEchars("娴嬭瘯",Exlist);
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // }
+ // });
+
+
+ // sendData(IP + "/IndexEchar/YAxis", param, 'post', function(res) {
+ // if (res.code == 0) { //鎴愬姛
+ // var YAxis=res.data;
+ // $.cookie('YAxis',YAxis);
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // }
+ // });
+ // function quit(){
+ // $.cookie('userId', '');
+ // location.href = "Login.html";
+ // }
+ });
+ </script>
+ </body>
+</html>
diff --git a/Pda/View/HouseDataSetting/stockQuery.html b/Pda/View/HouseDataSetting/stockQuery.html
index 8180398..28514ac 100644
--- a/Pda/View/HouseDataSetting/stockQuery.html
+++ b/Pda/View/HouseDataSetting/stockQuery.html
@@ -239,14 +239,23 @@
$("#SkuNo").val("");
$("#SkuName").val("");
$("#Standard").val("");
+
+ //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
+ let trs = $("#tableBoxList tr")
+ let len = trs.length
+ //console.log("tr 鏁伴噺 + " + trs.length)
+ for(i=len - 1; i >=2; i--){
+ trs[i].remove();
+ }
}
$("#btnQuery").click(function(){
- if($('#LocatNo').val() == '' && $('#PalletNo').val() == '' && $('#SkuName').val() == ''){
- // layer.msg("璇疯緭鍏ユ煡璇㈡潯浠�", {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
+ if($('#LocatNo').val() == '' && $('#PalletNo').val() == ''){
+ layer.msg("璇疯緭鍏ュ偍浣嶅湴鍧�鎴栨墭鐩樻潯鐮�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ clear();
return
}
var param = {
--
Gitblit v1.8.0