Merge remote-tracking branch 'origin/master'

admin-ui/src/permission.js

@@ -11,6 +11,7 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
+  console.log("路由 ==========》", to.meta.componentPath, to.meta.title)
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
@@ -29,7 +30,6 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 判断当前用户是否已拉取完user_info信息
-        console.log("SSSSSSS")
         store.dispatch('GetInfo').then(() => {
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {

admin-ui/src/store/modules/permission.js

@@ -37,7 +37,6 @@ const permission = {
         // 向后端请求路由数据
         getRouters().then(res => {
           let userInfo = getUserInfo()
-          console.log('a1',constantRoutes)
           constantRoutes.forEach(item => {
             if (userInfo.userType === '00' && item.redirect === 'index') {
               item.hidden = false
@@ -49,7 +48,6 @@ const permission = {
               item.hidden = false
             }
           })
-          console.log('a2',constantRoutes)
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
@@ -57,6 +55,7 @@ const permission = {
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes);
+          console.log('C4',rewriteRoutes)
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
           commit('SET_DEFAULT_ROUTES', sidebarRoutes)
@@ -75,6 +74,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       route.children = filterChildren(route.children)
     }
     if (route.component) {
+      route.meta.componentPath = route.component
       // Layout ParentView 组件特殊处理
       if (route.component === 'Layout') {
         route.component = Layout

admin-ui/src/views/app/user/index.vue

@@ -119,11 +119,11 @@
                         <span class="card-title">基本信息</span>
                     </div>
                     <div class="user-basic-info">
-                        <div class="avatar-section">
+                        <!-- <div class="avatar-section">
                             <div class="level-tag">
                                 <el-tag type="warning">Level {{ userInfo.level }}</el-tag>
                             </div>
-                        </div>
+                        </div> -->
                         <el-descriptions :column="3" border>
                             <el-descriptions-item label="姓名">
                                 <span class="primary-text">{{ userInfo.realName }}</span>
@@ -216,28 +216,33 @@
                         </el-tab-pane>
 
                         <el-tab-pane name="2">
-                            <span slot="label"><i class="el-icon-coin"></i> 消费明细</span>
+                            <span slot="label"><i class="el-icon-coin"></i> 余额明细</span>
                             <el-table v-loading="userloading" :data="userinfoData" fit highlight-current-row border stripe>
                                 <el-table-column label="订单编号" align="center" prop="orderNo" min-width="200" />
-                                <el-table-column label="订单类型" align="center" prop="orderType" width="150">
+                                <el-table-column label="订单类型" align="center" prop="orderType" min-width="100">
                                     <template slot-scope="scope">
                                         <dict-tag :options="dict.type.order_type" :value="scope.row.orderType" />
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="账单标题" align="center" prop="title" width="100" />
-                                <el-table-column label="支付方式" align="center" prop="payType" width="100">
+                                <el-table-column label="账单标题" align="center" prop="title" min-width="100" />
+                                <!-- <el-table-column label="支付方式" align="center" prop="payType" width="100">
                                     <template slot-scope="scope">
                                         <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
                                     </template>
+                                </el-table-column> -->
+                                <el-table-column label="支付总金额" align="center" prop="payTotalAmount" width="100" >
+                                    <template slot-scope="scope">
+                                       {{ scope.row.payTotalAmount}}
+                                    </template>
                                 </el-table-column>
-                                <el-table-column label="支付总金额" align="center" prop="payTotalAmount" width="100" />
-                                <el-table-column label="现金支付金额" align="center" prop="cashPayAmount" width="100" />
-                                <el-table-column label="充值余额支付金额" align="center" prop="rechargePayAmount" width="150" />
-                                <el-table-column label="赠送余额支付金额" align="center" prop="givePayAmount" width="150" />
+                                <!-- <el-table-column label="现金支付金额" align="center" prop="cashPayAmount" width="100" /> -->
+                                <el-table-column label="现金余额支付金额" align="center" prop="rechargePayAmount" width="130" />
+                                <el-table-column label="赠送余额支付金额" align="center" prop="givePayAmount" width="130" />
                                 <el-table-column label="福利金余额支付金额" align="center" prop="welfarePayAmount" width="150" />
-                                <el-table-column label="消费积分" align="center" prop="usePoint" width="80" />
+                                <!-- <el-table-column label="消费积分" align="center" prop="usePoint" width="80" />
                                 <el-table-column label="获取积分" align="center" prop="receivePoint" width="80" />
-                                <el-table-column label="是否退款" align="center" prop="isRefund" width="80" />
+                                <el-table-column label="是否退款" align="center" prop="isRefund" width="80" /> -->
+                                <el-table-column label="更新时间" align="center" prop="createTime" min-width="160" />
                             </el-table>
                             <pagination v-show="usertotal > 0" :total="usertotal" :page.sync="userViewForm.pageNum" :limit.sync="userViewForm.pageSize" @pagination="getMemberBillMstrData" />
                         </el-tab-pane>
@@ -245,7 +250,7 @@
                         <el-tab-pane name="3">
                             <span slot="label"><i class="el-icon-shopping-cart-1"></i> 商品订单</span>
                             <el-table v-loading="userloading" :data="userinfoData" fit highlight-current-row border stripe>
-                                <el-table-column label="订单编号" align="center" prop="orderNo" width="150" />
+                                <el-table-column label="订单编号" align="center" prop="orderNo" width="200" />
                                 <el-table-column label="订单总价（元）" align="center" prop="totalPrice" width="150" />
                                 <el-table-column label="抵扣金额（元）" align="center" prop="deductAmount" width="150">
                                     <template slot-scope="scope">
@@ -258,13 +263,13 @@
                                         <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="支付方式" align="center" prop="payType">
+                                <el-table-column label="支付方式" align="center" prop="payType" width="150">
                                     <template slot-scope="scope">
                                         <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="下单时间" align="center" prop="createTime" width="150" />
-                                <el-table-column label="支付时间" align="center" prop="payTime" width="150" />
+                                <el-table-column label="下单时间" align="center" prop="createTime" min-width="150" />
+                                <el-table-column label="支付时间" align="center" prop="payTime" min-width="150" />
                             </el-table>
                             <pagination v-show="usertotal > 0" :total="usertotal" :page.sync="userViewForm.pageNum" :limit.sync="userViewForm.pageSize" @pagination="getMemberOrderGoodsData" />
                         </el-tab-pane>
@@ -304,22 +309,22 @@
                         <el-tab-pane name="5">
                             <span slot="label"><i class="el-icon-bank-card"></i> 会员卡</span>
                             <el-table v-loading="userloading" :data="userinfoData" fit highlight-current-row border stripe>
-                                <el-table-column label="卡号" align="center" prop="cardNo" width="150px" />
-                                <el-table-column label="充值金额（元）" align="center" prop="rechargeAmount" width="150px" />
-                                <el-table-column label="赠送金额（元）" align="center" prop="giveAmount" width="150px" />
-                                <el-table-column label="充值余额（元）" align="center" prop="rechargeBalance" width="150px" />
-                                <el-table-column label="赠送余额（元）" align="center" prop="giveBalance" width="150px" />
-                                <el-table-column label="福利金额（元）" align="center" prop="welfareAmount" width="150px" />
-                                <el-table-column label="福利金余额（元）" align="center" prop="welfareBalance" width="150px" />
-                                <el-table-column label="赠送积分" align="center" prop="givePointAmount" width="150px" />
-                                <el-table-column label="使用状态" align="center" prop="rechargeStatus" width="150px">
+                                <el-table-column label="卡号" align="center" prop="cardNo" min-width="160px" />
+                                <el-table-column label="充值金额（元）" align="center" prop="rechargeAmount" width="120px" />
+                                <el-table-column label="赠送金额（元）" align="center" prop="giveAmount" width="120px" />
+                                <el-table-column label="充值余额（元）" align="center" prop="rechargeBalance" width="120px" />
+                                <el-table-column label="赠送余额（元）" align="center" prop="giveBalance" width="120px" />
+                                <el-table-column label="福利金额（元）" align="center" prop="welfareAmount" width="120px" />
+                                <el-table-column label="福利金余额（元）" align="center" prop="welfareBalance" width="130px" />
+                                <el-table-column label="赠送积分" align="center" prop="givePointAmount" width="100px" />
+                                <el-table-column label="使用状态" align="center" prop="rechargeStatus" width="100px">
                                     <template slot-scope="scope">
                                         <el-tag v-if="scope.row.rechargeStatus == 1">已使用</el-tag>
                                         <el-tag type="info" v-else>未使用</el-tag>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="充值门店" align="center" prop="rechargeStoreName" width="200px" />
-                                <el-table-column label="充值时间" align="center" prop="rechargeTime" width="150px" />
+                                <el-table-column label="充值门店" align="center" prop="rechargeStoreName" min-width="150px" />
+                                <el-table-column label="充值时间" align="center" prop="rechargeTime" min-width="150px" />
                             </el-table>
                             <pagination v-show="usertotal > 0" :total="usertotal" :page.sync="userViewForm.pageNum" :limit.sync="userViewForm.pageSize" @pagination="getMemberCardData" />
                         </el-tab-pane>

admin-ui/src/views/cloth/hanger/upHanger.vue

@@ -13,7 +13,7 @@
                                     <el-input v-model="queryParams.orderNo" placeholder="请输入洗衣单号" clearable @keyup.enter.native="handleQuery" />
                                 </el-form-item>
                                 <el-form-item label="状态" prop="flowStatus">
-                                    <el-radio-group v-model="queryParams.flowStatus">
+                                    <el-radio-group v-model="queryParams.flowStatus" @change="handleQuery">
                                         <el-radio-button label="3">未上挂</el-radio-button>
                                         <el-radio-button label="4">已上挂</el-radio-button>
                                     </el-radio-group>

admin-ui/src/views/goods/commonGoods/index.vue

@@ -108,7 +108,7 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="150"></el-table-column>
 
-      <el-table-column label="操作" align="center" width="200" fixed="right">
+      <el-table-column label="操作" align="center" width="200" fixed="right" v-if="userInfoVO.userType == '00'">
         <template slot-scope="scope">
           <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['goods:commonGoods:edit']"
             v-if="userInfoVO.userType == '00'">修改</el-button>

admin-ui/src/views/index.vue

@@ -12,15 +12,15 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="4">
         <div class="stat-card stat-card-green">
-          <div class="stat-card-title">洗衣金额</div>
+          <div class="stat-card-title">洗衣订单金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.clothReceiveAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.clothReceiveAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
       <el-col :xs="12" :sm="12" :lg="4">
         <div class="stat-card stat-card-purple">
-          <div class="stat-card-title">零售订单数</div>
+          <div class="stat-card-title">商品订单数</div>
           <div class="stat-card-value">
             <count-to :start-val="0" :end-val="statistics.goodsOrderCount" :duration="2600" />
           </div>
@@ -28,9 +28,9 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="4">
         <div class="stat-card stat-card-orange">
-          <div class="stat-card-title">零售金额</div>
+          <div class="stat-card-title">商品订单金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.goodsReceiveAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.goodsReceiveAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
@@ -46,7 +46,7 @@
         <div class="stat-card stat-card-cyan">
           <div class="stat-card-title">充值金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.chargeAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.chargeAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
@@ -86,8 +86,8 @@
                     <svg-icon icon-class="money" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">洗衣金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.clothReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <div class="card-panel-text">洗衣订单金额</div>
+                    <count-to :start-val="0" :end-val="dayStatistics.clothReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -97,7 +97,7 @@
                     <svg-icon icon-class="shopping" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">零售订单数</div>
+                    <div class="card-panel-text">商品订单数</div>
                     <count-to :start-val="0" :end-val="dayStatistics.goodsOrderCount" :duration="2600" class="card-panel-num" />
                   </div>
                 </div>
@@ -108,8 +108,8 @@
                     <svg-icon icon-class="money" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">零售金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.goodsReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <div class="card-panel-text">商品订单金额</div>
+                    <count-to :start-val="0" :end-val="dayStatistics.goodsReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -131,7 +131,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">充值金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.chargeAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dayStatistics.chargeAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -153,7 +153,7 @@
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <div class="chart-title">零售交易趋势</div>
+          <div class="chart-title">商品交易趋势</div>
           <div class="chart-content">
             <amount-trend-chart :data="goodsTrendData" />
           </div>

admin-ui/src/views/index_factory.vue

@@ -4,7 +4,7 @@
     <el-row :gutter="20" class="panel-group">
       <el-col :xs="12" :sm="12" :lg="6">
         <div class="stat-card stat-card-blue">
-          <div class="stat-card-title">累积洗衣件数</div>
+          <div class="stat-card-title">洗衣件数</div>
           <div class="stat-card-value">
             <count-to :start-val="0" :end-val="statistics.dailyInFactoryCount" :duration="2600" />
           </div>
@@ -12,7 +12,7 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="6">
         <div class="stat-card stat-card-green">
-          <div class="stat-card-title">累积洗衣金额</div>
+          <div class="stat-card-title">洗衣订单金额</div>
           <div class="stat-card-value">
             <count-to :start-val="0" :end-val="statistics.dailyInFactoryAmount" :duration="2600" prefix="￥" />
           </div>
@@ -20,7 +20,7 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="6">
         <div class="stat-card stat-card-red">
-          <div class="stat-card-title">累积撤衣件数</div>
+          <div class="stat-card-title">撤衣件数</div>
           <div class="stat-card-value">
             <count-to :start-val="0" :end-val="statistics.dailyRefundCount" :duration="2600" />
           </div>
@@ -28,7 +28,7 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="6">
         <div class="stat-card stat-card-orange">
-          <div class="stat-card-title">累积撤衣金额</div>
+          <div class="stat-card-title">撤衣订单金额</div>
           <div class="stat-card-value">
             <count-to :start-val="0" :end-val="statistics.dailyRefundAmount" :duration="2600" prefix="￥" />
           </div>
@@ -70,7 +70,7 @@
                     <svg-icon icon-class="money" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">洗衣金额</div>
+                    <div class="card-panel-text">洗衣订单金额</div>
                     <count-to :start-val="0" :end-val="factoryStatistics.dailyInFactoryAmount" :duration="2600" class="card-panel-num" prefix="￥" />
                   </div>
                 </div>
@@ -92,7 +92,7 @@
                     <svg-icon icon-class="money" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">撤单金额</div>
+                    <div class="card-panel-text">撤单订单金额</div>
                     <count-to :start-val="0" :end-val="factoryStatistics.dailyRefundAmount" :duration="2600" class="card-panel-num" prefix="￥" />
                   </div>
                 </div>

admin-ui/src/views/index_store.vue

@@ -17,15 +17,15 @@
             </el-col>
             <el-col :xs="12" :sm="12" :lg="6">
               <div class="stat-card stat-card-green">
-                <div class="stat-card-title">洗衣金额</div>
+                <div class="stat-card-title">洗衣订单金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="orderStats.clothOrderAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="orderStats.clothOrderAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
             <el-col :xs="12" :sm="12" :lg="6">
               <div class="stat-card stat-card-red">
-                <div class="stat-card-title">商品笔数</div>
+                <div class="stat-card-title">商品订单数</div>
                 <div class="stat-card-value">
                   <count-to :start-val="0" :end-val="orderStats.goodsOrderCount || 0" :duration="2600" />
                 </div>
@@ -33,9 +33,9 @@
             </el-col>
             <el-col :xs="12" :sm="12" :lg="6">
               <div class="stat-card stat-card-orange">
-                <div class="stat-card-title">商品金额</div>
+                <div class="stat-card-title">商品订单金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="orderStats.goodsOrderAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="orderStats.goodsOrderAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -52,7 +52,7 @@
               <div class="stat-card stat-card-purple">
                 <div class="stat-card-title">付款金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.rechargePayAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to ref="rechargePayAmount" :start-val="0" :end-val="chargeStats.rechargePayAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -68,7 +68,7 @@
               <div class="stat-card stat-card-teal">
                 <div class="stat-card-title">退款金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.chargeRefundAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="chargeStats.chargeRefundAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -76,7 +76,7 @@
               <div class="stat-card stat-card-indigo">
                 <div class="stat-card-title">退款笔数</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.refundCount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="chargeStats.refundCount || 0" :duration="2600"/>
                 </div>
               </div>
             </el-col>
@@ -90,7 +90,7 @@
       <el-col :span="24">
         <div class="chart-wrapper">
           <div class="chart-header">
-            <div class="chart-title">今日概览</div>
+            <div class="chart-title">营收概览</div>
             <div class="chart-actions">
               <el-radio-group v-model="dailyTimeRange" size="small" @change="handleDailyTimeRangeChange">
                 <el-radio-button label="today">今日</el-radio-button>
@@ -117,8 +117,8 @@
                     <svg-icon icon-class="money" class-name="card-panel-icon" />
                   </div>
                   <div class="card-panel-description">
-                    <div class="card-panel-text">洗衣金额</div>
-                    <count-to :start-val="0" :end-val="dailyOrderStats.clothOrderAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <div class="card-panel-text">洗衣订单金额</div>
+                    <count-to :start-val="0" :end-val="dailyOrderStats.clothOrderAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" :decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -129,7 +129,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">充值金额</div>
-                    <count-to :start-val="0" :end-val="dailyChargeStats.rechargePayAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dailyChargeStats.rechargePayAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" :decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -330,7 +330,7 @@ export default {
     .stat-card {
       height: 120px;
       border-radius: 8px;
-      padding: 20px;
+      padding: 20px 10px;
       color: #fff;
       display: flex;
       flex-direction: column;
@@ -350,7 +350,7 @@ export default {
       }
 
       .stat-card-value {
-        font-size: 28px;
+        font-size: 20px;
         font-weight: bold;
       }
     }

admin-ui/src/views/order/cloth/collectCloth.vue

@@ -33,9 +33,9 @@
                     <el-descriptions-item label="手机号">
                         {{ appUserInfo.phoneNumber }}
                     </el-descriptions-item>
-                    <el-descriptions-item label="等级">
+                    <!-- <el-descriptions-item label="等级">
                         {{ appUserInfo.level }}
-                    </el-descriptions-item>
+                    </el-descriptions-item> -->
                     <el-descriptions-item label="现金余额">
                         <span class="amount">{{ (appUserInfo.rechargeBalance * 100) / 100 }}</span>
                     </el-descriptions-item>
@@ -75,7 +75,8 @@
                         :data="orderClothItemDTOS"
                         border
                         stripe
-                        highlight-current-row>
+                        highlight-current-row
+                        height="100%">
                         <el-table-column label="序号" type="index" width="60" align="center" fixed="left"/>
                         <el-table-column label="衣物名称" min-width="180">
                             <template slot-scope="scope">
@@ -952,6 +953,7 @@ export default {
             })
         },
         onClothItemSelect(index) {
+            this.form.orderClothTypeDTOS = []
             for (let i = 0; i < this.form.clothTypeKeys.length; i++) {
                 var orderClothTypeDTO = { orderClothTypeCode: this.form.clothTypeKeys[i] }
                 if (this.form.clothTypeKeys[i] == '1') {
@@ -1050,6 +1052,7 @@ export default {
             }
         },
         addClothItemConfirm() {
+            console.log(this.addClothActiveTab)
             if (this.addClothActiveTab == 2) {
                 //选择颜色
                 var clothColorDTOS = []
@@ -1729,7 +1732,7 @@ export default {
 
 <style lang="scss" scoped>
 .collect-cloth-wrapper {
-    height: 100vh;
+    height: calc(100vh - 84px);
     display: flex;
     background: #f5f7fa;
     padding: 16px;
@@ -1790,7 +1793,8 @@ export default {
             }
 
             .cloth-list {
-                flex: 1;
+                // flex: 1;
+                height: calc(100vh - 300px);
                 overflow: auto;
                 padding: 0 16px;
 

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -6,6 +6,7 @@
                 :model="orderForm"
                 :rules="rules"
                 label-width="100px"
+                @submit.native.prevent.capture
             >
                 <div class="cash-container">
                     <!-- 左侧核对信息区域 -->

admin-ui/src/views/order/cloth/orderList.vue

@@ -19,11 +19,12 @@
                         <!-- <el-option key="9" label="待送衣" value="9" />
                         <el-option key="10" label="送衣中" value="10" /> -->
                         <el-option key="12" label="已完成" value="12" />
+                        <el-option key="15" label="已退款" value="15" />
                         <el-option key="-1" label="已取消" value="-1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="订单编码" prop="orderNo">
-                    <el-input v-model="queryParams.orderNo" placeholder="请输入订单编码" clearable style="width: 200px" @keyup.enter.native="handleQuery">
+                <el-form-item label="订单编号" prop="orderNo">
+                    <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable style="width: 200px" @keyup.enter.native="handleQuery">
                         <i slot="prefix" class="el-input__icon el-icon-document"></i>
                     </el-input>
                 </el-form-item>
@@ -51,23 +52,23 @@
 
         <!-- 列表区域 -->
       <Page uri="/mapi/order/cloth/list" :request-params="queryParams" ref="pagination">
-        <el-table-column label="订单编号" align="center" width="200">
+        <el-table-column label="订单编号" align="center" width="180">
           <template slot-scope="scope">
             {{ scope.row.orderNo  }}
           </template>
         </el-table-column>
-        <el-table-column label="衣服数量" align="center" width="100">
+        <el-table-column label="衣服数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.orderClothCount }}件
           </template>
         </el-table-column>
-        <el-table-column label="门店信息" align="center" width="150">
+        <el-table-column label="门店信息" align="center" width="140">
           <template slot-scope="scope">
             <i class="el-icon-s-shop"></i>
             {{ scope.row.sysOrg.name }}
           </template>
         </el-table-column>
-        <el-table-column label="客户姓名" align="center" width="120">
+        <el-table-column label="客户姓名" align="center" width="80">
           <template slot-scope="scope">
             <div class="customer-name">
               <i class="el-icon-user"></i>
@@ -75,7 +76,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="手机号" align="center" width="150">
+        <el-table-column label="手机号" align="center" width="120">
           <template slot-scope="scope">
             <div class="customer-phone" v-if="scope.row.appUserPhoneNumber">
               <i class="el-icon-mobile-phone"></i>
@@ -85,10 +86,14 @@
         </el-table-column>
         <el-table-column label="支付方式" align="center" width="100">
           <template slot-scope="scope">
-            <span v-if=" scope.row.payType === '0'">微信</span>
-            <span v-if=" scope.row.payType === '1'">支付宝</span>
-            <span v-if=" scope.row.payType === '2'">现金</span>
-            <span v-if=" scope.row.payType === '3'">会员余额</span>
+            <span v-if=" scope.row.payTimeType === '1' && scope.row.payStatus == 0">--</span>
+            <div v-else>
+                <span v-if=" scope.row.payType === '0'">微信</span>
+                <span v-if=" scope.row.payType === '1'">支付宝</span>
+                <span v-if=" scope.row.payType === '2'">现金</span>
+                <span v-if=" scope.row.payType === '3'">会员余额</span>
+            </div>
+            
           </template>
         </el-table-column>
         <el-table-column label="订单金额" align="center" width="100">
@@ -115,13 +120,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="退款状态" align="center" width="100">
+        <!-- <el-table-column label="退款状态" align="center" width="100">
           <template slot-scope="scope">
             <div class="status-group">
               <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="下单时间" align="center" width="180">
           <template slot-scope="scope">
             <div class="time-info">
@@ -150,10 +155,13 @@
                         </el-descriptions-item>
                         <el-descriptions-item>
                             <template slot="label"> 支付方式 </template>
-                            <template v-if="orderDetail.payType == '0'">微信</template>
-                            <template v-if="orderDetail.payType == '1'">支付宝</template>
-                            <template v-if="orderDetail.payType == '2'">现金</template>
-                            <template v-if="orderDetail.payType == '3'">余额</template>
+                            <span v-if="orderDetail.payTimeType === '1' && orderDetail.payStatus == 0">取衣付款</span>
+                            <span v-else>
+                                <template v-if="orderDetail.payType == '0'">微信</template>
+                                <template v-if="orderDetail.payType == '1'">支付宝</template>
+                                <template v-if="orderDetail.payType == '2'">现金</template>
+                                <template v-if="orderDetail.payType == '3'">余额</template>
+                            </span>
                             （{{ orderDetail.payAmount }}元）
                         </el-descriptions-item>
                         <el-descriptions-item>
@@ -222,6 +230,11 @@
                                 <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
                             </template>
                         </el-table-column>
+                        <el-table-column label="重洗" align="center" prop="repeatCount" width="100">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.repeatCount || 0 }}次</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="附件" align="center" width="150">
                             <template slot-scope="scope">
                                 <el-tag size="small" v-for="item in scope.row.orderClothAdjuncts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">

admin-ui/src/views/order/cloth/searchCloth.vue

@@ -45,10 +45,9 @@
         </el-row>
 
         <Page uri="/mapi/order/clothItem/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="100" fixed="left" />
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="衣服名称" align="center" prop="clothItemName" />
-          <el-table-column label="衣物照片" align="center" width="120">
+            <el-table-column label="衣物条码" align="center" prop="washCode" fixed="left" min-width="120"/>
+            <el-table-column label="衣服名称" align="center" prop="clothItemName"/>
+          <el-table-column label="衣物照片" align="center" width="100">
             <template slot-scope="scope">
               <div class="cloth-photos" v-if="scope.row.pics">
                 <el-image
@@ -74,7 +73,7 @@
                     <span v-else> 否 </span>
                 </template>
             </el-table-column>
-            <el-table-column label="客户信息" align="center" prop="appUserName" width="150">
+            <el-table-column label="客户信息" align="center" prop="appUserName" width="120">
                 <template slot-scope="scope">
                     <span>{{ scope.row.appUserName ? scope.row.appUserName : '--' }} </span>
                     <br />
@@ -88,6 +87,14 @@
                     </template>
                 </template>
             </el-table-column>
+            <el-table-column label="附件" align="center"  min-width="120">
+                <template slot-scope="scope">
+                    <template v-for="(item, index) in scope.row.orderClothAdjuncts">
+                        {{ index == 0 ? item.adjunctName : ',' + item.adjunctName }}
+                    </template>
+                    <span v-if="!scope.row.orderClothAdjuncts">暂无</span>
+                </template>
+            </el-table-column>
             <el-table-column label="挂衣号" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.clothHanger">
@@ -102,13 +109,14 @@
                     <dict-tag v-else :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
                 </template>
             </el-table-column>
+            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="120" />
           <el-table-column label="订单状态" align="center" prop="flowStatus" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
             </template>
           </el-table-column>
-            <el-table-column label="下单时间" align="center" prop="createTime" />
-            <el-table-column label="取衣时间" align="center" prop="sendClothTime">
+            <el-table-column label="下单时间" align="center" prop="createTime"  min-width="90"/>
+            <el-table-column label="取衣时间" align="center" prop="sendClothTime"  min-width="90">
                 <template slot-scope="scope">
                     <span v-if="scope.row.sendClothTime">
                         {{ scope.row.clothHanger.sendClothTime }}

admin-ui/src/views/order/cloth/sendCloth.vue

@@ -17,8 +17,8 @@
                         <el-option key="1" label="线下" value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="订单编码" prop="orderNo">
-                    <el-input v-model="queryParams.orderNo" placeholder="请扫描订单编码" clearable @keyup.enter.native="handleQuery" />
+                <el-form-item label="订单编号" prop="orderNo">
+                    <el-input v-model="queryParams.orderNo" placeholder="请扫描订单编号" clearable @keyup.enter.native="handleQuery" />
                 </el-form-item>
                 <el-form-item label="时间范围">
                     <el-date-picker v-model="createTimeRange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" style="width: 240px"> </el-date-picker>

admin-ui/src/views/order/financial/manageDay.vue

@@ -60,17 +60,17 @@
               <span class="card-title">洗衣订单统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="订单数量">{{ orderStats.clothOrderCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="订单笔数">{{ orderStats.clothOrderCount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="订单金额">¥{{ orderStats.clothOrderAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="实收金额">¥{{ orderStats.clothReceiveAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员金额">¥{{ orderStats.clothMemberAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ orderStats.clothRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信退款">¥{{ orderStats.clothWechatRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝退款">¥{{ orderStats.clothAlipayRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金退款">¥{{ orderStats.clothCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信支付">¥{{ orderStats.clothWechatAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝支付">¥{{ orderStats.clothAlipayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金支付">¥{{ orderStats.clothCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ orderStats.clothRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信退款">¥{{ orderStats.clothWechatRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝退款">¥{{ orderStats.clothAlipayRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金退款">¥{{ orderStats.clothCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员退款">¥{{ orderStats.clothMemberRefundAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
@@ -83,17 +83,18 @@
               <span class="card-title">商品订单统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="订单数量">{{ orderStats.goodsOrderCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="订单笔数">{{ orderStats.goodsOrderCount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="订单金额">¥{{ orderStats.goodsOrderAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="实收金额">¥{{ orderStats.goodsReceiveAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员金额">¥{{ orderStats.goodsMemberAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ orderStats.goodsRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信支付">¥{{ orderStats.goodsWechatAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝支付">¥{{ orderStats.goodsAlipayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金支付">¥{{ orderStats.goodsCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ orderStats.goodsRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信退款">¥{{ orderStats.goodsWechatRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝退款">¥{{ orderStats.goodsAlipayRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金退款">¥{{ orderStats.goodsCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员退款">¥{{ orderStats.goodsMemberRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信支付">¥{{ orderStats.goodsWechatAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝支付">¥{{ orderStats.goodsAlipayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金支付">¥{{ orderStats.goodsCashAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
         </el-col>
@@ -105,21 +106,22 @@
               <span class="card-title">充值统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="充值次数">{{ chargeStats.rechargeCount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="充值金额">¥{{ chargeStats.rechargePayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="赠送金额">¥{{ chargeStats.arriveGiveAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="福利金额">¥{{ chargeStats.arriveWelfareAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ chargeStats.refundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信退款">¥{{ chargeStats.wechatRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝退款">¥{{ chargeStats.alipayRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金退款">¥{{ chargeStats.cashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="充值笔数">{{ chargeStats.rechargeCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金实付">¥{{ chargeStats.rechargePayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金到账">¥{{ chargeStats.arriveCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="赠送到账">¥{{ chargeStats.arriveGiveAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="福利金到账">¥{{ chargeStats.arriveWelfareAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信支付">¥{{ chargeStats.wechatPayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝支付">¥{{ chargeStats.alipayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金支付">¥{{ chargeStats.cashPayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="卡支付">¥{{ chargeStats.cardPayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="赠送退款">¥{{ chargeStats.arriveGiveRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="福利退款">¥{{ chargeStats.arriveWelfareRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金赠送退款">¥{{ chargeStats.arriveCashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="卡密支付">¥{{ chargeStats.cardPayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ chargeStats.refundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信退款">¥{{ chargeStats.wechatRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝退款">¥{{ chargeStats.alipayRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金退款">¥{{ chargeStats.cashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="赠送余额退回">¥{{ chargeStats.arriveGiveRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="福利余额退回">¥{{ chargeStats.arriveWelfareRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金余额退回">¥{{ chargeStats.arriveCashRefundAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
         </el-col>
@@ -169,6 +171,7 @@
           clothMemberRefundAmount: 0,
           goodsOrderCount: 0,
           goodsOrderAmount: 0,
+          goodsReceiveAmount: 0,
           goodsMemberAmount: 0,
           goodsRefundAmount: 0,
           goodsWechatRefundAmount: 0,
@@ -227,6 +230,7 @@
             clothMemberRefundAmount: orderStats.clothMemberRefundAmount || 0,
             goodsOrderCount: orderStats.goodsOrderCount || 0,
             goodsOrderAmount: orderStats.goodsOrderAmount || 0,
+            goodsReceiveAmount: orderStats.goodsReceiveAmount || 0,
             goodsMemberAmount: orderStats.goodsMemberAmount || 0,
             goodsRefundAmount: orderStats.goodsRefundAmount || 0,
             goodsWechatRefundAmount: orderStats.goodsWechatRefundAmount || 0,

admin-ui/src/views/order/retailOrder/index.vue

@@ -34,7 +34,7 @@
 
         <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="订单编号" align="center" prop="orderNo" width="200" />
-          <el-table-column label="客户姓名" align="center" width="150">
+          <el-table-column label="客户姓名" align="center" width="130">
             <template slot-scope="scope">
               <div class="customer-name">
                 <i class="el-icon-user"></i>
@@ -42,7 +42,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="手机号" align="center" width="150">
+          <el-table-column label="手机号" align="center" width="130">
             <template slot-scope="scope">
               <div class="customer-phone" >
                 <i class="el-icon-mobile-phone"></i>
@@ -57,12 +57,12 @@
                 </template>
             </el-table-column>
             <el-table-column label="支付金额" align="center" prop="payAmount" width="120" />
-            <el-table-column label="支付方式" align="center" prop="payType" width="150">
+            <el-table-column label="支付方式" align="center" prop="payType" width="120">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
                 </template>
             </el-table-column>
-            <el-table-column label="订单状态" align="center" prop="orderStatus" width="150">
+            <el-table-column label="订单状态" align="center" prop="orderStatus" width="120">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
                 </template>

admin-ui/src/views/recharge/order/index.vue

@@ -51,21 +51,21 @@
       </div>
 
       <Page uri="/mapi/recharge/order/list" :request-params="queryParams" ref="pagination">
-        <el-table-column label="订单编号" align="center" width="130" prop="orderNo" fixed="left" :show-overflow-tooltip="true" />
+        <el-table-column label="订单编号" align="center" width="180" prop="orderNo" fixed="left" :show-overflow-tooltip="true" />
         <el-table-column label="下单门店" align="center" min-width="150" v-if="userInfoVO.userType == '00'" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.storeName || '--' }}
           </template>
         </el-table-column>
-        <el-table-column label="客户姓名" align="center" prop="realName" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="客户手机号" align="center" prop="phoneNumber" width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="支付方式" align="center" prop="payType" width="100">
+        <el-table-column label="客户姓名" align="center" prop="realName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column label="客户手机号" align="center" prop="phoneNumber" width="110" :show-overflow-tooltip="true" />
+        <el-table-column label="支付方式" align="center" prop="payType" width="80">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" v-if="scope.row.payType" />
             <el-tag size="mini" type="info" v-else>未支付</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="支付金额" align="center" min-width="180">
+        <el-table-column label="支付金额" align="center" min-width="120">
           <template slot-scope="scope">
             <div class="amount-info">
               <el-tag size="mini" type="primary" v-if="scope.row.cashPayAmount > 0">现金：¥{{ formatAmount(scope.row.cashPayAmount) }}</el-tag>
@@ -75,7 +75,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="充值金额" align="center" min-width="180">
+        <el-table-column label="充值金额" align="center" min-width="120">
           <template slot-scope="scope">
             <div class="amount-info">
               <el-tag size="mini" type="success">现金：¥{{ formatAmount(scope.row.rechargeAmount) }}</el-tag>
@@ -84,47 +84,47 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="赠送积分" align="center" width="100" v-if="userInfoVO.userType == '02'">
+        <el-table-column label="赠送积分" align="center" width="80" v-if="userInfoVO.userType == '02'">
           <template slot-scope="scope">
             <span class="points">{{ scope.row.givePointAmount || '0' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单状态" align="center" width="100">
+        <el-table-column label="订单状态" align="center" width="90">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recharge_order_status" :value="scope.row.orderStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="支付状态" align="center" width="100">
+        <el-table-column label="支付状态" align="center" width="90">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="退款状态" align="center" width="100">
+        <el-table-column label="退款状态" align="center" width="90">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recharge_refund_status" :value="scope.row.refundStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="160" :show-overflow-tooltip="true">
+        <!-- <el-table-column label="下单时间" align="center" width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime || '--' }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="支付时间" align="center" width="160" :show-overflow-tooltip="true">
+        </el-table-column> -->
+        <el-table-column label="支付时间" align="center" width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.payTime || '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="退款时间" align="center" width="160" :show-overflow-tooltip="true">
+        <el-table-column label="退款时间" align="center" width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.refundTime || '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" min-width="150" :show-overflow-tooltip="true">
+        <el-table-column label="备注" align="center" min-width="100" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.remark || '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150" fixed="right">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-tickets" @click="handleDetail(scope.row)">明细</el-button>
             <el-button type="text" icon="el-icon-delete" @click="refundOrder(scope.row)"

admin-ui/src/views/statistics/queryReception.vue

@@ -54,7 +54,7 @@
 
     <Page uri="/mapi/order/clothItem/list" :request-params="queryParams" ref="pagination">
       <el-table-column label="订单编号" align="center" prop="orderNo" min-width="150" fixed="left" />
-      <el-table-column label="衣物条码" align="center" prop="washCode" width="150" />
+      <el-table-column label="衣物条码" align="center" prop="washCode" width="200" />
       <el-table-column label="衣服名称" align="center" prop="clothItemName" width="150" />
       <el-table-column label="衣物照片" align="center" width="120">
         <template slot-scope="scope">
@@ -83,20 +83,20 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="颜色" align="center" width="150">
+      <el-table-column label="颜色" align="center" width="100">
         <template slot-scope="scope">
           <template v-for="(item, index) in scope.row.orderClothColors">
             {{ index == 0 ? item.clothColorName : ',' + item.clothColorName }}
           </template>
         </template>
       </el-table-column>
-      <el-table-column label="收衣时间" align="center" prop="createTime" min-width="150" />
+      <el-table-column label="收衣时间" align="center" prop="createTime" min-width="130" />
       <el-table-column label="状态" align="center" prop="flowStatus" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="挂衣号" align="center" width="120">
+      <el-table-column label="挂衣号" align="center" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.clothHanger">
             {{ scope.row.clothHanger.name + '#' + scope.row.clothHangerCode }}

admin-ui/src/views/workbench/workRecharge/index.vue

@@ -43,7 +43,7 @@
                                 {{ scope.row.useBindStoreName == null ? '--' : scope.row.useBindStoreName }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="120" />
+                        <el-table-column label="实付金额(元)" align="center" prop="rechargeAmount" width="120" />
                         <el-table-column label="卡内余额（元）" align="center" prop="rechargeAmount" width="120">
                             <template slot-scope="scope">
                                 <span style="display: block; text-align: left">现金金额: {{ scope.row.rechargeBalance }}</span>

admin-ui/src/views/workbench/workRetail/index.vue

@@ -171,16 +171,23 @@
         <el-card>
           <!-- 搜索栏 -->
           <div class="search-bar">
+            <el-radio-group v-model="goodsType"  @change="getCategoryList">
+              <el-radio-button label="0">普通商品</el-radio-button>
+              <el-radio-button label="2">生活服务</el-radio-button>
+              <el-radio-button label="3">汽车美容</el-radio-button>
+            </el-radio-group>
             <el-input
               v-model="searchQuery"
               placeholder="请输入商品条码/名称"
               clearable
               @clear="handleSearchClear"
               @keyup.enter.native="handleSearch"
+              style="flex: 1; margin-left: 10px;"
             >
 
               <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
             </el-input>
+            
           </div>
 
           <!-- 商品分类标签页 -->
@@ -1415,8 +1422,10 @@ export default {
 
 .right-panel {
   .search-bar {
-    padding: 15px;
+    padding: 15px 0;
     border-bottom: 1px solid #ebeef5;
+    display: flex;
+    align-items: center;
 
     .el-input {
       width: 100%;