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

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

@@ -14,10 +14,10 @@ export const titleObj = {
     推广名称: 'promotion_name',
     档位类型: 'tip_text',
     支付方式: 'pay_name',
-    平台审核: 'pt_verify_status_text',
-    平台审核备注: 'pt_verify_remark',
-    商户审核: 'sh_verify_status_text',
-    商户审核备注: 'sh_verify_remark'
+    // 平台审核: 'pt_verify_status_text',
+    // 平台审核备注: 'pt_verify_remark',
+    // 商户审核: 'sh_verify_status_text',
+    // 商户审核备注: 'sh_verify_remark'
   },
   1: {
     商户名称: 'company_name',
@@ -57,10 +57,10 @@ export const titlePtObj = {
 	  支付名称:"pay_merchant_name",
 	  收款主体:"payee_name",
 	  支付商户号:"pay_appid",
-	  平台审核: 'pt_verify_status_text',
-	  平台审核备注: 'pt_verify_remark',
-	  商户审核: 'sh_verify_status_text',
-	  商户审核备注: 'sh_verify_remark'
+	  // 平台审核: 'pt_verify_status_text',
+	  // 平台审核备注: 'pt_verify_remark',
+	  // 商户审核: 'sh_verify_status_text',
+	  // 商户审核备注: 'sh_verify_remark'
 	},
 	1: {
 	  商户名称: 'company_name',

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

@@ -117,7 +117,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="pt_verify_status_text" label="平台审核" show-overflow-tooltip
+      <!--  <el-table-column v-if="query.refund_status == 0" prop="pt_verify_status_text" label="平台审核" show-overflow-tooltip
           min-width="150px">
           <template #default="scope">
             <div class="wrapper">
@@ -126,11 +126,11 @@
               </span>
             </div>
           </template>
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="pt_verify_remark" label="平台审核备注" show-overflow-tooltip
+        </el-table-column> -->
+    <!--    <el-table-column v-if="query.refund_status == 0" prop="pt_verify_remark" label="平台审核备注" show-overflow-tooltip
           min-width="150px">
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="sh_verify_status_text" label="商户审核" show-overflow-tooltip
+        </el-table-column> -->
+       <!-- <el-table-column v-if="query.refund_status == 0" prop="sh_verify_status_text" label="商户审核" show-overflow-tooltip
           min-width="150px">
           <template #default="scope">
             <div class="wrapper">
@@ -139,22 +139,26 @@
               </span>
             </div>
           </template>
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="sh_verify_remark" label="商户审核备注" show-overflow-tooltip
+        </el-table-column> -->
+       <!-- <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> -->
         <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.platformVerify'"
+          <!--  <el-button link type="primary" size="small" v-action="'orderRefund.RefundOrder.platformVerify'"
               @click="openType('noapprovedVisible', scope.row, '平台审核')">平台审核</el-button>
-            <br />
-            <el-button link type="primary" size="small" v-action="'orderRefund.RefundOrder.companyVerify'"
+            <br /> -->
+          <!--  <el-button link type="primary" size="small" v-action="'orderRefund.RefundOrder.companyVerify'"
               @click="openType('noapprovedVisible', scope.row, '商户审核')">商户审核</el-button>
-            <br />
-            <el-button :disabled="!scope.row.can_pay" link type="primary" size="small"
+            <br /> -->
+           <!-- <el-button :disabled="!scope.row.can_pay" link type="primary" size="small"
               v-action="'orderRefund.RefundOrder.payToUser'"
               @click="openType('approvedVisible', scope.row)">确认打款</el-button>
-            <br />
+            <br /> -->
+			<el-button link type="primary" size="small"
+			  v-action="'orderRefund.RefundOrder.payToUser'"
+			  @click="openType('approvedVisible', scope.row)">确认打款</el-button>
+			<br />
           </template>
         </el-table-column>
       </el-table>

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

@@ -5,10 +5,10 @@
       <el-input v-model.number="formCallback.account_id" type="number" auto-complete="off"
         placeholder="请输入巨量账户ID"></el-input>
     </el-form-item>
-    <el-form-item label="巨量账户名称" prop="account_name" label-width="120px"
+    <!-- <el-form-item label="巨量账户名称" prop="account_name" label-width="120px"
       :rules="[{ required: true, message: '巨量账户名称必须填写' }, { max: 20, message: '至多输入20个字符', trigger: 'blur' }]">
       <el-input v-model="formCallback.account_name" auto-complete="off" placeholder="请输入巨量账户名称"></el-input>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="回传配置" prop="default_rate" :rules="[{ required: true, message: '回传配置必须填写' }]">
       <div class="flex flex-col">
         <el-form-item label="输入回传金额" prop="price">

src/views/payBack/juliangAccount/tabs/advertiserList/index.vue

@@ -4,9 +4,15 @@
       <el-form-item label="巨量账户ID">
         <el-input placeholder="请输入巨量账户ID" class="input" icon="search" v-model="query.account_id" clearable></el-input>
       </el-form-item>
-      <el-form-item label="巨量账户">
+	  <el-form-item label="回传配置ID">
+	    <el-input placeholder="请输入回传配置ID" class="input" icon="search" v-model="query.id" clearable></el-input>
+	  </el-form-item>
+	  <el-form-item label="关联推广ID">
+	    <el-input placeholder="关联推广ID" class="input" icon="search" v-model="query.promotion_id" clearable></el-input>
+	  </el-form-item>
+    <!--  <el-form-item label="巨量账户">
         <el-input placeholder="请输入巨量账户" class="input" icon="search" v-model="query.account_name" clearable></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </template>
   </Search>
   <div class="table-default">
@@ -15,11 +21,10 @@
       <el-button type="primary" size="default" @click="mulSet">批量设置</el-button>
     </div>
     <el-table :data="tableData" class="mt-3" v-loading="loading" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="80">
-      </el-table-column>
+      <el-table-column type="selection" width="80"></el-table-column>
+	   <el-table-column label="回传配置ID" width="260" prop="id"></el-table-column>
       <el-table-column label="巨量账户ID" width="260" prop="adv_account_id"></el-table-column>
-      <el-table-column label="巨量账户" width="260" prop="adv_account_name">
-      </el-table-column>
+      <!-- <el-table-column label="巨量账户" width="260" prop="adv_account_name"></el-table-column> -->
       <el-table-column label="回传开关" width="150" v-action="'callback.JuliangAccount.turnCallbackState'">
         <template #default="scope">
           <div>
@@ -31,6 +36,9 @@
       <el-table-column label="关联推广名称" width="260" prop="promotion_name">
       </el-table-column>
       <el-table-column label="关联推广ID" width="260" prop="promotion_id">
+		<template #default="scope">
+			   <el-button link type="primary" size="small" @click="goToPromotion( scope.row)" >{{scope.row.promotion_id}}</el-button>
+		 </template>
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
@@ -61,7 +69,8 @@ import create from './form/create.vue';
 import paybackConfig from './form/paybackConfig.vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { callbackJuliangAccountTurnCallbackState, callbackJuliangAccountUnbindPromotion } from '@/api/backConfig/index'
-
+const router = useRouter();
+const route = useRoute();
 const api = 'callback/juliangAccount/list';
 
 const { data, query, search, reset, loading } = useGetList(api, true);
@@ -91,6 +100,11 @@ const switchStatus = (data: object) => {
     search()
   })
 }
+const goToPromotion = (row: object) =>{
+	 router.push({ path: '/promotion/promotionList', query: { tab: 1,id:row.promotion_id } })
+}
+	
+
 const handleCancel = (row: object) => {
   ElMessageBox.confirm(
     `解绑后此回传账户所有数据重新计算（包括比例/保护数）,确定要取消 ${row.adv_account_name} 推广回传关联吗?`,
@@ -102,7 +116,7 @@ const handleCancel = (row: object) => {
     }
   )
     .then(() => {
-      callbackJuliangAccountUnbindPromotion({ id: row.id }).then(res => {
+      callbackJuliangAccountUnbindPromotion({ id: row.promotion_id }).then(res => {
         ElMessage.success(res.message)
         search()
       })
@@ -177,6 +191,7 @@ const openForm = (data: any) => {
   addAccountVisible.value = true
 };
 onMounted(() => {
+query.value.id = route.query.id 
   search();
 });
 </script>

src/views/payBack/juliangAccount/tabs/logList/excelTitle.ts

@@ -1,7 +1,7 @@
 // 导出中文/字段
 export const titleObj = {
   所属账户ID: 'advertiser_id',
-  所属账户: 'advertiser_name',
+  // 所属账户: 'advertiser_name',
   订单号: 'order_no',
   用户ID: 'uid',
   注册IP: 'user_ranse_ip',

src/views/payBack/juliangAccount/tabs/logList/index.vue

@@ -5,13 +5,13 @@
         <el-form-item label="所属账户ID" prop="advertiser_id">
           <el-input v-model="query.advertiser_id" placeholder="请输入所属账户ID" clearable />
         </el-form-item>
-        <el-form-item label="所属账户" prop="advertiser_id">
+      <!--  <el-form-item label="所属账户" prop="advertiser_id">
           <el-select v-model="query.advertiser_id" filterable remote clearable :remote-method="remoteMethod"
             placeholder="选择所属账户">
             <el-option v-for="item in adNameOtion" :key="item.id" :label="item.adv_account_name"
               :value="item.adv_account_id" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="用户ID" prop="uid">
           <el-input v-model="query.uid" placeholder="请输入用户ID" clearable />
         </el-form-item>
@@ -38,8 +38,8 @@
     <div class="table-default">
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="advertiser_id" label="所属账户ID" fixed="left" min-width="200px" />
-        <el-table-column label="所属账户" prop="advertiser_name" show-overflow-tooltip fixed="left" min-width="200px">
-        </el-table-column>
+<!--        <el-table-column label="所属账户" prop="advertiser_name" show-overflow-tooltip fixed="left" min-width="200px">
+        </el-table-column> -->
         <el-table-column prop="order_no" show-overflow-tooltip label="订单号" min-width="200px">
         </el-table-column>
         <el-table-column prop="uid" label="用户ID" show-overflow-tooltip>

src/views/promotion/promotionList/index.vue

@@ -100,7 +100,11 @@
                 </template>
               </el-table-column>
               <el-table-column prop="callback_type_str" label="回传类型" />
-              <el-table-column prop="callback_config_id" label="回传配置ID" />
+              <el-table-column prop="callback_config_id" label="回传配置ID" >
+				  <template #default="scope">
+				  	   <el-button link type="primary" size="small" @click="goToTtHuicHuan( scope.row)" >{{scope.row.callback_config_id}}</el-button>
+				   </template>
+			  </el-table-column>
               <el-table-column prop="status_str" label="状态">
                 <template #default="scope">
                   <div class="wrapper">
@@ -228,6 +232,9 @@ const timeChange = (e) => {
   }
 }
 
+const goToTtHuicHuan = (row: object) =>{
+	 router.push({ path: '/payback/juliangAccount', query: { id:row.callback_config_id } })
+}
 const handChange = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
   router.push({ path: '/promotion/promotionList', query: { tab } })
@@ -259,7 +266,7 @@ const deletePromotion = (row: object) => {
 }
 
 const resetQuery = () => {
-  query.value = Object.assign({ page: query.value.page, limit: query.value.limit, miniprogram_id: query.value.miniprogram_id, is_config: query.value.is_config });
+  query.value = Object.assign({ page: query.value.page, limit: query.value.limit, miniprogram_id: query.value.miniprogram_id, is_config: query.value.is_config,id:value.id });
   search()
 }
 const openType = (type: string, data: object) => {
@@ -305,6 +312,7 @@ const closeType = (type: string) => {
 onMounted(() => {
   activeName.value = Number(route.query.tab || 1)
   query.value.is_config = activeName.value
+  query.value.id = route.query.id 
   if (JSON.parse(Cache.get('nav_data'))?.app.id) {
     query.value.miniprogram_id = JSON.parse(Cache.get('nav_data'))?.app.id
   }

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

@@ -2,6 +2,9 @@
   <div>
     <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="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" />
@@ -17,7 +20,8 @@
     <div class="table-default">
       <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 prop="owner_name" label="商户名称" min-width="200px" />
+        <el-table-column prop="business_str" label="所属商务" min-width="200px" />
         <el-table-column label="收款信息" show-overflow-tooltip min-width="250px">
           <template #default="scope">
             <div>收款人：{{ scope.row.name_of_payee }}</div>
@@ -27,23 +31,28 @@
             <div>收款人手机号：{{ scope.row.phone_of_payee }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="created_at" show-overflow-tooltip label="申请时间" min-width="200px">
+        <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 min-width="200px">
-        </el-table-column>
-        <el-table-column prop="status_str" 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>
           <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> -->
+      <!--  <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" v-if="scope.row.status == 1" size="small" @click="open(scope.row)"
-              v-action="'jiesuan.BankAccount.addCompanyCard'">编辑</el-button>
-            <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
-              v-action="'jiesuan.BankAccount.delCompanyCard'" v-if="scope.row.status != 2">删除</el-button>
+          <!--  <el-button link type="primary" v-if="scope.row.status == 1" size="small" @click="open(scope.row)"
+              v-action="'jiesuan.BankAccount.addCompanyCard'">编辑</el-button> -->
+			  
+          <!--  <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
+              v-action="'jiesuan.BankAccount.delCompanyCard'" v-if="scope.row.status != 2">删除</el-button> -->
+			  <el-button link type="primary"  size="small" @click="open(scope.row)"
+			    v-action="'jiesuan.BankAccount.addCompanyCard'">编辑</el-button>
+			  <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
+			    v-action="'jiesuan.BankAccount.delCompanyCard'" >删除</el-button>
             <br />
           </template>
         </el-table-column>