Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

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/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>

src/pages/sale/studentTracking.vue

@@ -800,7 +800,7 @@
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
             this.titlelist = [];
-            for (let i = 0; i < this.RList.length; i++) {
+            for (let i = 0; i < this.RListlength; i++) {
               let obj = [{
                 Name: '月份/续费/转介',
                 Id: 1,