Merge branch 'dev' of 121.36.198.49:zy_duanju/zhiyu_duanju_distribution_manage_front into pansl

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

@@ -15,3 +15,24 @@ export const titleObj = {
   支付方式: 'pay_name',
   订单状态: 'status_txt'
 };
+
+
+export const titlePtObj = {
+	商户名称: 'company_name',
+	商户ID: 'puser_id',
+	优化师: 'username',
+	小程序: 'play_name',
+	用户ID: 'uid',
+	订单号: 'trade_no',
+	订单时间: 'created_at',
+	染色注册时间: 'ranse_created_at',
+	累计充值成功次数: 'total_count',
+	充值金额: 'price',
+	推广名称: 'promotion_title',
+	充值类型: 'tip_text',
+	支付方式: 'pay_name',
+	支付名称:"pay_merchant_name",
+	收款主体:"payee_name",
+	支付商户号:"pay_appid",
+	订单状态: 'status_txt'
+}

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

@@ -21,7 +21,7 @@
         <!-- :remote-method="remoteMethod($event, 'channelPromotions')"不支持这种写法自定义参数 -->
         <el-form-item label="推广名称" prop="promotion_id">
           <el-select v-model="query.promotion_id" filterable remote clearable
-            :remote-method="(query) => { remoteMethod(query, 'channelPromotions') }" placeholder="选择推广名称">
+            :remote-method="(query) => { remoteMethod(query, 'channelPromotions') }" placeholder="全部推广名称">
             <el-option v-for="item in channelPromotions" :key="item.promotion_id" :label="item.name"
               :value="item.promotion_id" />
           </el-select>
@@ -49,11 +49,23 @@
             v-model="query.orderTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
             start-placeholder="开始时间" end-placeholder="结束时间" />
         </el-form-item>
+		<el-form-item label="支付名称" prop="pay_merchant_name"  v-if="rolesIdentify.includes('administrator')">
+		  <el-input v-model="query.pay_merchant_name" placeholder="请输入支付名称" clearable />
+		</el-form-item>
+		<el-form-item label="收款主体" prop="payee_name" v-if="rolesIdentify.includes('administrator')">
+		  <el-input v-model="query.payee_name" placeholder="请输入收款主体" clearable />
+		</el-form-item>
+		<el-form-item label="支付商户号" prop="pay_appid"  v-if="rolesIdentify.includes('administrator')">
+		  <el-input v-model="query.pay_appid" placeholder="请输入支付商户号" clearable />
+		</el-form-item>
       </template>
       <template v-slot:extra_button>
-        <exportExcel api="channel/order_list" sheet_name="订单列表" :title_obj="titleObj"
+        <exportExcel  v-if="rolesIdentify.includes('administrator')"  api="channel/order_list" sheet_name="订单列表" :title_obj="titlePtObj"
           :extro_params="{ is_export: true, ...query }">
         </exportExcel>
+		<exportExcel v-else api="channel/order_list" sheet_name="订单列表" :title_obj="titleObj"
+		  :extro_params="{ is_export: true, ...query }">
+		</exportExcel>
       </template>
     </Search>
     <div class="table-default">
@@ -86,6 +98,12 @@
         </el-table-column>
         <el-table-column prop="pay_name" label="支付方式" show-overflow-tooltip min-width="150px">
         </el-table-column>
+		<el-table-column prop="pay_merchant_name" label="支付名称" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
+		<el-table-column prop="payee_name" label="收款主体" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
+		<el-table-column prop="pay_appid" label="支付商户号" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
         <el-table-column prop="status_txt" label="订单状态" show-overflow-tooltip min-width="150px">
           <template #default="scope">
             <div class="wrapper">
@@ -123,7 +141,7 @@ import { shortcuts } from '@/utils/shortcuts'
 import { useRouter, useRoute } from 'vue-router'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
-import { titleObj } from "./excelTitle"
+import { titleObj,titlePtObj } from "./excelTitle"
 import userDetail from './userDetail/index.vue'
 import create from './form/create.vue'
 import {

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

@@ -1,5 +1,5 @@
 // 导出中文/字段
-export default {
+export const titleObj = {
   0: {
     商户名称: 'company_name',
     商户ID: 'puser_id',
@@ -38,3 +38,49 @@ export default {
     订单状态: 'status_text'
   }
 };
+
+export const titlePtObj = {
+	0: {
+	  商户名称: 'company_name',
+	  商户ID: 'puser_id',
+	  优化师: 'username',
+	  小程序: 'xcx_name',
+	  用户ID: 'uid',
+	  订单号: 'trade_no',
+	  订单时间: 'order_created_at',
+	  染色注册时间: 'ranse_created_at',
+	  申退金额: 'refund_price',
+	  充值金额: 'order_price',
+	  推广名称: 'promotion_name',
+	  档位类型: 'tip_text',
+	  支付方式: 'pay_name',
+	  支付名称:"pay_merchant_name",
+	  收款主体:"payee_name",
+	  支付商户号:"pay_appid",
+	  平台审核: 'pt_verify_status_text',
+	  平台审核备注: 'pt_verify_remark',
+	  商户审核: 'sh_verify_status_text',
+	  商户审核备注: 'sh_verify_remark'
+	},
+	1: {
+	  商户名称: 'company_name',
+	  商户ID: 'puser_id',
+	  优化师: 'username',
+	  小程序: 'xcx_name',
+	  用户ID: 'uid',
+	  订单号: 'trade_no',
+	  订单时间: 'order_created_at',
+	  染色注册时间: 'ranse_created_at',
+	  申退金额: 'refund_price',
+	  充值金额: 'order_price',
+	  推广名称: 'promotion_name',
+	  档位类型: 'tip_text',
+	  支付方式: 'pay_name',
+	  支付名称:"pay_merchant_name",
+	  收款主体:"payee_name",
+	  支付商户号:"pay_appid",
+	  退款时间: 'pay_at',
+	  退款单号: 'refund_no',
+	  订单状态: 'status_text'
+	}
+}

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

@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="推广名称" prop="promotion_id">
             <el-select v-model="query.promotion_id" filterable remote clearable
-              :remote-method="(query) => { remoteMethod(query, 'channelPromotions') }" placeholder="选择推广名称">
+              :remote-method="(query) => { remoteMethod(query, 'channelPromotions') }" placeholder="全部推广名称">
               <el-option v-for="item in channelPromotions" :key="item.promotion_id" :label="item.name"
                 :value="item.promotion_id" />
             </el-select>
@@ -45,11 +45,24 @@
               value-format="YYYY-MM-DD" v-model="query.orderTime" type="daterange" :shortcuts="shortcuts"
               range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" />
           </el-form-item>
+		  <el-form-item label="支付名称" prop="pay_merchant_name"  v-if="rolesIdentify.includes('administrator')">
+		    <el-input v-model="query.pay_merchant_name" placeholder="请输入支付名称" clearable />
+		  </el-form-item>
+		  <el-form-item label="收款主体" prop="payee_name" v-if="rolesIdentify.includes('administrator')">
+		    <el-input v-model="query.payee_name" placeholder="请输入收款主体" clearable />
+		  </el-form-item>
+		  <el-form-item label="支付商户号" prop="pay_appid"  v-if="rolesIdentify.includes('administrator')">
+		    <el-input v-model="query.pay_appid" placeholder="请输入支付商户号" clearable />
+		  </el-form-item>
         </template>
         <template v-slot:extra_button>
-          <exportExcel api="orderRefund/order_list" sheet_name="订单列表" :title_obj="titleObj[query.refund_status]"
+          <exportExcel v-if="rolesIdentify.includes('administrator')"  api="orderRefund/order_list" sheet_name="订单列表" :title_obj="titlePtObj[query.refund_status]"
             :extro_params="{ is_all: true, ...query }">
           </exportExcel>
+		  <exportExcel v-else="rolesIdentify.includes('administrator')"  api="orderRefund/order_list" sheet_name="订单列表" :title_obj="titleObj[query.refund_status]"
+		    :extro_params="{ is_all: true, ...query }">
+		  </exportExcel>
+		  
         </template>
       </Search>
     </div>
@@ -82,6 +95,12 @@
         </el-table-column>
         <el-table-column prop="pay_name" label="支付方式" show-overflow-tooltip min-width="150px">
         </el-table-column>
+		<el-table-column prop="pay_merchant_name" label="支付名称" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
+		<el-table-column prop="payee_name" label="收款主体" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
+		<el-table-column prop="pay_appid" label="支付商户号" show-overflow-tooltip min-width="150px"  v-if="rolesIdentify.includes('administrator')">
+		</el-table-column>
         <el-table-column prop="pay_at" label="退款时间" v-if="query.refund_status == 1" show-overflow-tooltip
           min-width="180px">
         </el-table-column>
@@ -169,7 +188,7 @@ import { shortcuts } from '@/utils/shortcuts'
 import { useRouter, useRoute } from 'vue-router'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
-import titleObj from "./excelTitle"
+import {titleObj,titlePtObj} from "./excelTitle"
 import {
   channelOrderList,
   channelMiniprogramUseList,