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

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>