From 8f3d1b6c17b7362de112b85aa8587e5494ab4827 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Mon, 14 Oct 2024 16:40:27 +0800
Subject: [PATCH] 10.14

---
 fuintAdmin/src/assets/images/one_icon.png         | Bin 0 -> 834 bytes
 fuintAdmin/src/assets/images/three_icon.png       | Bin 0 -> 872 bytes
 fuintAdmin/src/assets/images/two_icon.png         | Bin 0 -> 813 bytes
 .../reconciliation/tab/trading.vue                |  14 ++++++++++----
 fuintAdmin/src/views/fleet/tab/fleetMember.vue    |   5 +++--
 fuintAdmin/src/views/shopowner.vue                |  14 +++++++++++++-
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 fuintAdmin/src/assets/images/one_icon.png
 create mode 100644 fuintAdmin/src/assets/images/three_icon.png
 create mode 100644 fuintAdmin/src/assets/images/two_icon.png

diff --git a/fuintAdmin/src/assets/images/one_icon.png b/fuintAdmin/src/assets/images/one_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a4047a36ed56a99b4c46cf875bab6cbf8d8eca5
GIT binary patch
literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq000#L000vR1^@s6e@;e=00004b3#c}2nYxW
zd<bNS0008{Nkl<ZI8TL?%TE(g6vn?h(-|Hul$VtliAAH7KxwyV)Y7;m;L4Q-m$=aK
z7l1BITq)7SCE&s}Bx+pIVoWqK#`2INiO>Wh5it}>1v>4$p6Rq>$2M@1X{NpB{?7Ss
zzk3*tiA*dwAegwvfI2WSVrz>`9JhyZ%ZCml$S}a%)(jCp4qgH+foUl~WDTyY(o>nQ
zA>xd&aY^N)tTmD-E^L7kkh;JbJ%Jr;LrSgz*|eomp*kQOry$hY0z4sCh}L4T3DshO
z0Ao^E&y@ClfYEbQaHkuhs>w)U{5qZWWFg;#W|x8?0X)uinE3vWcX|+Tb_10pKy?8h
z+RZiIa3R+*?Hg4*)1eY*W~qlNu|E0NoK^D06+me;^7m-%^JNpN9|dplKnO9Tw1)#_
zpuq&RlvDm4D^-1Elj>CfTT{T-TbA{#%SY#>z~-4YRp(wrEa1*EX|+VUzNj_>-QNt*
z+7n=fTvin35eVL+v_~SjBi26*8)2+0)OiW;zcDb&cYzJ7_X|)04auHqs+xytvET?}
z7$*5Bk>7k1XnSTrXM2IfyR!00@086G?l+-gIpEK7>5KkD$scug1ZWvDKp#7R!*vrX
zDxBc;=X2jP>*?OgYwur~&|jUM0X0}1w%>6WrZ2Ws#|xmTk8<f&%`{lMY$SUrcKn%0
zVgL31{gZQZ)InbUW>;4Pj9s-4+EEdx1l!+&v=cV~4liJH0{jrz{bWK5=0A)aAoZNC
zGKIoeYkf2tXPaK{03>OwkX`$z7B;s6mfp?XETs1=-GRKBt!c@1n2BphK1f2O$o@t|
zT(h%1Y}4n9l6#|)5R;t78>^AW>Ymb+vr9%=_5dt@|Ann8=Se+8iW6`b+G=J>m84LH
z^M1kD05omDGElbt{yI&FZTXzM;e1$EO?ydq+1N?FOujvwO5XtIw_Wq|<HcDeqwlBB
z7neB?HO<eP1EL%@-$0x?3%C{+qenuwyx#uffCYf=niC5Pk^hVS1^SUUkr#y*oB#j-
M07*qoM6N<$f@U{<=>Px#

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/assets/images/three_icon.png b/fuintAdmin/src/assets/images/three_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f27b9f32ee35e93e8a5d06c482e1569cf640824
GIT binary patch
literal 872
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS0009YNkl<ZI8U{eO-vI(6vyA}c3WH9TI8c7XlyZ>K*CaE;)O&T6C;T+sR>69
zp7h`WiboELUJWfrZX}*n)M#R2Qj8uvXi`eV14@fx6bpg{EZwj1&9q&1DYYkFv)SG0
zo8SEB|K79&_9@6daiJlYeoBN?6>g(|7$J~!cwwA`<LiwC)dj1wiKqcEhzYS82!%;W
zf>F{H&(&L?2F!pIxWXu(WEeoTZF4?xdUja<S-=KXX2+5MWRT6Ix(c+A2cxuQ7bOTF
zc$z@)9yZ4X3RfI*e9D?=1D9sUas<dRP)ne#EpfGVw|c-2Vj#%Brj$N$$-_3wOfWB!
z23ZEvR<ax_bzTCBpPJB$pnXlD@&E|_Rs=)NCC9^iD%LWIm_gvNvAGJy=5L<Ez}66&
zP5`@%wRtFgK-VzD)({X;0?7ekYcWm5Re$w-7X8)sbimnr13@zAKi+}z@d3{fd@Udx
zM9+8mYz3#WaJ|~kc@ye7J;WT`DU$CffWr;i!V6Fro|nN`M8Vt4^2VJ#!)yW%3pl|E
zRxsPPHOdPCC^HkF=QF#&kaqUOPuakg-c7N=x>lf4cl17=$NXhJvk?73ARa$|MzATA
zKhSI<pyZYJ#O*v@EuM680R8JQ1rvt{i0=r0FTT229v28WS~~GAfc||g<?g?G-lmwn
ztX$|@^4+`KLEI9y+XAZS03x|<R&Wu;RiNADuBrN~FRnsi<XJ8_Gh?<KSDcsSAxcQX
z(bW##k$xy2kZ;(_d-QN+DdP5lc&HudRtXBj5Am+BgEAV-WbUvOvKEO1R7&wgK!6Rn
z`n$n>^$b7K%obYQu&E}Z1KX?F^mSw8Dd>yk9bl|WgoK;Y>2<O!%WQ=Rp>ztb92Lcs
z=XxJF&sI9Z@*_luh^NM7F7$WeEhuk3|3O$p)%7UuIwk;2w`MZQnqRkHvOG<^u5<q6
zz!z4`8j~vn#&Y3h;nt&zxc}E}nM`zdUJaP-00%>ue61d|I*uYHu?o4Wuh#rp#ogTz
y$?427pBjOAeH10sHaCZ-)*cQ2ni|3Deg6+4l|Uv!VhuU~0000<MNUMnLSTZ7yN&<=

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/assets/images/two_icon.png b/fuintAdmin/src/assets/images/two_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..46b78681d0ebd4700275c229ccb225f749ae3eba
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS0008yNkl<ZI8U{d&rcdb6vyALO93&UKp`;@X`&aSgvLZYm{zY|)c>IR4`?rX
z6mPxh!Mpqk^q>bWB|UKj(GwUNL6c$?G5pX%clzGcS$9{EUVO=BcW2&y-gmz9b|iSE
zkY0%kJ;8-SVX)n9ucLqsywZ5>jE#*YdkN|aHUS4sAOgQw;29W!p+|+E@M8{aG#VgD
z|5B}1E6B1e>U1q&0OxYKdHmv=`0D!l8Y-0vsH$oZ>~uQ8=kw_cd_{Yf^+^VBKA+!X
zjI9%>SS-TB!$VgqNp&C)0GrLma}aD`nHAI0K3-m4LakN<zuym}u2YmsCBBl8kr6Sy
zpx;z8nBCvs!}<9+PoABf1-IJ`H#avxw%F}<u96~=NC55yFYa==Xy`M7_e2#9Ec_(^
zT@(Z%7`+pmAX8IQeD3Jzh~H^G7!1;*!Dl^~`gE7PZ8n?2H-ihL-sAD`BB@l0&ym-o
zqoeeAi;9OjDURddk^qypb8~aN2>GcG{g@66ilV&3_(8dP#kctG5>}8p@>s7<z!AXx
zr5G3(fZ^d`{*1l8g6c`24xCPZ0f%F&)oKC$B-B3qB0#lTH7LHgxX@OiZC<rnS3I5o
zDkgzX;Gf}ew7Ipl-I|_;a=Fagty`<z-QDqm^cPaQN%cB7wzok!J6m{ra+1`*l}IGi
zVywU%4yZ+=(8gp^B{tC@_wmJIvGA^;yM2Ej-Xu9M?aO4|YhY9xM}L-R;7=$7^_?A{
zBIGxzBYQ;9X3<K#UN7$m>)|2T4i27btLmyRn~h23@$m?=SmF|6aa>=FDN3|GGqcp#
z+|-ikrxE8xe}BI=uAH873uIMY!K2`o$ugZ65#RCg{Ik>TDjeQmlC;}gTl@Zdaq&YZ
z8)ytc8RzP%TdviD7D*Z!N~igziFgL46`*lROb(fo%|)&zCg#<?zL-Cg37O|Q9`wH^
rCzrk1Ebqr&L2%ItFDmW@`rrA#8XZ<9X)y@800000NkvXXu0mjfi+g|a

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index b2d64f09a..5a75c14d8 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
   <div style="">
-    <div class="card-change-1-search">
+    <div class="new-top" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="">
           <el-input v-model="queryParams.orderNo" placeholder="流水编号"></el-input>
@@ -67,7 +67,7 @@
             <el-option label="已退款" value="refund"/>
           </el-select>
         </el-form-item>
-        <el-form-item class="f-button" style="text-align: right;">
+        <el-form-item  style="float: right; margin-right: 0px ">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
 <!--          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>-->
@@ -260,7 +260,6 @@
     <el-dialog
       title="订单信息"
       :visible.sync="dialogVisible">
-
       <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
         <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
         <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>
@@ -525,7 +524,7 @@ import {
     }
   }
   .el-form--inline .el-form-item {
-    margin-right: 44px;
+   margin-bottom: 0px;
   }
   .icon-img{
 
@@ -586,5 +585,12 @@ import {
     color: grey;
     margin: 10px 0;
   }
+  .new-top{
+    width: 98%;
+    background: #FFFFFF;
+    margin: 15px auto;
+    height: 60px;
+    padding: 5px;
+  }
 
 </style>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index 8eb320738..a782e8be3 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -158,7 +158,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="车队名称" prop="fleetId">
           <el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;">
@@ -490,6 +490,7 @@ export default {
       endTime: "",
       beginTime1: "",
       endTime1: "",
+
       // 收银台订单列表
       orderList: [],
       deptList: [],
@@ -840,7 +841,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 73vh;
+  height: 73.5vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index a5878ac6c..cfd17a31c 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -185,7 +185,19 @@
         </div>
         <div style="overflow: auto; scrollbar-width: none; height: 74% ">
           <div class="hang-box" v-for="(item,index) in employeList" :key="index">
-            <div style="width: 10%">{{index +1}}</div>
+
+            <div style="width: 10%" v-if="index == 0">
+              <img src="../assets/images/one_icon.png"  style="width: 22px;height: 22px">
+
+
+            </div>
+            <div style="width: 10%" v-if="index == 1">
+              <img src="../assets/images/two_icon.png"  style="width: 22px;height: 22px">
+            </div>
+            <div style="width: 10%" v-if="index == 2">
+              <img src="../assets/images/three_icon.png"  style="width: 22px;height: 22px">
+            </div>
+            <div style="width: 10%" v-if="index>2">{{index +1}}</div>
             <div>{{ item.realName }}</div>
             <div style="width: 25%">{{item.cardSum}}</div>
             <div style="width: 25%">{{item.oilSum}}</div>