1

src/api/studentmsg/index.js

 import request from '../../utils/request'
-import request_zc from '../../utils/request_zc'
 
 
 /* 

src/components/activity/student-from.vue

+<style scoped>
+    .wenjuan_Shuru {
+        position: relative;
+    }
+    
+    .SurverDel {
+        position: absolute;
+        right: -5px;
+        top: -5px;
+    }
+</style>
+<template>
+  <q-dialog
+    v-model="persistent"
+    content-class="bg-grey-1"
+    persistent
+    transition-show="scale"
+    transition-hide="scale"
+  >
+    <q-card style="width: 800px;max-width:800px;">
+      <q-card-section>
+        <div class="text-h6">{{addMsg.ID==0?'新增学员':'修改学员'}}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
+        <div class="row wrap">
+          <!-- <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.SurveyType"
+            :options="platList" label="客户类型" ref="SurveyType" @input="getPlat()" :rules="[val => !!val || '请选择类型']" class="col-12 q-pb-lg" emit-value map-options />
+          -->
+          <q-input
+            filled
+            v-model="addMsg.Sort"
+            class="col-12 q-pb-lg"
+            ref="Sort"
+            label="学员编号"
+            :rules="[val => !!val || '请填写排序']"
+          ></q-input>
+          <div class="col-12 q-pb-lg">
+            <q-input
+              filled
+              v-model="addMsg.StartTime"
+              mask="####-##-## ##:##:##"
+              ref="SignStartTime"
+              label="开始时间"
+              :rules="[val => !!val || '请选择开始时间']"
+            >
+              <template v-slot:append>
+                <q-icon name="event" class="cursor-pointer">
+                  <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
+                    <div class="q-gutter-md row items-start">
+                      <q-date
+                        v-model="addMsg.StartTime"
+                        mask="YYYY-MM-DD HH:mm:ss"
+                        @input="date"
+                      />
+                      <q-time
+                        v-model="addMsg.StartTime"
+                        format24h
+                        mask="YYYY-MM-DD HH:mm:ss"
+                        @input="time"
+                      />
+                    </div>
+                    <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
+                  </q-popup-proxy>
+                </q-icon>
+              </template>
+</q-input>
+</div>
+<div class="col-12 q-pb-lg">
+    <q-input filled v-model="addMsg.EndTime" mask="####-##-## ##:##:##" ref="SignEndTime" label="结束时间" :rules="[val => !!val || '请选择结束时间']">
+        <template v-slot:append>
+                <q-icon name="event" class="cursor-pointer">
+                  <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
+                    <div class="q-gutter-md row items-start">
+                      <q-date
+                        v-model="addMsg.EndTime"
+                        mask="YYYY-MM-DD HH:mm:ss"
+                        @input="endDate"
+                      />
+                      <q-time
+                        v-model="addMsg.EndTime"
+                        format24h
+                        mask="YYYY-MM-DD HH:mm:ss"
+                        @input="endTime"
+                      />
+                    </div>
+                    <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
+                  </q-popup-proxy>
+                </q-icon>
+              </template>
+    </q-input>
+</div>
+</div>
+</q-card-section>
+<q-separator />
+<q-card-actions align="right" class="bg-white">
+    <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
+    <q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading" @click="saveActive" />
+</q-card-actions>
+</q-card>
+</q-dialog>
+</template>
+<script>
+    import {
+        setActivitySurveyGuest,
+        getActivitySurveyGuestModule
+    } from '../../api/studentmsg/index'
+    export default {
+        props: {
+            saveObj: {
+                type: Object,
+                default: null
+            },
+            ID: {
+                type: String,
+                default: null
+            }
+        },
+        data() {
+            return {
+                persistent: true,
+                addMsg: {
+                    Id: 0, //新增传0
+                    GuestType: 2, //客户类型(1-小程序用户,2-学员用户)
+                    GuestId: 2644, //学员编号
+                    StartTime: "2022-04-20 00:00:00", //开始时间
+                    EndTime: "2022-04-25 18:00:00", //结束时间
+                    SurveyId: 0 //意见调查表编号
+                },
+                platList: [],
+                dateList: [],
+                FormTypeList: [],
+                saveLoading: false
+            };
+        },
+        mounted() {
+            this.initObj();
+        },
+        methods: {
+            // 选择报名开始时间
+            date(val) {
+                this.addMsg.SignStartTime = val;
+            },
+            time(val) {
+                this.addMsg.SignStartTime = val;
+            },
+            // 选择报名结束时间
+            endDate(val) {
+                this.addMsg.SignEndTime = val;
+            },
+            endTime(val) {
+                this.addMsg.SignEndTime = val;
+            },
+            //初始化表单
+            initObj() {
+                this.addMsg.SurveyId = this.ID
+                if (this.saveObj && this.saveObj.ID > 0) {
+                    getActivitySurveyGuestModule({
+                        Id: saveObj.ID
+                    }).then(res => {
+                        this.addMsg = res.data.data;
+                        console.log("11111", res);
+                    })
+                } else {
+                    this.addMsg.Id = 0;
+                    // this.addMsg.GuestId = 1;
+                    // this.StartTime = '';
+                    // this.EndTime = '';
+                }
+            },
+            //关闭弹窗
+            closeSaveForm() {
+                this.$emit("close");
+                this.persistent = false;
+            },
+            saveActive() {
+                setActivitySurveyGuest(this.addMsg).then(res => {
+                    if (res.data.Id == 0) {
+                        this.$q.notify({
+                            icon: 'iconfont icon-chenggong',
+                            color: 'accent',
+                            timeout: 2000,
+                            message: '数据保存成功！',
+                            position: 'top'
+                        })
+                        this.$emit('close');
+                        this.$emit('success');
+                    } else {
+                        this.$q.notify({
+                            type: 'negative',
+                            position: "top",
+                            message: res.data.message
+                        })
+                    }
+                })
+            }
+
+
+        }
+    };
+</script>
\ No newline at end of file

src/components/stuMan/eventsCalendar.vue

@@ -287,9 +287,19 @@
   <div>
       <div class="eventsCalendar_Form">
         <div style="text-align:right;margin:12px 20px 8px 0">
-            <el-date-picker style="width:190px" v-model="date" type="month" size="small"  value-format="yyyy-M-d"
-            @change="getList()" placeholder="选择日期">
+            <el-date-picker
+            style="width:190px"
+              v-model="date"
+              type="date"
+              :clearable="false"
+              value-format="yyyy-MM-d"
+              :picker-options="pickerOptions"
+              :editable="false"
+              placeholder="选择日期"
+              @change="getList"
+            >
             </el-date-picker>
+            
         </div>
         <template>
             <el-calendar v-model="date" id="calendar" style="margin-bottom:40px;">

src/components/work/index.vue

@@ -127,7 +127,7 @@
       </div> -->
       <q-btn-group
         outline
-        style="position: fixed;top: 75px;right:20px;z-index: 666666;"
+        style="position: fixed;top: 15px;right:20px;z-index: 666666;"
       >
         <q-btn
           dense

src/pages/activity/QuesActivityList.vue

@@ -58,12 +58,14 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
+            <q-btn flat size="xs" icon="iconfont icon-view" color="accent" style="font-weight:400" label="配置学员"
+            @click="Gochild(props.row)" />
             <q-btn flat size="xs" icon="iconfont icon-view" color="accent" style="font-weight:400" label="配置"
-              @click="GoYijian(props.row)" />
+            @click="GoYijian(props.row)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
-              @click="addObj(props.row)" />
+            @click="addObj(props.row)" />
             <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
-              @click="delQuestion(props.row)" />
+            @click="delQuestion(props.row)" />
           </q-td>
         </template>
       </q-table>
@@ -248,6 +250,12 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      // 跳转到配置学员详情页
+      Gochild(row){
+        this.OpenNewUrl('/activity/configurationstudentsList',{
+            ID: row.ID
+        });
+      },
       //跳转到意见调查表
       GoYijian(row) {
         this.OpenNewUrl('/activity/questionnaireList', {

src/pages/financial/returnPassbook/ReturnperiodsList.vue

@@ -65,7 +65,6 @@
     <template>
       <el-table ref="filterTable" :data="tableData" v-loading='loading'
         :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
-
         <el-table-column prop="BatchName" label="周期"></el-table-column>
         <el-table-column v-if="isReturnperiods" prop="TotalMoney" label="累计金额"> </el-table-column>
         <el-table-column v-if="isReturnperiods" prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
@@ -76,8 +75,8 @@
         <el-table-column v-if="isReturnperiods" prop="CreateDate" label="创建时间"> </el-table-column>
         <el-table-column v-if="isReturnperiods" label="财务单据">
           <template slot-scope="scope">
-            <template v-if="scope.row.FinanceIdList" v-for="item in scope.row.FinanceIdList">
-              <a @click="goDetails(item)"
+            <template v-if="scope.row.FinanceIdList">
+              <a v-for="(item,index) in scope.row.FinanceIdList" :key="index" @click="goDetails(item)"
                 style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
             </template>
           </template>
@@ -88,13 +87,12 @@
               <el-tooltip class="item" effect="dark" content="查看" placement="top">
                 <i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
               </el-tooltip>
-
-              <templat v-if="isReturnperiods">
+              <template v-if="isReturnperiods">
                 <el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
                   content="生成财务单据" placement="top">
                   <i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
                 </el-tooltip>
-              </templat>
+              </template>
             </div>
           </template>
         </el-table-column>