优化优化

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

@@ -58,13 +58,15 @@
     </Search>
     <div class="table-default">
       <el-table :data="tableData" class="mt-3" v-loading="loading">
-        <el-table-column prop="company_name" label="商户名称" min-width="200px">
+        <el-table-column prop="company_name" label="商户名称" min-width="200px"
+          v-if="!(rolesIdentify.includes('optimizer') || rolesIdentify.includes('company'))">
           <template #default="scope">
             <div>{{ scope.row.company_name }}</div>
             <div>ID:{{ scope.row.puser_id }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="username" label="优化师" show-overflow-tooltip min-width="200px">
+        <el-table-column prop="username" label="优化师" show-overflow-tooltip min-width="200px"
+          v-if="!rolesIdentify.includes('optimizer')">
         </el-table-column>
         <el-table-column prop="play_name" show-overflow-tooltip label="小程序" min-width="200px">
         </el-table-column>
@@ -93,7 +95,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openType('userDetailVisible', scope.row)">用户详情</el-button>
             <br />

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

@@ -55,13 +55,15 @@
     </div>
     <div class="table-default">
       <el-table :data="tableData" class="mt-3" v-loading="loading">
-        <el-table-column prop="company_name" label="商户名称" min-width="200px">
+        <el-table-column prop="company_name" label="商户名称" min-width="200px"
+          v-if="rolesIdentify.includes('administrator')">
           <template #default="scope">
             <div>{{ scope.row.company_name }}</div>
             <div>ID:{{ scope.row.puser_id }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="username" label="优化师" show-overflow-tooltip min-width="200px">
+        <el-table-column prop="username" label="优化师" show-overflow-tooltip min-width="200px"
+          v-if="!rolesIdentify.includes('optimizer')">
         </el-table-column>
         <el-table-column prop="xcx_name" show-overflow-tooltip label="小程序" min-width="200px">
         </el-table-column>
@@ -122,7 +124,7 @@
         <el-table-column v-if="query.refund_status == 0" prop="sh_verify_remark" label="商户审核备注" show-overflow-tooltip
           min-width="150px">
         </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" label="操作">
+        <el-table-column v-if="query.refund_status == 0" label="操作" fixed="right">
           <template #default="scope">
             <el-button link type="primary" size="small" v-action="'orderRefund.RefundOrder.companyVerify'"
               @click="openType('noapprovedVisible', scope.row, '平台审核')">平台审核</el-button>

src/views/payBack/juliangAccount/tabs/advertiserList/form/create.vue

@@ -89,7 +89,7 @@ const promotion = ref('')
 const formCallback = ref({
   account_id: '',
   account_name: '',
-  min_money: null,
+  min_money: 30,
   max_money: null,
   state: 1,
   protect_num: 0,

src/views/payBack/juliangAccount/tabs/advertiserList/form/paybackConfig.vue

@@ -85,7 +85,7 @@ const promotion = ref('')
 const form = ref()
 const formCallback = ref({
   ids: [],
-  min_money: null,
+  min_money: 30,
   max_money: null,
   state: 1,
   protect_num: 0,

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

@@ -56,11 +56,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="name_of_payee" label="收款人姓名" show-overflow-tooltip>
+        <el-table-column prop="name_of_payee" label="收款人姓名" show-overflow-tooltip min-width="150px">
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="操作" v-if="isShowOperate">
+        <el-table-column label="操作" v-if="isShowOperate" fixed="right">
           <template #default="scope">
             <el-button link type="primary" size="small" v-if="query.status == 1"
               @click="openType('withdrawDetailVisible', scope.row)">提现详情</el-button>

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

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-radio-group v-model="query.status" @change="search">
+    <el-radio-group v-model="query.status" @change="search" class="pl-5">
       <el-radio v-for="item in statusList" :label="item.value" :key="item.value">{{ item.name }}</el-radio>
     </el-radio-group>
     <Search :search="search" :reset="resetQuery">
       <template v-slot:body>
-		  <el-form-item label="商户名称" prop="name">
-			  <el-input v-model="query.owner_name" name="owner_name"  clearable placeholder="请输入商户名称" /> 		
-		  </el-form-item>
+        <el-form-item label="商户名称" prop="name">
+          <el-input v-model="query.owner_name" name="owner_name" clearable placeholder="请输入商户名称" />
+        </el-form-item>
         <el-form-item label="所属商务" prop="business_id">
           <el-select v-model="query.business_id" filterable clearable placeholder="选择所属商务">
             <el-option v-for="item in businessList" :key="item.id" :label="item.username" :value="item.id" />
@@ -18,11 +18,11 @@
             v-model="query.createTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
             start-placeholder="开始时间" end-placeholder="结束时间" />
         </el-form-item>
-		<el-form-item label="审核时间" v-if="query.status != 1">
-		  <el-date-picker unlink-panels clearable @change="VerifyTimeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
-		    v-model="query.verifyTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
-		    start-placeholder="开始时间" end-placeholder="结束时间" />
-		</el-form-item>
+        <el-form-item label="审核时间" v-if="query.status != 1">
+          <el-date-picker unlink-panels clearable @change="VerifyTimeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+            v-model="query.verifyTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
+            start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
       </template>
     </Search>
     <div class="table-default">
@@ -35,28 +35,28 @@
         </el-table-column>
         <el-table-column prop="business_name" show-overflow-tooltip label="所属商务" min-width="200px">
         </el-table-column>
-       <el-table-column prop="owner_name" label="收款信息" min-width="250px">
-         <template #default="scope">
-           <div>收款人：{{ scope.row.name_of_payee }}</div>
-           <div>银行卡号:{{ scope.row.card_no }}</div>
-           <div>开户支行:{{ scope.row.sub_bank_name}}</div>
-           <div>开户银行:{{ scope.row.bank_name  }}</div>
-           <div>收款人手机号:{{ scope.row.phone_of_payee}}</div> 
-         </template>
-       </el-table-column>
-		<el-table-column prop="created_at" label="申请时间" show-overflow-tooltip min-width="200px">
-		</el-table-column>
-		<el-table-column prop="checked_at"  v-if="query.status != 1" label="审核时间" show-overflow-tooltip min-width="200px">
-		</el-table-column>
-        <el-table-column prop="remark"  v-if="query.status != 1" label="备注" show-overflow-tooltip  min-width="200px">
+        <el-table-column prop="owner_name" label="收款信息" min-width="250px">
+          <template #default="scope">
+            <div>收款人：{{ scope.row.name_of_payee }}</div>
+            <div>银行卡号:{{ scope.row.card_no }}</div>
+            <div>开户支行:{{ scope.row.sub_bank_name }}</div>
+            <div>开户银行:{{ scope.row.bank_name }}</div>
+            <div>收款人手机号:{{ scope.row.phone_of_payee }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="created_at" label="申请时间" show-overflow-tooltip min-width="200px">
+        </el-table-column>
+        <el-table-column prop="checked_at" v-if="query.status != 1" label="审核时间" show-overflow-tooltip min-width="200px">
+        </el-table-column>
+        <el-table-column prop="remark" v-if="query.status != 1" label="备注" show-overflow-tooltip min-width="200px">
+        </el-table-column>
+        <el-table-column prop="status_text" v-if="query.status != 1" label="状态" show-overflow-tooltip min-width="200px">
+          <template #default="scope">
+            <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.status_text }}</el-text>
+          </template>
         </el-table-column>
-		<el-table-column prop="status_text"  v-if="query.status != 1" label="状态" show-overflow-tooltip min-width="200px">
-		  <template #default="scope">
-		    <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.status_text }}</el-text>
-		  </template>
-		</el-table-column>
-		
-        <el-table-column label="操作"  v-if="query.status == 1">
+
+        <el-table-column label="操作" v-if="query.status == 1">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openType('approvedVisible', scope.row)">审核通过</el-button>
             <br />
@@ -134,11 +134,11 @@ const colorType = (data: object) => {
 }
 
 const noapproveChange = () => {
-  jiusanBankCardVerify({ id: current.value.id, status: 3,remark:form.value.remark }).then(res => {
+  jiusanBankCardVerify({ id: current.value.id, status: 3, remark: form.value.remark }).then(res => {
     ElMessage.success(res.message)
-	if(res.code == 10000){
-		closeType('noapprovedVisible');
-	}
+    if (res.code == 10000) {
+      closeType('noapprovedVisible');
+    }
     search()
   })
 }
@@ -149,15 +149,15 @@ const createTimeChange = (e: object) => {
     const timeArr = toRaw(e);
     query.value.created_at_start = timeArr[0]
     query.value.created_at_end = timeArr[1]
-	delete query.value.checked_at_start
-	delete query.value.checked_at_end
-	delete query.value.verifyTime
+    delete query.value.checked_at_start
+    delete query.value.checked_at_end
+    delete query.value.verifyTime
   } else {
     delete query.value.created_at_start
     delete query.value.created_at_end
-	delete query.value.checked_at_start
-	delete query.value.checked_at_end
-	delete query.value.verifyTime
+    delete query.value.checked_at_start
+    delete query.value.checked_at_end
+    delete query.value.verifyTime
   }
 }
 
@@ -167,17 +167,17 @@ const VerifyTimeChange = (e: object) => {
     const timeArr = toRaw(e);
     query.value.checked_at_start = timeArr[0]
     query.value.checked_at_end = timeArr[1]
-	delete query.value.created_at_start
-	delete query.value.created_at_end
-	delete query.value.createTime
+    delete query.value.created_at_start
+    delete query.value.created_at_end
+    delete query.value.createTime
   } else {
     delete query.value.checked_at_start
     delete query.value.checked_at_end
-	delete query.value.created_at_start
-	delete query.value.created_at_end
-	delete query.value.createTime
+    delete query.value.created_at_start
+    delete query.value.created_at_end
+    delete query.value.createTime
+
 
-	
   }
 }