From d22e69bd5fe7c9a7fd6dc4d00d2041481c11052b Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 27 Mar 2025 17:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accountCenter/butie/butieSummary/index.vue   | 16 ++++++++--------
 .../consume/consumeSummary/index.vue             | 14 +++++++-------
 .../consume/consumerWalletSummary/index.vue      |  2 +-
 src/views/dish/material/index.vue                | 13 ++++++++-----
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/views/accountCenter/butie/butieSummary/index.vue b/src/views/accountCenter/butie/butieSummary/index.vue
index 9a3f6b18..7d379751 100644
--- a/src/views/accountCenter/butie/butieSummary/index.vue
+++ b/src/views/accountCenter/butie/butieSummary/index.vue
@@ -68,33 +68,33 @@
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
         <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
         <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
-        <el-table-column label="所属组织" align="center" prop="custOrgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
+        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
         <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/> 
         <el-table-column label="补贴" align="center">
-            <el-table-column label="笔数" align="center" prop="times" :show-overflow-tooltip="true" /> 
-            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true" >
+            <el-table-column label="笔数" align="center" prop="times" width="120" :show-overflow-tooltip="true" /> 
+            <el-table-column label="金额" align="center" prop="amount" width="140" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
         <el-table-column label="补贴清空" align="center">
-            <el-table-column label="笔数" align="center" prop="clearTimes" :show-overflow-tooltip="true" /> 
-            <el-table-column label="金额" align="center" prop="clearAmount" :show-overflow-tooltip="true" >
+            <el-table-column label="笔数" align="center" prop="clearTimes" width="120" :show-overflow-tooltip="true" /> 
+            <el-table-column label="金额" align="center" prop="clearAmount" width="140" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                     <span>{{ (scope.row.clearAmount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
         <el-table-column label="补贴撤销" align="center">
-            <el-table-column label="笔数" align="center" prop="revocationTimes" :show-overflow-tooltip="true"/> 
-            <el-table-column label="金额" align="center" prop="revocationAmount" :show-overflow-tooltip="true">
+            <el-table-column label="笔数" align="center" prop="revocationTimes" width="120" :show-overflow-tooltip="true"/> 
+            <el-table-column label="金额" align="center" prop="revocationAmount" width="140" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.revocationAmount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
-        <el-table-column label="合计金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
+        <el-table-column label="合计金额" align="center" prop="totalAmount" width="180" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
                 </template>
diff --git a/src/views/accountCenter/consume/consumeSummary/index.vue b/src/views/accountCenter/consume/consumeSummary/index.vue
index 2be1b79b..668a9bc6 100644
--- a/src/views/accountCenter/consume/consumeSummary/index.vue
+++ b/src/views/accountCenter/consume/consumeSummary/index.vue
@@ -78,30 +78,30 @@
         <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
         <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/> 
         <el-table-column label="正常消费" align="center">
-            <el-table-column label="次数" align="center" prop="consumeNum" :show-overflow-tooltip="true" /> 
-            <el-table-column label="金额" align="center" prop="consumeAmount" :show-overflow-tooltip="true" >
+            <el-table-column label="次数" align="center" prop="consumeNum" width="120" :show-overflow-tooltip="true" /> 
+            <el-table-column label="金额" align="center" prop="consumeAmount" width="130" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                     <span>{{ (scope.row.consumeAmount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
         <el-table-column label="补扣消费" align="center">
-            <el-table-column label="次数" align="center" prop="consumeRepairNum" :show-overflow-tooltip="true" /> 
-            <el-table-column label="金额" align="center" prop="consumeRepairAmount" :show-overflow-tooltip="true" >
+            <el-table-column label="次数" align="center" prop="consumeRepairNum" width="120" :show-overflow-tooltip="true" /> 
+            <el-table-column label="金额" align="center" prop="consumeRepairAmount" width="130" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                     <span>{{ (scope.row.consumeRepairAmount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
         <el-table-column label="退单退款" align="center">
-            <el-table-column label="次数" align="center" prop="consumeRefundNum" :show-overflow-tooltip="true"/> 
-            <el-table-column label="金额" align="center" prop="consumeRefundAmount" :show-overflow-tooltip="true">
+            <el-table-column label="次数" align="center" prop="consumeRefundNum" width="120" :show-overflow-tooltip="true"/> 
+            <el-table-column label="金额" align="center" prop="consumeRefundAmount" width="130" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.consumeRefundAmount/100).toFixed(2) }}</span>
                 </template>
             </el-table-column>
         </el-table-column>
-        <el-table-column label="合计金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
+        <el-table-column label="合计金额" align="center" prop="totalAmount" width="180" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
                 </template>
diff --git a/src/views/accountCenter/consume/consumerWalletSummary/index.vue b/src/views/accountCenter/consume/consumerWalletSummary/index.vue
index 715cfa98..e50906a2 100644
--- a/src/views/accountCenter/consume/consumerWalletSummary/index.vue
+++ b/src/views/accountCenter/consume/consumerWalletSummary/index.vue
@@ -29,7 +29,7 @@
             </el-radio-group>
         </el-form-item>
         <br>
-        <el-form-item label="用户类别" v-if="activeName!='psn'">
+        <el-form-item label="用户类别" v-if="activeName!='organization'">
             <el-select v-model="queryParams.psnTypeList" multiple style="width: 220px" clearable> 
                 <el-option
                 v-for="dict in dict.type.user_psn_type"
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index 9589fcb4..92f58518 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -153,8 +153,6 @@
           <el-col :span="1.5"> 
             <el-button
                 type="success"
-                plain
-                icon="el-icon-edit"
                 size="mini"
                 :disabled="multiple"
                 @click="handleBatchEdit" 
@@ -174,14 +172,19 @@
                 :on-success="handleFileSuccess" 
             >
                 <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
+                  type="success"  
                   size="mini"  
                   >批量导入
               </el-button>
             </el-upload>
           </el-col>
+          <!-- <el-col :span="1.5"> 
+                <el-button
+                  type="success"  
+                  size="mini"  
+                  >批量导入
+              </el-button> 
+          </el-col> -->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>