解润东 (29c564a1) · Commits · 首开风险隐患双控平台 / BCDH-APP · GitLab

src/views/checked/index.vue

+38 −14

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		<div @click="onSearch" >搜索</div>
		</template>
		</van-search>
		<van-tabs v-model="active" :swipe-threshold="3" >
		<van-tabs v-model="active" :swipe-threshold="3" @change="tabChange">
		<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>
		@@ -55,10 +55,21 @@ export default {
		},
		data() {
		return {
		title:'待提交',//默认选中状态的tab页签
		active:'0',//默认选中状态
		status:'unconfirm',//默认提交状态
		goback:'save-workbench',//返回工作台
		value:'',//列表搜索关键字值
		checkedConfirmList:[],//检查列表
		checkedConfirmList:[
		{
		title:'待提交',
		list:[]
		},
		{
		title:'已提交',
		list:[]
		}
		],//检查列表
		text:'检查执行',//顶部文本
		finish:'',//问题是否提交
		}
		@@ -69,27 +80,25 @@ export default {
		methods: {
		/* 首次进入页面请求检查执行列表接口 */
		list(){
		this.checkedList=[]
		// this.checkedList=[]
		this.clearTab()
		this.$toast.loading({
		message:'加载中...',
		forbidClick: true,
		loadingType: 'spinner',
		duration: 0
		})
		getFun('check/carry/user/list',{name:this.value}).then((Response)=>{
		getFun('check/carry/user/list',{name:this.value,status:this.status}).then((Response)=>{
		this.$toast.clear()
		// this.checkedList=Response.data
		this.checkedConfirmList=Response.data.data
		this.checkedConfirmList.forEach((item)=>{
		if(item.title==this.title){
		item.list=Response.data[0].list
		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('加载失败,请稍后再试')
		@@ -115,6 +124,21 @@ export default {
		// 只显示第一个数据
		}
		this.$forceUpdate()
		},
		//清空tab列表数据
		clearTab(){
		this.checkedConfirmList.forEach((it)=>{
		it.list=[]
		})
		},
		tabChange(name,title){
		if(name=='0'){
		this.status='unconfirm'
		}else{
		this.status='confirmed'
		}
		this.title=title
		this.list()
		}
		}
		}

src/views/checkedConfirm/index.vue

+38 −9

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		<template>
		<div>
		<LHeader v-bind:text="text" :goback="goback"></LHeader>
		<van-tabs v-model="active" :swipe-threshold="3" >
		<van-tabs v-model="active" :swipe-threshold="3" @change="tabChange">
		<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.realName}}</div>
		@@ -44,9 +44,20 @@ export default {
		},
		data() {
		return {
		title:'待确认',//默认选中状态的tab页签
		status:'unconfirm',//默认确认状态
		active:'0',//默认选中状态
		goback:'save-workbench',//返回工作台
		checkedConfirmList:[],//检查确认列表
		checkedConfirmList:[
		{
		title:'待确认',
		list:[]
		},
		{
		title:'已确认',
		list:[]
		}
		],//检查确认列表
		text:'检查确认列表',//顶部文本
		}
		},
		@@ -56,20 +67,23 @@ export default {
		methods: {
		/* 首次进入页面请求检查执行列表接口 */
		list(){
		this.checkedConfirmList=[]
		// this.checkedConfirmList=[]
		this.clearTab()
		this.$toast.loading({
		message:'加载中...',
		forbidClick: true,
		loadingType: 'spinner',
		duration: 0
		})
		getFun('check/confirm/list').then((Response)=>{
		this.checkedConfirmList=Response.data
		getFun('check/confirm/list',{status:this.status}).then((Response)=>{
		this.checkedConfirmList.forEach((item)=>{
		if(item.title==this.title){
		item.list=Response.data[0].list
		item.list.forEach((it)=>{
		it.isOpen=false
		it.OpenText="展开 ▼";
		})
		}
		})
		this.$toast.clear()
		}).catch(()=>{
		@@ -92,6 +106,21 @@ export default {
		// 只显示第一个数据
		}
		this.$forceUpdate()
		},
		//清空tab列表数据
		clearTab(){
		this.checkedConfirmList.forEach((it)=>{
		it.list=[]
		})
		},
		tabChange(name,title){
		if(name=='0'){
		this.status='unconfirm'
		}else{
		this.status='confirmed'
		}
		this.title=title
		this.list()
		}
		}
		}

src/views/notice/index.vue

+65 −22

Original line number	Diff line number	Diff line
		@@ -21,21 +21,25 @@
		<div @click="onSearch" >搜索</div>
		</template>
		</van-search>
		<div class="card" v-for="(item,index) in noticeList" :key="index" @click="cardLocation(item)">
		<div>负责人姓名：{{item.realName}}</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>问题数量：{{item.troubleNumber}}</div>
		<van-tabs v-model="active" :swipe-threshold="3" @change="tabChange">
		<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.realName}}</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>问题数量：{{it.troubleNumber}}</div>
		</div>
		<div class="more" @click.stop="toggle(item)">
		{{ item.OpenText }}
		<div class="more" @click.stop="toggle(it)">
		{{ it.OpenText }}
		</div>
		</div>
		</van-tab>
		</van-tabs>
		<tab-bar :index="1"></tab-bar>
		</div>
		</template>
		@@ -52,9 +56,21 @@ export default {
		},
		data() {
		return {
		title:'待完成',//默认选中状态的tab页签
		active:'0',//默认选中状态
		status:'unconfirm',//默认完成状态
		value:'',//列表搜索关键字值
		goback:'save-workbench',//返回工作台
		noticeList:[],//整改通知管理列表
		checkedConfirmList:[
		{
		title:'待完成',
		list:[]
		},
		{
		title:'已完成',
		list:[]
		}
		],//整改通知管理列表
		text:'整改通知管理',
		}
		},
		@@ -64,20 +80,32 @@ export default {
		methods: {
		/* 请求整改通知列表 */
		init(){
		this.noticeList=[]
		// this.noticeList=[]
		this.clearTab()
		this.$toast.loading({
		message:'加载中...',
		forbidClick: true,
		loadingType: 'spinner',
		duration: 0
		})
		getFun('check/notify/list',{select:this.value}).then((Response)=>{
		getFun('check/notify/list',{select:this.value,status:this.status}).then((Response)=>{
		this.$toast.clear()
		this.noticeList=Response.data
		this.noticeList.forEach((item)=>{
		item.isOpen=false
		item.OpenText="展开 ▼";
		this.checkedConfirmList.forEach((item)=>{
		if(item.title==this.title){
		item.list=Response.data[0].list
		item.list.forEach((it)=>{
		it.isOpen=false
		it.OpenText="展开 ▼";
		})
		}
		})
		// this.checkedConfirmList=Response.data
		// this.checkedConfirmList.forEach((item)=>{
		// item.list.forEach((it)=>{
		// it.isOpen=false
		// it.OpenText="展开 ▼";
		// })
		// })
		})
		},
		/* 搜索查询列表接口 */
		@@ -107,6 +135,21 @@ export default {
		// 只显示第一个数据
		}
		this.$forceUpdate()
		},
		//清空tab列表数据
		clearTab(){
		this.checkedConfirmList.forEach((it)=>{
		it.list=[]
		})
		},
		tabChange(name,title){
		if(name=='0'){
		this.status='unconfirm'
		}else{
		this.status='confirmed'
		}
		this.title=title
		this.init()
		}
		}
		}

src/views/notice/noticeList/index.vue

+12 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,14 @@
		<van-popup v-model="showCalendar2" position="bottom">
		<van-picker ref="apicker" title="人员匹配" show-toolbar :columns="columns" @confirm="personOnConfirm" @cancel="showCalendar2=false"/>
		</van-popup>
		<van-field name="notifyType" label="确认次数">
		<template #input>
		<van-radio-group v-model="notifyType" direction="horizontal">
		<van-radio name="1">一次确认</van-radio>
		<van-radio name="2">二次确认</van-radio>
		</van-radio-group>
		</template>
		</van-field>
		<!-- <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="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> -->
		@@ -122,6 +130,7 @@
		<div class="card">
		<div>整改完成时间：{{value}}</div>
		<div>人员组：{{person}}</div>
		<div>确认类别：{{notifyType+'次确认'}}</div>
		</div>
		<!-- </van-checkbox-group> -->
		<!-- <div class="page-footer">
		@@ -177,6 +186,7 @@ export default {
		},
		data() {
		return {
		notifyType:'1',//确认次数
		currentDate: new Date(),//当前默认时间
		dialogShow:false,//弹框是否显示
		istext:true,//是否显示文字
		@@ -356,6 +366,7 @@ export default {
		/* ----详情---- */
		if(this.isFinish){
		this.person=Response.data.userName
		this.notifyType=Response.data.notifyType
		//获取选中状态数组
		this.noticeQuestionList.forEach((item)=>{
		if(item.checkSubmitId){
		@@ -466,6 +477,7 @@ export default {
		troubleIds:checkedList,
		finishTime:this.value,
		leaderSign:this.resultImg,
		notifyType:this.notifyType
		}
		//判断projectId是否为null决定id传值类别
		if(this.projectId!='null'){