问题记录删除，详情接口联调，缓存更新问题

解润东
20211111

src/router/index.js

@@ -179,6 +179,24 @@ const routes = [{
     },
     component: () => import( /* webpackChunkName: "create-order" */ '../views/checked/problem/note'),
   },
+  {
+    path: '/detail',
+    name: 'detail',
+    meta: {
+      title: '问题详情',
+      index: 3
+    },
+    component: () => import( /* webpackChunkName: "create-order" */ '../views/checked/problem/note/detail'),
+  },
+  {
+    path: '/edit',
+    name: 'edit',
+    meta: {
+      title: '问题编辑',
+      index: 3
+    },
+    component: () => import( /* webpackChunkName: "create-order" */ '../views/checked/problem/note/edit'),
+  },
   {
     path: '/formwork',
     name: 'formwork',

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

@@ -26,7 +26,7 @@
                     <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.typeDictName" style="width:15%"></td>
+                            <td align="center" v-text="item2.checkItem" 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">

src/views/checked/problem/index.vue

@@ -19,7 +19,7 @@
             <div>检查地点：{{nums.address}}</div>
         </div>
         <div class="button-more">
-            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">临时问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>
+            <van-button type="primary" round size="large" @click="problem(nums)" :disabled="finish=='true'?true:false">临时问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>
             <van-button type="primary" round size="large" @click="formwork">检查清单模板{{'('+nums.listNumber+')'}}</van-button>
             <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{'('+nums.troubleNumber+')'}}</van-button>
             <van-button type="info" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>
@@ -57,8 +57,11 @@ export default {
         else if(sessionStorage.getItem('id')){
             this.id=sessionStorage.getItem('id')
             this.finish=sessionStorage.getItem('finish')
+            //问题记录提交时候刷新问题记录数量
             if(this.$route.query.pageName){
                 this.init()
+            }else if(sessionStorage.getItem('noteDelete')){
+                this.init()
             }else{
                 //当清单模板，问题列表，问题记录不进行提交操作返回该页面调用缓存数据
                 this.nums=JSON.parse(sessionStorage.getItem('nums'))
@@ -99,8 +102,13 @@ export default {
                 })
             })
         },
-        problem(){
-            this.$router.push({name:'list',query:{id:this.id}})
+        problem(nums){
+            var obj={
+                projectFlag:nums.projectFlag,
+                deptIdList:nums.deptIdList,
+                deptNameList:nums.deptNameList
+            }
+            this.$router.push({name:'list',query:{id:this.id,obj:JSON.stringify(obj)}})
         },
         note(){
             this.$router.push({
@@ -113,8 +121,8 @@ export default {
         },
         formwork(){
             this.$router.push({name:'formwork',query:{id:this.id,finish:this.finish}})
-        }
-    }
+        },
+    },
 }
 </script>
 <style lang="less" scoped>

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

@@ -49,8 +49,9 @@
                 name="picker"
                 :value="value"
                 label="责任单位"
+                :disabled="Isvalue"
                 placeholder="请选择部门"
-                @click="showPicker = true"
+                @click="!Isvalue?showPicker = true:showPicker = false"
                 :rules="[{ required: true, message: '请填写问题位置' }]"
             />
             <van-popup v-model="showPicker" position="bottom">
@@ -112,11 +113,16 @@ export default {
             planItemId:'',//不合格跳转进本页面所传列id
             islay:false,//是否显示法律依据
             isFormwork:false,//决定是否从不合格跳转到本页面是否禁用检查名称，内容，法律依据
+            Isvalue:false,//是否禁用责任单位
         }
     },
     mounted() {
         if(this.$route.query.id){
             this.id=this.$route.query.id
+            var obj=JSON.parse(this.$route.query.obj)
+            this.Isvalue=obj.projectFlag
+            this.ids=obj.deptIdList
+            this.value=obj.deptNameList.join('/')
         }
         if(this.$route.query.name=='formwork'){
             // this.problemName=this.$route.query.checkitem,//检查项目
@@ -156,6 +162,7 @@ export default {
         },
         /* 问题提交 */
         onSubmit(value){
+            console.log(value)
             var pictures=[];
             value.uploader.forEach((item) => {
                 pictures.push(item.content)

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

@@ -13,12 +13,19 @@
         <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-overlay @click.stop="close(item)" :show="item.show"  >
+                    <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
+                    <van-button round type="info"  @click.stop="update(index,item)">修改</van-button>
+                    <van-button round type="warning " @click.stop="Delete(item)">删除</van-button>
+                </van-overlay>
                 <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
+                <div @click="cardClick(item)">
                     <div>问题名称：{{item.title}}</div>
                     <div>问题位置：{{item.address}}</div>
                     <div>问题内容：{{item.context}}</div>
                     <div>发现时间：{{item.checkTime}}</div>
                 </div>
+            </div>
         </van-checkbox-group>
         <div class="page-footer">
             <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
@@ -71,6 +78,7 @@ export default {
                 this.$toast.clear()
                 this.list=Response.data
                 this.list.forEach((item)=>{
+                    item.show=false
                     if(item.checkSubmitId){
                         this.result.push(parseInt(item.checkSubmitId))
                     }
@@ -148,18 +156,80 @@ export default {
             }).catch(()=>{
                 this.$toast.success('取消')
             })
-        }
+        },
+        //卡片单击事件
+        cardClick(item){
+            item.show=true
+            this.$forceUpdate()//强制刷新
+        },
+        //关闭遮罩层事件
+        close(item){
+            item.show=false
+            this.$forceUpdate()//强制刷新
+        },
+        //修改卡片值
+        update(index,item){
+            item.show=false
+            this.$forceUpdate()//强制刷新
+            this.$router.push('/edit')
+        },
+        //列表详情
+        detail(index,item){
+            item.show=false
+            this.$forceUpdate()//强制刷新
+            this.$router.push({name:'detail',query:{id:item.id}})
+        },
+        //卡片删除
+        Delete(item){
+            item.show=false
+            this.$forceUpdate()//强制刷新
+            this.$dialog.confirm({
+                title: '提示',
+                message: '确定删除该记录？',
+            }).then(()=>{
+                this.$toast.loading({
+                    message:'删除中...',
+                    forbidClick: true,
+                    loadingType: 'spinner',
+                    duration: 0
+                })
+                postFun('check/carry/trouble/delete/'+item.id).then((Response)=>{
+                    this.$toast.clear()
+                    this.$toast.success('删除成功')
+                    this.init()
+                    sessionStorage.setItem('noteDelete',true)
+                }).catch(()=>{
+                    this.$toast.clear()
+                    this.$toast.fail('删除失败,请稍后再试')
+                })
+               this.$toast.clear()
+            }).catch(()=>{
+                this.$toast.success('取消删除')
+            })
+        },
     }
 }
 </script>
 <style lang="less" scoped>
     .card{
         width:90%;
+        position: relative;
         box-shadow: 0px 0px 10px 2px #F3F3F3;
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
         border-radius: 4%;
+        .van-overlay {
+            display:flex;
+            justify-content: space-evenly;
+            align-items: center;
+            .van-button{
+                width: 20%;
+                margin-top: 0;
+            }
+            text-align: center;
+            position: absolute;
+        }
     }
     .card div{
         font-size: 0.4rem;

src/views/notice/noticeList/index.vue

@@ -169,7 +169,7 @@ export default {
             this.init()
         }
         //判断是否从电子签名跳转过来-获取图片是否显示的布尔值
-        if(this.$route.name=='noticeList'){
+        if(this.$route.query.name=='noticeList'){
             if(this.$route.query.img==true){
                 this.istext=false
                 this.isImg=true
@@ -317,14 +317,14 @@ export default {
         sign(){
             //点击电子签名，保存用户选择的日期和复选框回显值
             if(this.finish=='false'){
-                this.$router.push({name:'sign',query:{img:true}})
+                this.$router.push({name:'sign',query:{name:'sign',img:true}})
             }
         },
         //电子签名2
         sign2(){
             //点击电子签名，保存用户选择的日期和复选框回显值
             if(this.finish=='false'){
-                this.$router.push({name:'sign',query:{img2:true}})
+                this.$router.push({name:'sign',query:{name:'sign',img2:true}})
             }
         },
         //提交问题记录
@@ -392,7 +392,7 @@ export default {
         detail(){
 
         },
-        //卡片提交
+        //卡片删除
         Delete(item){
             item.show=false
             this.$forceUpdate()//强制刷新

src/views/notice/noticeList/sign/index.vue

@@ -38,7 +38,7 @@ export default {
         };
     },
     mounted(){
-        if(this.$route.name=='sign'){
+        if(this.$route.query.name=='sign'){
             this.img=this.$route.query.img
             this.img2=this.$route.query.img2
         }
@@ -55,7 +55,7 @@ export default {
             this.resultImg = res //把base64赋给img
             //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
             console.log(this.value)
-            this.$router.push({name:'noticeList',query:{img:this.img,img2:this.img2}})
+            this.$router.push({name:'noticeList',query:{name:'sign',img:this.img,img2:this.img2}})
             //判断是检查组签字还是项目经理签字
             if(this.img){
                 sessionStorage.setItem('resultImg',this.resultImg)