Skip to content

B
BCDH-APP
Commit 9a8cc915 authored by 13841799530's avatar 13841799530
Browse files
Options

bug修改 

20211115
解润东
parent 57380a7e
Hide whitespace changes
Inline Side-by-side
Showing with 265 additions and 164 deletions
src/App.vue
View file @ 9a8cc915
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
"major-survey", "major-survey",
"risk-add", "risk-add",
"noticeList", "noticeList",
"confirmNote",
], ],
}; };
}, },
......
src/views/checked/problem/index.vue
View file @ 9a8cc915
...@@ -118,7 +118,9 @@ export default { ...@@ -118,7 +118,9 @@ export default {
finish:this.finish finish:this.finish
} }
}) })
console.log(this.nums.id)
sessionStorage.setItem('noteId',this.nums.id) sessionStorage.setItem('noteId',this.nums.id)
sessionStorage.setItem('checkedFinish',this.finish)
}, },
formwork(){ formwork(){
this.$router.push({name:'formwork',query:{id:this.id,finish:this.finish}}) this.$router.push({name:'formwork',query:{id:this.id,finish:this.finish}})
......
src/views/checked/problem/list/index.vue
View file @ 9a8cc915
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
label="法律依据" label="法律依据"
placeholder="法律依据" placeholder="法律依据"
:disabled="isFormwork" :disabled="isFormwork"
:rules="[{ required: true, message: '请填写法律依据' }]"
/> />
<van-field <van-field
v-model="problemPosition" v-model="problemPosition"
...@@ -64,12 +63,12 @@ ...@@ -64,12 +63,12 @@
/> />
<!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> --> <!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> -->
</van-popup> </van-popup>
<van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]"> <van-field name="uploader" label="图像上传" >
<template #input> <template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" /> <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
</template> </template>
</van-field> </van-field>
<van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]"> <van-field name="uploader2" label="视频上传" >
<template #input> <template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" /> <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" />
</template> </template>
......
src/views/checked/problem/note/edit/index.vue
View file @ 9a8cc915
...@@ -95,10 +95,16 @@ export default { ...@@ -95,10 +95,16 @@ export default {
mounted() { mounted() {
if(this.$route.query.name=='note'){ if(this.$route.query.name=='note'){
this.editObj=JSON.parse(this.$route.query.obj) this.editObj=JSON.parse(this.$route.query.obj)
this.editObj.value="" this.editObj={
this.editObj.pictures=[] id:this.editObj.id,//问题ID
this.editObj.videos=[] address:this.editObj.address,//问题位置
console.log(this.editObj) 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() this.init()
}, },
...@@ -134,10 +140,20 @@ export default { ...@@ -134,10 +140,20 @@ export default {
value.uploader.forEach((item) => { value.uploader.forEach((item) => {
pictures.push(item.content) pictures.push(item.content)
}); });
if(this.editObj.pictures){
this.editObj.pictures.forEach((item)=>{
pictures.push(item)
})
}
var videos=[]; var videos=[];
value.uploader2.forEach((item) => { value.uploader2.forEach((item) => {
videos.push(item.content) videos.push(item.content)
}); })
if(this.editObj.videos){
this.editObj.videos.forEach((item)=>{
videos.push(item)
})
}
var obj={ var obj={
id:this.editObj.id,//列表ID id:this.editObj.id,//列表ID
pictures:pictures,//图片 pictures:pictures,//图片
......
src/views/checked/problem/note/index.vue
View file @ 9a8cc915
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<div class="card" v-for="(item,index) in list" :key="index" > <div class="card" v-for="(item,index) in list" :key="index" >
<van-overlay @click.stop="close(item)" :show="item.show" > <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="primary" @click.stop="detail(index,item)">详情</van-button>
<van-button round type="info" @click.stop="update(index,item)">修改</van-button> <van-button round type="info" v-show="!finish" @click.stop="update(index,item)">修改</van-button>
<van-button round type="warning " @click.stop="Delete(item)">删除</van-button> <van-button round type="warning " v-show="!finish" @click.stop="Delete(item)">删除</van-button>
</van-overlay> </van-overlay>
<van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox> <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
<div @click="cardClick(item)"> <div @click="cardClick(item)">
...@@ -57,11 +57,11 @@ export default { ...@@ -57,11 +57,11 @@ export default {
} }
}, },
mounted() { mounted() {
if(sessionStorage.getItem('nodeId')){ if(sessionStorage.getItem('noteId')){
this.id=sessionStorage.getItem('nodeId') this.id=sessionStorage.getItem('noteId')
} }
if(this.$route.query.finish){ if(sessionStorage.getItem('checkedFinish')){
this.finish=this.$route.query.finish this.finish=sessionStorage.getItem('checkedFinish')
} }
this.init() this.init()
}, },
...@@ -176,6 +176,7 @@ export default { ...@@ -176,6 +176,7 @@ export default {
id:item.id,//问题ID id:item.id,//问题ID
address:item.address,//问题位置 address:item.address,//问题位置
deptId:item.deptIds,//责任单位ID deptId:item.deptIds,//责任单位ID
deptNames:item.deptNames,//责任单位名称
context:item.context,//问题描述 context:item.context,//问题描述
checkBasis:item.checkBasis,//法律依据 checkBasis:item.checkBasis,//法律依据
pictures:item.pictures,//图片 pictures:item.pictures,//图片
......
src/views/checkedConfirm/confirmNote/index.vue
View file @ 9a8cc915
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
</div> </div>
</div> </div>
</van-checkbox-group> </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> <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
</div> </div> -->
<van-field <van-field
readonly readonly
clickable clickable
...@@ -43,18 +43,6 @@ ...@@ -43,18 +43,6 @@
<van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/> <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
</van-popup> </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="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"> <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> </div>
...@@ -74,7 +62,6 @@ export default { ...@@ -74,7 +62,6 @@ export default {
}, },
data() { data() {
return { return {
currentDate: new Date(),//当前默认时间
dialogShow:false,//弹框是否显示 dialogShow:false,//弹框是否显示
istext:true,//是否显示文字 istext:true,//是否显示文字
isImg:false,//是否显示图片 isImg:false,//是否显示图片
...@@ -89,24 +76,48 @@ export default { ...@@ -89,24 +76,48 @@ export default {
id:'',//整改通知id id:'',//整改通知id
showCalendar: false,//日期弹出层状态 showCalendar: false,//日期弹出层状态
showCalendar2: false,//人员匹配弹出层状态 showCalendar2: false,//人员匹配弹出层状态
finish:true,//检查状态 finish:false,//检查状态
isFinish:false,//提交状态 isFinish:false,//提交状态
person:'',//人员匹配
columns:'',//下拉数组
projectId:'',//判断请求树形菜单还是下拉框 projectId:'',//判断请求树形菜单还是下拉框
} }
}, },
watch:{ 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() { mounted() {
//获取确认id //刷新页面时候，从session中获取确认id
if(this.$route.query.id){ if(sessionStorage.getItem('ConfirmFinish')){
this.id=this.$route.query.id this.finish=sessionStorage.getItem('ConfirmFinish')
this.projectId=this.$route.query.projectId }
if(sessionStorage.getItem('ConfirmId')){
this.id=sessionStorage.getItem('ConfirmId')
} }
this.problem() this.problem()
this.init()
}, },
methods: { methods: {
/* 问题记录列表 */ /* 问题记录列表 */
...@@ -143,51 +154,27 @@ export default { ...@@ -143,51 +154,27 @@ export default {
if(Response.data.leaderSign){ if(Response.data.leaderSign){
this.resultImg=Response.data.leaderSign this.resultImg=Response.data.leaderSign
} }
//电子签名数据2回显
if(Response.data.managerSign){
this.resultImg2=Response.data.managerSign
}
//判断是否有签名 //判断是否有签名
if(this.resultImg){ if(this.resultImg){
this.istext=false this.istext=false
this.isImg=true 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(){ // checkedAllClick(){
if(this.checkedAll){ // if(this.checkedAll){
this.$refs.checkboxGroup.toggleAll(true); // this.$refs.checkboxGroup.toggleAll(true);
}else{ // }else{
/* 全不选只可以控制未禁用状态下的复选框 */ // /* 全不选只可以控制未禁用状态下的复选框 */
for(var key of this.$refs.checkboxGroup.$children){ // for(var key of this.$refs.checkboxGroup.$children){
if(!key.$el._prevClass.includes('disabled')){ // if(!key.$el._prevClass.includes('disabled')){
key.toggle(false) // key.toggle(false)
} // }
} // }
} // }
}, // },
/* 复选框改变事件 */ /* 复选框改变事件 */
checkedEvent(){ checkedEvent(){
if(this.result.length==this.noticeQuestionList.length){ if(this.result.length==this.noticeQuestionList.length){
...@@ -196,16 +183,13 @@ export default { ...@@ -196,16 +183,13 @@ export default {
this.checkedAll=false this.checkedAll=false
} }
}, },
//人员选择事件
personChecked(){
this.showCalendar2=true//显示遮罩层
},
/* 全选框改变事件 */ /* 全选框改变事件 */
checkedAllEvent(){ // checkedAllEvent(){
if(this.checkedAll){ // if(this.checkedAll){
this.$refs.checkboxGroup.toggleAll(true); // this.$refs.checkboxGroup.toggleAll(true);
} // }
}, // },
/* 时间戳转换 */ /* 时间戳转换 */
onConfirm(date) { onConfirm(date) {
this.value = this.util.timestampToTime(date,'DT1',true) this.value = this.util.timestampToTime(date,'DT1',true)
...@@ -231,7 +215,13 @@ export default { ...@@ -231,7 +215,13 @@ export default {
sign(){ sign(){
//点击电子签名，保存用户选择的日期和复选框回显值 //点击电子签名，保存用户选择的日期和复选框回显值
if(this.finish=='false'){ 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 { ...@@ -259,11 +249,10 @@ export default {
loadingType: 'spinner', loadingType: 'spinner',
duration: 0 duration: 0
}) })
postFun('check/notify/trouble',obj).then((Response)=>{ postFun('check/confirm/trouble',obj).then((Response)=>{
this.$toast.clear() this.$toast.clear()
this.$toast.success('提交成功') this.$toast.success('确认成功')
this.init() this.problem()
this.$router.push('/notice')
}).catch(()=>{ }).catch(()=>{
this.$toast.clear() this.$toast.clear()
this.$toast.fail('提交失败,请稍后再试') this.$toast.fail('提交失败,请稍后再试')
...@@ -286,19 +275,6 @@ export default { ...@@ -286,19 +275,6 @@ export default {
this.$forceUpdate()//强制刷新 this.$forceUpdate()//强制刷新
this.$router.push({name:'confirmDetail',query:{id:item.id}}) 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> </script>
......
src/views/checkedConfirm/index.vue
View file @ 9a8cc915
...@@ -61,7 +61,9 @@ export default { ...@@ -61,7 +61,9 @@ export default {
}) })
}, },
cardLocation(item){ 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
View file @ 9a8cc915
...@@ -60,6 +60,7 @@ export default { ...@@ -60,6 +60,7 @@ export default {
}) })
}, },
cardLocation(item){ cardLocation(item){
sessionStorage.setItem('projectId',item.projectId)
sessionStorage.setItem('finish',item.finish) sessionStorage.setItem('finish',item.finish)
sessionStorage.setItem('id',item.id) sessionStorage.setItem('id',item.id)
this.$router.push({ this.$router.push({
......
src/views/notice/noticeList/detail/index.vue
View file @ 9a8cc915
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<LHeader v-bind:text="text"></LHeader> <LHeader v-bind:text="text"></LHeader>
<div class="card"> <div class="card">
<div>问题位置：{{list.address}}</div> <div>问题位置：{{list.address}}</div>
<div>责任单位：{{list.deptNames}}</div> <div>责任单位：{{list.deptNames.join('/')}}</div>
<div>问题描述：{{list.context}}</div> <div>问题描述：{{list.context}}</div>
<div>法律依据：{{list.checkBasis}}</div> <div>法律依据：{{list.checkBasis}}</div>
<div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div> <div>图片展示：<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div>
......
src/views/notice/noticeList/edit/index.vue
View file @ 9a8cc915
...@@ -96,12 +96,18 @@ export default { ...@@ -96,12 +96,18 @@ export default {
if(this.$route.query.name=='noticeList'){ if(this.$route.query.name=='noticeList'){
this.editObj=JSON.parse(this.$route.query.obj) this.editObj=JSON.parse(this.$route.query.obj)
this.editObj.value="" this.editObj={
this.editObj.pictures=[] id:this.editObj.id,//问题ID
this.editObj.videos=[] 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() this.init()
}, },
methods: { methods: {
...@@ -132,12 +138,15 @@ export default { ...@@ -132,12 +138,15 @@ export default {
/* 问题提交 */ /* 问题提交 */
onSubmit(value){ onSubmit(value){
var pictures=[]; var pictures=[];
console.log(value)
value.uploader.forEach((item) => { value.uploader.forEach((item) => {
pictures.push(item.content) if(item.content){pictures.push(item.content)}
else if(item){pictures.push(item)}
}); });
var videos=[]; var videos=[];
value.uploader2.forEach((item) => { value.uploader2.forEach((item) => {
videos.push(item.content) if(item.content){videos.push(item.content)}
else if(item){videos.push(item)}
}); });
var obj={ var obj={
id:this.editObj.id,//列表ID id:this.editObj.id,//列表ID
...@@ -165,9 +174,9 @@ export default { ...@@ -165,9 +174,9 @@ export default {
duration: 2000 duration: 2000
}) })
this.$router.push({ this.$router.push({
name:'note', name:'noticeList',
query:{ query:{
pageName:'problemList' pageName:'noticeListEdit'
} }
}) })
}).catch(()=>{ }).catch(()=>{
......
src/views/notice/noticeList/index.vue
View file @ 9a8cc915
...@@ -81,9 +81,21 @@ ...@@ -81,9 +81,21 @@
<van-popup v-model="showCalendar" position="bottom"> <van-popup v-model="showCalendar" position="bottom">
<van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/> <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
</van-popup> </van-popup>
<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>
<!-- <van-calendar v-model="showCalendar" @confirm="onConfirm" /> --> <!-- <van-calendar v-model="showCalendar" @confirm="onConfirm" /> -->
<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="istext" @click="sign" >电子签字</p><img class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div>
<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="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"> <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> </div>
...@@ -111,10 +123,10 @@ export default { ...@@ -111,10 +123,10 @@ export default {
dialogShow:false,//弹框是否显示 dialogShow:false,//弹框是否显示
istext:true,//是否显示文字 istext:true,//是否显示文字
isImg:false,//是否显示图片 isImg:false,//是否显示图片
istext2:true,//是否显示文字2 // istext2:true,//是否显示文字2
isImg2:false,//是否显示图片2 // isImg2:false,//是否显示图片2
resultImg:'',//电子签名图片 resultImg:'',//电子签名图片
resultImg2:'',//电子签名图片2 // resultImg2:'',//电子签名图片2
noticeQuestionList:[],//整改通知问题记录列表 noticeQuestionList:[],//整改通知问题记录列表
active: 0,//tab选中状态 active: 0,//tab选中状态
checkedAll:false,//全选状态 checkedAll:false,//全选状态
...@@ -124,6 +136,7 @@ export default { ...@@ -124,6 +136,7 @@ export default {
value: '',//日期值 value: '',//日期值
id:'',//整改通知id id:'',//整改通知id
showCalendar: false,//弹出层状态 showCalendar: false,//弹出层状态
showCalendar2:false,//人员匹配弹出层状态
finish:'',//检查状态 finish:'',//检查状态
isFinish:false,//提交状态 isFinish:false,//提交状态
dialogTitle:'标题',//弹框标题 dialogTitle:'标题',//弹框标题
...@@ -134,6 +147,10 @@ export default { ...@@ -134,6 +147,10 @@ export default {
address:'',//问题位置 address:'',//问题位置
context:''//问题内容 context:''//问题内容
}, },
ids:[],//人员匹配数组
columns:[],//人员匹配下拉数据数组默认值
person:'',//人员匹配默认值
projectId:'',
} }
}, },
watch:{ watch:{
...@@ -144,19 +161,24 @@ export default { ...@@ -144,19 +161,24 @@ export default {
if(this.$route.params.name=='notice'){ if(this.$route.params.name=='notice'){
//清空表单 //清空表单
this.value="" this.value=""
this.person=""
this.active=0 this.active=0
this.checkedAll=false this.checkedAll=false
this.result=[]; this.result=[];
this.resultImg="" this.resultImg=""
this.resultImg2="" // this.resultImg2=""
this.isImg=false; this.isImg=false;
this.istext=true this.istext=true
this.isImg2=false; // this.isImg2=false;
this.istext2=true // this.istext2=true
//获取检查id //获取检查id
if(sessionStorage.getItem('id')){ if(sessionStorage.getItem('id')){
this.id=sessionStorage.getItem('id') this.id=sessionStorage.getItem('id')
} }
//获取人员匹配projectId
if(sessionStorage.getItem('projectId')){
this.projectId=sessionStorage.getItem('projectId')
}
//获取检查状态 //获取检查状态
if(sessionStorage.getItem('finish')){ if(sessionStorage.getItem('finish')){
this.finish=sessionStorage.getItem('finish') this.finish=sessionStorage.getItem('finish')
...@@ -164,23 +186,41 @@ export default { ...@@ -164,23 +186,41 @@ export default {
this.init() this.init()
} }
//判断是否从电子签名跳转过来-获取图片是否显示的布尔值 //判断是否从电子签名跳转过来-获取图片是否显示的布尔值
if(this.$route.query.name=='noticeList'){ if(this.$route.query.name=='sign'){
if(this.$route.query.img==true){ if(this.$route.query.img==true||this.$route.query.img=='true'){
this.istext=false this.istext=false
this.isImg=true this.isImg=true
//从session中获取签名生成的图片1 //从session中获取签名生成的图片1
if(sessionStorage.getItem('resultImg')){ if(sessionStorage.getItem('resultImg')){
this.resultImg=sessionStorage.getItem('resultImg') this.resultImg=sessionStorage.getItem('resultImg')
} }
}else if(this.$route.query.img2==true){ }
//从session中获取签名生成的图片2 // else if(this.$route.query.img2==true){
if(sessionStorage.getItem('resultImg2')){ // //从session中获取签名生成的图片2
this.resultImg2=sessionStorage.getItem('resultImg2') // if(sessionStorage.getItem('resultImg2')){
} // this.resultImg2=sessionStorage.getItem('resultImg2')
this.istext2=false // }
this.isImg2=true // this.istext2=false
// this.isImg2=true
// }
this.active=1
}
//判断是否编辑页面跳转进来
if(this.$route.query.pageName=='noticeListEdit'){
//获取检查id
if(sessionStorage.getItem('id')){
this.id=sessionStorage.getItem('id')
}
//获取检查状态
if(sessionStorage.getItem('finish')){
this.finish=sessionStorage.getItem('finish')
}
//获取人员匹配projectId
if(sessionStorage.getItem('projectId')){
this.projectId=sessionStorage.getItem('projectId')
} }
this.active=1 this.active=1
this.init()
} }
}, },
mounted() { mounted() {
...@@ -192,6 +232,10 @@ export default { ...@@ -192,6 +232,10 @@ export default {
if(sessionStorage.getItem('finish')){ if(sessionStorage.getItem('finish')){
this.finish=sessionStorage.getItem('finish') this.finish=sessionStorage.getItem('finish')
} }
//获取人员匹配projectId
if(sessionStorage.getItem('projectId')){
this.projectId=sessionStorage.getItem('projectId')
}
this.init() this.init()
}, },
methods: { methods: {
...@@ -205,8 +249,32 @@ export default { ...@@ -205,8 +249,32 @@ export default {
}) })
await this.statusList() await this.statusList()
await this.problem() await this.problem()
await this.Selection()
this.$toast.clear() this.$toast.clear()
}, },
//请求人员匹配下拉菜单
Selection(){
this.columns=[];
if(this.projectId!='null'){
//请求下拉菜单
getFun('check/project/user/list/'+this.projectId).then((Response)=>{
if(Response.data.length){
Response.data.forEach((item)=>{
this.columns.push({
text:item.username,
id:item.id
})
})
}
})
}else{
//请求下拉树形菜单
getFun('/check/dept/user/tree').then((Response)=>{
this.columns=Response.data
})
}
},
/* 上报状态列表 */ /* 上报状态列表 */
statusList(){ statusList(){
this.noticeTableList=[] this.noticeTableList=[]
...@@ -242,20 +310,20 @@ export default { ...@@ -242,20 +310,20 @@ export default {
if(Response.data.leaderSign){ if(Response.data.leaderSign){
this.resultImg=Response.data.leaderSign this.resultImg=Response.data.leaderSign
} }
//电子签名数据2回显 // //电子签名数据2回显
if(Response.data.managerSign){ // if(Response.data.managerSign){
this.resultImg2=Response.data.managerSign // this.resultImg2=Response.data.managerSign
} // }
//判断是否有签名 //判断是否有签名
if(this.resultImg){ if(this.resultImg){
this.istext=false this.istext=false
this.isImg=true this.isImg=true
} }
//判断是否有签名 // //判断是否有签名
if(this.resultImg2){ // if(this.resultImg2){
this.istext2=false // this.istext2=false
this.isImg2=true // this.isImg2=true
} // }
} }
}) })
}, },
...@@ -314,13 +382,13 @@ export default { ...@@ -314,13 +382,13 @@ export default {
this.$router.push({name:'sign',query:{name:'sign',img:true}}) this.$router.push({name:'sign',query:{name:'sign',img:true}})
} }
}, },
//电子签名2 // //电子签名2
sign2(){ // sign2(){
//点击电子签名，保存用户选择的日期和复选框回显值 // //点击电子签名，保存用户选择的日期和复选框回显值
if(this.finish=='false'){ // if(this.finish=='false'){
this.$router.push({name:'sign',query:{name:'sign',img2:true}}) // this.$router.push({name:'sign',query:{name:'sign',img2:true}})
} // }
}, // },
//提交问题记录 //提交问题记录
commit(){ commit(){
var checkedList=[] var checkedList=[]
...@@ -337,7 +405,7 @@ export default { ...@@ -337,7 +405,7 @@ export default {
troubleIds:checkedList, troubleIds:checkedList,
finishTime:this.value, finishTime:this.value,
leaderSign:this.resultImg, leaderSign:this.resultImg,
managerSign:this.resultImg2 ids:this.ids
} }
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
...@@ -378,6 +446,7 @@ export default { ...@@ -378,6 +446,7 @@ export default {
id:item.id,//问题ID id:item.id,//问题ID
address:item.address,//问题位置 address:item.address,//问题位置
deptId:item.deptIds,//责任单位ID deptId:item.deptIds,//责任单位ID
deptNames:item.deptNames,//责任单位名称数组
context:item.context,//问题描述 context:item.context,//问题描述
checkBasis:item.checkBasis,//法律依据 checkBasis:item.checkBasis,//法律依据
pictures:item.pictures,//图片 pictures:item.pictures,//图片
...@@ -418,8 +487,26 @@ export default { ...@@ -418,8 +487,26 @@ export default {
}).catch(()=>{ }).catch(()=>{
this.$toast.success('取消删除') this.$toast.success('取消删除')
}) })
}, },
//人员选择事件
personChecked(){
this.showCalendar2=true//显示遮罩层
},
//人员匹配确认按钮
personOnConfirm(value){
//获取回显的部门值和部门id数组
this.person=""
this.ids=[]
var valueList=this.$refs.apicker.getValues()
console.log(valueList)
valueList.forEach((item)=>{
this.ids.push(item.id)
this.person+=item.text+' / '
})
//去尾'/'
this.person=this.person.substr(0,this.person.length-2)
this.showCalendar2 = false;
}
} }
} }
</script> </script>
...@@ -472,9 +559,7 @@ export default { ...@@ -472,9 +559,7 @@ export default {
.card-middle div:nth-child(2){ .card-middle div:nth-child(2){
font-size: 0.3rem; font-size: 0.3rem;
font-weight: bolder; font-weight: bolder;
overflow:hidden; width: 5rem;
white-space:nowrap;
text-overflow:ellipsis;
} }
.card-right{ .card-right{
font-size: 0.3rem; font-size: 0.3rem;
...@@ -515,15 +600,15 @@ export default { ...@@ -515,15 +600,15 @@ export default {
margin-left:0.4rem ; margin-left:0.4rem ;
font-size: 0.37333rem; font-size: 0.37333rem;
} }
.sign2{ // .sign2{
width: 90%; // width: 90%;
height: 2rem; // height: 2rem;
display: flex; // display: flex;
align-items: center; // align-items: center;
margin-top: 0.1rem; // margin-top: 0.1rem;
margin-left:0.4rem ; // margin-left:0.4rem ;
font-size: 0.37333rem; // font-size: 0.37333rem;
} // }
.van-tag{ .van-tag{
color: #323233 color: #323233
} }
......
src/views/notice/noticeList/sign/index.vue
View file @ 9a8cc915
...@@ -34,33 +34,42 @@ export default { ...@@ -34,33 +34,42 @@ export default {
result:[], result:[],
checkedAll:'', checkedAll:'',
img:'', img:'',
img2:'' // img2:'',
confirmImg:'',
}; };
}, },
mounted(){ mounted(){
if(this.$route.query.name=='sign'){ if(this.$route.query.name=='sign'){
this.img=this.$route.query.img 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: { methods: {
handleReset () { handleReset () {
this.$refs.esign.reset() this.$refs.esign.reset()
}, },
// 生成base64格式 // 生成base64格式
handleGenerate () { handleGenerate () {
this.$refs.esign.generate().then(res => { this.$refs.esign.generate().then(res => {
this.resultImg = res //把base64赋给img this.resultImg = res //把base64赋给img
//生成图片后存储到session中并跳转把图片是否显示的boolean带过去 //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
console.log(this.value) if(this.confirmImg){
this.$router.push({name:'noticeList',query:{name:'sign',img:this.img,img2:this.img2}}) 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){ if(this.img){
sessionStorage.setItem('resultImg',this.resultImg) 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 => { }).catch(err => {
// 画布没有签字时会执行这里 // 画布没有签字时会执行这里
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment