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

src/components/administrative/ExaminationStatistics.vue

@@ -469,7 +469,7 @@ export default {
     this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth()+1);
     
     let cont = dt.getMonth()
-    for(let i = 1; i <= cont; i ++){
+    for(let i = 1; i <= (cont+1); i ++){
       let o = i < 10 ? '0'+i : i;
       this.periodsList.push({
         label: `2019${o}`,

src/components/index.vue

@@ -826,7 +826,7 @@
         <button class="normalBtn" @click="updateTeamName">保存</button>
       </div>
     </el-dialog>
-    <el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
+    <el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie2">
       <div>
         <p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
         <div v-html="detailMessage.Content">
@@ -1491,6 +1491,9 @@ export default {
       dom.href = obj.Url;
       dom.click();
     },
+    closeChangeMachie2(done){
+      this.outerVisibleNot = false
+    },
     closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
       // done();
       this.saleRnkShow= false