Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/router/router.config.js

@@ -217,19 +217,19 @@ export let routers = [
         path: '/securityCheckRegister',
         name: 'securityCheckRegister',
         component: () => import('@/views/menu/securityCheckRegister/index'),
-        meta: { title: '安全检查登记', keepAlive: true }
+        meta: { title: '安全检查登记', keepAlive: true,deep: 1 }
       },
       {
         path: '/securityAdd',
         name: 'securityAdd',
         component: () => import('@/views/menu/securityCheckRegister/add'),
-        meta: { title: '安全检查', keepAlive: false ,hideTabBar:true}
+        meta: { title: '安全检查', keepAlive: false ,hideTabBar:true,deep: 2}
       },
       {
         path: '/securityDetail',
         name: 'securityDetail',
         component: () => import('@/views/menu/securityCheckRegister/detail'),
-        meta: { title: '安全检查详情', keepAlive: false ,hideTabBar:true}
+        meta: { title: '安全检查详情', keepAlive: false ,hideTabBar:true,deep: 2}
       },
       {
         path: '/addWorker',
@@ -241,37 +241,37 @@ export let routers = [
         path: '/problemItem',
         name: 'problemItem',
         component: () => import('@/views/menu/problemItem/index'),
-        meta: { title: '隐患问题清单', keepAlive: true }
+        meta: { title: '隐患问题清单', keepAlive: true ,deep: 1}
       },
       {
         path: '/problemDetail',
         name: 'problemDetail',
         component: () => import('@/views/menu/problemItem/detail'),
-        meta: { title: '隐患问题详情', keepAlive: false }
+        meta: { title: '隐患问题详情', keepAlive: false ,deep: 2}
       },
       {
         path: '/resumption',
         name: 'resumption',
         component: () => import('@/views/menu/resumption/list.vue'),
-        meta: { title: '履职登记', keepAlive: true }
+        meta: { title: '履职登记', keepAlive: true ,deep: 1}
       },
       {
         path: '/resumption_detail',
         name: 'resumption_detail',
         component: () => import('@/views/menu/resumption/detail.vue'),
-        meta: { title: '履职', keepAlive: false ,hideTabBar:true}
+        meta: { title: '履职', keepAlive: false ,hideTabBar:true,deep: 2}
       },
       {
         path: '/safetyBook',
         name: 'safetyBook',
         component: () => import('@/views/menu/safetyBook/index.vue'),
-        meta: { title: '安全责任书', keepAlive: true ,hideTabBar:false}
+        meta: { title: '安全责任书', keepAlive: true ,hideTabBar:false,deep: 1}
       },
       {
         path: '/safetyBookDetail',
         name: 'safetyBookDetail',
         component: () => import('@/views/menu/safetyBook/detail.vue'),
-        meta: { title: '责任书详情', keepAlive: false ,hideTabBar:true}
+        meta: { title: '责任书详情', keepAlive: false ,hideTabBar:true,deep: 2}
       },
       {
         path: '/visitRegister',

src/views/menu/securityCheckRegister/add.vue

@@ -19,7 +19,7 @@
             v-else
             v-model="taskInfo.checkTeam"
             label="检查组成员"
-            rows="2"
+            rows="1"
             maxlength="100"
             autosize
             type="textarea"
@@ -118,14 +118,19 @@
           </van-collapse>
         </div>
       </fieldset>
+
     </div>
     <!--  按钮   -->
-    <div v-if="enable" class="flex-box">
-      <van-button type="default"  plain @click="accredit" v-show="showGrantBtn">授权</van-button>
-      <van-button type="info"  plain hairline @click="saveData">保存</van-button>
-      <van-button type="info" @click="submitData">提交</van-button>
+    <div v-if="enable" class="bottom-box">
+      <p>注：未到任务开始时间，不可提交</p>
+      <div class="flex-box">
+        <van-button type="default"  plain @click="accredit" v-show="showGrantBtn">授权</van-button>
+        <van-button type="info"  plain hairline @click="saveData">保存</van-button>
+        <van-button type="info" :disabled="Boolean(!isSubmit)" @click="submitData">提交</van-button>
+      </div>
     </div>
 
+
     <!--    <van-image-preview v-model="showPreView" :images="preViewImages.images" :startPosition="preViewImages.startPosition">-->
     <!--      <template v-slot:index>第{{ index }}页</template>-->
     <!--    </van-image-preview>-->
@@ -173,6 +178,8 @@ export default {
       checkNum: 0,
       //nfc图片
       nfcImage: [],
+      //是否能提交
+      isSubmit:false, //未到提交时间不能提交
       enable: false,
       stateList: [],
       dayList: [],
@@ -403,6 +410,7 @@ export default {
         this.dateList = this.getDictItem('rectification_deadline');
         //设置默认展开项
         this.activeNames = this.checkList.map(v => v.itemName);
+        this.isSubmit = res.data.inRegisterTime;
       })
     },
     //保存数据
@@ -462,7 +470,6 @@ export default {
     //授权
     accredit() {
       let { checkOrgId, ymdDate, planId, beCheckedOrgId, id } = this.taskInfo
-      console.log(checkOrgId, 'checkOrgId')
       this.$router.push({
         path: '/addWorker',
         query: {
@@ -518,24 +525,31 @@ export default {
   height: 100%;
   overflow: hidden;
   .page-container {
-    height: calc(100vh - 220px);
+    height: calc(100vh - 246px);
     overflow: auto;
     padding: 20px;
   }
-  .flex-box {
-    padding: 20px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    > span {
-      margin: 0 20px;
+  .bottom-box{
+    padding:10px 20px 20px 20px;
+    >P{
+      padding-left: 10px;
+      font-size: 22px;
+      color: red;
+      line-height: 36px;
     }
-
-    >button{
-      flex:.45;
-      margin:0 10px;
-      /* min-width: 30%;
-      max-width: 50%; */
+    .flex-box {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      > span {
+        margin: 0 20px;
+      }
+      >button{
+        flex:.45;
+        margin:0 10px;
+        /* min-width: 30%;
+        max-width: 50%; */
+      }
     }
   }
   .legend {

src/views/menu/securityCheckRegister/index.vue

@@ -77,6 +77,7 @@ import {dataList,registerRole} from './api'
 import {mapGetters} from "vuex";
 import {formatDate} from "@/filters/filter";
 export default {
+  name: 'securityCheckRegister',
   components: {
     NavBar,
     OrgTree,