coys

src/components/TopBar.vue

@@ -7,7 +7,7 @@
     <div class="bottom-box">
       <div>
         <p class="user-name">{{userName}}</p>
-        <p class="introduce-info">福建省农村信用联合社 · 省联社安全保卫管理人员</p>
+        <p class="introduce-info" v-for="item in rolesList" :key="item.roleId">{{orgName}} · {{item.roleName}}</p>
       </div>
       <van-icon name="arrow" size="20"  />
     </div>
@@ -23,11 +23,16 @@ export default {
   },
   data() {
     return {
-      active: this.defaultActive
+      active: this.defaultActive,
+      rolesList:[]
     }
   },
   computed: {
-    ...mapGetters(['userName'])
+    ...mapGetters(['userName','orgName'])
+  },
+  created(){
+    this.rolesList=JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST'))
+    console.log(this.rolesList);
   },
   methods: {
     clickOutLogin(){

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavBar />
+    <NavBar :go="{type:'push',path:'/monitoringCall'}" />
     <div class="bigBox">
       <van-collapse v-model="activeNames">
         <div class="titleBox">

src/views/menu/monitoringCall/components/taskInfo.vue

@@ -171,15 +171,19 @@ export default {
       this.falg = false
 
       this.dataList.forEach(item => {
+
         if (item.isChecked) {
+          console.log(item);
           if (item.situation == '1' && item.abnormalIllustrate == '') {
             Toast(`${item.dictLabel}的异常情况说明不能为空!`)
+            
             this.falg = true
           }
         }
       })
     },
     submitHadnler() {
+      this.beforSubmitV()
       if (this.falg) {
         //校验不通过
       } else {

src/views/menu/monitoringCall/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavBar />
+    <NavBar :go="{type:'push',path:'/menu'}" />
     <van-row>
       <van-col span="24">
         <org-tree v-model="cascaderValue" @change="getDataList"></org-tree>

src/views/menu/training/components/addTraining.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavBar />
+    <NavBar :go="{type:'push',path:'/training'}" />
     <van-form class="bigbox" ref="form">
       <div class="mainItem">
         <div>标题</div>

src/views/menu/training/components/personnelSignature.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavBar />
+    <NavBar :go="{type:'push',path:'/training'}"/>
 
     <div class="mainItem">
       <div>标题</div>

src/views/menu/training/index.vue

@@ -1,23 +1,12 @@
 <template>
   <div>
     <div class="topBox">
-      <NavBar />
+      <NavBar :go="{type:'push',path:'/menu'}" />
 
       <van-row>
         <van-col span="24">
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
-          <!-- <van-field
-            v-model="orgName"
-            is-link
-            label-width="4em"
-            clearable
-            label="组织机构"
-            placeholder=""
-            @click="orgShow = true"
-          />
-          <van-popup v-model="orgShow" class="popup" round position="bottom">
-            
-          </van-popup> -->
+         
         </van-col>
       </van-row>
       <van-row>
@@ -234,22 +223,16 @@ export default {
   },
 
   created() {
-    this.init()
-    this.presentDate = this.presentDateCpd
+    this.presentDate = new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
   },
   mounted() {
-    this.cascaderValue=(JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID'))+'')
-    console.log(this.cascaderValue);
-  },
-  computed: {
-    presentDateCpd() {
-      return new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
-    }
+    this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+    console.log(this.cascaderValue)
+    this.init()
   },
   methods: {
     //机构搜索
     getDataList(val) {
-      
       this.cascaderValue = val.id
       this.orgName = val.name
       this.selectListAppHandler()
@@ -287,11 +270,11 @@ export default {
       let falg = false
       let timefalg = false
       //value1 当前登陆用户ID
+      let date = new Date().getTime()
+      let startDate = Date.parse(new Date(list.startDate))
+      let endDate = Date.parse(new Date(list.endDate))
       //当前时间再时间范围内且签名是待签名状态且签名列表存在当前登录人未签名的情况才可以进行签名
       if (list.startDate && list.endDate && list.status == 0) {
-        let date = new Date().getTime()
-        let startDate = Date.parse(new Date(list.startDate))
-        let endDate = Date.parse(new Date(list.endDate))
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }
@@ -306,7 +289,12 @@ export default {
           }
         })
       })
-
+      if (date > endDate) {
+        //当前时间大于结束时间表示已超期
+      
+        timefalg = false
+        falg = false
+      }
       if (falg && timefalg) {
         return true
       }
@@ -357,7 +345,7 @@ export default {
         if (code == 200) {
           if (type) {
             this.taskList.push(...rows)
-            if (rows.length == 0||rows.length <10) {
+            if (rows.length == 0 || rows.length < 10) {
               //已加载完全部数据
               this.finished = true
             }
@@ -425,7 +413,7 @@ export default {
     },
     //月份选中触发
     onDateConfirm() {
-      this.currentDate = this.newDate(this.currentDate)
+      this.currentDate = this.newDate(this.presentDate)
 
       this.showDate = false
       this.selectListAppHandler()
@@ -494,7 +482,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.popup{
+.popup {
   height: 40vh;
 }
 .navBarclas {