Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/App.vue

@@ -45,6 +45,7 @@ export default {
         "major-survey",
         "risk-add",
         "noticeList",
+        "confirmNote",
       ],
     };
   },

src/views/checked/problem/index.vue

@@ -81,6 +81,9 @@ export default {
             getFun('check/carry/count',{planId:this.id}).then((Response)=>{
                 this.$toast.clear()
                 this.nums=Response.data
+                sessionStorage.setItem('deptNameList',JSON.stringify(Response.data.deptNameList))
+                sessionStorage.setItem('deptIdList',JSON.stringify(Response.data.deptIdList))
+                sessionStorage.setItem('projectFlag',Response.data.projectFlag)
                 sessionStorage.setItem('nums',JSON.stringify(this.nums))
             }).catch(()=>{
                 this.$toast.clear()
@@ -118,7 +121,9 @@ export default {
                     finish:this.finish
                 }
             })
+            console.log(this.nums.id)
             sessionStorage.setItem('noteId',this.nums.id)
+            sessionStorage.setItem('checkedFinish',this.finish)
         },
         formwork(){
             this.$router.push({name:'formwork',query:{id:this.id,finish:this.finish}})

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

@@ -34,7 +34,6 @@
                 label="法律依据"
                 placeholder="法律依据"
                 :disabled="isFormwork"
-                :rules="[{ required: true, message: '请填写法律依据' }]"
             />
             <van-field
                 v-model="problemPosition"
@@ -64,12 +63,12 @@
                 />
                 <!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> -->
             </van-popup> 
-            <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
+            <van-field name="uploader" label="图像上传" >
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
                 </template>
             </van-field>
-            <van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
+            <van-field name="uploader2" label="视频上传" >
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" />
                 </template>
@@ -120,9 +119,15 @@ export default {
         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(sessionStorage.getItem('projectFlag')){
+            this.Isvalue=sessionStorage.getItem('projectFlag')=='true'?true:false
+        }
+        if(sessionStorage.getItem('deptNameList')){
+            this.value=JSON.parse(sessionStorage.getItem('deptNameList')).join('/')
+        }
+        if(sessionStorage.getItem('deptIdList')){
+            this.ids=JSON.parse(sessionStorage.getItem('deptIdList'))
         }
         if(this.$route.query.name=='formwork'){
             // this.problemName=this.$route.query.checkitem,//检查项目

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

@@ -24,6 +24,7 @@
                 name="法律依据"
                 label="法律依据"
                 placeholder="法律依据"
+                :disabled="true"
                 :rules="[{ required: true, message: '请填写法律依据' }]"
             />
             <van-field
@@ -53,12 +54,12 @@
                 />
                 <!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> -->
             </van-popup> 
-            <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
+            <van-field name="uploader" label="图像上传" >
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
                 </template>
             </van-field>
-            <van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
+            <van-field name="uploader2" label="视频上传" >
                 <template #input>
                     <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
                 </template>
@@ -95,10 +96,16 @@ export default {
     mounted() {
         if(this.$route.query.name=='note'){
             this.editObj=JSON.parse(this.$route.query.obj)
-            this.editObj.value=""
-            this.editObj.pictures=[]
-            this.editObj.videos=[]
-            console.log(this.editObj)
+            this.editObj={
+                id:this.editObj.id,//问题ID
+                address:this.editObj.address,//问题位置
+                value:this.editObj.deptNames.join('/'),//责任单位
+                context:this.editObj.context,//问题描述
+                checkBasis:this.editObj.checkBasis,//法律依据
+                pictures:this.editObj.pictures,//图片
+                videos:this.editObj.videos//视频
+            }
+            this.ids=this.editObj.deptIds
         }
         this.init()
     },
@@ -134,10 +141,20 @@ export default {
             value.uploader.forEach((item) => {
                 pictures.push(item.content)
             });
+            if(this.editObj.pictures){
+                this.editObj.pictures.forEach((item)=>{
+                    pictures.push(item)
+                })
+            }
             var videos=[];
             value.uploader2.forEach((item) => {
                 videos.push(item.content)
-            });
+            })
+            if(this.editObj.videos){
+                this.editObj.videos.forEach((item)=>{
+                    videos.push(item)
+                })
+            }
             var obj={
                 id:this.editObj.id,//列表ID
                 pictures:pictures,//图片

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

@@ -15,8 +15,8 @@
             <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-button round type="info" v-show="!finish"  @click.stop="update(index,item)">修改</van-button>
+                    <van-button round type="warning " v-show="!finish" @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)">
@@ -57,11 +57,11 @@ export default {
         }
     },
     mounted() {
-        if(sessionStorage.getItem('nodeId')){
-            this.id=sessionStorage.getItem('nodeId')
+        if(sessionStorage.getItem('noteId')){
+            this.id=sessionStorage.getItem('noteId')
         }
-        if(this.$route.query.finish){
-            this.finish=this.$route.query.finish
+        if(sessionStorage.getItem('checkedFinish')){
+            this.finish=sessionStorage.getItem('checkedFinish')=='false'?false:true
         }
         this.init()
     },
@@ -176,6 +176,7 @@ export default {
                 id:item.id,//问题ID
                 address:item.address,//问题位置
                 deptId:item.deptIds,//责任单位ID
+                deptNames:item.deptNames,//责任单位名称
                 context:item.context,//问题描述
                 checkBasis:item.checkBasis,//法律依据
                 pictures:item.pictures,//图片

src/views/checkedConfirm/confirmNote/index.vue

@@ -27,9 +27,9 @@
                     </div>
                 </div>
             </van-checkbox-group>
-            <div class="page-footer">
+            <!-- <div class="page-footer">
                 <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
-            </div>
+            </div> -->
             <van-field
                 readonly
                 clickable
@@ -43,18 +43,6 @@
                 <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
             </van-popup> 
             <div class="sign"><span>检查组负责人签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext" @click="sign" >电子签字</p><img  class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div>
-            <van-field
-                readonly
-                clickable
-                name="person"
-                :value="person"
-                label="人员选择"
-                placeholder="请选择人员"
-                @click="personChecked"
-                />
-            <van-popup v-model="showCalendar2" position="bottom">
-                <van-picker  ref="apicker" title="人员匹配" show-toolbar :columns="columns" @confirm="personOnConfirm" @cancel="showCalendar2=false"/>
-            </van-popup> 
             <div class="page-footer-button">
                 <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">整改确认</van-button>
             </div>
@@ -74,7 +62,6 @@ export default {
     },
     data() {
         return {
-            currentDate: new Date(),//当前默认时间
             dialogShow:false,//弹框是否显示
             istext:true,//是否显示文字
             isImg:false,//是否显示图片
@@ -89,24 +76,48 @@ export default {
             id:'',//整改通知id
             showCalendar: false,//日期弹出层状态
             showCalendar2: false,//人员匹配弹出层状态
-            finish:true,//检查状态
+            finish:false,//检查状态
             isFinish:false,//提交状态
-            person:'',//人员匹配
-            columns:'',//下拉数组
             projectId:'',//判断请求树形菜单还是下拉框
         }
     },
     watch:{
         
+    },
+    activated(){
+        //判断是否由确认列表跳转进来，清空表单获取新数据
+        if(this.$route.params.name=='checkedConfirm'){
+            this.istext=true//是否显示文字
+            this.isImg=false//是否显示图片
+            this.value=''//日期值
+            this.resultImg=''//电子签名图片
+            this.id=this.$route.params.id//请求问题记录列表的唯一id
+            this.noticeTableList=[];//问题记录列表数组
+            if(sessionStorage.getItem('ConfirmFinish')){
+                this.finish=sessionStorage.getItem('ConfirmFinish')
+            }
+        }
+        //判断是否从电子签名跳转过来-获取图片是否显示的布尔值
+        if(this.$route.query.name=='callbackSign'){
+            if(this.$route.query.confirmImg==true||this.$route.query.confirmImg=='true'){
+                this.istext=false
+                this.isImg=true
+                //从session中获取签名生成的图片1
+                if(sessionStorage.getItem('confirmImg')){
+                    this.resultImg=sessionStorage.getItem('confirmImg')
+                }
+            }
+        }
     },
     mounted() {
-        //获取确认id
-        if(this.$route.query.id){
-            this.id=this.$route.query.id
-            this.projectId=this.$route.query.projectId
+        //刷新页面时候，从session中获取确认id
+        if(sessionStorage.getItem('ConfirmFinish')){
+            this.finish=sessionStorage.getItem('ConfirmFinish')
+        }
+        if(sessionStorage.getItem('ConfirmId')){
+            this.id=sessionStorage.getItem('ConfirmId')
         }
         this.problem()
-        this.init()
     },
     methods: {
         /* 问题记录列表 */
@@ -143,51 +154,27 @@ export default {
                     if(Response.data.leaderSign){
                         this.resultImg=Response.data.leaderSign
                     }
-                    //电子签名数据2回显
-                    if(Response.data.managerSign){
-                        this.resultImg2=Response.data.managerSign
-                    }
                     //判断是否有签名
                     if(this.resultImg){
                         this.istext=false
                         this.isImg=true
                     }
-                    //判断是否有签名
-                    if(this.resultImg2){
-                        this.istext2=false
-                        this.isImg2=true
-                    }
                 }
             })
         },
-        //请求人员匹配下拉菜单
-        init(){
-            this.columns=[];
-            if(this.projectId){
-                //请求下拉菜单
-                getFun('check/project/user/list',{projectId:this.projectId}).then((Response)=>{
-                    this.columns=Response.data
-                })
-            }else{
-                //请求下拉树形菜单
-                getFun('/check/dept/user/tree',{projectId:this.projectId}).then((Response)=>{
-                    this.columns=Response.data
-                })
-            }
-        },
         /* 全选点击事件---只让全选框的触发全不选事件 */
-        checkedAllClick(){
-            if(this.checkedAll){
-                this.$refs.checkboxGroup.toggleAll(true);
-            }else{
-                /* 全不选只可以控制未禁用状态下的复选框 */
-                for(var key of this.$refs.checkboxGroup.$children){
-                    if(!key.$el._prevClass.includes('disabled')){
-                        key.toggle(false)
-                    }
-                }
-            }
-        },
+        // checkedAllClick(){
+        //     if(this.checkedAll){
+        //         this.$refs.checkboxGroup.toggleAll(true);
+        //     }else{
+        //         /* 全不选只可以控制未禁用状态下的复选框 */
+        //         for(var key of this.$refs.checkboxGroup.$children){
+        //             if(!key.$el._prevClass.includes('disabled')){
+        //                 key.toggle(false)
+        //             }
+        //         }
+        //     }
+        // },
         /* 复选框改变事件 */
         checkedEvent(){
             if(this.result.length==this.noticeQuestionList.length){
@@ -196,16 +183,13 @@ export default {
                 this.checkedAll=false
             }
         },
-        //人员选择事件
-        personChecked(){
-            this.showCalendar2=true//显示遮罩层
-        },
+        
         /* 全选框改变事件 */
-        checkedAllEvent(){
-            if(this.checkedAll){
-                this.$refs.checkboxGroup.toggleAll(true);
-            }
-        },
+        // checkedAllEvent(){
+        //     if(this.checkedAll){
+        //         this.$refs.checkboxGroup.toggleAll(true);
+        //     }
+        // },
         /* 时间戳转换 */
         onConfirm(date) {
             this.value = this.util.timestampToTime(date,'DT1',true)
@@ -231,7 +215,13 @@ export default {
         sign(){
             //点击电子签名，保存用户选择的日期和复选框回显值
             if(this.finish=='false'){
-                this.$router.push({name:'sign',query:{name:'sign',img:true}})
+                //每次签名检测需要签名的模块是哪个
+                if(sessionStorage.getItem('IsconfirmImg')){
+                    sessionStorage.removeItem('IsconfirmImg')
+                }else{
+                    sessionStorage.setItem('IsconfirmImg',true)
+                }
+                this.$router.push({name:'sign',query:{name:'confirmNote',confirmImg:true}})
             }
         },
         //提交问题记录
@@ -259,11 +249,10 @@ export default {
                     loadingType: 'spinner',
                     duration: 0
                 })
-                postFun('check/notify/trouble',obj).then((Response)=>{
+                postFun('check/confirm/trouble',obj).then((Response)=>{
                     this.$toast.clear()
-                    this.$toast.success('提交成功')
-                    this.init()
-                    this.$router.push('/notice')
+                    this.$toast.success('确认成功')
+                    this.problem()
                 }).catch(()=>{
                     this.$toast.clear()
                     this.$toast.fail('提交失败,请稍后再试')
@@ -286,19 +275,6 @@ export default {
             this.$forceUpdate()//强制刷新
             this.$router.push({name:'confirmDetail',query:{id:item.id}})
         },
-        //人员匹配确认按钮
-        personOnConfirm(){
-            //获取回显的部门值和部门id数组
-            this.person=""
-            this.ids=[]
-            var valueList=this.$refs.apicker.getValues()
-            valueList.forEach((item)=>{
-                this.ids.push(item.id)
-                this.person+=item.text+' / '
-            })
-            console.log(this.person)
-            this.showCalendar2 = false;
-        }
     }
 }
 </script>

src/views/checkedConfirm/index.vue

@@ -61,7 +61,9 @@ export default {
             })
         },
         cardLocation(item){
-            this.$router.push({name:'confirmNote',query:{projectId:item.projectId,id:item.id}})//此id来判断是否加载问题上报新数据
+            sessionStorage.setItem('ConfirmFinish',item.finish)
+            sessionStorage.setItem('ConfirmId',item.id)
+            this.$router.push({name:'confirmNote',params:{name:'checkedConfirm',id:item.id}})//此id来判断是否加载问题上报新数据
         }
     }
 }

src/views/notice/index.vue

@@ -60,6 +60,7 @@ export default {
             })
         },
         cardLocation(item){
+            sessionStorage.setItem('projectId',item.projectId)
             sessionStorage.setItem('finish',item.finish)
             sessionStorage.setItem('id',item.id)
             this.$router.push({

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

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
             <div>问题位置：{{list.address}}</div>
-            <div>责任单位：{{list.deptNames}}</div>
+            <div>责任单位：{{list.deptNames.join('/')}}</div>
             <div>问题描述：{{list.context}}</div>
             <div>法律依据：{{list.checkBasis}}</div>
             <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false"  v-model="list.pictures" /></div>

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

@@ -96,12 +96,18 @@ export default {
         
         if(this.$route.query.name=='noticeList'){
             this.editObj=JSON.parse(this.$route.query.obj)
-            this.editObj.value=""
-            this.editObj.pictures=[]
-            this.editObj.videos=[]
+            this.editObj={
+                id:this.editObj.id,//问题ID
+                address:this.editObj.address,//问题位置
+                value:this.editObj.deptNames.join('/'),//责任单位
+                context:this.editObj.context,//问题描述
+                checkBasis:this.editObj.checkBasis,//法律依据
+                pictures:this.editObj.pictures,//图片
+                videos:this.editObj.videos//视频
+            }
+            this.ids=this.editObj.deptIds
             
         }
-        console.log(this.editObj)
         this.init()
     },
     methods: {
@@ -132,12 +138,15 @@ export default {
         /* 问题提交 */
         onSubmit(value){
             var pictures=[];
+            console.log(value)
             value.uploader.forEach((item) => {
-                pictures.push(item.content)
+                if(item.content){pictures.push(item.content)}
+                else if(item){pictures.push(item)}
             });
             var videos=[];
             value.uploader2.forEach((item) => {
-                videos.push(item.content)
+                if(item.content){videos.push(item.content)}
+                else if(item){videos.push(item)}
             });
             var obj={
                 id:this.editObj.id,//列表ID
@@ -165,9 +174,9 @@ export default {
                         duration: 2000
                     })
                     this.$router.push({
-                        name:'note',
+                        name:'noticeList',
                         query:{
-                            pageName:'problemList'
+                            pageName:'noticeListEdit'
                         }
                     })
                 }).catch(()=>{

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

@@ -34,33 +34,42 @@ export default {
             result:[],
             checkedAll:'',
             img:'',
-            img2:''
+            // img2:'',
+            confirmImg:'',
         };
     },
     mounted(){
         if(this.$route.query.name=='sign'){
             this.img=this.$route.query.img
-            this.img2=this.$route.query.img2
+            // this.img2=this.$route.query.img2
+        }
+        if(this.$route.query.name=='confirmNote'){
+            this.confirmImg=this.$route.query.confirmImg
         }
     },
     methods: {
     handleReset () {
-
       this.$refs.esign.reset()
-
     },
     // 生成base64格式
     handleGenerate () {
         this.$refs.esign.generate().then(res => {
             this.resultImg = res //把base64赋给img
             //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
-            console.log(this.value)
-            this.$router.push({name:'noticeList',query:{name:'sign',img:this.img,img2:this.img2}})
+            if(this.confirmImg){
+                this.$router.push({name:'confirmNote',query:{name:'callbackSign',confirmImg:this.confirmImg}})
+            }else{
+                this.$router.push({name:'noticeList',query:{name:'sign',img:this.img}})
+            }
             //判断是检查组签字还是项目经理签字
             if(this.img){
                 sessionStorage.setItem('resultImg',this.resultImg)
-            }else if(this.img2){
-                 sessionStorage.setItem('resultImg2',this.resultImg)
+            }
+            // else if(this.img2){
+            //     sessionStorage.setItem('resultImg2',this.resultImg)
+            // }
+            else if(this.confirmImg){
+                sessionStorage.setItem('confirmImg',this.resultImg)
             }
         }).catch(err => {
             // 画布没有签字时会执行这里