From e7af9f6b531ace2be0c249bf8fc8bbedf2e07efa Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 11 Oct 2024 14:52:33 +0800
Subject: [PATCH] 10.11

---
 fuintAdmin/src/views/handover/HandoverDetails.vue    |  7 -------
 fuintAdmin/src/views/handover/HandoverRecord.vue     |  2 +-
 .../src/views/cashier/NewComponents/Handover.vue     |  2 +-
 .../src/views/cashier/NewComponents/credit.vue       |  9 +--------
 .../NewComponents/integralOrder/pointsCashier.vue    |  3 ++-
 .../views/cashier/orderComponents/order_Cashier.vue  | 12 ++++++------
 .../src/views/cashier/orderComponents/order_Vip.vue  |  4 ++--
 7 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index d61968441..6b1b4bf6b 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -26,12 +26,9 @@
                 :label="option.realName"
                 :value="option.id"
                 :disabled="queryParams.status === '统一交班'"
-
               ></el-option>
             </el-select>
           </el-form-item>
-
-
           <el-form-item class="flex-container" style="float: right">
             <el-button type="primary" icon="el-icon-search" :disabled="!isSearch" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -278,8 +275,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -297,8 +292,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
diff --git a/fuintAdmin/src/views/handover/HandoverRecord.vue b/fuintAdmin/src/views/handover/HandoverRecord.vue
index 765d91c43..375e3046a 100644
--- a/fuintAdmin/src/views/handover/HandoverRecord.vue
+++ b/fuintAdmin/src/views/handover/HandoverRecord.vue
@@ -10,7 +10,7 @@ export default {
     return {
       // 查看详情
       openSeeDetails:false,
-      // 交易明细
+      // 170px
       openTransactionDetail:false,
       // 商品汇总
       openGoodsSum:false,
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 0b9f5b0cb..df55c9548 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -100,7 +100,7 @@
           <div>{{orderSummary.sumnum}}</div>
         </div>
         <div class="xxing"></div>
-        <div style="overflow: auto; height: 35vh;scrollbar-width: none; ">
+        <div style="overflow: auto; height: 32vh;scrollbar-width: none; ">
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index aa28d8dd3..5685fb3b4 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -488,14 +488,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="归还方式" prop="payType">
-<!--              <el-radio-group v-model="form2.payType"-->
-<!--                              @click="returnMethod">-->
-<!--                <el-radio v-for="item in payList"-->
-<!--                          :key="item.dictValue"-->
-<!--                          :value="item.dictValue"-->
-<!--                          :label="item.dictValue" border>{{ item.dictLabel }}</el-radio>-->
-<!--              </el-radio-group>-->
-              <el-radio v-model="payType" v-for="item in payList"
+              <el-radio style="margin-left: 0px;margin-bottom: 10px" v-model="payType" v-for="item in payList"
                         :key="item.dictValue" :value="item.dictValue"
                         v-if="item.dictValue!='APPLET_CODE'"
                         :label="item.dictValue"
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
index f274d80d1..ed633e454 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
@@ -375,9 +375,10 @@ export default {
   margin: 0px auto;
   border-radius: 8px;
   box-sizing: border-box;
-  padding: 0px 15px;
+  padding:  15px;
   border-bottom: 1px solid #eceff1;
   padding-bottom: 0px;
+  height: 64px;
 
 }
 .cont_box{
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 8f868b8d0..181a6447c 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -181,23 +181,23 @@
             </el-table-column>
             <el-table-column label="操作" align="center"  class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini"
                            @click="getOrdersInfo(scope.row.id)"
                            type="text" plain round>详情
-                </el-button>
+                </div>
 <!--                <el-button style="color: #fe8c4a" size="mini"-->
 <!--                           @click="getOrdersInfo2(scope.row.id)"-->
 <!--                           type="text" plain round>详情2-->
 <!--                </el-button>-->
-                <el-button style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini"
                            @click="patchwork(scope.row)"
                            type="text" plain round>补打小票
-                </el-button>
-                <el-button style="color: #fe8c4a" size="mini"
+                </div>
+                <div style="color: #fe8c4a" size="mini"
                            v-if="scope.row.status === 'paid'"
                            @click="refHandleRefund(scope.row.id)"
                            type="text" plain round>退款
-                </el-button>
+                </div>
               </template>
             </el-table-column>
 
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index 9b61f6d53..8f740bd15 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -173,10 +173,10 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <!--              <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
-                <el-button style="width: 60px" size="mini"
+                <div style="width: 60px;color: #ff8c4b;margin: 0 auto"
                            @click="patchwork(scope.row)"
                            type="primary" plain round>补打
-                </el-button>
+                </div>
                 <!--              <el-button style="width: 60px" size="mini"-->
                 <!--                         @click="handleRefund(scope.row.id)"-->
                 <!--                         type="danger" plain round>退款</el-button>-->