Merge remote-tracking branch 'origin/main'

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>

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;
 }
 

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>