Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into test

src/views/data/workconfig/component/my-table.vue

@@ -4,10 +4,10 @@
       <el-table-column prop="shopName" align="center" label="商户名称" />
       <el-table-column prop="staffName" align="center" label="职员名称" />
       <el-table-column prop="orderCount" align="center" label="订单数量" />
-      <el-table-column prop="handAmount" align="center" label="应交金额" />
-      <el-table-column prop="quickInAmount" align="center" label="快捷收款金额" />
+      <el-table-column prop="orderTurnover" align="center" label="应交金额" />
+      <el-table-column prop="balance" align="center" label="余额支付" />
       <el-table-column prop="refundAmount" align="center" label="退款金额" />
-      <el-table-column prop="handAmount" align="center" label="总收入" />
+      <el-table-column prop="turnover" align="center" label="总收入" />
       <el-table-column prop="loginTime" align="center" label="开始时间" />
       <el-table-column prop="handoverTime" align="center" label="交班时间" />
       <el-table-column label="操作" align="center">

src/views/index/index.vue

@@ -3,7 +3,8 @@
     <div class="item_wrap">
       <div class="title">您好，欢迎登录</div>
       <div class="item_list">
-        <div class="item" v-for="(item, index) in quickStore.quickMenus" :key="item.id" @click="menuClick(item.menuId)">
+        <div class="item" v-for="(item, index) in quickStore.quickMenus.splice(0, 6)" :key="item.id"
+          @click="menuClick(item.menuId)">
           <img class="icon" :src="icons[index + 1]" alt="">
           {{ returnMenuName(item.menuId) }}
         </div>

src/views/order/index/components/detail.vue

@@ -93,13 +93,8 @@
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
-                <el-button
-                  v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount"
-                  size="small"
-                  type="danger"
-                  class="u-m-l-10"
-                  @click="tuikuan()"
-                >
+                <el-button v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount" size="small"
+                  type="danger" class="u-m-l-10" @click="tuikuan()">
                   <span>退款</span>
                 </el-button>
               </div>
@@ -130,35 +125,22 @@
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
             <h4>第{{ index }}次下单</h4>
-            <el-table
-              :data="item"
-              :ref="'refTable' + index"
-              @select-all="tableSelectAll($event, index)"
-            >
+            <el-table :data="item" :ref="'refTable' + index" @select-all="tableSelectAll($event, index)">
               <!-- <el-table-column type="selection" width="55" /> -->
               <el-table-column label="数量" type="selection">
                 <template v-slot="scope">
                   <div v-if="detail.status == 'unpaid'">
-                    <el-checkbox
-                      v-if="scope.row.num - scope.row.returnNum > 0"
-                      v-model="scope.row.checked"
-                    />
+                    <el-checkbox v-if="scope.row.num - scope.row.returnNum > 0" v-model="scope.row.checked" />
                   </div>
                   <div v-else>
-                    <el-checkbox
-                      v-if="scope.row.num - scope.row.refundNum > 0"
-                      v-model="scope.row.checked"
-                    />
+                    <el-checkbox v-if="scope.row.num - scope.row.refundNum > 0" v-model="scope.row.checked" />
                   </div>
                 </template>
               </el-table-column>
               <el-table-column label="商品" width="150">
                 <template v-slot="scope">
                   <div class="shop_info">
-                    <el-image
-                      :src="scope.row.productImg"
-                      style="width: 40px; height: 40px"
-                    ></el-image>
+                    <el-image :src="scope.row.productImg" style="width: 40px; height: 40px"></el-image>
                     <div class="info">
                       <span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
                         {{ scope.row.productName }}
@@ -191,32 +173,17 @@
               <el-table-column label="实付">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
-              <el-table-column
-                v-if="detail.status == 'unpaid'"
-                label="可退菜数量"
-                align="center"
-                width="130px"
-              >
+              <el-table-column v-if="detail.status == 'unpaid'" label="可退菜数量" align="center" width="130px">
                 <template v-slot="scope">
-                  <el-input-number
-                    v-if="scope.row.checked"
-                    :min="0"
-                    style="width: 100px"
-                    v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.returnNum"
-                  ></el-input-number>
+                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.returnNum"></el-input-number>
                   <span class="" v-else>{{ scope.row.num - scope.row.returnNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column v-else label="可退款数量" align="center" width="130px">
                 <template v-slot="scope">
-                  <el-input-number
-                    v-if="scope.row.checked"
-                    :min="0"
-                    style="width: 100px"
-                    v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"
-                  ></el-input-number>
+                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"></el-input-number>
                   <span class="" v-else>
                     {{ scope.row.num - scope.row.refundNum - scope.row.returnNum }}
                   </span>
@@ -231,23 +198,13 @@
               <el-table-column label="操作" fixed="right">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
-                    <el-button
-                      v-if="canTuikuan(scope.row)"
-                      link
-                      size="small"
-                      @click="tuikuan(scope.row)"
-                    >
+                    <el-button v-if="canTuikuan(scope.row)" link size="small" @click="tuikuan(scope.row)">
                       <span>退款</span>
                     </el-button>
                     <span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
                   </template>
                   <template v-if="detail.status == 'unpaid'">
-                    <el-button
-                      v-if="canTuicai(scope.row)"
-                      link
-                      size="small"
-                      @click="tuicai(scope.row)"
-                    >
+                    <el-button v-if="canTuicai(scope.row)" link size="small" @click="tuicai(scope.row)">
                       <span>退菜</span>
                     </el-button>
                     <span class="color-999" v-else>已退菜</span>
@@ -257,41 +214,25 @@
             </el-table>
           </template>
           <!-- 退款 -->
-          <div
-            class="u-p-20 u-flex u-row-right"
-            v-if="
-              detail.status !== 'refund' &&
-              detail.status !== 'unpaid' &&
-              detail.status !== 'cancelled'
-            "
-          >
-            <el-checkbox
-              v-model="allSelected"
-              @change="allSelectedChange"
-              label="全选"
-            ></el-checkbox>
+          <div class="u-p-20 u-flex u-row-right" v-if="
+            detail.status !== 'refund' &&
+            detail.status !== 'unpaid' &&
+            detail.status !== 'cancelled'
+          ">
+            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
           </div>
           <!-- 退菜 -->
           <div class="u-p-20 u-flex u-row-right" v-if="detail.status == 'unpaid'">
-            <el-checkbox
-              v-model="allSelected"
-              @change="allSelectedChange"
-              label="全选"
-            ></el-checkbox>
+            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuicai('all')">退菜</el-button>
           </div>
         </div>
       </div>
     </el-drawer>
     <!-- 退款 -->
-    <return-money
-      :modal="false"
-      ref="refReturnMoney"
-      :max="selGoods.num"
-      :goods="selGoods"
-      @confirm="refReturnMoneyConfirm"
-    ></return-money>
+    <return-money :modal="false" ref="refReturnMoney" :max="selGoods.num" :goods="selGoods"
+      @confirm="refReturnMoneyConfirm"></return-money>
     <!-- 退菜 -->
     <order-return-cart ref="refReturnCart" @confirm="refReturnCartConfirm"></order-return-cart>
   </div>
@@ -466,6 +407,12 @@ export default {
     },
     tuikuan(item) {
       if (!item) {
+        let arrs = []
+        for (let i in this.detail.detailMap) {
+          this.detail.detailMap[i].map((v) => {
+            arrs.push(v);
+          });
+        }
         this.$refs.refReturnMoney.open([], this.detail);
         return;
       }
@@ -484,6 +431,10 @@ export default {
       if (arr.length == 0) {
         return ElMessage.error("请选择要退款的商品和数量");
       }
+
+      console.log('tuikuan===', arr);
+      return
+
       this.$refs.refReturnMoney.open(arr, this.detail);
     },
     tuicai(item) {
@@ -502,7 +453,7 @@ export default {
       if (arr.length == 0) {
         return ElMessage.error("请选择要退菜的商品和数量");
       }
-      console.log(arr);
+      console.log('tuicai===', arr);
       this.$refs.refReturnCart.open(arr, this.detail);
     },
 

src/views/user/charge/data.ts

@@ -8,13 +8,18 @@
 // adminIn 管理员充值
 // adminOut管理员消费
 export const $bizCode = {
-  cashIn: "现金充值",
+  cashIn: "会员充值",
+  cashback: "消费返现",
+  cashback_refund: "消费返现扣减",
+  freeIn: "霸王餐充值",
+  awardIn: "充值奖励",
   wechatIn: "微信小程序充值",
   alipayIn: "支付宝小程序充值",
-  awardIn: "充值奖励",
-  rechargeRefund: "充值退款",
-  orderPay: "订单消费",
+  orderPay: "订单支付奖励",
   orderRefund: "订单退款",
-  adminIn: "管理员充值",
-  adminOut: "管理员消费",
+  rechargeRefund: "充值退款",
+  rechargeCashRefund: "会员现金退款",
+  adminIn: "管理员手动增减余额",
+  adminOut: "管理员退款充值",
+  rechargeRedemption: "充值兑换码"
 }