bug修复

解润东
20220117

src/views/checked/index.vue

@@ -21,20 +21,24 @@
                 <div @click="onSearch" >搜索</div>
             </template>
         </van-search>
-        <div class="card" v-for="(item,index) in checkedList"  :key="index"  @click="cardLocation(item)">
-            <div>检查编号：{{item.no}}</div>
-            <div>检查名称：{{item.name}}</div>
-            <div>检查类型：{{item.type}}</div>
-            <div v-show="item.isOpen">
-                <div>开始时间：{{item.planStartTime}}</div>
-                <div>结束时间：{{item.planEndTime}}</div>
-                <div>检查地点：{{item.address}}</div>
-                <div>是否提交：{{item.finish?'已提交':'未提交'}}</div>
-            </div>
-            <div class="more" @click.stop="toggle(item)">
-                {{ item.OpenText }}
-            </div>
-        </div>
+        <van-tabs v-model="active" :swipe-threshold="3"	>
+            <van-tab  v-for="(item,index) in checkedConfirmList"  :key="index" :title="item.title">
+                <div class="card" v-for="(it,index) in item.list"  :key="index"  @click="cardLocation(it)">
+                    <div>检查编号：{{it.no}}</div>
+                    <div>检查名称：{{it.name}}</div>
+                    <div>检查类型：{{it.type}}</div>
+                    <div v-show="it.isOpen">
+                        <div>开始时间：{{it.planStartTime}}</div>
+                        <div>结束时间：{{it.planEndTime}}</div>
+                        <div>检查地点：{{it.address}}</div>
+                        <div>是否提交：{{it.finish?'已提交':'未提交'}}</div>
+                    </div>
+                    <div class="more" @click.stop="toggle(it)">
+                        {{ it.OpenText }}
+                    </div>
+                </div>
+            </van-tab>
+        </van-tabs>
         <tab-bar :index="1"></tab-bar>
     </div>
 </template>
@@ -51,9 +55,10 @@ export default {
     },
     data() {
         return {
+            active:'0',//默认选中状态
             goback:'save-workbench',//返回工作台
             value:'',//列表搜索关键字值
-            checkedList:[],//检查列表
+            checkedConfirmList:[],//检查列表
             text:'检查执行',//顶部文本
             finish:'',//问题是否提交
         }
@@ -73,11 +78,18 @@ export default {
             })
             getFun('check/carry/user/list',{name:this.value}).then((Response)=>{
                 this.$toast.clear()
-                this.checkedList=Response.data
-                this.checkedList.forEach((item)=>{
-                    item.isOpen=false
-                    item.OpenText="展开 ▼";
+                // this.checkedList=Response.data
+                this.checkedConfirmList=Response.data.data
+                this.checkedConfirmList.forEach((item)=>{
+                    item.list.forEach((it)=>{
+                        it.isOpen=false
+                        it.OpenText="展开 ▼";
+                    })
                 })
+                // this.checkedList.forEach((item)=>{
+                //     item.isOpen=false
+                //     item.OpenText="展开 ▼";
+                // })
             }).catch(()=>{
                 this.$toast.clear()
                 this.$toast.fail('加载失败,请稍后再试')

src/views/checked/problem/index.vue

@@ -41,6 +41,7 @@ export default {
     },
     data() {
         return {
+            noTroubleFlag:false,//是否有问题提交参数
             id:'',//问题上报清单列表列表id
             nums:{},//问题上报清单列表
             text:'问题上报',//顶部文本
@@ -103,11 +104,16 @@ export default {
                     return
                 }
             }
+            if(this.submitTroubleNumber==0){
+                this.noTroubleFlag=true
+            }else{
+                this.noTroubleFlag=false
+            }
             this.$dialog.confirm({
                 title: '提示',
                 message: '您已提交'+this.submitTroubleNumber+'个问题'+'确定结束检查上报？',
             }).then(()=>{
-                postFun('check/carry/trouble/finish',{planId:this.id}).then((Response)=>{
+                postFun('check/carry/trouble/finish',{planId:this.id,noTroubleFlag:this.noTroubleFlag}).then((Response)=>{
                     this.$toast.clear()
                     this.$router.push('/checked')
                 }).catch(()=>{

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

@@ -61,7 +61,7 @@ export default {
             this.id=sessionStorage.getItem('noteId')
         }
         if(sessionStorage.getItem('checkedFinish')){
-            this.finish=sessionStorage.getItem('checkedFinish')=='false'?false:true
+            this.finish=sessionStorage.getItem('checkedFinish')!='true'?false:true
         }
         this.init()
     },