From 143939e8d0b13507fa6ddb786603976ce10ef38e Mon Sep 17 00:00:00 2001
From: wtq <2394975549@qq.com>
Date: Wed, 20 May 2026 15:11:51 +0800
Subject: [PATCH] '!'

---
 src/store/modules/permission.js               |   1 -
 .../jx_horizon/jxHorizonPartner/list.vue      | 168 +++++++++++++-----
 vue.config.js                                 |  44 +----
 3 files changed, 128 insertions(+), 85 deletions(-)

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1ca57b6..4a2a102 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -53,7 +53,6 @@ const permission = {
 
 // 遍历后台传来的路由字符串，转换为组件对象
 function filterAsyncRouter(asyncRouterMap) {
-  console.log('asyncRouterMap',asyncRouterMap)
   return asyncRouterMap.filter(route => {
     if (route.component) {
       // Layout组件特殊处理
diff --git a/src/views/jx_horizon/jxHorizonPartner/list.vue b/src/views/jx_horizon/jxHorizonPartner/list.vue
index faf7911..c930095 100644
--- a/src/views/jx_horizon/jxHorizonPartner/list.vue
+++ b/src/views/jx_horizon/jxHorizonPartner/list.vue
@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">    
+      <el-form-item label="创建时间" prop="createdAt">
+        <el-date-picker 
+          type="datetime" 
+          v-model="form.createdAt" 
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss" 
+          :style="{width: '100%'}" 
+          placeholder="请选择创建时间" 
+          clearable></el-date-picker>
+      </el-form-item>
       <el-form-item label="电话" prop="phone">
         <el-input
             v-model="queryParams.phone"
@@ -10,24 +20,56 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>    
-      <el-form-item label="角色标示" prop="roleCode">
-        <el-input
-            v-model="queryParams.roleCode"
-            placeholder="请输入角色标示"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="角色标识" prop="roleCode">
+        <!-- /@change="handleQuery" -->
+        <el-select v-model="queryParams.roleCode" placeholder="请选择角色标识" clearable size="small"  @change="handleQuery">
+            <el-option
+                v-for="dict in roleCodeOptions"
+                :key="dict.key"
+                :label="dict.value"
+                :value="dict.key"
+            />
+        </el-select>
       </el-form-item>    
-      <el-form-item label="所属等级" prop="levelOrder">
+      <!-- <el-form-item label="所属等级" prop="levelOrder">
         <el-input
             v-model="queryParams.levelOrder"
             placeholder="请输入所属等级"
             clearable
             size="small"
+            :disabled="true"
+           @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>    -->
+      <el-form-item label="分成比例" prop="commissionRate">
+        <el-input
+            v-model="queryParams.commissionRate"
+            placeholder="请输入分成比例"
+            clearable
+            size="small"
             @keyup.enter.native="handleQuery"
         />
-      </el-form-item>      
+      </el-form-item>
+      <el-form-item label="生效时间" prop="effectiveAt">
+        <el-date-picker 
+          type="datetime" 
+          v-model="form.effectiveAt" 
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss" 
+          :style="{width: '100%'}" 
+          placeholder="请选择生效时间" 
+          clearable>
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="名称" prop="userName">
+         <el-input
+            v-model="queryParams.userName"
+            placeholder="请输入名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>     
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -66,10 +108,12 @@
     </el-row>
     <el-table v-loading="loading" :data="jxHorizonPartnerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />      
-      <el-table-column label="系统id" align="center" prop="id" />      
+      <!-- <el-table-column label="系统id" align="center" prop="id" />       -->
+      <el-table-column label="创建时间" align="center" prop="createdAt" />      
+      <el-table-column label="更新时间" align="center" prop="updatedAt" />      
       <el-table-column label="系统用户ID" align="center" prop="userId" />      
       <el-table-column label="电话" align="center" prop="phone" />      
-      <el-table-column label="角色标示" align="center" prop="roleCode" :formatter="roleCodeFormat" />      
+      <el-table-column label="角色标识" align="center" prop="roleCode" :formatter="roleCodeFormat" />      
       <el-table-column label="所属等级" align="center" prop="levelOrder" />      
       <el-table-column label="分成比例" align="center" prop="commissionRate" />      
       <el-table-column label="生效时间" align="center" prop="effectiveAt" width="180">
@@ -80,6 +124,11 @@
       <el-table-column label="公司ID" align="center" prop="companyId" />      
       <el-table-column label="合伙人" align="center" prop="parentId" />      
       <el-table-column label="代理人" align="center" prop="agentId" />      
+      <el-table-column label="创建渠道" align="center" prop="createdBy" />      
+      <el-table-column label="用户备注" align="center" prop="userName" />      <!-- 备注 -->   
+      <el-table-column label="公司备注" align="center" prop="companyName" />   <!-- 备注 -->   
+      <el-table-column label="合伙人备注" align="center" prop="parentName" />   <!-- 备注 -->   
+      <el-table-column label="代理人备注" align="center" prop="agentName" />   <!-- 备注 -->   
       <el-table-column label="备注" align="center" prop="remark" />      
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -110,30 +159,38 @@
     <!-- 添加或修改合伙人对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">      
-      <el-form-item label="系统用户ID" prop="userId">
+      <!-- <el-form-item label="系统用户ID" prop="userId">
            <el-input v-model="form.userId" placeholder="请输入系统用户ID" />
-      </el-form-item>      
+      </el-form-item>       -->
       <el-form-item label="电话" prop="phone">
            <el-input v-model="form.phone" placeholder="请输入电话" />
       </el-form-item>      
-      <el-form-item label="角色标示" prop="roleCode">
-           <el-input v-model="form.roleCode" placeholder="请输入角色标示" />
+      <el-form-item label="角色标识" prop="roleCode">
+           <!-- <el-input v-model="form.roleCode" placeholder="请输入角色标识" /> -->
+          <el-select v-model="form.roleCode" placeholder="请选择角色标识" clearable size="small" style="width: 100%;">
+            <el-option
+                v-for="dict in roleCodeOptions"
+                :key="dict.key"
+                :label="dict.value"
+                :value="dict.key"
+            />
+        </el-select>
       </el-form-item>      
-      <el-form-item label="所属等级" prop="levelOrder">
+      <!-- <el-form-item label="所属等级" prop="levelOrder">
            <el-input v-model="form.levelOrder" placeholder="请输入所属等级" />
-      </el-form-item>      
+      </el-form-item>       -->
       <el-form-item label="分成比例" prop="commissionRate">
            <el-input v-model="form.commissionRate" placeholder="请输入分成比例" />
       </el-form-item>      
        <el-form-item label="生效时间" prop="effectiveAt">
-           <el-date-picker clearable size="small" style="width: 200px"
+           <el-date-picker clearable size="small" style="width: 100%"
                v-model="form.effectiveAt"
                type="date"
                value-format="yyyy-MM-dd"
                placeholder="选择生效时间">
            </el-date-picker>
        </el-form-item>      
-      <el-form-item label="公司ID" prop="companyId">
+      <!-- <el-form-item label="公司ID" prop="companyId">
            <el-input v-model="form.companyId" placeholder="请输入公司ID" />
       </el-form-item>      
       <el-form-item label="合伙人" prop="parentId">
@@ -141,7 +198,7 @@
       </el-form-item>      
       <el-form-item label="代理人" prop="agentId">
            <el-input v-model="form.agentId" placeholder="请输入代理人" />
-      </el-form-item>      
+      </el-form-item>       -->
       <el-form-item label="备注" prop="remark">
            <el-input v-model="form.remark" placeholder="请输入备注" />
       </el-form-item>       
@@ -193,7 +250,10 @@ export default {
         createdAt: undefined,
         phone: undefined,
         roleCode: undefined,
-        levelOrder: undefined,
+        commissionRate:undefined, // 分成比例
+        effectiveAt:undefined,  // 生效时间
+        userName:undefined,      // 名称
+        // levelOrder: undefined,
       },
       // 表单参数
       form: {},
@@ -202,30 +262,33 @@ export default {
         createdAt : [
           { required: true, message: "创建时间不能为空", trigger: "blur" }
         ],
-        userId : [
-          { required: true, message: "系统用户ID不能为空", trigger: "blur" }
-        ],
+        // userId : [
+        //   { required: true, message: "系统用户ID不能为空", trigger: "blur" }
+        // ],
         phone : [
           { required: true, message: "电话不能为空", trigger: "blur" }
         ],
         roleCode : [
-          { required: true, message: "角色标示不能为空", trigger: "blur" }
-        ],
-        levelOrder : [
-          { required: true, message: "所属等级不能为空", trigger: "blur" }
+          { required: true, message: "角色标识不能为空", trigger: "blur" }
         ],
+        // levelOrder : [
+        //   { required: true, message: "所属等级不能为空", trigger: "blur" }
+        // ],
         commissionRate : [
           { required: true, message: "分成比例不能为空", trigger: "blur" }
         ],
-        companyId : [
-          { required: true, message: "公司ID不能为空", trigger: "blur" }
-        ],
-        parentId : [
-          { required: true, message: "合伙人不能为空", trigger: "blur" }
-        ],
-        agentId : [
-          { required: true, message: "代理人不能为空", trigger: "blur" }
+        effectiveAt : [
+          { required: true, message: "生效时间不能为空", trigger: "blur" }
         ],
+        // companyId : [
+        //   { required: true, message: "公司ID不能为空", trigger: "blur" }
+        // ],
+        // parentId : [
+        //   { required: true, message: "合伙人不能为空", trigger: "blur" }
+        // ],
+        // agentId : [
+        //   { required: true, message: "代理人不能为空", trigger: "blur" }
+        // ],
         remark : [
           { required: true, message: "备注不能为空", trigger: "blur" }
         ],
@@ -234,14 +297,20 @@ export default {
   },
   created() {    
     this.getDicts("sys_horizon_partner").then(response => {
-      this.roleCodeOptions = response.data.values||[];
+      console.log('获取角色标识数据',response)
+      this.roleCodeOptions = response.data.values || [];
     });
     this.getList();
   },
-  methods: {    
+  methods: {   
     /** 查询合伙人列表 */
     getList() {
       this.loading = true;
+      // let obj = this.queryForm
+      if(this.queryParams.roleCode){
+        let findIndex = this.roleCodeOptions.findIndex(item => item.key === this.queryParams.roleCode)
+        this.queryParams.levelOrder = findIndex + 1
+      }
       listJxHorizonPartner(this.queryParams).then(response => {
         let list = response.data.list || [];        
         this.jxHorizonPartnerList = list;        
@@ -249,9 +318,15 @@ export default {
         this.loading = false;
       });
     },    
-    // 角色标示字典翻译
+    // 角色标识字典翻译
     roleCodeFormat(row, column) {
       return this.selectDictLabel(this.roleCodeOptions, row.roleCode);
+    },
+    selectDictLabel(roleCodeOptions,roleCode){
+      if(roleCode){
+        let findIndex = roleCodeOptions.findIndex(item => item.key === roleCode)
+        return findIndex + 1
+      }else return ''
     },    
     // 取消按钮
     cancel() {
@@ -267,12 +342,12 @@ export default {
         userId: undefined,        
         phone: undefined,        
         roleCode: undefined,        
-        levelOrder: undefined,        
+        // levelOrder: undefined,        
         commissionRate: undefined,        
         effectiveAt: undefined,        
-        companyId: undefined,        
-        parentId: undefined,        
-        agentId: undefined,        
+        // companyId: undefined,        
+        // parentId: undefined,        
+        // agentId: undefined,        
         createdBy: undefined,        
         remark: undefined,        
       };      
@@ -280,6 +355,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log('你搜索了码')
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -315,6 +391,10 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.roleCode){
+            let findIndex = this.roleCodeOptions.findIndex(item => item.key === this.form.roleCode)
+            this.form.levelOrder = findIndex + 1
+          }
           if (this.form.id != undefined) {
             updateJxHorizonPartner(this.form).then(response => {
               if (response.code === 0) {
diff --git a/vue.config.js b/vue.config.js
index 65f56a4..4c38ce2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,53 +34,17 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `https://jxhorizon.jxc4.com/`,
+        // target: `http://192.168.0.75:8300/`,
+        // target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       }
     },
-    // proxy: {
-    //   "/v2": {
-    //     target: "https://jxhorizon.jxc4.com",
-    //     changeOrigin: true,
-    //     secure: false,
-    //     pathRewrite:{
-    //       ['^v2']:"/"
-    //     }
-    //   }
-    // },
     sockHost:"https://jxhorizon.jxc4.com/",
+    // sockHost:"http://192.168.0.75:8300",
   },
-// devServer: {
-//   port: port,
-//   disableHostCheck: true,
-//   proxy: {
-//     '/horizon': {
-//       target: 'https://jxhorizon.jxc4.com',
-//       changeOrigin: true,
-//       secure: false,
-//       pathRewrite: {
-//         '^/horizon': '/horizon'
-//       }
-//     }
-//   }
-// },
-// devServer: {
-//   port: port,
-//   disableHostCheck: true,
-//   // 👇 👇 只保留这个代理，不要加任何多余配置 👇 👇
-//   proxy: {
-//     '/horizon': {
-//       target: 'https://jxhorizon.jxc4.com',
-//       changeOrigin: true,
-//       secure: false,
-//       pathRewrite: {
-//         '^/horizon': '/horizon'
-//       }
-//     }
-//   }
-// },
   configureWebpack: {
     name: name,
     resolve: {
@@ -166,4 +130,4 @@ module.exports = {
         }
       )
   }
-}
+}
\ No newline at end of file