commit

src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js

@@ -132,6 +132,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
                                   <el-checkbox label="CLUB_SECRETARY">协会秘书长</el-checkbox>
                                   <el-checkbox label="CLUB_VICE_SECRETARY">协会副秘书长</el-checkbox>
                                   <el-checkbox label="CLUB_OPERATOR">协会操作员</el-checkbox>
+                                  <el-checkbox label="CLUB_REIMBURSEMENT_MANAGER">协会报销负责人</el-checkbox>
                                   <el-checkbox label="CLUB_MEMBER">协会会员</el-checkbox>
                                 </el-checkbox-group>
                           </el-form-item>

src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html

@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
                 <el-table-column label="结束时间" prop="endTime" sortable></el-table-column>
                 <el-table-column label="操作" fixed="right" width="450px">
                     <template scope="{row}">
-                        <el-button size="mini" type="primary" @click="openQrCode(row.id)">二维码</el-button>
+                        <el-button size="mini" type="primary" @click="openQrCode(row)">二维码</el-button>
                         <el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
                         <el-button size="mini" type="primary" @click="openSubject(row.id)">题目设置</el-button>
                         <el-button size="mini" type="danger" @click="onDelete(row.id)">删除</el-button>
@@ -77,8 +77,13 @@ layout("/layouts/platform.html"){
             },
 
             // 打开二维码
-            openQrCode(id) {
-                this.signatureAddress = '?id=' + id
+            openQrCode(row) {
+                const { id,category}=row
+                if (category==='SURVEY'){
+                    this.signatureAddress = window.location.origin+"/platform/h5/qsv/survey?id=" + id
+                }else{
+                    this.signatureAddress = window.location.origin+"/platform/h5/qsv/quiz?id=" + id
+                }
                 this.$refs.qrCodePlusRef.openDialog()
             },