优化

src/views/ordersManage/tabs/rechargeList/excelTitle.ts

@@ -8,7 +8,7 @@ export const titleObj = {
   订单号: 'trade_no',
   订单时间: 'created_at',
   染色注册时间: 'ranse_created_at',
-  累计充值次数: 'total_count',
+  累计充值成功次数: 'total_count',
   充值金额: 'price',
   推广名称: 'promotion_title',
   充值类型: 'tip_text',

src/views/ordersManage/tabs/rechargeList/index.vue

@@ -33,7 +33,7 @@
               :value="item.miniprogram_id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="优化师" v-if="!query.promotion_id" prop="user_id">
+        <el-form-item label="优化师" v-if="!query.promotion_id && !rolesIdentify.includes('optimizer')" prop="user_id">
           <el-select v-model="query.user_id" filterable remote clearable
             :remote-method="(query) => { remoteMethod(query, 'channelPromotionsUsers') }" placeholder="选择优化师">
             <el-option v-for="item in promotionsUsersList" :key="item.user_id" :label="item.name" :value="item.user_id" />
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="created_at" label="订单时间" show-overflow-tooltip min-width="200px" />
         <el-table-column prop="ranse_created_at" label="染色注册时间" show-overflow-tooltip min-width="200px" />
-        <el-table-column prop="total_count" label="累计充值次数" show-overflow-tooltip min-width="150px">
+        <el-table-column prop="total_count" label="累计充值成功次数" show-overflow-tooltip min-width="150px">
         </el-table-column>
         <el-table-column prop="price" label="充值金额" show-overflow-tooltip>
         </el-table-column>

src/views/ordersManage/tabs/refundList/index.vue

@@ -33,7 +33,7 @@
                 :value="item.miniprogram_id" />
             </el-select>
           </el-form-item>
-          <el-form-item label="优化师" v-if="!query.promotion_id" prop="user_id">
+          <el-form-item label="优化师" v-if="!query.promotion_id && !rolesIdentify.includes('optimizer')" prop="user_id">
             <el-select v-model="query.user_id" filterable remote clearable
               :remote-method="(query) => { remoteMethod(query, 'channelPromotionsUsers') }" placeholder="选择优化师">
               <el-option v-for="item in promotionsUsersList" :key="item.user_id" :label="item.name"

src/views/settleManage/financialControl/tabs/rechargeSettle/index.vue

@@ -46,9 +46,9 @@
         </el-table-column>
         <el-table-column prop="created_at" show-overflow-tooltip label="提现时间" min-width="200px">
         </el-table-column>
-        <el-table-column prop="card_no" label="提现账户" show-overflow-tooltip>
+        <el-table-column prop="card_no" label="提现账户" show-overflow-tooltip min-width="200px">
         </el-table-column>
-        <el-table-column prop="status_str" label="状态" show-overflow-tooltip min-width="200px">
+        <el-table-column prop="status_str" label="状态" show-overflow-tooltip>
           <template #default="scope">
             <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.status_str }}</el-text>
             <div v-if="query.status == 4">
@@ -56,7 +56,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="name_of_payee" label="收款人姓名" show-overflow-tooltip min-width="200px">
+        <el-table-column prop="name_of_payee" label="收款人姓名" show-overflow-tooltip>
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip>
         </el-table-column>

src/views/settleManage/paymentAccountInfo/tabs/paymentInfo/form/create.vue

@@ -122,7 +122,7 @@ const submitForm = (formEl: FormInstance | undefined) => {
 }
 
 if (props.primary) {
-
+  formData.value = JSON.parse(JSON.stringify(props.primary))
 }
 
 const emit = defineEmits(['close']);

src/views/settleManage/paymentAccountInfo/tabs/paymentInfo/index.vue

@@ -18,7 +18,7 @@
       <Operate :show="open" v-action="'jiesuan.BankAccount.addCompanyCard'" />
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="owner_name" label="所属商务" min-width="200px" />
-        <el-table-column label="收款信息" show-overflow-tooltip min-width="200px">
+        <el-table-column label="收款信息" show-overflow-tooltip min-width="250px">
           <template #default="scope">
             <div>收款人：{{ scope.row.name_of_payee }}</div>
             <div>银行卡号：{{ scope.row.card_no }}</div>
@@ -29,15 +29,21 @@
         </el-table-column>
         <el-table-column prop="created_at" show-overflow-tooltip label="申请时间" min-width="200px">
         </el-table-column>
-        <el-table-column prop="checked_at" label="审核时间" show-overflow-tooltip>
+        <el-table-column prop="checked_at" label="审核时间" show-overflow-tooltip min-width="200px">
         </el-table-column>
-        <el-table-column prop="status_str" label="状态" show-overflow-tooltip min-width="200px">
+        <el-table-column prop="status_str" label="状态" show-overflow-tooltip>
           <template #default="scope">
             <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.status_str }}</el-text>
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200px">
         </el-table-column>
+        <!-- <el-table-column label="操作" width="200">
+          <template #default="scope">
+            <el-button link type="primary" size="small" @click="open(scope.row)"
+              v-action="'jiesuan.BankAccount.addCompanyCard'">编辑</el-button>
+          </template>
+        </el-table-column> -->
       </el-table>
       <Paginate />
     </div>

src/views/settleManage/settlementCenter/tabs/rechargeRules/index.vue

@@ -3,8 +3,8 @@
     (1)：结算功能针对同一账号下的所有小程序<br />
     (2)：分成金额=(充值总额-退款)*分成比例<br />
     (3)：申请提现后自动进入审核流程，审核需要1-5个工作日，节假日顺延，审核成功后自动打款<br />
-    (4)：每天最多提现一次<br />
-    (5)：账户余额低于500元时无法申请提现<br />
+    (4)：每日提现一次<br />
+    (5)：单笔提现金额不少于500<br />
   </div>
 </template>
 

src/views/settleManage/settlementCenter/tabs/rechargeSettle/index.vue

@@ -66,7 +66,7 @@
         </el-table-column>
         <el-table-column prop="jiesuan_money" label="日结算总额" show-overflow-tooltip min-width="200px">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" min-width="200px">
           <template #default="scope">
             <el-button link type="primary" size="small"
               @click="openType('orderDetailVisible', scope.row)">查看订单详情</el-button>