jufubao-admin-library 1.1.87 → 1.1.89

package/library/viewModules/viewWalking/schemas/walking.js

@@ -283,10 +283,10 @@ module.exports = {
       path: '/code-partner/v1/code-activity-for-forign',
       isRule: false,
       params: {
-        id: ['activity_name', 'String', '非必填'],
-        id: ['activity_use_scene', 'String', '非必填'],
-        id: ['selected_activity_id', 'String', '非必填'],
-        id: ['site_id', 'String', '非必填'],
+        activity_name: ['activity_name', 'String', '非必填'],
+        activity_use_scene: ['activity_use_scene', 'String', '非必填'],
+        selected_activity_id: ['selected_activity_id', 'String', '非必填'],
+        site_id: ['site_id', 'String', '非必填'],
       },
       disabled: true,
       role: '',

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/components/PeopleManage.vue

@@ -307,7 +307,7 @@ export default {
       console.log(this.listValue,'listValue')
       let params = {
         item: {
-          action:'import_prize_activity_user',
+          action:'import_walking_activity_user',
           request_params: JSON.stringify({
             file_url: this.listValue.template.url,
             file_name: this.listValue.template.name,

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/list.vue

@@ -619,5 +619,16 @@ export default {
     }
   }
 }
+#qrCode{
+  display: flex;
+  justify-content: center;
+  padding-top: 25px;
+}
+.code_notice{
+  text-align: center;
+  color: #606266;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
 </style>
 

package/library/viewModules/viewsCorporateActivities/router/activity_manage.js

@@ -73,6 +73,19 @@ const activityManageRouter = {
         // #endif
       }
     },
+    {
+      path: 'sign_result/:id',
+      name: 'ActivitySignResultList',
+      hidden:true,
+      component: () => setModuleName(import('@/viewsCorporateActivities/sign_result'), 'ActivitySignResultList'),
+      meta: {
+        title: '查看结果',
+        icon: 'xdicon_jiamengshangyonghu',
+        // #ifdef saas-admin
+        roles: [activity_manage.getActivityUserList]
+        // #endif
+      }
+    },
   ]
 }
 

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/CommentBox.vue

@@ -6,7 +6,7 @@
     </div>  
     <div class="app-container-card" v-for="(item,index) in commentData['comments']" :key="index">
       <div class="app-container-card-left">
-        <img src="" alt="">
+        <img :src="item.user_avatar" alt="">
       </div>
       <div class="app-container-card-right">
         <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,true)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan"></i><i @click="handleShow(item.id,item.is_show,true)" v-else class="xd_admin_iconfont xdicon_biyan"></i></div></div>
@@ -24,7 +24,7 @@
     >
      <div class="app-container-card" v-for="(item,index) in tables" :key="index">
       <div class="app-container-card-left">
-        <img src="" alt="">
+        <img :src="item.user_avatar" alt="">
       </div>
       <div class="app-container-card-right">
         <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,false)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan"></i><i @click="handleShow(item.id,item.is_show,false)" v-else class="xd_admin_iconfont xdicon_biyan"></i></div></div>
@@ -69,7 +69,7 @@ export default {
   },
   data () {
     return {
-      page_size: 1, //当前页面数量
+      page_token: 1, //当前页面数量
       limit: 20, //搜索参数
       total: 0,
       showDialog:false,
@@ -114,10 +114,10 @@ export default {
       let params = {
         filters:{
           activity_id:this.commentData['activity_id'],
-          work_id:this.commentData['work_id'],
+          work_id:this.commentData['id'],
         },
-        page_token: isFirst?'1':this.limit.toString(),
-        page_size: isFirst?3:this.page_size
+        page_token: isFirst?'1':this.page_token.toString(),
+        page_size: isFirst?3:this.limit
       }
       let loading = Loading.service({})
       this.getCompanyWorkCommentList(params).then((res) => {
@@ -136,7 +136,7 @@ export default {
      * @param page {Number} 访问页面页码数
      */
     handlePagination(page) {
-      this.page_size = page;
+      this.page_token = page;
       this.getList(false);
     },
     onJfbTagForReload () {

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/ContentBox.vue

@@ -178,9 +178,9 @@ export default {
         color: #666666;
         font-size: 14px;
         margin-top: 20px;
-        position: absolute;
-        bottom: 20px;
-        right: 10px;
+       // position: absolute;
+        //bottom: 20px;
+        //right: 10px;
         &>div:first-child{
           margin-right: 10px;
         }

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/PeopleManage.vue

@@ -307,7 +307,7 @@ export default {
         let loading = Loading.service({})
         let params = {
         item: {
-          action:'import_walking_activity_user',
+          action:'import_company_activity_user',
           request_params: JSON.stringify({
             file_url: this.listValue.template.url,
             file_name: this.listValue.template.name,

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/create.vue

@@ -19,10 +19,10 @@
             <div v-if="contentList.length">
               <div v-for="(item,index) in contentList" :key="index" style="display:flex;width:100%">
                 <div style="width:60%">
-                   <el-form-item label="标题:" required>
+                   <el-form-item label="标题:">
                     <el-input v-model="contentList[index].title" placeholder="" style="width:60%"></el-input>
                   </el-form-item>
-                  <el-form-item label="">
+                  <el-form-item label=" " required>
                     <el-input v-model="contentList[index].rule" type="textarea" placeholder="" style="width:80%"></el-input>
                   </el-form-item>
                 </div>
@@ -73,7 +73,7 @@ export default {
       status: false,
       renderFormKey: Date.now(),
       businessData: null,
-      subCompanyData:[],
+      companyData:[],
       siteData:[],
       form:{},
       contentList:[],
@@ -109,16 +109,39 @@ export default {
         }
       }
     },
+    'listValue.is_all_sub_company_attend':{
+      handler(n,o){
+        if(n&&n!==o){
+          this.initForm(this.listValue)
+        }
+      }
+    },
+    'listValue.activity_type':{
+      handler(n,o){
+        if(n&&n!==o){
+          this.initForm(this.listValue)
+        }
+      }
+    },
   },
 
   created () {
     this.title = this.$route.meta.title
     getOptions([
      // #ifdef app-activity
-      this.getEditxSiteLists()
+      this.getEditxSiteLists(),
+    // #endif
+    // #ifdef saas-admin
+    {
+      server: 'saas-company',
+      fn: 'sub_company',
+      path: 'p1'
+    }
     // #endif
     ]).then(res=>{
-      // this.subCompanyData = res[0].data.list
+      // #ifdef saas-admin
+      this.companyData = res[0].data.list
+      // #endif
       // #ifdef app-activity
       this.siteData = res[0].data.list.map((item) => {
         return {
@@ -133,17 +156,17 @@ export default {
         this.getCompanyActivityItem({id:this.id})
         .then(res=>{
           let info = res.data
-          // if(res.data.activity_quota){
-          //   info.quota_type = 'Y'
-          // }else{
-          //   info.quota_type = 'N'
-          // }
-          // if(res.data.activity_fee){
-          //   info.fee_type = 'no_free'
-          //   info.activity_fee = this.$xdHelper.divisionFloatNumber(info.activity_fee, 100)
-          // }else{
-          //   info.fee_type = 'free'
-          // }
+          if(res.data.activity_quota){
+            info.quota_type = 'Y'
+          }else{
+            info.quota_type = 'N'
+          }
+          if(res.data.activity_fee){
+            info.fee_type = 'no_free'
+            info.activity_fee = this.$xdHelper.divisionFloatNumber(info.activity_fee, 100)
+          }else{
+            info.fee_type = 'free'
+          }
           if(res.data.activity_logo){
             info.activity_logo = {
               url:res.data.activity_logo
@@ -216,6 +239,7 @@ export default {
           valueKey: 'activity_type', //form[valueKey]
           value: params.activity_type || 'sign_up', //v-model
           placeholder: '请选择活动类型',
+          disabled:this.id?true:false,
           list: [{ value: 'sign_up', label: '企业报名' }, { value: 'activity', label: '企业活动' }],
           rules: [
             { required: true, message: '请选择活动类型', trigger: ['blur', 'change'] },
@@ -253,6 +277,36 @@ export default {
             { required: true, message: '请选择参与设置', trigger: ['blur', 'change'] },
           ]
         },
+        // #ifdef saas-admin
+         {
+          label: '全部企业参与:', //label
+          ele: "xd-radio",
+          valueKey: 'is_all_sub_company_attend', //form[valueKey]
+          value: params.is_all_sub_company_attend || 'Y', //v-model
+          placeholder: '请选择是否全部企业参与',
+          list: [{ value: 'Y', label: '是' }, { value: 'N', label: '否' }],
+          rules: [
+            { required: true, message: '请选择是否全部企业参与', trigger: ['blur', 'change'] },
+          ]
+        },
+        params.is_all_sub_company_attend==='N'&&{
+          label: '参与企业:',
+          ele: 'xd-select-list',
+          valueKey: 'sub_company_ids',
+          value: params.sub_company_ids||[],
+          placeholder: '请选择',
+          classNmae:'input40',
+          multiple: true,
+          list: this.companyData,
+          rules: [
+            {
+              required: true,
+              message: '请选择参与企业',
+              trigger: 'blur'
+            },
+          ]
+        },
+        // #endif
         // #ifdef app-activity
         params.site_id&&{
           label: "活动地址:",
@@ -377,60 +431,60 @@ export default {
             { required: true, message: "请选择活动时间" }
           ]
         },
-        // {
-        //   label: '报名时间:', 
-        //   ele: 'xd-date-range', 
-        //   valueKey: ['sign_up_start_time', 'sign_up_end_time'], 
-        //   value: (params.sign_up_start_time && params.sign_up_end_time) ? [params.sign_up_start_time, params.sign_up_end_time] : null, 
-        //   format: 'yyyy/MM/dd HH:mm:ss',
-        //   formatValue: 'timestamp', 
-        //   placeholder: ['活动开始时间', '活动结束时间'],
-        // },
-        // {
-        //   label: '活动名额:',
-        //   ele: "xd-radio",
-        //   valueKey: 'quota_type', 
-        //   value: params.quota_type || 'N', 
-        //   placeholder: '请选择活动名额',
-        //   list: [{ value: 'Y', label: '限制' }, { value: 'N', label: '不限' }],
-        //   rules: [
-        //     { required: true, message: '请选择活动名额', trigger: ['blur', 'change'] },
-        //   ]
-        // },
-        // params.quota_type==='Y'&&{
-        //   label: "",
-        //   ele: "el-input",
-        //   value: params.activity_quota || '',
-        //   type:'number',
-        //   valueKey: 'activity_quota',
-        //   placeholder: "请输入",
-        //   rules: [
-        //     { required: true, message: '请输入', trigger: ['blur'] },
-        //   ]
-        // },
-        // {
-        //   label: '活动费用:', 
-        //   ele: "xd-radio",
-        //   valueKey: 'fee_type', 
-        //   value: params.fee_type || 'free', 
-        //   placeholder: '请选择活动费用',
-        //   list: [{ value: 'no_free', label: '收费' }, { value: 'free', label: '免费' }],
-        //   rules: [
-        //     { required: true, message: '请选择活动费用', trigger: ['blur', 'change'] },
-        //   ]
-        // },
-        // params.fee_type==='no_free'&&{
-        //   label: "",
-        //   ele: "el-input",
-        //   type:'number',
-        //   value: params.activity_fee || '',
-        //   valueKey: 'activity_fee',
-        //   placeholder: "请输入",
-        //   rules: [
-        //     { required: true, message: '请输入', trigger: ['blur'] },
-        //   ]
-        // },
-        // {
+        params.activity_type==='sign_up'&&{
+          label: '报名时间:', 
+          ele: 'xd-date-range', 
+          valueKey: ['sign_up_start_time', 'sign_up_end_time'], 
+          value: (params.sign_up_start_time && params.sign_up_end_time) ? [params.sign_up_start_time, params.sign_up_end_time] : null, 
+          format: 'yyyy/MM/dd HH:mm:ss',
+          formatValue: 'timestamp', 
+          placeholder: ['活动开始时间', '活动结束时间'],
+        },
+        params.activity_type==='sign_up'&&{
+          label: '活动名额:',
+          ele: "xd-radio",
+          valueKey: 'quota_type', 
+          value: params.quota_type || 'N', 
+          placeholder: '请选择活动名额',
+          list: [{ value: 'Y', label: '限制' }, { value: 'N', label: '不限' }],
+          rules: [
+            { required: true, message: '请选择活动名额', trigger: ['blur', 'change'] },
+          ]
+        },
+        params.activity_type==='sign_up'&&params.quota_type==='Y'&&{
+          label: "",
+          ele: "el-input",
+          value: params.activity_quota || '',
+          type:'number',
+          valueKey: 'activity_quota',
+          placeholder: "请输入",
+          rules: [
+            { required: true, message: '请输入', trigger: ['blur'] },
+          ]
+        },
+        params.activity_type==='sign_up'&&{
+          label: '活动费用:', 
+          ele: "xd-radio",
+          valueKey: 'fee_type', 
+          value: params.fee_type || 'free', 
+          placeholder: '请选择活动费用',
+          list: [{ value: 'no_free', label: '收费' }, { value: 'free', label: '免费' }],
+          rules: [
+            { required: true, message: '请选择活动费用', trigger: ['blur', 'change'] },
+          ]
+        },
+        params.activity_type==='sign_up'&&params.fee_type==='no_free'&&{
+          label: "",
+          ele: "el-input",
+          type:'number',
+          value: params.activity_fee || '',
+          valueKey: 'activity_fee',
+          placeholder: "请输入",
+          rules: [
+            { required: true, message: '请输入', trigger: ['blur'] },
+          ]
+        },
+        // params.activity_type==='sign_up'&&{
         //   label: "活动规则:", //label
         //   ele: "xd-tinymce", //package 名称
         //   valueKey: "activity_rule", //form[valueKey]
@@ -480,17 +534,6 @@ export default {
             { required: true, message: "请输入数值" }
           ]
         },
-        // {
-        //   label: '活动状态:', 
-        //   ele: "xd-radio",
-        //   valueKey: 'activity_status', 
-        //   value: params.activity_status || 'Y', 
-        //   placeholder: '请选择活动状态',
-        //   list: [{ value: 'Y', label: '开启' }, { value: 'N', label: '禁用' }],
-        //   rules: [
-        //     { required: true, message: '请选择活动状态', trigger: ['blur', 'change'] },
-        //   ]
-        // },
         {
           ele: "title",
           label: "内容设置",
@@ -507,8 +550,8 @@ export default {
       this.renderFormKey = Date.now()
     },
     add(item) {
-      if(!item['title']||!item['rule']){
-        this.$message.error('请输入标题和规则')
+      if(!item['rule']){
+        this.$message.error('请输入规则')
         return
       }
       // if(this.contentList.length>=10){
@@ -542,6 +585,20 @@ export default {
         this.$message.error('请进行内容设置')
         return false
       }
+      if (this.listValue['fee_type'] === 'no_free') {
+        copyFormParams['activity_fee'] = this.$xdHelper.multiplyFloatNumber(Number(this.listValue['activity_fee']), 100)
+      }else if(this.listValue['fee_type'] === 'free'){
+         copyFormParams['activity_fee'] = 0
+      }
+      if(this.listValue['quota_type']==='N'){
+        copyFormParams['activity_quota'] = 0
+      }
+      if(!this.listValue.sign_up_end_time){
+        delete copyFormParams['sign_up_end_time']
+      }
+      if(!this.listValue.sign_up_start_time){
+        delete copyFormParams['sign_up_start_time']
+      }
       return copyFormParams
     },
     /**
@@ -551,15 +608,6 @@ export default {
       this.$refs['poster'].submitAll()
         .then(res => {
           let params = this.getParams();
-       
-          // if (params['fee_type'] === 'no_free') {
-          //   params['activity_fee'] = this.$xdHelper.multiplyFloatNumber(Number(params['activity_fee']), 100)
-          // }else if(params['fee_type'] === 'free'){
-          //    params['activity_fee'] = 0
-          // }
-          // if(params['quota_type']==='N'){
-          //   params['activity_quota'] = 0
-          // }
           console.log(params,'ppppp')
           // return
           let loading = Loading.service({})

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/list.vue

@@ -25,7 +25,8 @@
           is-border
         >
           <template slot="result" slot-scope="scope">
-            <el-button style="margin:auto" type="primary" size="small" @click="$router.push(`/activity_manage/result/${scope.row.id}`)">查看</el-button>
+            <el-button v-if="scope.row.activity_type==='activity'" style="margin:auto" type="primary" size="small" @click="$router.push(`/activity_manage/result/${scope.row.id}`)">查看</el-button>
+            <el-button v-else-if="scope.row.activity_type==='sign_up'" style="margin:auto" type="primary" size="small" @click="$router.push(`/activity_manage/sign_result/${scope.row.id}`)">查看</el-button>
           </template>
           <template slot="activity_start_time" slot-scope="scope">
             <div>{{scope.row.activity_start_time}}</div>
@@ -81,6 +82,18 @@
     >
       <people-manage :id="clickId"></people-manage>
     </xd-dialog>
+    <xd-dialog
+      title="提示"
+      :show.sync="codeVisible"
+      :showClose="false"
+      @onConfirm="handleSure"
+      @onCancel="handleSure"
+    >
+      <div class="code_notice">请使用微信扫二维码体验活动</div>
+      <div style="height: 200px; background: #efefef">
+        <div id="qrCode" ref="qrcode"></div>
+      </div>
+    </xd-dialog>
   </div>
 </template>
 
@@ -95,6 +108,7 @@ import permissions from "@/constant/permissions"
 import PeopleManage from './components/PeopleManage'
 import XdDialog from "@/components/XdDialog.vue";
 import { getOptions } from "@/utils/options";
+import QRCode from 'qrcodejs2'
 import {
   mapActions,
   mapState,
@@ -178,6 +192,7 @@ export default {
       showPeopleManage:false,
       clickId:null,
       sourceFromData:[],
+      codeVisible:false,
     }
   },
   
@@ -239,7 +254,9 @@ export default {
      */
     getList() {
       let params = {
-        ...this.searchParams,
+        filters:{
+          ...this.searchParams,
+        },
         page_token: this.page_size.toString(),
         page_size: this.limit
       };
@@ -281,12 +298,12 @@ export default {
           label: "活动名称",
           ele: "el-input",
           value: "",
-          valueKey: "name",
+          valueKey: "activity_name",
         },
         {
           label: '活动状态:',
           ele: 'xd-select-list',
-          valueKey: 'status',
+          valueKey: 'activity_status',
           value: '',
           placeholder: '请选择状态',
           list: [
@@ -312,7 +329,7 @@ export default {
         {
           label: '活动来源:',
           ele: 'xd-select-list',
-          valueKey: 'activity_type',
+          valueKey: 'source_from',
           value: '',
           placeholder: '请选择活动类型',
           list: this.sourceFromData
@@ -370,7 +387,17 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
+  #qrCode{
+    display: flex;
+    justify-content: center;
+    padding-top: 25px;
+  }
+  .code_notice{
+    text-align: center;
+    color: #606266;
+    font-size: 16px;
+    margin-bottom: 10px;
+  }
 
 </style>
 

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/result.vue

@@ -51,7 +51,7 @@ import {
 import { getOptions } from '@/utils/options';
 
 export default {
-  name: "ActivityManageList",
+  name: "ActivityManageResult",
   components: {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
@@ -82,12 +82,21 @@ export default {
       id:null,
       contentKey:'contentKey',
       commentKey:'commentKey',
+      sortData:[],
     }
   },
   
   created() {
     this.id = this.$route.params.id
-    this.initSearchForm();
+    getOptions(
+      {
+        server: "saas-app-public",
+        fn: "company-work-list-rank",
+        path: "p1",
+      }).then(res=>{
+        this.sortData = res.data.list
+        this.initSearchForm();
+      })
   },
   methods: {
     ...mapActions('activity_manage', [
@@ -148,25 +157,28 @@ export default {
           label: "用户搜索",
           ele: "el-input",
           value:'',
-          valueKey: 'key',
+          valueKey: 'keyword',
           placeholder: "请输入用户手机号/ID",
         },
         {
           label: '状态搜索',
           ele: 'xd-select-list',
-          valueKey: 'status',
+          valueKey: 'activity_status',
           value: '',
           placeholder: '请选择',
           classNmae:'input40',
           multiple: false,
-          list: [{label:'正常',value:'Y'},{label:'隐藏',value:'N'}],
+          list: [{label:'启用',value:'Y'},{label:'禁用',value:'N'}],
         },
         {
-          label: "列表排序",
-          ele: "el-input",
-          value:'',
-          valueKey: 'sort',
-          placeholder: "按发布时间/点赞/评论",
+          label: '列表排序',
+          ele: 'xd-select-list',
+          valueKey: 'activity_sort',
+          value: '',
+          placeholder: '请选择',
+          classNmae:'input40',
+          multiple: false,
+          list: this.sortData,
         },
       ];
     },

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/sign_result.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__search">
+      <xd-search
+        dateFilter
+        labelWidth="100px"
+        v-if="searchForm.length > 0"
+        v-model="searchParams"
+        :timeType="true"
+        :list="searchForm"
+        @onSearch="handleSearch"
+        @onDone="getList"
+      ></xd-search>
+    </el-card>
+    <el-card class="app-container__list">
+      <div slot="header" class="app-container__list-pagination">
+        <div></div>
+        <div>
+          <el-button type="primary" @click="handleExport" v-if="isExport">导出</el-button>
+        </div>
+      </div>
+      <div class="app-container__list-table">
+        <xd-table
+          :headers="headers"
+          :list="tables"
+          is-border
+          @onClick="handleTableClick"
+        >
+        <template slot="operate" slot-scope="scope">
+          <el-button style="margin:auto" type="primary" size="small" v-if="scope.row.is_read==='N'&&isRead" @click="handleToRead(scope.row)">标记已读</el-button>
+          <div v-else style="color:#999999;margin:auto">已读</div>
+        </template>
+        </xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :total="total"
+          :limit.sync="limit"
+          :page="page_size"
+          :auto-scroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+    <xd-dialog :show.sync="dialogExport" title="请输入文件名称" width="500px">
+      <el-form
+        @submit.native.prevent
+        :model="exportFrom"
+        :rules="exportRules"
+        ref="exportRuleForm"
+        label-width="80px">
+        <el-form-item label="文件名称" prop="name">
+          <el-input
+            @keyup.enter.native="saveExportForm"
+            v-model="exportFrom.name"
+            placeholder="请输入文件名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="btn">
+        <el-button type="primary" @click="saveExportForm">确定</el-button>
+        <el-button type="default" @click="cancelExportForm">返回</el-button>
+      </div>
+    </xd-dialog>
+  </div>
+</template>
+
+
+<script>
+import XdSearch from "@/components/XdSearch";
+import XdPagination from "@/components/XdPagination.vue";
+import XdTable from "@/components/XdTable";
+import { Loading } from 'element-ui';
+import checkPermission from "@/utils/permission";
+import permissions from "@/constant/permissions"
+import XdDialog from "@/components/XdDialog"
+import {
+  mapActions,
+  mapState,
+} from 'vuex';
+import { getOptions } from '@/utils/options';
+
+export default {
+  name: "ActivityManageList",
+  components: {
+    XdPagination, //翻译插件
+    XdSearch, //搜查插件
+    XdTable,
+    XdDialog
+  },
+  computed: {
+    isRead () {
+      // #ifdef saas-admin
+        return checkPermission([permissions.activity_manage.activityUseritem])
+      // #endif
+      // #ifdef app-activity
+      return true
+      // #endif
+    },
+    isExport () {
+      // #ifdef saas-admin
+        return checkPermission([permissions.activity_manage.activityUserListExport])
+      // #endif
+      // #ifdef app-activity
+      return true
+      // #endif
+    },
+    headers(){
+      return [
+        {"type": "normal", "prop": "id", "align": "center", "label": "ID"},
+        // #ifdef saas-admin
+        {"type": "normal", "prop": "sub_company_name", "align": "center", "label": "公司"},
+        {"type": "normal", "prop": "department_names", "align": "center", "width": 100, "label": "部门"},
+        // #endif
+        {"type": "normal", "prop": "user_name", "align": "center", "label": "报名人"},
+        {"type": "normal", "prop": "created_time", "align": "center", "label": "报名时间"},
+        {
+          "type": "operate","prop":'operate', "align": "center", "width": 170, "label": "操作",
+          "values": [
+
+          ].filter(i=>i)
+        }
+      ]
+    }
+  },
+  data() {
+    return {
+      //分页参数
+      page_size: 1, //当前页面数量
+      limit: 20, //搜索参数
+      total: 0,
+
+      //search
+      searchForm: [], //搜索区域模块表单
+      searchParams: null, //搜索参数
+
+      //列表对象
+      tables: [],
+
+      //文件名称
+      dialogExport:false,
+      exportFrom:{
+        name:'',
+      },
+      exportRules: {
+        name: [
+          {
+            required: true,
+            message: "请输入文件名称",
+            trigger: "blur",
+          },
+          { min: 0, max: 20, message: '文件名称长度不能超过20', trigger: 'blur' }
+        ],
+      },
+    }
+  },
+  
+  created() {
+    this.initSearchForm();
+  },
+  methods: {
+    ...mapActions('activity_manage', [
+      'getActivityUserList',
+      'activityUseritem'
+    ]),
+    onJfbTagForReload(){
+      this.getList()
+    },
+    handleTableClick({value, row}){
+     
+    },
+    getParams(){
+      let needFilter = JSON.parse(JSON.stringify(this.searchParams))
+      let timeObj = {
+        created_time_range: {
+          start_time: this.searchParams.created_time_start,
+          end_time: this.searchParams.created_time_end,
+        }
+      }
+      delete needFilter.created_time_start
+      delete needFilter.created_time_end
+      let params = {
+        filter: this.searchParams.created_time_start ? { ...needFilter, ...timeObj } : needFilter,
+        page_token: this.page_size.toString(),
+        page_size: this.limit
+      }
+      return params
+    },
+    /**
+     * @description 获取数据列表
+     */
+    getList() {
+      let params = this.getParams()
+      let loading = Loading.service({});
+      this.getActivityUserList(params).then(res => {
+        const {list, total_size} = res.data;
+        this.tables = list.map(item=>{
+          return {
+            ...item,
+            created_time: getTimeFormat(item.created_time)
+          }
+        });
+        console.log(this.tables,'this.tables')
+        this.total = total_size;
+        loading.close();
+      }).catch(err=>loading.close())
+    },
+
+
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch({ action, form }) {
+      this.page_size = 1;
+      this.getList();
+    },
+    /**
+     * @description 初始化搜索模块
+     */
+    initSearchForm() {
+      this.searchForm = [
+        {
+          label: '报名人:',
+          ele: 'xd-remote-select',
+          valueKey: 'user_id',
+          value: [],
+          className: 'input40',
+          placeholder: `请选择报名人`,
+          multiple: false,
+          collapseTags: false,
+          remoteSearch: (query, resolve) => {
+            getOptions({
+              server: 'saas-company',
+              fn: 'staff',
+              path: 'p1',
+              params: {
+                page_token: '1',
+                page_size: '500',
+                user_name: query
+              }
+            })
+              .then(res => {
+                resolve(res.data.list)
+              })
+          },
+        },
+        {
+          label: '提交时间:', //label
+          ele: 'xd-date', //package 名称
+          valueKey: ['created_time_start', 'created_time_end'], //form[valueKey]
+          value: [], //v-model
+          format: 'yyyy/MM/dd HH:mm:ss',//时间显示格式
+          formatValue: 'timestamp', //输出时间格式
+          placeholder: ['开始时间', '结束时间'],
+        },
+
+      ];
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination(page) {
+      this.page_size = page;
+      this.getList();
+    },
+
+    handleExport(){
+      this.dialogExport = true
+    },
+    //导出确定
+    saveExportForm(){
+      this.$refs['exportRuleForm'].validate((valid) => {
+        if (valid) {
+          let params = {
+            ...this.getParams(),
+            export: 1,
+            file_ext: 'xlsx',
+            file_name: this.exportFrom.name,
+          }
+          let loading = Loading.service({})
+          this.getActivityUserList(params).then(res => {
+            console.log(res, 'asdasda')
+            this.$message.success('导出任务已经开始执行，请去任务管理查看下载状态')
+            this.exportFrom.name = ''
+            this.dialogExport = false
+            loading.close()
+          }).catch(err => {
+            console.log(err, 'err')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    //导出取消
+    cancelExportForm(){
+      this.dialogExport = false
+      this.exportFrom.name = ''
+      this.$refs['exportRuleForm'].clearValidate()
+    },
+
+    //标记已读
+    handleToRead(row){
+      this.activityUseritem({id:row.id})
+      .then(res=>{
+        this.$message.success('操作成功')
+        this.getList()
+      })
+    },
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+
+
+</style>
+

package/library/viewModules/viewsPrize/viewsPrize/list.vue

@@ -403,8 +403,8 @@ export default {
     },
     getParams(){
       let copySearchParams = this.$xdHelper.cloneDeep(this.searchParams)
-      if(this.searchParams&&this.searchParams.op_user_name&&this.searchParams.op_user_name.length){
-        copySearchParams.op_user_id = this.searchParams.op_user_name[0]['value']
+      if(this.searchParams&&this.searchParams.op_user_list&&this.searchParams.op_user_list.length){
+        copySearchParams.op_user_id = this.searchParams.op_user_list[0]['value']
       }
       let params = {
         filters:{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.87",
+  "version": "1.1.89",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {