修改bug，优化功能

解润东
20211105

src/App.vue

@@ -23,7 +23,7 @@
     data () {
       return {
         transitionName: 'slide-left',
-        cachePage:["add-danger","change-info","affirm-danger","risk-affirm","manager-survey","super-survey","major-survey","risk-add","notice"]
+        cachePage:["add-danger","change-info","affirm-danger","risk-affirm","manager-survey","super-survey","major-survey","risk-add","noticeList"]
       }
     },
     watch: {

src/components/TabBar.vue

 <template>
   <div>
+      <!-- 占位导航栏div，防止导航栏挡住内容 -->
+    <div style="width:100%;height:2rem"></div>
     <van-tabbar v-model="active" @change="onChange">
       <van-tabbar-item 
         v-for="(item,index) in tabBarList"
@@ -71,4 +73,5 @@ export default {
 </script>
 <style scoped>
 /* @import url(); 引入css类 */
+
 </style>

src/views/checked/index.vue

@@ -93,8 +93,10 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
 </style>

src/views/checked/problem/formwork/index.vue

@@ -17,16 +17,16 @@
                     <thead>
                         <tr>
                             <th>序号</th>
-                            <th>检查项目</th>
+                            <th>检查类型</th>
                             <th>检查内容</th>
-                            <th>法律依据/出处</th>
-                            <th>结果</th>
+                            <th>法规依据</th>
+                            <th>检查结果</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr v-for="(item2,index2) in item.list" :key="index2">
                             <td align="center" v-text="index2+1" style="width:10%" ></td>
-                            <td align="center" v-text="item2.checkItem" style="width:15%"></td>
+                            <td align="center" v-text="item2.typeDictName" style="width:15%"></td>
                             <td align="center" v-text="item2.checkContent" style="width:20%"></td>
                             <td align="center" v-text="item2.checkBasis" style="width:30%"></td>
                             <td align="center">
@@ -104,9 +104,8 @@ export default {
         },
         /* 不合格跳转传参回显到检查问题清单 */
         noGrage(item2){
-            console.log(item2)
             //通过禁用状态来判断是否可以跳转
-            if(item2.isDisabled==false){
+            if(item2.isDisabled==false&&this.finish!='true'){
                 this.$router.push({
                     name: 'list',
                     query:{
@@ -124,16 +123,6 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-    .card{
-        width:90%;
-        box-shadow: 0px 0px 10px 2px #F3F3F3;
-        padding: 0.25rem;
-        margin:0.4rem auto;
-        background: white;
-    }
-    .card div{
-        font-size: 0.4rem;
-    }
     table{
         width: 100%;
     }

src/views/checked/problem/index.vue

@@ -124,9 +124,11 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     .button-more{
         text-align: center;

src/views/checked/problem/list/index.vue

@@ -52,6 +52,7 @@
                 label="问题描述"
                 placeholder="问题描述"
                 :rules="[{ required: true, message: '请填写问题描述' }]"
+                :disabled="isFormwork"
             />
             <van-field
                 v-if="islay"
@@ -59,6 +60,7 @@
                 name="法律依据"
                 label="法律依据"
                 placeholder="法律依据"
+                :disabled="isFormwork"
                 :rules="[{ required: true, message: '请填写法律依据' }]"
             />
             <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
@@ -109,6 +111,7 @@ export default {
             planId:'',//不合格跳转进本页面所传列表id
             planItemId:'',//不合格跳转进本页面所传列id
             islay:false,//是否显示法律依据
+            isFormwork:false,//决定是否从不合格跳转到本页面是否禁用检查名称，内容，法律依据
         }
     },
     mounted() {
@@ -116,9 +119,10 @@ export default {
             this.id=this.$route.query.id
         }
         if(this.$route.query.name=='formwork'){
-            this.problemName=this.$route.query.checkitem,//检查项目
+            // this.problemName=this.$route.query.checkitem,//检查项目
             this.problemDescribe=this.$route.query.checkContent,//检查内容
-            this.checkBasis=this.$route.query.checkBasis//法律依据  
+            this.checkBasis=this.$route.query.checkBasis//法规依据  
+            this.isFormwork=true
             this.planId=this.$route.query.planId
             this.planItemId=this.$route.query.planItemId,
             this.islay=true

src/views/checked/problem/note/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
             <div class="card" v-for="(item,index) in list"  :key="index" >
-                <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{item.id}}</van-checkbox>
+                <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                 <div>问题名称：{{item.title}}</div>
                 <div>问题位置：{{item.address}}</div>
                 <div>问题内容：{{item.context}}</div>
@@ -22,7 +22,6 @@
         </van-checkbox-group>
         <div class="page-footer">
             <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
-            <van-button round type="defult" @click="cancel" :disabled="finish=='true'?true:false">取消</van-button>
             <van-button round type="info" @click="commit" :disabled="finish=='true'?true:false">提交</van-button>
         </div>
         <tab-bar :index="1"></tab-bar>
@@ -108,9 +107,6 @@ export default {
                 this.$refs.checkboxGroup.toggleAll(true);
             }
         },
-        cancel(){
-            this.$toast.success('取消')
-        },
         //提交问题
         commit(){
             var checkedList=[]
@@ -152,8 +148,6 @@ export default {
             }).catch(()=>{
                 this.$toast.success('取消')
             })
-            
-            
         }
     }
 }
@@ -165,9 +159,11 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     .van-checkbox{
         margin-bottom: 0.1rem;

src/views/notice/index.vue

@@ -80,8 +80,10 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
 </style>

src/views/notice/noticeList/index.vue

@@ -87,10 +87,10 @@
                 <div class="sign2"><span>项目经理签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext2" @click="sign2" >电子签字</p><img  class="sign-img2" v-show="isImg2" :src="resultImg2" alt=""></van-tag></div>
                 <div class="page-footer-button">
                     <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">生成整改通知单</van-button>
-                    <van-button round type="defult" size="large" @click="cancel" :disabled="finish=='true'?true:false">取消</van-button>
                 </div>
             </van-tab>
         </van-tabs>
+        <!-- <div></div> -->
         <tab-bar :index="1"></tab-bar>
         
     </div>
@@ -101,7 +101,7 @@ import tabBar from "@/components/TabBar";
 import LHeader from '@/components/header.vue'
 import { getFun,postFun } from '@/service/table'
 export default {
-    name: 'notice',
+    name: 'noticeList',
     components: {
         "LHeader":LHeader,
         "tabBar":tabBar
@@ -291,9 +291,6 @@ export default {
             this.value = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
             this.showCalendar = false;
         },
-        cancel(){
-            this.$toast('取消')
-        },
         //日期输入框点击事件
         calendarOpen(){
             if(this.finish=='false'){
@@ -427,6 +424,7 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
         .van-overlay {
             display:flex;
             justify-content: space-evenly;
@@ -441,6 +439,7 @@ export default {
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     table{
         width: 100%;