更新v0.7.8相关功能

App.vue

@@ -170,7 +170,8 @@
 
 				>text {
 					font-size: 35rpx;
-					line-height: 52.5rpx;
+					line-height: 52.5rpx;
+					font-weight: normal;
 					color: #292C33;
 				}
 
@@ -179,7 +180,7 @@
 					flex-direction: row;
 					align-items: center;
 					margin-left: 20rpx;
-					border-radius: 17.5rpx;
+					// border-radius: 17.5rpx;
 					height: 35rpx;
 					font-size: 17.5rpx;
 					line-height: 35rpx;

manifest.json

@@ -2,7 +2,7 @@
     "name" : "追踪方法学",
     "appid" : "__UNI__03C4C69",
     "description" : "",
-    "versionName" : "0.7.6",
+    "versionName" : "0.7.9",
     "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {

pages/auditItemDetails/auditItemDetails.vue

@@ -215,7 +215,7 @@
 	}
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 	.auditItemDetails {
 		.bottomBtn {
 			position: fixed;

pages/checkList/checkList.vue

@@ -76,7 +76,8 @@
 		<uni-popup ref="popup" type="bottom" :maskClick="true">
 			<view class="selectableList">
 				<scroll-view scroll-y="true" class="listWrap">
-					<view :class="getClass(v.id)" v-for="(v,i) in selectables" @click="listClickHandle(v)">{{v.name}}
+					<view :class="getClass(v.id)" v-for="(v,i) in selectables" @click="listClickHandle(v)">
+						{{`${v.name}(${v.count})`}}
 					</view>
 				</scroll-view>
 				<view class="btnGroup">
@@ -117,15 +118,18 @@
 				ifclearSearch: false,
 				selectables: [{
 						id: 0,
-						name: '全部'
+						name: '全部',
+						count: 0
 					},
 					{
 						id: 1,
-						name: '进行中'
+						name: '进行中',
+						count: 0
 					},
 					{
 						id: 2,
-						name: '已完成'
+						name: '已完成',
+						count: 0
 					}
 				]
 
@@ -145,12 +149,12 @@
 				} else {
 					return '';
 				}
-			},
-			selectedStr() {
-				const {
-					status
-				} = this.filter;
-				return (status.map(t => t.name)).join(',')
+			},
+			selectedStr() {
+				const {
+					status
+				} = this.filter;
+				return (status.map(t => t.name)).join(',')
 			},
 		},
 		watch: {
@@ -159,7 +163,7 @@
 			 */
 			ifReloadPageData: function(newVal) {
 				if (newVal) {
-					this.getPageList();
+					this.getPageList(this.checkId);
 				}
 			},
 			filter(val, oldVal) {
@@ -252,26 +256,30 @@
 
 				if (this.filter.status[0].id == 2) {
 					//进行中
-					tempArr = this.depList.filter(item => item.status == 2);
+					tempArr = this.depList.filter(item => item.completeDes == '进行中');
 				}
 
 				if (this.filter.status[0].id == 1) {
 					//已完成
-					tempArr = this.depList.filter(item => item.status != 2);
+					tempArr = this.depList.filter(item => item.completeDes == '已完成');
 				}
 
 				this.copiedDepList = tempArr.filter(item => item.deptName.indexOf(this.filter.keyword) != -1);
 			},
-			getPageList: function() {
+			getPageList: function(checkId) {
 				this.dispatch('planList', {
 					situationId: this.situationId
 				}).then((data) => {
 					if (data && data.length > 0) {
 						this.planList = data;
 						let checkArr = data.filter((item) => Number(item.status) === 2).sort((a, b) => a
-							.createTime - b.createTime);
-						this.checkId = checkArr ? checkArr[checkArr.length - 1].id :
-							data.length > 0 ? data[0].id : '';
+							.createTime - b.createTime);
+							
+						if(!checkId){
+							this.checkId = checkArr ? checkArr[checkArr.length - 1].id :
+								data.length > 0 ? data[0].id : '';
+						}
+						
 						this.getDepList();
 					}
 				});
@@ -310,6 +318,27 @@
 						this.depList = list;
 						this.copiedDepList = list;
 						this.showModalHandle(false);
+
+						let onloading = list.filter(item => item.completeDes == '进行中'); //进行中
+						let completed = list.filter(item => item.completeDes == '已完成'); //已完成
+
+						const arr = [{
+								id: 0,
+								name: '全部',
+								count: list.length
+							},
+							{
+								id: 1,
+								name: '已完成',
+								count: completed.length
+							},
+							{
+								id: 2,
+								name: '进行中',
+								count: onloading.length
+							}
+						];
+						this.selectables = [...arr]
 					}
 				});
 			},

pages/checkMainPoints/checkMainPoints.vue

@@ -373,7 +373,7 @@
  
 				if (!notNowBindPeopledeptIds.includes(this.deptId) || bool) {
 					const nowPermission = JSON.parse(uni.getStorageSync('nowPermission'));
-					// console.log(this.isBindResponsible,this.checkDetailMapResponses.length,nowPermission)
+					console.log(this.isBindResponsible,this.checkDetailMapResponses.length > 0,nowPermission);
 					if (!this.isBindResponsible && this.checkDetailMapResponses.length > 0 && nowPermission == 3) {
 						//当是否已绑定当事人状态为false,可查核项大于0且当前角色是查核组员时
 						//只有从查核列表进来才提示
@@ -396,12 +396,15 @@
 							}
 						});
 					}else{
-						uni.showModal({
-							title: '提示',
-							content: '你目前无法批量分配当事人',
-							confirmText: '确定',
-					        showCancel:false
-						});
+						if(!this.isBindResponsible){
+							//已绑定当事人不弹提示！
+							 uni.showModal({
+							 	title: '提示',
+							 	content: '你目前无法批量分配当事人',
+							 	confirmText: '确定',
+							     showCancel:false
+							 });
+						}
 					}
 				}
 			},

pages/editCheckList/editCheckList.vue

@@ -13,13 +13,13 @@
 					<view class="searchBtn" @click="searchHandle">搜索</view>
 				</view>
 			</view>
-		</view>
-	
+		</view>
+
 		<view class="check-map-list">
 			<scroll-view :class="[ifAllPlanListHasDistribution==true?'scroll-y noBottom':'scroll-y']" scroll-y="true"
 				v-if="checkList.length > 0">
 				<view class="item" v-for="(item, index) in copiedCheckList" :key="index">
-					<view v-if="item.finishedStatus != 1"
+					<view 
 						:class="{'checkPoint':true,checked:(checkedList.findIndex(t=>t.deptId == item.deptId) != -1)}"
 						@click="checkedHandle(item)">
 						<image class="innerImg" v-if="(checkedList.findIndex(t=>t.deptId == item.deptId) != -1)"
@@ -42,30 +42,28 @@
 					<view class="footer">
 						<view class="row" @click="checkEdit(item, index, '指派查核人员')">
 							<text class="label">查核人</text>
-							<view class="content">
+							<view class="labelVal">
 								<text :class="['base-text', item.empName ? 'black-color' : '']">
-									{{ item.empName?item.empName : '选择查核成员'}}
+									{{ item.empName?item.empName : '去选择查核成员'}}
 								</text>
 							</view>
-							<image class="arrow" src="/static/images/icon-more.png"></image>
 						</view>
 						<view class="row" @click="checkEdit(item, index, '设置查核时间')">
 							<text class="label">计划时间</text>
-							<view class="content">
+							<view class="labelVal">
 								<text :class="['base-text', item.startDate ? 'black-color' : '']">
 									{{ item.startDate ? item.startDate : '选择起始时间' }}
 								</text>
-								<text class="center-text">至</text>
+								<text class="center-text">~</text>
 								<text :class="['base-text', item.endDate ? 'black-color' : '']">
 									{{ item.endDate ? item.endDate : '选择结束时间' }}
 								</text>
 							</view>
-							<image class="arrow" src="/static/images/icon-more.png"></image>
 						</view>
 					</view>
 				</view>
 			</scroll-view>
-			<view class="null" v-else>暂无数据</view>
+			<view class="null" v-if="copiedCheckList.length==0||checkList.length == 0">暂无数据</view>
 			<view class="fixed-buttom-btn" @click="submit" v-if="multiple == 'true'">
 				<text class="btn-text">完成</text>
 			</view>
@@ -76,21 +74,22 @@
 				<view class="rightBtn" @click="bottomBtnClickHandle('right')">{{`（已选${checkedList.length}项）批量分配`}}
 				</view>
 			</view>
-		</view>
-		
-		<uni-popup ref="popup" type="bottom" :maskClick="true">
-			<view class="selectableList">
-				<scroll-view scroll-y="true" class="listWrap">
-					<view :class="getClass(v.id)" v-for="(v,i) in selectables" @click="listClickHandle(v)">{{v.name}}
-					</view>
-				</scroll-view>
-				<view class="btnGroup">
-					<view class="cancelBtn btn" @click="btnGroupClickHandle(false)">取消</view>
-					<view class="confirmBtn btn" @click="btnGroupClickHandle(true)">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-		
+		</view>
+
+		<uni-popup ref="popup" type="bottom" :maskClick="true">
+			<view class="selectableList">
+				<scroll-view scroll-y="true" class="listWrap">
+					<view :class="getClass(v.id)" v-for="(v,i) in selectables" @click="listClickHandle(v)">
+						{{`${v.name}(${v.count})`}}
+					</view>
+				</scroll-view>
+				<view class="btnGroup">
+					<view class="cancelBtn btn" @click="btnGroupClickHandle(false)">取消</view>
+					<view class="confirmBtn btn" @click="btnGroupClickHandle(true)">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
 	</view>
 </template>
 
@@ -125,13 +124,13 @@
 				} = this.filter;
 				return (status.map(t => t.name)).join(',')
 			},
-		},
-		watch:{
-			filter(val, oldVal) {
-				if (val.keyword.length == 0) {
-					this.searchHandle();
-				}
-			}
+		},
+		watch: {
+			filter(val, oldVal) {
+				if (val.keyword.length == 0) {
+					this.searchHandle();
+				}
+			}
 		},
 		data() {
 			return {
@@ -151,28 +150,37 @@
 				ifInit: null,
 				ifshowBottom: false,
 				checkedList: [], //批量选中的集合
-				ifCheckAll: false, //是否全选
-				copiedCheckList:[],
+				ifCheckAll: false, //是否全选
+				copiedCheckList: [],
 				ifclearSearch: false,
 				filter: {
 					keyword: '',
 					status: [{
 						name: '全部',
-						id: 0
+						id: 0,
+						count: 0
 					}]
-				},
-				selectables: [{
-						id: 0,
-						name: '全部'
-					},
-					{
-						id: 1,
-						name: '进行中'
+				},
+				selectables: [{
+						id: 0,
+						name: '全部',
+						count: 0
+					},
+					{
+						id: 1,
+						name: '进行中',
+						count: 0
+					},
+					{
+						id: 2,
+						name: '未分配',
+						count: 0
 					},
 					{
-						id: 2,
-						name: '未分配'
-					}
+						id: 3,
+						name: '已完成',
+						count: 0
+					}
 				]
 			};
 		},
@@ -292,35 +300,35 @@
 				}
 			},
 			listClickHandle(item) {
-					const _filter = this.filter;
-					const {
-						status
-					} = _filter;
-					const index = _filter.status.findIndex(t => t.id == item.id);
-
-					if (item.id == 0) {
-						//全部
-						this.filter = {
-							...this.filter,
-							status: [{
-								name: '全部',
-								id: 0
-							}]
-						};
-						return;
-					}
-					//去除全部选项选中
-					status.splice(_filter.status.findIndex(t => t.id == 0), 1);
+				const _filter = this.filter;
+				const {
+					status
+				} = _filter;
+				const index = _filter.status.findIndex(t => t.id == item.id);
+
+				if (item.id == 0) {
+					//全部
+					this.filter = {
+						...this.filter,
+						status: [{
+							name: '全部',
+							id: 0
+						}]
+					};
+					return;
+				}
+				//去除全部选项选中
+				status.splice(_filter.status.findIndex(t => t.id == 0), 1);
 
-					if (index != -1) {
-						status.splice(index, 1)
-					} else {
-						status.push({
-							name: item.name,
-							id: item.id
-						})
-					}
-					this.filter = _filter;
+				if (index != -1) {
+					status.splice(index, 1)
+				} else {
+					status.push({
+						name: item.name,
+						id: item.id
+					})
+				}
+				this.filter = _filter;
 			},
 			selecterHandle() {
 				this.$refs.popup.open();
@@ -332,19 +340,23 @@
 				};
 			},
 			searchHandle() {
-					let tempArr = this.checkList;
+				let tempArr = this.checkList;
 
-					if (this.filter.status[0].id == 1) {
-						//进行中
-						tempArr = this.checkList.filter(item => item.completeDes == '进行中');
-					}
+				if (this.filter.status[0].id == 1) {
+					//进行中
+					tempArr = this.checkList.filter(item => item.completeDes == '进行中');
+				}
 
-					if (this.filter.status[0].id == 2) {
-						//未分配
-						tempArr = this.checkList.filter(item => item.completeDes == '未分配');
-					}
+				if (this.filter.status[0].id == 2) {
+					//未分配
+					tempArr = this.checkList.filter(item => item.completeDes == '未分配');
+				}
+				if (this.filter.status[0].id == 3) {
+					//未分配
+					tempArr = this.checkList.filter(item => item.completeDes == '已完成');
+				}
 
-					this.copiedCheckList = tempArr.filter(item => item.deptName.indexOf(this.filter.keyword) != -1);
+				this.copiedCheckList = tempArr.filter(item => item.deptName.indexOf(this.filter.keyword) != -1);
 			},
 			batchCancelDistri() { //批量撤销
 				const _that = this;
@@ -573,7 +585,7 @@
 				}
 			},
 			// 获取查核列表
-			getCheckList(checkId, situationType) {
+			getCheckList(checkId, situationType) {
 				const that = this;
 				this.$store.dispatch({
 					type: 'editCheckList/commActions',
@@ -587,21 +599,43 @@
 						type: "commActions",
 						key: "getDateStr",
 					}).then((dateStr) => {
-						if (dateStr) {
-							const _data = data.map(item => {
-								if (item.endDate && moment(item.endDate)
-									.valueOf() < moment(dateStr).valueOf()) {
-									return {
-										...item,
-										completeState: true // true:说明计划已结束, 不能编辑查核人和计划时间
-									}
-								} else {
-									return item
-								}
-							});
-							//copiedCheckList用于搜索/筛选
-							that.copiedCheckList = _data;
-							
+						if (dateStr) {
+							const _data = data.map(item => {
+								if (item.endDate && moment(item.endDate)
+									.valueOf() < moment(dateStr).valueOf()) {
+									return {
+										...item,
+										completeState: true // true:说明计划已结束, 不能编辑查核人和计划时间
+									}
+								} else {
+									return item
+								}
+							});
+							//copiedCheckList用于搜索/筛选
+							that.copiedCheckList = _data;
+
+							this.selectables = [{
+									id: 0,
+									name: '全部',
+									count: _data.length
+								},
+								{
+									id: 1,
+									name: '进行中',
+									count: (_data.filter(item => item.completeDes == '进行中')).length
+								},
+								{
+									id: 2,
+									name: '未分配',
+									count: (_data.filter(item => item.completeDes == '未分配')).length
+								},
+								{
+									id: 3,
+									name: '已完成',
+									count: (_data.filter(item => item.completeDes == '已完成')).length
+								}
+							]
+
 							this.$store.commit({
 								type: 'editCheckList/comChangeState',
 								key: 'checkList',
@@ -632,67 +666,67 @@
 <style lang="less" scoped>
 	.editCheckList {
 		padding-top: 30rpx;
-	}
-	
-	.selectableList {
-		display: flex;
-		width: 100%;
-		flex-direction: column;
-		height: 50vh;
-		padding-top: 50rpx;
-		box-sizing: border-box;
-		border-radius: 25rpx 25rpx 0px 0px;
-		background-color: #FFFFFF;
-	
-		.listWrap {
-			height: calc(50vh - 75rpx);
-			overflow-y: scroll;
-	
-			.list {
-				height: 87.5rpx;
-				line-height: 87.5rpx;
-				text-align: center;
-				font-size: 30rpx;
-				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
-				font-weight: 400;
-				color: #8A8F99;
-	
-				&.on {
-					font-weight: 500;
-					color: #3377FF;
-				}
-			}
-		}
-	
-		.btnGroup {
-			display: flex;
-			width: 100%;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-	
-			.btn {
-				width: 50%;
-				height: 75rpx;
-				line-height: 75rpx;
-				text-align: center;
-				font-size: 22.5rpx;
-				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
-				font-weight: 400;
-				color: #3377FF;
-			}
-	
-			.cancelBtn {
-				border-top: 0.62rpx solid #DADEE6;
-			}
-	
-			.confirmBtn {
-				color: #FFFFFF;
-				background: #3377FF;
-			}
-		}
-	}
-	
+	}
+
+	.selectableList {
+		display: flex;
+		width: 100%;
+		flex-direction: column;
+		height: 50vh;
+		padding-top: 50rpx;
+		box-sizing: border-box;
+		border-radius: 25rpx 25rpx 0px 0px;
+		background-color: #FFFFFF;
+
+		.listWrap {
+			height: calc(50vh - 75rpx);
+			overflow-y: scroll;
+
+			.list {
+				height: 87.5rpx;
+				line-height: 87.5rpx;
+				text-align: center;
+				font-size: 30rpx;
+				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+				font-weight: 400;
+				color: #8A8F99;
+
+				&.on {
+					font-weight: 500;
+					color: #3377FF;
+				}
+			}
+		}
+
+		.btnGroup {
+			display: flex;
+			width: 100%;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+
+			.btn {
+				width: 50%;
+				height: 75rpx;
+				line-height: 75rpx;
+				text-align: center;
+				font-size: 22.5rpx;
+				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+				font-weight: 400;
+				color: #3377FF;
+			}
+
+			.cancelBtn {
+				border-top: 0.62rpx solid #DADEE6;
+			}
+
+			.confirmBtn {
+				color: #FFFFFF;
+				background: #3377FF;
+			}
+		}
+	}
+
 	.searchBar {
 		width: 93%;
 		margin: 0 auto;
@@ -741,7 +775,7 @@
 				align-items: center;
 				height: 70rpx;
 				padding-left: 25rpx;
-
+                border-radius: 5rpx;
 				.serachIcon {
 					width: 25rpx;
 					height: 25rpx;
@@ -784,26 +818,34 @@
 			}
 
 			.item {
-				position: relative;
-
-				.title-wrap {
+				position: relative;
+                border-radius: 5rpx;
+				.title-wrap {
+					padding-left:60rpx;
 					text {
 						white-space: nowrap;
 						text-overflow: ellipsis;
-						overflow: hidden;
+						overflow: hidden;
+						
 					}
 				}
 
-				.status {
+				.status {
+					position: absolute;
+					right: 0;
+					top:0;
 					display: flex;
 					justify-content: center;
-					width: 100rpx;
+					width: 110rpx;
 					height: 35rpx;
 					color: #FFFFFF;
 					text-align: center;
 					line-height: 35rpx;
-					border-radius: 20rpx;
-
+					// border-radius: 20rpx;
+                    background: url(../../static/white_statusbg.png);
+					background-size:35rpx;
+					background-repeat: no-repeat;
+				
 					&.noStart {
 						background-color: #eee;
 					}
@@ -821,7 +863,7 @@
 			.checkPoint {
 				position: absolute;
 				top: 30rpx;
-				right: 25rpx;
+				left: 25rpx;
 				width: 25rpx;
 				height: 25rpx;
 				z-index: 2;
@@ -851,16 +893,13 @@
 
 					.label {
 						color: #525866;
-						width: 100rpx;
 					}
 
-					.content {
+					.labelVal {
 						display: flex;
-						flex-direction: row;
+						flex-direction: row;
 						align-items: center;
-						flex: 1;
 						height: 100%;
-						padding: 0 25rpx;
 
 						.base-text {
 							flex: 1;
@@ -871,7 +910,7 @@
 						}
 
 						.center-text {
-							padding: 0 25rpx;
+							padding: 0 5rpx;
 							color: #292C33;
 						}
 
@@ -883,6 +922,9 @@
 					.arrow {
 						width: 12.5rpx;
 						height: 21.25rpx;
+					}
+					&:last-child {
+						border-top: none;
 					}
 				}
 			}

pages/home/home.vue

@@ -107,7 +107,7 @@
 			return {
 				ifshowVersionInfo:false,
 				showJournal: false,
-				version: '0.7.6',
+				version: '0.7.9',
 				versionData: {
 					versionNo: '',
 					versionId: '',

pages/login/login.vue

@@ -104,7 +104,7 @@
 				// #ifdef H5
 				  const hospSign = this.hospSign;
 				// #endif
-	
+	             
 				this.$store.dispatch({
 					type: 'login/commActions',
 					payload: {

pages/mainPointsDetail/mainPointsDetail.vue

@@ -8,7 +8,9 @@
 						<view v-for="item in checkItemResultList"
 							:class="[checkedSelectResultListIds.includes(item.id)?'list on':'list']" :key="item.id"
 							@click.stop="selectResultHandle(item)">
-							<image class="checkIcon" :src="`../../static/${!moreDeduction?'check-radio.png':'check-checkbox.png'}`" mode=""></image>
+							<image class="checkIcon"
+								:src="`../../static/${!moreDeduction?'check-radio.png':'check-checkbox.png'}`" mode="">
+							</image>
 							{{item.resultName}}
 						</view>
 					</scroll-view>
@@ -17,7 +19,9 @@
 						<view v-for="item in checkItemResultList"
 							:class="[checkedSelectResultListIds[currentEditTextAreaIndex]&&checkedSelectResultListIds[currentEditTextAreaIndex].includes(item.id)?'list on':'list']"
 							:key="item.id" @click.stop="selectResultHandle(item)">
-							<image class="checkIcon" :src="`../../static/${!moreDeduction?'check-radio.png':'check-checkbox.png'}`" mode=""></image>
+							<image class="checkIcon"
+								:src="`../../static/${!moreDeduction?'check-radio.png':'check-checkbox.png'}`" mode="">
+							</image>
 							{{item.resultName}}
 						</view>
 					</scroll-view>
@@ -95,10 +99,10 @@
 						</view>
 					</view>
 					<view class="inputScore">
-						<text class="label">本项扣分</text>
+						<text class="label">本项扣分</text>
 						<view class="textValue" v-if="!ifInputScore" @click='changeToInputScore'>{{deductPoint}}</view>
-						<input class="value" v-if="ifInputScore" @input="onInputScore" focus='true' auto-blur='true'  @blur='inputOnBlur' type="number" v-model="inputScore"
-						  placeholder-class="placeholder" />
+						<input class="value" v-if="ifInputScore" @input="onInputScore" focus='true' auto-blur='true'
+							@blur='inputOnBlur' type="number" v-model="inputScore" placeholder-class="placeholder" />
 					</view>
 				</view>
 			</view>
@@ -123,8 +127,7 @@
 								v-model="item.talkResult" @blur="changeTextarea($event, i)"></textarea>
 						</view>
 						<view class="talkImg" @click="imgClick(i)">
-							<tm-upload-img label="上传图片" :filePaths="item.filePath" :isMultiple="true"
-							    :pickIndex = "i"
+							<tm-upload-img label="上传图片" :filePaths="item.filePath" :isMultiple="true" :pickIndex="i"
 								@changeFilePaths="changeFilePaths2" />
 						</view>
 					</view>
@@ -193,12 +196,12 @@
 				checkPointId: "",
 				itemBelongGroup: [],
 				itemId: '',
-				currentEditTextAreaIndex:-1, //当前编辑的查核结果下标
+				currentEditTextAreaIndex: -1, //当前编辑的查核结果下标
 				checkItemResultList: [], //查核结果说明下拉列表
 				checkedSelectResultList: [], //下拉结果选中集合
 				checkedSelectResultListIds: [],
 				currentSelect: '',
-				checkItemScore:0, //查核选中的分数
+				checkItemScore: 0, //查核选中的分数
 				checkItemValue: null, //查核选中的分数占比
 				checkConfiglist: [], //查核情况可配置列表
 				totalScore: 0, //总分
@@ -211,9 +214,9 @@
 				checkedSelectResultListData: [],
 				multiSelectScore: [],
 				deductPoint: 0, //本次扣分
-				currentCheckedTab: null, //当前选中的查核tab
-				moreDeduction:false,  //缺陷项是否多选
-				ifInputScore:false,  //是否手动干预分值
+				currentCheckedTab: null, //当前选中的查核tab
+				moreDeduction: false, //缺陷项是否多选
+				ifInputScore: false, //是否手动干预分值
 			};
 		},
 		onShow() {
@@ -223,81 +226,85 @@
 			this.checkedResponsibleData = responsibleList.checkedResponsibleList;
 			this.checkedResponsibleList = responsibleList.checkedResponsibleList.map(item => item.main);
 		},
-		computed: {
-		},
+		computed: {},
 		watch: {
 			checkedResponsibleList: function() {
 				const {
 					responsibleList
 				} = this.$store.state;
 				return responsibleList.checkedResponsibleList.map(item => item.main);
-			},
-			selectedScore:function(newVal,oldVal){
-				  this.scoreCounter()
-			},
-			checkItemScore:function(newVal){
-				  this.scoreCounter()
-			},
-			deductPoint:function(newVal,oldVal){
-				   this.currentScore = this.totalScore - newVal
+			},
+			selectedScore: function(newVal, oldVal) {
+				this.scoreCounter()
+			},
+			checkItemScore: function(newVal) {
+				this.scoreCounter()
+			},
+			deductPoint: function(newVal, oldVal) {
+				this.currentScore = this.totalScore - newVal
 			}
 		},
 		mounted() {
 			this.checkTaskDetail(this.id);
 			this.getPeizhiList();
 
-		},
-		onBackPress() {
-			this.$store.commit('checkMainPoints/comChangeState', { //刷新前一页数据
-				key: 'ifReloadPageData',
-				data: true
-			});
 		},
-		methods: {
-			scoreCounter(){
-				if(this.inputScore){
-					this.deductPoint = Number(this.inputScore) + this.selectedScore
-				}else{
-					this.deductPoint = this.selectedScore + this.checkItemScore
-				}
-			},
-			changeToInputScore(){
-				this.ifInputScore = true;
-			},
-			inputOnBlur(){
-				this.ifInputScore = false;
-				// this.inputScore = null;
-			},
-			onInputScore(e) {
-				this.deductPoint = e.target.value;
+		onBackPress() {
+			this.$store.commit('checkMainPoints/comChangeState', { //刷新前一页数据
+				key: 'ifReloadPageData',
+				data: true
+			});
+		},
+		methods: {
+			scoreCounter() {
+				if(this.checkItemValue == -1){
+					//清空分数
+					this.deductPoint = 0;
+					return
+				}
+				if (this.inputScore) {
+					this.deductPoint = Number(this.inputScore) + this.selectedScore
+				} else {
+					this.deductPoint = this.selectedScore + this.checkItemValue
+				}
+			},
+			changeToInputScore() {
+				this.ifInputScore = true;
+			},
+			inputOnBlur() {
+				this.ifInputScore = false;
+				// this.inputScore = null;
+			},
+			onInputScore(e) {
+				this.deductPoint = e.target.value;
 			},
 			//查核结果清空操作
 			clearResult(ifMulti, index) {
 				if (ifMulti) {
 					//多个查核结果组件时	
-					this.talkList[index].talkResult = '';
-					if(this.multiSelectScore[index]){
-						    this.selectedScore = this.selectedScore - this.multiSelectScore[index];
+					this.talkList[index].talkResult = '';
+					if (this.multiSelectScore[index]) {
+						this.selectedScore = this.selectedScore - this.multiSelectScore[index];
 					}
 					this.checkedSelectResultListIds.splice(index, 1, []);
 					this.checkedSelectResultList.splice(index, 1, []);
-					this.checkedSelectResultListData.splice(index, 1, []);
-					this.multiSelectScore[index] = 0;
-					this.currentEditTextAreaIndex = -1;
-					
-                    
-				} else {
-					
+					this.checkedSelectResultListData.splice(index, 1, []);
+					this.multiSelectScore[index] = 0;
+					this.currentEditTextAreaIndex = -1;
+
+
+				} else {
+
 					this.recordList[0].seeResult = '';
 					this.checkedSelectResultListIds = [];
 					this.checkedSelectResultList = [];
-					this.checkedSelectResultListData = [];
+					this.checkedSelectResultListData = [];
 					this.selectedScore = 0;
-				}
-				
+				}
+
 			},
 			clickModalhandle() {
-				this.showSelectModal = false;
+				this.showSelectModal = false;
 				this.currentEditTextAreaIndex = -1;
 			},
 			openSelectModal(index) {
@@ -315,16 +322,16 @@
 			selectResultHandle(item) {
 
 				if (this.data.checkModelName == '访谈') {
-					const currentIndex = this.currentEditTextAreaIndex;
-					if(!this.moreDeduction){
-						 //缺陷项单选
-						 this.checkedSelectResultListIds.splice(currentIndex, 1,[item.id]);
-						 this.checkedSelectResultList.splice(currentIndex, 1, [item.resultName]);
-						 this.checkedSelectResultListData.splice(currentIndex, 1, [item]);
-						 
-						 return ;
-					} 
-					
+					const currentIndex = this.currentEditTextAreaIndex;
+					if (!this.moreDeduction) {
+						//缺陷项单选
+						this.checkedSelectResultListIds.splice(currentIndex, 1, [item.id]);
+						this.checkedSelectResultList.splice(currentIndex, 1, [item.resultName]);
+						this.checkedSelectResultListData.splice(currentIndex, 1, [item]);
+
+						return;
+					}
+
 					if (this.checkedSelectResultListIds[currentIndex] && this.checkedSelectResultListIds[currentIndex]
 						.includes(item.id)) {
 
@@ -355,14 +362,14 @@
 						this.checkedSelectResultList.splice(currentIndex, 1, tempArr);
 						this.checkedSelectResultListData.splice(currentIndex, 1, tempArrData);
 					}
-				} else {
-					if(!this.moreDeduction){
-						 //缺陷项单选
-						 this.checkedSelectResultListIds = [item.id];
-						 this.checkedSelectResultList = [item.resultName];
-						 this.checkedSelectResultListData = [item];
-						 return ;
-					} 
+				} else {
+					if (!this.moreDeduction) {
+						//缺陷项单选
+						this.checkedSelectResultListIds = [item.id];
+						this.checkedSelectResultList = [item.resultName];
+						this.checkedSelectResultListData = [item];
+						return;
+					}
 					// 缺陷项多选
 					if (this.checkedSelectResultListIds.includes(item.id)) {
 						const tempIdsArr = this.checkedSelectResultListIds;
@@ -370,7 +377,7 @@
 						const tempArrData = this.checkedSelectResultListData;
 						tempIdsArr.splice(tempIdsArr.indexOf(item.id), 1);
 						tempArr.splice(tempArr.indexOf(item.resultName), 1);
-						tempArrData.splice(tempArrData.findIndex(t=>t.id == item.id), 1);
+						tempArrData.splice(tempArrData.findIndex(t => t.id == item.id), 1);
 						this.checkedSelectResultListIds = tempIdsArr;
 						this.checkedSelectResultList = tempArr;
 						this.checkedSelectResultListData = tempArrData;
@@ -384,8 +391,8 @@
 			commitSelectResult() {
 
 				const _commitFunc = () => {
-					if (this.data.checkModelName == '访谈') {
-	
+					if (this.data.checkModelName == '访谈') {
+
 						const tempArr = this.checkedSelectResultListData[this.currentEditTextAreaIndex].map(item =>
 							item.percentScore);
 						const tempScore = tempArr.reduce((prev, cur) => {
@@ -395,10 +402,10 @@
 						this.talkList[this.currentEditTextAreaIndex].talkResult = this.checkedSelectResultList[this
 							.currentEditTextAreaIndex].join(',');
 						this.multiSelectScore[this.currentEditTextAreaIndex] = tempScore;
-						this.selectedScore = this.multiSelectScore.reduce((prev, cur) => (prev + cur), 0);
-						
-					} else {
-				
+						this.selectedScore = this.multiSelectScore.reduce((prev, cur) => (prev + cur), 0);
+
+					} else {
+
 						const tempArr = this.checkedSelectResultListData.map(item => item.percentScore);
 						const tempScore = tempArr.reduce((prev, cur) => {
 							return prev + cur;
@@ -419,11 +426,11 @@
 							id: id,
 						},
 					},
-				}).then((res) => {
-				    uni.$once('未在查核规定时间内', function (data) {
-						  uni.navigateBack();
-					});
-					
+				}).then((res) => {
+					uni.$once('未在查核规定时间内', function(data) {
+						uni.navigateBack();
+					});
+
 					this.id = id;
 					this.deptId = res.deptId;
 					//再次编辑回显
@@ -432,8 +439,8 @@
 						.split(',') : [];
 					this.Index = res.checkResult;
 					this.totalScore = res.totalScore;
-					this.currentScore = res.score;
-					this.deductPoint = res.deductPoint;
+					this.currentScore = res.checkResult ? res.score : res.totalScore;
+					this.deductPoint = res.deductPoint;
 					this.moreDeduction = res.moreDeduction;
 					if (res.checkResultRequestList && res.checkResultRequestList.length > 0) {
 						if (res.checkModelName == '访谈') {
@@ -453,7 +460,7 @@
 									tempResult.map(item => item.id));
 								const tempArr = this.checkedSelectResultList[currentIndex].concat(
 									tempResult.map(item => item.resultName));
-								
+
 
 								this.checkedSelectResultListIds.splice(currentIndex, 1, tempIdsArr);
 								this.checkedSelectResultList.splice(currentIndex, 1, tempArr);
@@ -484,11 +491,13 @@
 							this.recordList[0].seeResult = res.checkResultRequestList[0].checkResultDescribe;
 							this.checkedSelectResultListIds = tempIds;
 							this.checkedSelectResultList = res.checkResultRequestList[0].checkResultDescribe.split(
-								',');
-								
-							this.checkedSelectResultListData = tempResult;
-							
-							console.log({tempResult});
+								',');
+
+							this.checkedSelectResultListData = tempResult;
+
+							console.log({
+								tempResult
+							});
 							// this.selectedScore = tempScore;
 
 						}
@@ -545,23 +554,30 @@
 				this.currentCheckedTab = data;
 				this.Index = parsedData.attr;
 				this.data.checkResult = parsedData.attr;
+
+
 				this.checkItemScore = parsedData.itemGetScore;
 				this.checkItemValue = parsedData.value;
-				this.calScore = parsedData.calScore;
-				if (!this.inputScore) {   //没有手输调整过的才可以修改
-					this.checkItemScore = parsedData.itemGetScore; 
-				}
+				this.calScore = parsedData.calScore;
+				
+				if (!this.inputScore) { //没有手输调整过的才可以修改
+					this.checkItemScore = parsedData.itemGetScore;
+				}
+
 
-			},
-			/**
-			 * @param {{
-				 files
-				 index,
-			 }} fileInfo
-			 files：文件集合
-			 index:当前编辑的下标
+			},
+			/**
+			 * @param {{
+				 files
+				 index,
+			 }} fileInfo
+			 files：文件集合
+			 index:当前编辑的下标
 			 */
-			changeFilePaths({files, index}) {
+			changeFilePaths({
+				files,
+				index
+			}) {
 				let _recordList = [...this.recordList];
 				_recordList[index].filePath = files;
 				this.filePath = _recordList[0].filePath;
@@ -578,27 +594,30 @@
 			},
 			del(index) {
 				let list = [...this.talkList];
-				let list2 = [];
-			    //清空该项数据
-				this.clearResult(true,index);
-				
+				let list2 = [];
+				//清空该项数据
+				this.clearResult(true, index);
+
 				for (let i = 0; i < list.length; i++) {
 					if (i != index) {
 						list2.push(list[i]);
 					}
 				}
 				this.talkList = list2;
-			},
-			/**
-			 * @param {{
-				 files
-				 index,
-			 }} fileInfo
-			 files：文件集合
-			 index:当前编辑的下标
+			},
+			/**
+			 * @param {{
+				 files
+				 index,
+			 }} fileInfo
+			 files：文件集合
+			 index:当前编辑的下标
 			 */
-			changeFilePaths2(fileInfo) {
-				const {files,index} = fileInfo;
+			changeFilePaths2(fileInfo) {
+				const {
+					files,
+					index
+				} = fileInfo;
 				for (let j = 0; j < this.talkList.length; j++) {
 					this.talkList[index].filePath = files;
 				}
@@ -614,160 +633,158 @@
 			imgClick(i) {
 				this.editIndex = i;
 			},
-			sureDetail(key) {
-				console.log('commit check');
-				return new Promise((resolve)=>{
-					     const _commitCheck = () => {
-							 try{
-								   if (this.Index) {
-								   	let params = {
-								   		id: this.data.id,
-								   		checkResult: this.data.checkResult,
-								   		checkResultRequestList:[],
-								   		checkItemScore: this.checkItemScore,
-								   		value: this.checkItemValue,
-								   		situationType: this.situationType,
-								   		calScore: this.calScore,
-								   		score: this.currentScore,
-								   		deductPoint: this.deductPoint,
-								   	};
-									
-									console.log({params});
-										   					     				     
-								   	if (this.data.checkModelName == "访谈") {
-								   		let list = [];
-								   		for (let i = 0; i < this.talkList.length; i++) {
-								   			let path = "";
-								   			for (let j = 0; j < this.talkList[i].filePath.length; j++) {
-								   				if (j == 0) {
-								   					path += `${this.talkList[i].filePath[j]}`;
-								   				} else {
-								   					path += `,${this.talkList[i].filePath[j]}`;
-								   				}
-								   			}
-								   			let item = {
-								   				checkResultId: i,
-								   				checkResultDescribe: this.talkList[i].talkResult,
-								   				checkResultUrl: path,
-								   			};
-								   					     
-								   			list.push(item);
-								   		}
-								   		params.checkResultRequestList = list;
-								   	} else {
-								   		
-								   		let item = {
-								   			checkResultId: 1,
-								   			checkResultDescribe: this.recordList[0].seeResult,
-								   			checkResultUrl: this.filePath.join(','),
-								   		};
-								   					     
-								   		params.checkResultRequestList = [item];
-								   	}
-								   	const checkConfiglist = JSON.parse(JSON.stringify(this.checkConfiglist));
-								
-								   	this.$store.dispatch({
-								   		type: "mainPointsDetail/commActions",
-								   		payload: {
-								   			key: "saveCheckTaskDetail",
-								   			data: {
-								   				...params,
-								   			},
-								   		},
-								   	}).then((res) => {
-								   		if (res) {
-								   			resolve(true);
-											// console.log({checkConfiglist,params});
-								   			for (let i = 0; i < checkConfiglist.length; i++) {
-
-								   				if (
-								   					checkConfiglist[i].attr == params.checkResult &&
-								   					(checkConfiglist[i].resultType == 2 ||
-								   						checkConfiglist[i].resultType == 3)
-								   				) {
-													//当主要缺失和次要缺失时发起改善任务
-								   					console.log('开始提交改善前准备');
-								   				
-								   					let param = {
-								   						situationId: this.data.situationId,
-								   						situationName: this.data.situationName,
-								   						checkGroupId: this.data.checkGroupId,
-								   						checkGroupName: this.data.checkGroupName,
-								   						checkItemId: this.data.checkItemId,
-								   						checkItemName: this.data.checkItemName,
-								   						checkPointId: this.data.checkPointId,
-								   						checkPointName: this.data.checkPointName,
-								   						deptName: this.data.deptName,
-								   						deptId: this.data.deptId,
-								   						appointFlag: false,
-								   						desicion: 0,
-								   						taskType: "1",
-								   						checkId: this.data.checkId,
-								   						checkResult: 0,
-								   						newResultType: checkConfiglist[i].resultType,
-								   						// checkResult: this.resultConfigList[i].id,
-								   						receiveEmpId: this.data.receiveEmpId,
-								   						receiveEmpName: this.data.receiveEmpName,
-								   						checkDetailId: this.data.id,
-								   					};
-								   					     
-								   					this.$store.dispatch({
-								   						type: "mission/commActions",
-								   						payload: {
-								   							key: "comTaskCirculation",
-								   							data: {
-								   								...param,
-								   							},
-								   						},
-								   					});
-								   				} else {
-								   					console.log('改善条件为false');
-								   				}
-								   			}
-								   					     
-								   			if (key == 'back') {
-								   				//点完成时返回
-								   				this.$store.commit('checkMainPoints/comChangeState', {
-								   					'key': 'ifUpdate',
-								   					'data': true
-								   				});
-								   				_goBackFresh('pages/checkMainPoints/checkMainPoints');
-								   			}
-								   		} else {
-								   			console.log('res为false');
-								   			resolve(false);
-								   		}
-								   	});
-								   } else {
-									   uni.showToast({
-										title: '请先选择查核结果！',
-										duration: 2000,
-										icon: 'none'
-									   });
-								   	resolve(false);
-								   }
-							 }catch(err){
-								 resolve(err);
-							 }     
-					     }
-					     
-					     if(this.data.checkResult == '无缺失'&&this.deductPoint != 0){
-					     	//查核结果为‘无缺失’且扣分为非0
-					     	uni.showModal({
-					     	    title: '提示',
-					     	    content: `当前选择无缺失结果，但扣分数为${this.deductPoint}，确认继续提交么？`,
-					     	    success: function (res) {
-					     	        if (res.confirm) {
-					     	            _commitCheck();
-					     	        } else if (res.cancel) {
-					     	            console.log('用户点击取消操作');
-										resolve(false);
-					     	        }
-					     	    }
-					     	});
-					     }else{
-							 _commitCheck();
-						 }
+			sureDetail(key) {
+				console.log('commit check');
+				return new Promise((resolve) => {
+					const _commitCheck = () => {
+						try {
+							if (this.Index) {
+								let params = {
+									id: this.data.id,
+									checkResult: this.data.checkResult,
+									checkResultRequestList: [],
+									checkItemScore: this.checkItemScore,
+									value: this.checkItemValue,
+									situationType: this.situationType,
+									calScore: this.calScore,
+									score: this.currentScore,
+									deductPoint: this.deductPoint,
+								};
+
+								if (this.data.checkModelName == "访谈") {
+									let list = [];
+									for (let i = 0; i < this.talkList.length; i++) {
+										let path = "";
+										for (let j = 0; j < this.talkList[i].filePath.length; j++) {
+											if (j == 0) {
+												path += `${this.talkList[i].filePath[j]}`;
+											} else {
+												path += `,${this.talkList[i].filePath[j]}`;
+											}
+										}
+										let item = {
+											checkResultId: i,
+											checkResultDescribe: this.talkList[i].talkResult,
+											checkResultUrl: path,
+										};
+
+										list.push(item);
+									}
+									params.checkResultRequestList = list;
+								} else {
+
+									let item = {
+										checkResultId: 1,
+										checkResultDescribe: this.recordList[0].seeResult,
+										checkResultUrl: this.filePath.join(','),
+									};
+
+									params.checkResultRequestList = [item];
+								}
+								const checkConfiglist = JSON.parse(JSON.stringify(this.checkConfiglist));
+
+								this.$store.dispatch({
+									type: "mainPointsDetail/commActions",
+									payload: {
+										key: "saveCheckTaskDetail",
+										data: {
+											...params,
+										},
+									},
+								}).then((res) => {
+									if (res) {
+										resolve(true);
+										// console.log({checkConfiglist,params});
+										for (let i = 0; i < checkConfiglist.length; i++) {
+
+											if (
+												checkConfiglist[i].attr == params.checkResult &&
+												(checkConfiglist[i].resultType == 2 ||
+													checkConfiglist[i].resultType == 3)
+											) {
+												//当主要缺失和次要缺失时发起改善任务
+												console.log('开始提交改善前准备');
+
+												let param = {
+													situationId: this.data.situationId,
+													situationName: this.data.situationName,
+													checkGroupId: this.data.checkGroupId,
+													checkGroupName: this.data.checkGroupName,
+													checkItemId: this.data.checkItemId,
+													checkItemName: this.data.checkItemName,
+													checkPointId: this.data.checkPointId,
+													checkPointName: this.data.checkPointName,
+													deptName: this.data.deptName,
+													deptId: this.data.deptId,
+													appointFlag: false,
+													desicion: 0,
+													taskType: "1",
+													checkId: this.data.checkId,
+													checkResult: 0,
+													newResultType: checkConfiglist[i].resultType,
+													// checkResult: this.resultConfigList[i].id,
+													receiveEmpId: this.data.receiveEmpId,
+													receiveEmpName: this.data.receiveEmpName,
+													checkDetailId: this.data.id,
+												};
+
+												this.$store.dispatch({
+													type: "mission/commActions",
+													payload: {
+														key: "comTaskCirculation",
+														data: {
+															...param,
+														},
+													},
+												});
+											} else {
+												console.log('改善条件为false');
+											}
+										}
+
+										if (key == 'back') {
+											//点完成时返回
+											this.$store.commit('checkMainPoints/comChangeState', {
+												'key': 'ifUpdate',
+												'data': true
+											});
+											_goBackFresh('pages/checkMainPoints/checkMainPoints');
+										}
+									} else {
+										console.log('res为false');
+										resolve(false);
+									}
+								});
+							} else {
+								uni.showToast({
+									title: '请先选择查核结果！',
+									duration: 2000,
+									icon: 'none'
+								});
+								resolve(false);
+							}
+						} catch (err) {
+							resolve(err);
+						}
+					}
+
+					if (this.data.checkResult == '无缺失' && this.deductPoint != 0) {
+						//查核结果为‘无缺失’且扣分为非0
+						uni.showModal({
+							title: '提示',
+							content: `当前选择无缺失结果，但扣分数为${this.deductPoint}，确认继续提交么？`,
+							success: function(res) {
+								if (res.confirm) {
+									_commitCheck();
+								} else if (res.cancel) {
+									console.log('用户点击取消操作');
+									resolve(false);
+								}
+							}
+						});
+					} else {
+						_commitCheck();
+					}
 				})
 			},
 			toTuLi() {
@@ -799,10 +816,10 @@
 						}
 					}
 				});
-			
+
 
 			},
-			clearForm(index) {
+			clearForm(index) {
 				//清除上一项的查核信息
 				this.Index = '';
 				// this.deductPoint = 0;
@@ -818,8 +835,8 @@
 					}
 
 				} else {
-					this.recordList[0].talkResult = '';
-	
+					this.recordList[0].talkResult = '';
+
 				}
 				this.checkedSelectResultListIds = [];
 				this.checkedSelectResultList = [];
@@ -837,40 +854,40 @@
 					});
 					return;
 				}
-				const result = await this.sureDetail();
-		
-				if(result){
-					  let current = this.itemBelongGroup.filter(item => {
-					  	return item.id == this.id;
-					  });
-					  if (num < 0) {
-					  	if (current[0].index == 0) {
-					  		uni.showToast({
-					  			title: '已经没有上一项',
-					  			duration: 2000,
-					  			icon: 'none'
-					  		});
-					  		return;
-					  	}
-					  }
-					  if (num > 0) {
-					  	if (current[0].index == this.itemBelongGroup.length - 1) {
-					  		uni.showToast({
-					  			title: '已经没有下一项',
-					  			duration: 2000,
-					  			icon: 'none'
-					  		});
-					  		return;
-					  	}
-					  }
-					  let needItemIndex = num > 0 ? current[0].index + 1 : current[0].index - 1;
-					  let needItemId = this.itemBelongGroup[needItemIndex].id;
-					  let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
-					
-					  this.clearForm();
-					  this.clearResult();
-					  this.checkTaskDetail(needItemId);
-					  this.getCheckItemResultList(needItemCheckId); //获取缺陷项列表数据
+				const result = await this.sureDetail();
+
+				if (result) {
+					let current = this.itemBelongGroup.filter(item => {
+						return item.id == this.id;
+					});
+					if (num < 0) {
+						if (current[0].index == 0) {
+							uni.showToast({
+								title: '已经没有上一项',
+								duration: 2000,
+								icon: 'none'
+							});
+							return;
+						}
+					}
+					if (num > 0) {
+						if (current[0].index == this.itemBelongGroup.length - 1) {
+							uni.showToast({
+								title: '已经没有下一项',
+								duration: 2000,
+								icon: 'none'
+							});
+							return;
+						}
+					}
+					let needItemIndex = num > 0 ? current[0].index + 1 : current[0].index - 1;
+					let needItemId = this.itemBelongGroup[needItemIndex].id;
+					let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
+
+					this.clearForm();
+					this.clearResult();
+					this.checkTaskDetail(needItemId);
+					this.getCheckItemResultList(needItemCheckId); //获取缺陷项列表数据
 				};
 			},
 			// 获取查核项可配置列表
@@ -906,7 +923,7 @@
 		}) {
 			this.id = id;
 			this.checkPointId = checkPointId;
-			this.situationType = situationType;
+			this.situationType = situationType;
 			this.checkItemId = checkItemId;
 			this.getCheckConfigList(checkItemId);
 			this.getCheckItemResultList(checkItemId);
@@ -915,12 +932,12 @@
 			const eventChannel = this.getOpenerEventChannel();
 			eventChannel.on('acceptDataFromOpenerPage', (data) => {
 				// console.log({data});
-				this.itemBelongGroup = data.data[0].responseList.map((item, index) => {
-					
+				this.itemBelongGroup = data.data[0].responseList.map((item, index) => {
+
 					return ({
 						index: index,
-						id: item['id'],
-						checkItemId:item['checkItemId']
+						id: item['id'],
+						checkItemId: item['checkItemId']
 					})
 				});
 				//重新导航进页面，删除缓存并设置最新数据
@@ -1199,8 +1216,8 @@
 							font-weight: 400;
 							color: #525866;
 							margin-right: 105rpx;
-						}
-					
+						}
+
 						.value {
 							flex: 0.9;
 							font-size: 22.5rpx;
@@ -1261,15 +1278,15 @@
 							color: #3377FF;
 						}
 					}
-				}
-				
-				.textValue {
-					display: flex;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: center;
-					width: 70%;
-					height: 100%;
+				}
+
+				.textValue {
+					display: flex;
+					flex-direction: row;
+					justify-content: flex-start;
+					align-items: center;
+					width: 70%;
+					height: 100%;
 				}
 
 				.inputScore {

pages/mission-action/components/disagree.vue

@@ -74,6 +74,15 @@
         this.value = e.detail.value;
       },
       sure() {
+		if(this.value.length<2){
+			//限制最小输入内容
+			uni.showModal({
+			    title: '提示',
+				showCancel:false,
+			    content: '请输入原因，至少2个字符以上！'
+			});
+			return;
+		}
         const { params } = this.btnInfo;
         let requestParams = {};
         this.btnInfo.params.map(item => {

pages/mission-action/components/pdca-components/do-and-check.vue

@@ -19,7 +19,7 @@
 							<text>过程记录</text>
 						</view>
 						<view class="content">
-							<textarea class="textarea" :key="type" placeholder="请输入" placeholder-style="color: #B8BECC"
+							<textarea class="textarea" :key="type" :placeholder="placeholder" placeholder-style="color: #B8BECC"
 								:maxlength="500" auto-height :value="item.record" :disabled="disabled"
 								@input="changeRecord($event, i)" />
 						</view>
@@ -79,6 +79,11 @@
 					}]
 				}
 			},
+		},
+		computed:{
+			placeholder(){
+				return this.type === 'do' ? '**具体实施方式，What项目+When时间+Where地点+Who负责人+How如何做' : '**根据目标/对策/方案/计划检测执行成果，以图来呈现，须有具体数据做比'
+			},
 		},
 		methods: {
 			// 过程记录变化

pages/mission-action/components/pdca-components/one-textarea.vue

@@ -8,8 +8,8 @@
 				<text>{{ label }}</text>
 			</view>
 			<view class="content">
-				<textarea class="textarea" :key="title" placeholder="请输入" placeholder-style="color: #B8BECC"
-					:maxlength="500" auto-height :value="defaultValue" :disabled="disabled" @input="changeVal" />
+				<textarea class="textarea" :key="title" :placeholder="placeholder" placeholder-style="color: #B8BECC"
+					:maxlength="500"  :value="defaultValue" :disabled="disabled" @input="changeVal" />
 			</view>
 		</view>
 		<!-- <view class="bottomBtn" @click="goToPrevPage" v-if="disabled">返回改善任务详情</view> -->
@@ -39,8 +39,13 @@
 		},
 		computed: {
 			// 多行文本框标题
-			title() {
-				return this.type === 'plan' ? '改善计划（Plan）' : '对策处置（Action）'
+			title() {
+				
+				// return this.type === 'plan' ? '改善计划（Plan）' : '对策处置（Action）'
+				return ''
+			},
+			placeholder(){
+				return this.type === 'plan' ? '**根据原因分析及改善目标拟定几个对策/方案/计划' : '**1.有效实施改善后将执行方式纳入标准规范内。       2.有些残余的问题是否需要在第二轮PDCA中改善。'
 			},
 			// 多行文本框子标题
 			label() {

pages/mission-action/components/write-back.vue

@@ -87,7 +87,8 @@
 				this.filePath = files;
 			},
 			sure() {
-				let requestParams = {};
+				let requestParams = {};
+				let _value = this.value;
 				this.btnInfo.params.map(item => {
 					if (item.valueKey) {
 						requestParams[item.paramsKey] = (
@@ -104,13 +105,17 @@
 								break;
 							case 'textarea': // 回复内容
 								requestParams[item.paramsKey] = this.value;
+								break;
+							case 'approveReason': // 单位负责人改善回复内容
+								requestParams[item.paramsKey] = this.value;
 								break;
 							default:
 								requestParams[item.paramsKey] = '';
 								break;
 						}
 					}
-				});
+				});
+	
 				this.$emit('comRequest', requestParams);
 			}
 		}

pages/mission-details/mission-details.vue

@@ -28,7 +28,8 @@
 									</view>
 								</view>
 								<template v-if="getContext(item, true, 'selectDetails')">
-									<view class="link-view"
+									<view class="link-view"
+									    v-if="ifShowStepLinkBtn(item,i)" 
 										@click="goToDetails(item, getContext(item, true, 'selectDetails'))">
 										<text>{{ getContext(item, true, 'selectDetails').name }}</text>
 										<image class="blue-arr" src="/static/blue-arrow.png"></image>
@@ -78,14 +79,16 @@
 					pfmTaskCirculationList,
 					taskType,
 					checkResult
-				} = this.missionDetails;
+				} = this.missionDetails;
+	
 				if (buttonDisplayFlag == 1 && pfmTaskCirculationList && pfmTaskCirculationList.length > 0) {
 					let task = null;
 					if (taskType == 1 || taskType == 3) { // 状态为1, 和3比较特殊,需要再比较checkResult
 						task = taskTypeList.find(item => (item.taskType == taskType && item.checkResult == checkResult));
 					} else {
 						task = taskTypeList.find(item => item.taskType == taskType);
-					}
+					}
+					console.log({task});
 					return task ? task.btnList : []
 				} else {
 					return [];
@@ -113,13 +116,16 @@
 		created() {
 			this.getMissionDetails();
 		},
-		methods: {
+		methods: {
+			ifShowStepLinkBtn(item,i){
+				//当为改善回复且已完成且是最后一步时不展示
+				return !(this.missionDetails.endFlag == true && this.missionDetails.checkResult == 2 && i == (this.missionDetails.pfmTaskCirculationList.length) - 1)
+			},
 			goBack() {
 				//解决page页面栈的重复，同伙返回道该页面
 				const pages = getCurrentPages();
 				for(let i = pages.length - 1;i>=0;i--){
 					if(pages[i].route != pages[pages.length - 1].route){
-						  console.log({i});
 						  uni.navigateBack({
 						      delta:(pages.length - 1) - i 
 						  });
@@ -227,7 +233,8 @@
 			 *  @param {Boolean} isLink 是否需要跳转页面（查看详情）
 			 *  @param {String} rowKey 任务流程中的key
 			 */
-			getContext(obj, isLink, rowKey) {
+			getContext(obj, isLink, rowKey) {
+				
 				let currentTypeTask = null;
 				if (obj.taskType == 1) {
 					const {

pages/mission/components/list-item.vue

@@ -8,7 +8,8 @@
 				<view v-show="!isDetails" :class="['bg-box', isComplete ? 'disabled-bg' : 'hight-bg']">
 					<text>{{isComplete ? '改善结案' : '改善中'}}</text>
 				</view>
-	    	<text class="title">{{ task.checkPointName }}</text>
+			<text class="title">{{ task.checkItemName }}</text>
+	    	<text class="subtitle">{{ task.checkPointName }}</text>
 	    	<view class="row">
 	    		<view class="col">
 	    			<image class="com-icon" src="/static/search-icon.png"></image>
@@ -81,7 +82,7 @@
 			position: relative;
 			display: flex;
 			flex-direction: column;
-			height: 203.75rpx;
+			height: 240.75rpx;
 			background-color: #fff;
 			padding: 0 25rpx;
 
@@ -95,12 +96,19 @@
 			}
 
 			.title {
-				line-height: 25rpx;
+				width: 100%;
 				font-size: 25rpx;
 				font-weight: bold;
 				color: #292C33;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow-x: hidden;
+			}
+            .subtitle {
+				font-size: 12px;
+				color: #666F80;
+				margin:10rpx 0;
 			}
-
 			.row {
 				display: flex;
 				align-items: center;

pages/mission/mission.vue

@@ -95,26 +95,21 @@
 			}
 		},
 		created() {
-			// this.getMissionList();
 			this.init(true);
 			this.refTimer = setInterval(() => {
 			    this.isInitWs = websocket.ws ? false : true;
 			    this.init(this.isInitWs);
 			}, 3 * 60 * 1000);
-			// this.messStatus();
+		},
+		onShow() {
+			this.init(true);
 		},
 		beforeDestroy() {
 		    // 关闭ws连接
 		    websocket.close();
 		    clearInterval(this.refTimer);
-		  },
-		  // watch:{
-		  // 	  "$route":{
-		  // 		  handler(route){
-		  // 			  this.messStatus();
-		  // 		  }
-		  // 	  }
-		  // },
+		},
+
 		methods: {
 			toggleBtn() {
 				let flag = !this.showCloseList;

pages/responsibleList/responsibleList.vue

@@ -32,7 +32,7 @@
 	export default {
 		data() {
 			return {
-				currentTabIndex:0,
+				currentTabIndex:1,
 				checkedResponsibleListTemp:[],
 				checkedResponsibleListTemp_all:[],
 				checkedResponsibleListTemp_dept:[],
@@ -51,6 +51,7 @@
 			this.deptIdTemp = deptId;
 			this.isFromCheckMainPoints = isFromCheckMainPoints;
 			if(checkId)this.checkId = checkId
+			this.tabClick(this.currentTabIndex);
 		},
 		onShow() {
 			const {responsibleList} = this.$store.state;
@@ -78,7 +79,7 @@
 						});
 					}
 				});
-		},
+		}, 
 		onUnload(){
 			this.checkedResponsibleList=[];
 		},

utils/requestUrl.js

@@ -11,8 +11,8 @@
 export const networkType = 1; //网络类型：内网=0，外网=1
 
 // export const URL = '192.168.50.190:8801/imed/pfm/'; // 本地
-export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
-// export const URL = '118.31.245.65:8802/imed/pfm/'; //线上
+// export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
+export const URL = '118.31.245.65:8802/imed/pfm/'; //线上
 // export const URL = '112.12.21.134:8111/imed/pfm/'; //横店
 
 // export const URL = '192.168.1.253:8111/imed/pfm/';