From 519a85d922942090b11cbbc2035734379a1d0952 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, 8 Apr 2020 23:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/easyui/themes/icons/filelist.jpg | Bin 1421 -> 1440 bytes
 erp_web/js/pages/materials/in_out.js        |   4 ++--
 erp_web/pages/materials/sale_out_list.html  |   4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/erp_web/js/easyui/themes/icons/filelist.jpg b/erp_web/js/easyui/themes/icons/filelist.jpg
index 08ce7b43f830ca2e3280b0ed2e0cd3a53f5d57ea..16a5af5badd9b6483ac8165258c84bb5c0ece0cf 100644
GIT binary patch
delta 547
zcmeC>Ucf!Uh*5KLBBRVk|ILgs76z_njuz&w=9Z4mhK8<=mS!%NZk7hd=H}*R#wLd5
zN(vRZ1-`yko_WP3iFwJXo-VdZKoPyn%oHoAUKd<?C&w{`O*UiFVlOTUN=>s$nf#v7
zWHKl7+xk`p1}0_(WWdVC%+A5cz|6>qEXu&l%EThTz`(-H%FM<OlVKDDY8GM<7GV`-
zQ#2I+;25YZCXraUQOPK2ld-djOUe{>bwLJ3CKfhkglUWnLV|`&!XFeJ1C{ET7qX}*
z|G&k+1605y$SlZU&v3!2{hQd#1KCXNf~5ymPLK`G*|L49SBnFmgOF@ntl;E;yD8ro
z(w1e%XI#C!?Ze{|-sVoPgL)w*tqmGHQ>JQ&Onk}6JHaNed&;qldF3rncP{<fvo7-e
zwG|ttoXU2d(x3K2PEo|dNo(4*8>>a?tDehbW-+j6E)`$1tL&QG6|Zkv${SjRZ>^JE
zqRJC3o6FO%^1h{mN=x4h2UFQg>z>Vh-}Aj>|LL#76F)z@rdFr1;Qb+sSxbwbm#KAT
z=dqV9+P>x6&zD>4H=jB2Mo|6q*SJ^y?xzZFy*+NZtUR)^<kIE6*ZSA)m2bDUII(5w
n=jHvfPi*9V+_AIYzjfAshM(y*Pj#%jOR`=+I4k+E{{Kw?MNGa5

delta 537
zcmZ3$-OD|}h*5HKBBRVk|ILh(e=sR>C{*MY`1)FTPF~4mIyr$UB*enf*vZMl%*n{n
zz`)$l&D7M=%*DvS!qCXT(8bln#Y{<|xFjew%_=27ximL5uf)^ER*8_F$r8-(>YEuD
zm>C%vkN_(iJ2M9(0~0ffC<8MS3oD}l0|N^)D+?<xOg*C@6ElO5s4$BNE1RMiyTk{>
zKxJ{q#KMh6Nt=wFO;V<)3o<Y=GqE8V#>gNjWXSYEF_2kU*|C1163hQv3_L)2CP8LF
z2787Vy6#7Eb(gO{Sa>GBKtG6iRqnKDUseWmuv}u8@W$v(CpV`^pgC{Y*+Om?-D&q^
zzCE}V;}ynP^x={i!vdqAkOe{RTUg8-xo36ExGKCZ<;$*ZR`0#1)s(K%Q8k)%;i>Y?
z>nz@z)FiJ6cSs(+_xMP?&d=5r3<Arh#C>}Ac8#6J^*`V2ZfINAOswQIHovmQ>;~68
z&M8bD9$%d+HiaJPTh$(rJ}qm`ZbRXTKeN86)peY2uPJn`{S`0j^7Xs^@7puphwl3z
z9r4?0rfieWzx%s>8dckE?s!}5Vk)fH{5)jEcTM(tkNVF?TclS#cpPH?xK4`uuRrhk
b&(E#e-_A2$vN8N!UFuu&XLd^a|K9`vr*^gq

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 57b884af..a62dd10b 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -464,8 +464,8 @@
 				},
 				{ title: '单据日期',field: 'opertimeStr',width:145},
 				{ title: '操作员',field: 'operpersonname',width:60},
-				{ title: '金额合计',field: 'totalprice',width:60},
-				{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:60,formatter:function(value,rec){
+				{ title: '金额合计',field: 'totalprice',width:70},
+				{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){
 						return (rec.discountmoney + rec.discountlastmoney).toFixed(2);
 					}
 				},
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index 27f3f4e3..4fc6d165 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -137,7 +137,9 @@
                 </td>
                 <td>销售费用</td>
                 <td style="padding:5px">
-                    <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
+                    <div class="other-money-list">
+                        <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
+                    </div>
                     <img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
                 </td>
                 <td>销售人员</td>