个u谷歌都是古风公司都交看看花覅和是覅Hi好ifhi

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

@@ -147,25 +147,14 @@ export default {
             console.log(value)
             var pictures=[];
             value.uploader.forEach((item) => {
-                if(item){
-                    pictures.push(item.content)
-                }
-                
+                if(item.content){pictures.push(item.content)}
+                else if(item.url){pictures.push(item.url)}
             });
-            if(this.editObj.pictures){
-                this.editObj.pictures.forEach((item)=>{
-                    pictures.push(item.url)
-                })
-            }
             var videos=[];
             value.uploader2.forEach((item) => {
-                videos.push(item.content)
-            })
-            if(this.editObj.videos){
-                this.editObj.videos.forEach((item)=>{
-                    videos.push(item.url)
-                })
-            }
+                if(item.content){videos.push(item.content)}
+                else if(item.url){videos.push(item.url)}
+            });
             var obj={
                 id:this.editObj.id,//列表ID
                 pictures:pictures,//图片

src/views/checkedConfirm/confirmNote/detail/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <div class="card">
             <div>问题位置：{{list.address}}</div>
-            <div>责任单位：{{list.deptId}}</div>
+            <div>责任单位：{{list.deptNames}}</div>
             <div>问题描述：{{list.context}}</div>
             <div>法律依据：{{list.checkBasis}}</div>
             <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false"  v-model="list.pictures" /></div>
@@ -48,8 +48,22 @@ export default {
         /* 获取详情列表 */
         init(){
             this.list={}
-            getFun('check/confirm/trouble/list',{planId:this.id}).then((Response)=>{
-                this.list=Response.data.list
+            getFun('check/notify/trouble/'+this.id).then((Response)=>{
+                this.list=JSON.parse(JSON.stringify(Response.data))
+                //数据处理
+                this.list.deptNames=this.list.deptNames.join('/')
+                this.list.pictures=[]
+                this.list.videos=[]
+                Response.data.pictures.forEach((item) => {
+                    this.list.pictures.push({
+                        url:item
+                    })
+                });
+                Response.data.videos.forEach((item) => {
+                    this.list.videos.push({
+                        url:item
+                    })
+                });
             })
         }
     }

src/views/checkedConfirm/confirmNote/index.vue

@@ -20,7 +20,7 @@
                     <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                     <div @click="cardClick(item)">
                         <div>负责人姓名：{{item.realName}}</div>
-                        <div>问题名称：{{item.title}}</div>
+                        <!-- <div>问题名称：{{item.title}}</div> -->
                         <div>问题位置：{{item.address}}</div>
                         <div>问题内容：{{item.context}}</div>
                         <div>发现时间：{{item.checkTime}}</div>
@@ -42,9 +42,10 @@
             <van-popup v-model="showCalendar" position="bottom">
                 <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>
+            <div class="sign"><span>检查组负责人签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istextl" @click="signl" >电子签字</p><img  class="sign-img" v-show="isImgl" :src="resultImgl" alt=""></van-tag></div>
+            <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>
             <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="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">确认</van-button>
             </div>
         <tab-bar :index="1"></tab-bar>
     </div>
@@ -62,10 +63,14 @@ export default {
     },
     data() {
         return {
+            currentDate: new Date(),//当前默认时间
+            istextl:true,//检查组签字是否显示文字
             dialogShow:false,//弹框是否显示
             istext:true,//是否显示文字
             isImg:false,//是否显示图片
             resultImg:'',//电子签名图片
+            resultImgl:'',//检查组电子签名图片
+            isImgl:false,//是否显示检查组图片
             noticeQuestionList:[],//整改通知问题记录列表
             active: 0,//tab选中状态
             checkedAll:false,//全选状态
@@ -89,8 +94,11 @@ export default {
         if(this.$route.params.name=='checkedConfirm'){
             this.istext=true//是否显示文字
             this.isImg=false//是否显示图片
+            this.istextl=true//检查组是否显示文字
+            this.isImgl=false//检查组是否显示图片
             this.value=''//日期值
             this.resultImg=''//电子签名图片
+            this.resultImgl=''//检查组电子签名图片
             this.id=this.$route.params.id//请求问题记录列表的唯一id
             this.noticeTableList=[];//问题记录列表数组
             if(sessionStorage.getItem('ConfirmFinish')){
@@ -109,6 +117,17 @@ export default {
                 }
             }
         }
+        //判断是否从检查组的电子签名跳转过来-获取图片是否显示的布尔值
+        if(this.$route.query.name=='callbackSignl'){
+            if(this.$route.query.confirmImgl==true||this.$route.query.confirmImgl=='true'){
+                this.istextl=false
+                this.isImgl=true
+                //从session中获取签名生成的图片1
+                if(sessionStorage.getItem('confirmImgl')){
+                    this.resultImgl=sessionStorage.getItem('confirmImgl')
+                }
+            }
+        }
     },
     mounted() {
         //刷新页面时候，从session中获取确认id
@@ -155,11 +174,20 @@ export default {
                     if(Response.data.leaderSign){
                         this.resultImg=Response.data.leaderSign
                     }
+                    // //检查组电子签名数据回显
+                    // if(Response.data.leaderSign){
+                    //     this.resultImg=Response.data.leaderSign
+                    // }
                     //判断是否有签名
                     if(this.resultImg){
                         this.istext=false
                         this.isImg=true
                     }
+                    //判断是否有签名
+                    if(this.resultImgl){
+                        this.istextl=false
+                        this.isImgl=true
+                    }
                 }
             })
         },
@@ -225,6 +253,19 @@ export default {
                 this.$router.push({name:'sign',query:{name:'confirmNote',confirmImg:true}})
             }
         },
+        //电子签名2
+        signl(){
+            //点击电子签名，保存用户选择的日期和复选框回显值
+            if(this.finish=='false'){
+                //每次签名检测需要签名的模块是哪个
+                if(sessionStorage.getItem('IsconfirmImgl')){
+                    sessionStorage.removeItem('IsconfirmImgl')
+                }else{
+                    sessionStorage.setItem('IsconfirmImgl',true)
+                }
+                this.$router.push({name:'sign',query:{name:'confirmNotel',confirmImgl:true}})
+            }
+        },
         //提交问题记录
         commit(){
             var checkedList=[]

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

@@ -53,12 +53,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>
@@ -155,11 +155,6 @@ export default {
                 if(item.content){videos.push(item.content)}
                 else if(item.url){videos.push(item.url)}
             });
-            if(this.editObj.videos){
-                this.editObj.videos.forEach((item)=>{
-                    videos.push(item.url)
-                })
-            }
             var obj={
                 id:this.editObj.id,//列表ID
                 pictures:pictures,//图片

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

@@ -29,6 +29,7 @@ export default {
             lineColor: 'red',
             bgColor: '',
             resultImg: '',
+            confirmImgl:'',
             isCrop: false,
             value:'',
             result:[],
@@ -46,6 +47,9 @@ export default {
         if(this.$route.query.name=='confirmNote'){
             this.confirmImg=this.$route.query.confirmImg
         }
+        if(this.$route.query.name=='confirmNotel'){
+            this.confirmImgl=this.$route.query.confirmImgl
+        }
     },
     methods: {
     handleReset () {
@@ -58,6 +62,8 @@ export default {
             //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
             if(this.confirmImg){
                 this.$router.push({name:'confirmNote',query:{name:'callbackSign',confirmImg:this.confirmImg}})
+            }else if(this.confirmImgl){
+                this.$router.push({name:'confirmNote',query:{name:'callbackSignl',confirmImgl:this.confirmImgl}})
             }else{
                 this.$router.push({name:'noticeList',query:{name:'sign',img:this.img}})
             }
@@ -65,9 +71,9 @@ export default {
             if(this.img){
                 sessionStorage.setItem('resultImg',this.resultImg)
             }
-            // else if(this.img2){
-            //     sessionStorage.setItem('resultImg2',this.resultImg)
-            // }
+            else if(this.confirmImgl){
+                sessionStorage.setItem('confirmImgl',this.resultImg)
+            }
             else if(this.confirmImg){
                 sessionStorage.setItem('confirmImg',this.resultImg)
             }