From 4a6a4b4e9290326543577d65c8b315a54616debc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 14 Aug 2019 23:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/easyui-1.3.5/themes/icons/no.png | Bin 1853 -> 1592 bytes
 erp_web/pages/manage/app.html               |   2 +-
 erp_web/pages/materials/material.html       |   1 +
 erp_web/pages/materials/person.html         |  45 +-------------------
 4 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/erp_web/js/easyui-1.3.5/themes/icons/no.png b/erp_web/js/easyui-1.3.5/themes/icons/no.png
index 6adbed7079afc8920d345b8698043e0e456f2f0b..b14398dbbf8a99ed339c5994b1840f4f552a3a05 100644
GIT binary patch
delta 905
zcmdnXw}WSbBnKM<1B3kM|A`wFRhgpA%*@=3j7(jeTpdjf4P7lQj14Va4b7bloy{#Q
zoQ#Z>6e@BHe0{B4@{>z*Q}aqZU2K(rB6=yADOOOut~m5gUdUu94^`uYOU*|nS(qAU
zTxxWgo$D2Zo!>DqFs<=)aSW-rl@jdjFB~ZHFD+=9L&LRC8MC>hW-ba*(Qp%P5_)_r
z!>431_Z5$boyE`P3sQUZdiv+8b#V(N9XiC`$!XZO!$3sQWQLhX=aoy-b!BhOd|9&Y
z`#sI2M}9xOvvd7>>*sfh-8+sZt;p3>^-WWbUmz^2#=%m*yJ1t9TXR5v@h6U3v!YsW
zecpEKWcvl4lg<YV5;*)$I=<ZP@k-Oj{odi;vLelbg<48)Tnr@VDA}_A`LMIbK;x8*
zn)}YQZPOy%ZDbDLcp2>!+EAJIb<3f*Ma4y(hgW=YD?O8b#KA`L_`VeGbuxQ(I#~BQ
z82#wBn(p#jM{Ke8jru+<j<zO`%Trl`A~@F`5G{XDUdOz;L+Me(VfU}bBB6@g)=#vo
zNYOu3a@y@;@_V=W>J4#!4dPnWD*h#Z;x+N=HTmM}bK-r25u+8yv#|XKr(L>KvYFL&
z#UH&okJA=Q<e#+M{-hC~{8-~`ZPYK9lO+e2gz@X-uW?AJe7d1ES7b;1(-^LMTEPoe
z7Cz$p8Te0<D^@DQVH$(zsa263IxbTeML0G_>CL<Q+3eQrTMzE!Io@2dMkv%khfz)K
z+TnBE$MzT-aZW98ms?+Tuk*>g8u7V_{Gtu2PW$s#GC%s4ChsLVck)c$E3&I6$v>a}
zc;TllT1FaQqM59=&f(m@_;wY$e^b5wiT95=XLTGqdTxn-qTjD`#c8GQeX1_bo?v*{
zg8SDp#@+*xd54-O{+@Q=&o8FRwZ2O4^*?QzdF08l&n73<h0iT8GV|%#o%bjwAwuA$
z>f9Gn0(x1`1AnbNq#<cg>J|3#ppt3W-K5qC#rXUkT@RI=tN*iJ6T3eB#OV{#DSM*7
zEcES|RxZZcop8Cu_-aq!Pbt4s%>u50Kl~d^4;!4wdL;gAG53$fM=Mv}$o>BN*Msk;
jHr#$&UH816iHE^!VfCKK1-pEJnU2BJ)z4*}Q$iB}r7MZj

delta 1168
zcmcgqYfMvj6z{5=TQaBHK5VjVI;ZZDv8_~IE@r8=YQrf~WFZc6sTmF!sbgtPM5C9q
z(Uoq>8?>dQ5L#mjHI#=<Wd-RBw1aX7r9kC^E6@QYU`w}FYWv@fb07JzFFQFoIXU^A
z{C?+QeEH{B%6GiDiAJM+5WDR}+q-+|Sxg3l8OKgYPG+*>84OM$D<L8IFe8qWa3r3&
zKQW%Ud)GN(5s!C({oU7Rg{RMmx$J|xsmdq01-S>F^|ChTt!kt*c0R)-ZiMmC-~Jbq
zv=JtD(_uUiLm#Kno?A_W433v1T>x%?00643^#DAg5*+^>Aj0D<0z3xrFD?dyL87hA
zs#MzB+Yw0;3PmImL2@~v*LMTV0E9X_??@y@iDVvN0>E2d?o}v|OtwtrHk;RCLCwu%
zRu<y(r}4o-vr>s>XNk(nE`h+-*w|NH?Gy;yV`Io>Lpog>hFK^P<KyVzLu4>`rPAo}
z<NcYL$l)N=YL8H8y>jJ`sw!uF{XK~UQG(QJheqQEi0bu3MFk23qCB3jx*B0ve`_n*
z-yd?jZB0!N>~_LrLSkI(6^YEHrE>sF0P6q?0Dl6IIXNgle}&Sk*P~09NB{>w7+_ed
zy;D?#3JQ?LLX?!u4Gvmw+(4zJXmpflX+b_88X6k!?sggs;c$428dR(8RjGy)3ZkwK
z<>gsxYth<TD~2Jze|lhG1OP`@uR5t^*3=-Y6^TTIOlB-9dICVm<<Yb>l%8%?tC87^
zMn(vV*yUQKG@U&8m){?noD3EgPEort8c7U`^7*4eA#w2{nwUTX1HS^y+3nW4x~NP>
zW@nQcjTayYU{$Hm!a^tzKu?X0KPh`ey{$%^o_gY+(*GOr|4K*Ob-})wdf4Z=Y*xlO
z*Pb%zH4bY#JM5ms9&`zx`XqCwNfbPr&Yf@mXpwG9%_?{^uIF;$-fhs;A#c*uwCM=`
z`$_)DR_<pi{Qk{`j-$tVJ$dJ2cHk>tn1?<bSZ*xwv@Q($AOCW_?_OolTb)AOom=mD
zZEA*P;D4MH5L|zi^XVShX1ZxjX*k92`09s)72A!U6ZPY(eIC=H-x$5LhLx9cY*@%Q
ztuM|kcAn1{_1uz{HapE+dTi%0zvJ2)?-4&;9{I7QEaSqL>-AfP?=O|;kG%83K3$A*
z{@aH3%#_=2-Q7PUnL4VSTRvTjzGs~(+!|+Qo+);@vr}$1eM4qTb>d3&x`1|jHhU?}
R9x_u$q;WZ^Z2cjD<Zp9v!x#Vn

diff --git a/erp_web/pages/manage/app.html b/erp_web/pages/manage/app.html
index ae793d78..b727e5c2 100644
--- a/erp_web/pages/manage/app.html
+++ b/erp_web/pages/manage/app.html
@@ -156,7 +156,7 @@
                 {
                     title: '图标', field: 'icon', width: 100, formatter: function (value, row) {
                         if (value != null) {
-                            return "<img alt='图标' style='width:32px;height:32px;' src=\"../../upload/images/deskIcon/" + value + "\" />";
+                            return "<img alt='图标' style='width:28px;height:28px;' src=\"../../upload/images/deskIcon/" + value + "\" />";
                         }
                     }
                 },
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 09888dae..17b7ad80 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -1460,6 +1460,7 @@
                 $("#searchParentName").val("");
                 $("#searchParentId").val("");
                 $("#searchName").val("");
+                $("#searchModel").val("");
                 types = ""; //清空类别
                 //加载完以后重新初始化
                 $("#searchBtn").click();
diff --git a/erp_web/pages/materials/person.html b/erp_web/pages/materials/person.html
index 22ef2b56..f0025ab9 100644
--- a/erp_web/pages/materials/person.html
+++ b/erp_web/pages/materials/person.html
@@ -82,55 +82,13 @@
 </div>
 
 <script type="text/javascript">
-    var depotList = null;
-    var depotID = null;
     //初始化界面
     $(function () {
-        //初始化系统基础信息
-        initSystemData();
-        initSelectInfo();
         initTableData();
         ininPager();
         initForm();
     });
 
-    //初始化系统基础信息
-    function initSystemData() {
-        $.ajax({
-            type: "get",
-            url: "/depot/getAllList",
-            //设置为同步
-            async: false,
-            dataType: "json",
-            success: function (res) {
-                if(res && res.code === 200){
-                    depotList = res.data;
-                } else {
-                    $.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error');
-                    return;
-                }
-            }
-        });
-    }
-
-    //初始化页面选项卡
-    function initSelectInfo() {
-        var options = "";
-
-        if (depotList != null) {
-            options = "";
-            for (var i = 0; i < depotList.length; i++) {
-                var depot = depotList[i];
-                if (0 == i) {
-                    depotID = depot.id;
-                }
-                options += '<option value="' + depot.id + '">' + depot.name + '</option>';
-            }
-            $("#ProjectId").empty().append(options);
-            $("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
-        }
-    }
-
     //防止表单提交重复
     function initForm() {
         $('#personFM').form({
@@ -480,9 +438,8 @@
     //重置按钮
     $("#searchResetBtn").unbind().bind({
         click: function () {
-            $("#searchProjectId").val("");
+            $("#searchName").val("");
             $("#searchType").val("");
-
             //加载完以后重新初始化
             $("#searchBtn").click();
         }