v0.8.6

1、新增新快捷查核功能，顺序执行【下一步】功能
2、优化普通情境单位任务明细页筛选功能
3、增加自查督查中定性结果按code进行操作，包括回显、保存、改善任务支持后端作废

manifest.json

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

pages/checkMainPoints/checkMainPoints.vue

@@ -66,7 +66,7 @@
 				  	<view class="filterBtnWrap" :style="{paddingBottom:i==2?'20px':0}">
 				  		<com-button v-for="(item, index) in v.list" :btnText="item.label" :width="`${32}%`" :height="80" :marginBottom="20"
 				  		     :marginRight="(index+1)%3==0?0:`2%`"
-				  			:type="setFilterBtnType(item.value,v.key)" v-on:btnClick="btnClick(item.value,v.key)" />
+				  			:type="setFilterBtnType(item.value,v.key)" v-on:btnClick="btnClick(item.value,v.key,v.code)" />
 				  	</view>
 				  </view>
 			</view>
@@ -210,7 +210,8 @@
 				active:{
 					result:['全部'],
 					checkStatus:'全部',
-					other:'全部'
+					other:'全部',
+					code:-1,
 				},  //筛选tab下标
 				checkId: '',
 				deptId: '',
@@ -230,7 +231,8 @@
 				notApplicableList: [], //保存本次check的查核项id
 				scoreType:null,  //计分方式类型  add by yfb 20230417
 				customScoreTotal:null,  //自定义计分总分分值
-				deductPointTotal:null,  //扣分汇总
+				deductPointTotal:null,  //扣分汇总
+				iOrder:1,// 查核项明细中，下一步顺序是否按要点结束，1:按要点结束；2:按顺序结束
 			};
 		},
 		computed: {
@@ -287,7 +289,8 @@
 			functionId, //计划id 用于自查督查
 			departmentId,//科室id 用于自查督查
 			systemSituationType, 
-			pointsetType,  //计分方式类型 add by yfb 20230417
+			pointsetType,  //计分方式类型 add by yfb 20230417
+			checkOrder,//下一项 功能类型 add by yfb 20230609
 		}) {
 		
 			this.deptId = deptId;
@@ -313,10 +316,10 @@
 			if(this.currentSelectedInvestigationUser){
 				this.getFilterList(checkId,deptId,this.currentSelectedInvestigationUser.investigationId);
 			}else{
-				this.getFilterList(checkId,deptId?deptId:departmentId);
+				this.getFilterList(checkId?checkId:functionId,deptId?deptId:departmentId);
 		        //this.getFilterList(checkId,departmentId);
 			}
-			
+			this.iOrder=checkOrder;
 		},
 		onShow: function() {
 			if (this.ifReloadPageData) {
@@ -357,27 +360,27 @@
 			 * @param {number} responsibleUserId  责任对象id 非必传
 			 */
 			getFilterList(checkId,deptId,responsibleUserId){
-				console.log('2023052302 dept',deptId);
 				this.$store.dispatch({
 					type: 'checkMainPoints/commActions',
 					key: 'getPointConditions',
 					data: {
 						checkId:checkId,
 						responsibleUserId,
-						deptId:deptId
+						deptId:deptId,
+						indicatorType:this.isZichaDucha?1:0 //0 普通的  1自查督查
 					}
 				}).then(data=>{
-				    console.log('2023052205 data',data);
+					
 					const {checkResults=[],checkStatuses=[],others=[]} = data;
-					const _checkResults = checkResults.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value}));
-					const _checkStatuses = checkStatuses.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value}));
-					const _others = others.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value}));
+					const _checkResults = checkResults.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value,code:t.code}));
+					const _checkStatuses = checkStatuses.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value,code:t.code}));
+					const _others = others.map(t=>({label:`${t.value}(${t.num})`,id:Math.random(),value:t.value,code:t.code}));
 					this.btnArr  = [
 						{key:'查核状态',list:_checkStatuses},
 						{key:'查核结果',list:_checkResults},
 						{key:'其他',list:_others},
 					];
-					console.log('2023052205',this.btnArr);
+					
 				})
 			},
 			//绑定当事人
@@ -441,6 +444,7 @@
 			loadItemData() {
 				
 				if(this.isZichaDucha){
+					
 					//自查督查的情况下
 					this.$store.dispatch({
 						type: 'checkMainPoints/commActions',
@@ -448,9 +452,11 @@
 						data:{
 							functionId:this.functionId,
 							// filter:
+							checkStatus:this.active.checkStatus.code,
+							checkResult:this.active.result.code,
+							other:this.active.other.code
 						}
 					}).then(data => {
-						console.log('2023052306 test',data);
 						if (data) {
 							let renderList = data.checkDetailMapResponses?data.checkDetailMapResponses:[];
 						    							
@@ -471,11 +477,9 @@
 							if (data.scoreType==2){
 								this.totalScore=data.customScore;
 								this.currentScore=data.customScoreTotal;
-								console.log('true');
 							}else{
 								this.currentScore = data.getScore;
 								this.totalScore = data.totalScore;
-								console.log('false');
 							}
 							this.totalSubtotalScore = data.totalSubtotalScore;
 							this.checkDetailMapResponses = renderList;
@@ -490,13 +494,15 @@
 							});
 							//检查是否需要弹绑定当事人弹窗
 							//this.toBindPeople();
+							
+							//add by yfb 20230609
+							this.iOrder=data.checkOrder;
 						}
 					});
 					
 					return
 				}
 				
-				console.log('20230523',this.situationType,this.currentSelectedInvestigationUser);
 				//非自查督查的情况下
 				if(this.situationType == 2&&!this.currentSelectedInvestigationUser){
 					//分页模式下且未选择访谈对象时拒绝请求数据同时清空历史数据
@@ -628,7 +634,6 @@
 				if(!this.isZichaDucha){
 					//非自查督查
 					let ids = [];
-					console.log('2023052203',item);
 					this.detailList.forEach(item => {
 						//筛选掉已查核项
 						const temp = item.responseList.filter(v => !v.checkResult);
@@ -695,10 +700,11 @@
 				}
 				
 			},
-			btnClick(val,key) {
+			btnClick(val,key,code) {
 				const _active = this.active;
 				if(key == '查核结果'){
-					 const index = _active.result.findIndex(t=>t == val);
+					
+					const index = _active.result.findIndex(t=>t == val);
 					 if(index >= 0){
 						   //当前已存在该id
 						   _active.result.splice(index,1);
@@ -713,7 +719,7 @@
 				if(key == '其他'){
 					_active.other = val
 				}
-				
+				_active.code=code;
 				this.active = _active;
 				//更新列表
 				this.loadItemData();
@@ -807,7 +813,10 @@
 							});
 						});
 						//检查是否需要弹绑定当事人弹窗
-						this.toBindPeople();
+						this.toBindPeople();
+						
+						//add by yfb 20230609
+						this.iOrder=data.checkOrder;
 					}
 				});
 			},
@@ -836,14 +845,23 @@
 					}
 					
 					uni.navigateTo({
-						url: `/pages/${str}?id=${child.id}&checkPointId=${checkPointId}&checkItemId=${child.checkItemId}&situationType=${this.situationType}&isZichaDucha=${this.isZichaDucha}&departmentId=${this.departmentId}`,
-						success: function(res) {
-							const currentGroup = that.detailList.filter(item => item.checkPointId ==
-								checkPointId);
-							// 通过eventChannel向被打开页面传送数据
-							res.eventChannel.emit('acceptDataFromOpenerPage', {
-								data: currentGroup
-							});
+						url: `/pages/${str}?id=${child.id}&checkPointId=${checkPointId}&checkItemId=${child.checkItemId}&situationType=${this.situationType}&isZichaDucha=${this.isZichaDucha}&departmentId=${this.departmentId}&checkOrder=${this.iOrder}&systemSituationType=${this.systemSituationType}`,
+						success: function(res) {
+							
+							if (that.iOrder==1){
+								const currentGroup = that.detailList.filter(item => item.checkPointId ==
+									checkPointId);
+								// 通过eventChannel向被打开页面传送数据
+								res.eventChannel.emit('acceptDataFromOpenerPage', {
+									data: currentGroup
+								});
+							}else if (that.iOrder==2){
+								
+								// 通过eventChannel向被打开页面传送数据
+								res.eventChannel.emit('acceptDataFromOpenerPage', {
+									data: that.detailList
+								});
+							}
 						}
 					});
 				}

pages/creatingSituations/components/situationPreview.vue

@@ -92,7 +92,14 @@
 				<input v-model="situationPreview.preTotal" placeholder="请输入" type="number" />
 				<text>分</text>
 			</view>
-			<!--end 20230417-->
+			<!--end 20230417-->
+			<!--add by yfb 20230615-->
+			<view class="checkOrderSetType" @click="checkOrderSetTypeHandle">
+				<text>快捷查核方式</text>
+				<text class="typeValue">{{situationPreview.checkOrderSetTypeName}}</text>
+				<image class="arrowRight" src="../../../static/incon-more.png" mode=""></image>
+			</view>
+			<!--end 20230615-->
 		</view>
 	</view>
 </template>
@@ -108,7 +115,7 @@
 				
 				modalVisible:false,
 				ifShowTemplateSelector: false, //是否展示选择模版的选项
-				ifShowSetTotal:false,
+				ifShowSetTotal:false,  //预设计分方式
 				childContainer:[],
 				resultLists:[],//创建情境选择的条件
 			}
@@ -121,7 +128,8 @@
 				checkRent: state => state.creatingSituations.checkRent,
 				situationPreview: state => state.creatingSituations.situationPreview,
 				situationTypeList: state => state.creatingSituations.situationTypeList,
-				pointsetTypeList:state => state.creatingSituations.pointsetTypeList
+				pointsetTypeList:state => state.creatingSituations.pointsetTypeList,
+				checkOrderSetTypeList:state=>state.creatingSituations.checkOrderSetTypeList
 			}),
 			situationTypeName() {
 				if (this.situationTypeList.length > 0 && this.situationPreview) {
@@ -133,12 +141,21 @@
 			},
 			pointsetTypeName(){
 				if (this.pointsetTypeList.length > 0 && this.situationPreview) {
-					const temp = this.pointsetTypeList.filter(item => item.situationType == this.situationPreview
+					const temp = this.pointsetTypeList.filter(item => item.pointsetType == this.situationPreview
 						.pointsetType);
 					
 					return temp.length > 0 ? temp[0].pointsetTypeName : null;
 				}
 				return null;
+			},
+			checkOrderSetTypeName(){
+				if (this.checkOrderSetTypeList.length > 0 && this.situationPreview) {
+					const temp = this.checkOrderSetTypeList.filter(item => item.checkOrderSetType == this.situationPreview
+						.checkOrderSetType);
+					
+					return temp.length > 0 ? temp[0].checkOrderSetTypeName : null;
+				}
+				return null;
 			},
 			list: function() {
 				const {
@@ -244,6 +261,16 @@
 					key: 'showPopupSelectorList',
 					data: true
 				});
+			},
+			checkOrderSetTypeHandle(){
+				this.$store.commit('creatingSituations/comChangeState', {
+					key: 'popupType',
+					data: 4
+				});
+				this.$store.commit('creatingSituations/comChangeState', {
+					key: 'showPopupSelectorList',
+					data: true
+				});
 			},
 			loopOptions: function(arr, conditionIds, list) {
 				arr.map((item) => {
@@ -549,6 +576,21 @@
 					margin-left: 40rpx;
 				}
 			
+				.arrowRight {
+					position: absolute;
+					right: 20rpx;
+					width: 15rpx;
+					height: 25rpx;
+				}
+			}
+			.checkOrderSetType {
+				position: relative;
+			
+				.typeValue {
+					display: inline-block;
+					margin-left: 40rpx;
+				}
+			
 				.arrowRight {
 					position: absolute;
 					right: 20rpx;

pages/creatingSituations/components/taskPreview.vue

@@ -56,6 +56,13 @@
 	        	<text>分</text>
 	        </view>
 			<!--end 20230417-->
+			<!--add by yfb 20230615-->
+			<view class="checkOrderSetType" @click="checkOrderSetTypeHandle">
+				<text>计分方式</text>
+				<text class="typeValue">{{checkOrderSetTypeName}}</text>
+				<image class="arrowRight" src="../../../static/incon-more.png" mode=""></image>
+			</view>
+			<!--end 20230615-->
 		</view>
 	</view>
 </template>
@@ -81,7 +88,8 @@
 				situationsCenter: state => state.situationsCenter,
 				checkPerson: state => state.creatingSituations.checkPerson,
 				situationTypeList:state => state.creatingSituations.situationTypeList,
-				pointsetTypeList:state=>state.creatingSituations.pointsetTypeList  //add by yfb 20230417
+				pointsetTypeList:state=>state.creatingSituations.pointsetTypeList  ,//add by yfb 20230417
+				checkOrderSetTypeList:state=>state.creatingSituations.checkOrderSetTypeList,
 			}),
 			situationTypeName(){
 				if(this.situationTypeList.length>0&&this.situationPreview){
@@ -97,6 +105,13 @@
 				}
 				return null;
 			},
+			checkOrderSetTypeName(){
+				if(this.checkOrderSetTypeList.length>0&&this.situationPreview){
+					  const temp  = this.checkOrderSetTypeList.filter(item=>item.checkOrderSetType == this.situationPreview.checkOrderSetType);
+					  return temp.length>0?temp[0].checkOrderSetTypeName:null;
+				}
+				return null;
+			},
 			list: function() {
 				const { conditionIds, options } = this.condition;
 				let list = [];
@@ -148,6 +163,11 @@
 				this.$store.commit('creatingSituations/comChangeState',{key:'popupType',data:3});
 				this.$store.commit('creatingSituations/comChangeState',{key:'showPopupSelectorList',data:true});
 			},
+			checkOrderSetTypeHandle(){
+				// this.$refs.popup.open();
+				this.$store.commit('creatingSituations/comChangeState',{key:'popupType',data:4});
+				this.$store.commit('creatingSituations/comChangeState',{key:'showPopupSelectorList',data:true});
+			},
 			loopOptions: function(arr, conditionIds, list) {
 				arr.map((item)=>{
 					if(conditionIds.includes(item.id)) {
@@ -355,6 +375,19 @@
 					height: 25rpx;
 				}
 			}
+			.checkOrderSetType{
+				position: relative;
+				.typeValue {
+					display: inline-block;
+					margin-left: 40rpx;
+				}
+				.arrowRight {
+					position: absolute;
+					right:20rpx;
+					width: 15rpx;
+					height: 25rpx;
+				}
+			}
 		}
 	}
 </style>

pages/creatingSituations/creatingSituations.vue

@@ -18,7 +18,12 @@
 				:setting="{
 			  value: 'pointsetType',
 			  name: 'pointsetTypeName'
-			}" :openkeys="[0]" @change="pointsetTypeChanged" />
+			}" :openkeys="[0]" @change="pointsetTypeChanged" />
+			<tm-radio-group v-if="popupType==4" :list="checkOrderSetTypeList" :defaultValue='situationPreview.checkOrderSetType'
+				:setting="{
+			  value: 'checkOrderSetType',
+			  name: 'checkOrderSetTypeName'
+			}" :openkeys="[0]" @change="checkOrderSetTypeChanged" />
 		</uni-popup>
 
 		<check-map-detail v-if="showCheckMapDetail"></check-map-detail>
@@ -140,7 +145,8 @@
 				checkPerson:state=>state.creatingSituations.checkPerson,
 				conditionCard: state => state.creatingSituations.conditionCard,
 				pointsetTypeList:state=>state.creatingSituations.pointsetTypeList   ,//add by yfb 20230417
-
+				situationCheckOrder:state=>state.creatingSituations.situationCheckOrder, //add by yfb 20230609
+				checkOrderSetTypeList:state=>state.creatingSituations.checkOrderSetTypeList
 			}),
 			situationTypeName() {
 				const temp = this.situationTypeList.filter(item => item.situationType == this.situationPreview
@@ -150,9 +156,13 @@
 			pointsetTypeName(){
 				const temp = this.pointsetTypeList.filter(item => item.pointsetType == this.situationPreview
 					.pointsetType);
-				console.log('042702');
-				console.log(temp);
 				return temp[0].pointsetTypeName;
+			},	
+			checkOrderSetTypeName(){
+				const temp = this.checkOrderSetTypeList.filter(item => item.checkOrderSetType == this.situationPreview
+					.checkOrderSetType);
+				console.log('2023061502',temp,this.checkOrderSetTypeList);
+				return temp[0].checkOrderSetTypeName;
 			},
 			botmBtnGroup: function() {
 				if(this.stepActive === 0){
@@ -300,7 +310,9 @@
 			actTarget,
 			situationId,
 			themeName, //情境名
-			systemSituationType, //系统情境类型 0 个案 1 普通 2自查督查
+			systemSituationType, //系统情境类型 0 个案 1 普通 2自查督查
+			//situationCheckOrder, //查核快捷方式类型 1：分类类型；2：全表类型
+			
 		}) {
 			this.errMsg='';
 			this.dispatch('getDictionary').then(res => {
@@ -313,6 +325,16 @@
 				});
 				this.myCommit('pointsetTypeList', tmp);
 				this.situationPreview.pointsetTypeName=tmp[0].pointsetTypeName;
+	
+				let checkOrdertmp=res.CheckOrder.map((item)=>{
+					return {
+						checkOrderSetType:parseInt(item.itemCode),
+						checkOrderSetTypeName:item.itemName,
+					}
+				});
+				this.myCommit('checkOrderSetTypeList',checkOrdertmp);
+				this.situationPreview.checkOrderSetTypeName=checkOrdertmp[0].checkOrderSetTypeName;
+				
 			});
 			
 			this.isPlanSet = actTarget == 'planSet';
@@ -320,7 +342,7 @@
 			
 			
 			this.saveType = type ? type : 'POST';
-			
+			//this.situationCheckOrder=situationCheckOrder;
 			if(systemSituationType == 2){
 				  
 				  this.myCommit('theme', {
@@ -416,6 +438,16 @@
 						pointsetTypeName:name.pointsetTypeName
 					}
 				});
+			},
+			checkOrderSetTypeChanged(type, name){
+				this.$store.commit('creatingSituations/comChangeState', {
+					key: 'situationPreview',
+					data: {
+						...this.situationPreview,
+						checkOrderSetType: type,
+						checkOrderSetTypeName:name.checkOrderSetTypeName
+					}
+				});
 			},
 			zichaduchaSave: function() {
 				  let data = {
@@ -457,7 +489,8 @@
 					  }),
 					  filterDepartments:this.checkMap.list.map(item=>item.departmentId),
 					  scoreType:this.situationPreview.pointsetType,   //add by yfb 20230417 
-					  customScore:this.situationPreview.preTotal
+					  customScore:this.situationPreview.preTotal,
+					  checkOrder:this.situationPreview.checkOrderSetType
 					  
 				}
 				this.dispatch(`saveZichaduchaPlan`, param).then((data) => {
@@ -482,7 +515,8 @@
 					showCountNum,
 					pageTemplateId,
 					pointsetType,
-					preTotal
+					preTotal,
+					checkOrderSetType
 				} = this.situationPreview;
 				const {
 					dateObj,
@@ -579,7 +613,8 @@
 					scoreType:pointsetType,
 					customScore:parseInt(preTotal),
 					remingpreTotal:parseInt(preTotal),
-					remindpointsetType:pointsetType
+					remindpointsetType:pointsetType,
+					checkOrder:parseInt(checkOrderSetType)
 				};
 				if (this.saveType === 'PUT') {
 					data.id = this.editID;

pages/creatingSituations/model.js

@@ -71,11 +71,14 @@ const initState = {
 		showCountNum:0,//查核组员查核列表是否统计小计
 		preTotal:0,    //预设总分参数
 		pointsetType:1,//计分方式类型，1：汇总累加 2：自定义   -add by yfb 20230417
-		pointsetTypeName:null //计分方式名称
+		pointsetTypeName:null ,//计分方式名称
+		checkOrderSetType:1,// 快捷查询方式  add by yfb 20230615
+		checkOrderSetTypeName:null//
 	},
 	templateList:[],//分页模板
 	situationTypeList:[],//情境类型列表
-	pointsetTypeList:[],//计分方式类型列表    -add by yfb 20230417
+	pointsetTypeList:[],//计分方式类型列表    -add by yfb 20230417,
+	checkOrderSetTypeList:[],//快捷查核方式列表  add by yfb 20230615
 	editConfig: null // 编辑时候的原始数据
 };
 

pages/home/home.vue

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

pages/mainPointsDetail/mainPointsDetail.vue

@@ -171,7 +171,7 @@
 	import {
 		_goBackFresh
 	} from '../../utils/compatible.js';
-
+import situationPreviewVue from '../creatingSituations/components/situationPreview.vue';
 	export default {
 		data() {
 			return {
@@ -216,7 +216,9 @@
 				deductPoint: 0, //本次扣分
 				currentCheckedTab: null, //当前选中的查核tab
 				moreDeduction: false, //缺陷项是否多选
-				ifInputScore: false, //是否手动干预分值
+				ifInputScore: false, //是否手动干预分值
+				iOrder:1, //查核项明细中，下一步顺序是否按要点结束，1:按要点结束；2:按顺序结束
+				situationType:0,
 			};
 		},
 		created() {
@@ -445,7 +447,6 @@
 					uni.$once('未在查核规定时间内', function(data) {
 						uni.navigateBack();
 					});
-
 					this.id = id;
 					this.deptId = res.deptId;
 					//再次编辑回显
@@ -457,6 +458,7 @@
 						.itemTotalScore) : (res.checkResult ? res.score : res.totalScore);
 					this.deductPoint = res.deductPoint;
 					this.moreDeduction = res.moreDeduction;
+					//this.iOrder=res.checkOrder;
 
 					if (res.checkResultRequestList && res.checkResultRequestList.length > 0) {
 						if (res.checkModelName == '访谈') {
@@ -680,7 +682,7 @@
 						//console.log('checkedResponsibleList',this.checkedResponsibleList,'checkedResponsibleData',this.checkedResponsibleData);
 						let resultIndex = this.resultConfigList.findIndex(item => item.name == this.data
 							.checkResult);
-
+							
 						try {
 							if (this.Index) {
 								let params = !this.isZichaDucha ? {
@@ -705,7 +707,7 @@
 									checkResultRequestList: [],
 									checkItemScore: this.checkItemScore,
 									value: this.checkItemValue,
-									situationType: this.situationType,
+									situationType: this.systemSituationType,
 									calScore: this.calScore,
 									score: this.currentScore,
 
@@ -744,8 +746,7 @@
 								}
 								const checkConfiglist = JSON.parse(JSON.stringify(this.checkConfiglist));
 
-
-
+								
 								this.$store.dispatch({
 									type: "mainPointsDetail/commActions",
 									payload: {
@@ -756,13 +757,14 @@
 										},
 									},
 								}).then((res) => {
-									if (res) {
+									if (res) {
+										
 										resolve(true);
 
 										// const resultIndex = this.resultConfigList.findIndex(item => item.name == this.data.checkResult);
 
 										// console.log({resultIndex,'this.resultConfigList':this.resultConfigList});
-
+										
 										for (let i = 0; i < checkConfiglist.length; i++) {
 
 											const index = this.resultConfigList.findIndex(item => item
@@ -772,12 +774,27 @@
 												name = this.resultConfigList[index].name
 											}
 
-
+											
+											// if (
+											// 	checkConfiglist[i].attr == (this.isZichaDucha ? name :
+											// 		params.checkResult) &&
+											// 	(checkConfiglist[i].resultType == 2 ||
+											// 		checkConfiglist[i].resultType == 3)
+											// )
+											let configResultType=false;
+											//if (this.isZichaDucha){
+											if (this.resultConfigList[resultIndex].resultType==2||this.resultConfigList[resultIndex].resultType==3)
+												configResultType=true;
+											// }else{
+											// 	if (checkConfiglist[i].resultType == 2 ||
+											// 		checkConfiglist[i].resultType == 3)
+											// 	configResultType=true;
+											// }
+											
 											if (
-												checkConfiglist[i].attr == (this.isZichaDucha ? name :
-													params.checkResult) &&
-												(checkConfiglist[i].resultType == 2 ||
-													checkConfiglist[i].resultType == 3)
+												checkConfiglist[i].attr == (this.isZichaDucha ? this.resultConfigList[index].name:
+													params.checkResult ) &&
+												configResultType
 											) {
 												//当主要缺失和次要缺失时发起改善任务
 												console.log('开始提交改善前准备');
@@ -839,7 +856,7 @@
 													receiveEmpName: this.data.receiveEmpName,
 													checkDetailId: this.data.id,
 												};
-
+												
 												this.$store.dispatch({
 													type: "mission/commActions",
 													payload: {
@@ -952,7 +969,8 @@
 				}
 				this.checkedSelectResultListIds = [];
 				this.checkedSelectResultList = [];
-				this.checkedSelectResultListData = [];
+				this.checkedSelectResultListData = [];
+				this.filePath=[];
 			},
 			goToPrevPage() {
 				_goBackFresh('pages/checkMainPoints/checkMainPoints');
@@ -994,8 +1012,8 @@
 					}
 					let needItemIndex = num > 0 ? current[0].index + 1 : current[0].index - 1;
 					let needItemId = this.itemBelongGroup[needItemIndex].id;
-					let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
-
+					let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
+					
 					this.clearForm();
 					this.clearResult();
 					this.checkTaskDetail(needItemId);
@@ -1034,9 +1052,11 @@
 			situationType,
 			isZichaDucha,
 			departmentId,
-			checkGroupName,
+			checkGroupName,
+			checkOrder,
+			systemSituationType,
 		}) {
-
+			this.iOrder= checkOrder;
 			this.id = id;
 			this.checkPointId = checkPointId;
 			this.situationType = situationType;
@@ -1045,21 +1065,39 @@
 
 			this.getCheckConfigList(checkItemId);
 			this.getCheckItemResultList(checkItemId);
-			this.isZichaDucha = isZichaDucha? JSON.parse(isZichaDucha) : false; //是否为自查督查
-
-
+			this.isZichaDucha = isZichaDucha? JSON.parse(isZichaDucha) : false; //是否为自查督查
+			
+			this.systemSituationType=systemSituationType;
+			//console.log('2023062604 situationType',this.systemSituationType);
 			//接收来自上个页面所传过来的数据
-			const eventChannel = this.getOpenerEventChannel();
-			eventChannel.on('acceptDataFromOpenerPage', (data) => {
-				// console.log({data});
-				this.itemBelongGroup = data.data[0].responseList.map((item, index) => {
-
-					return ({
-						index: index,
-						id: item['id'],
-						checkItemId: item['checkItemId']
-					})
-				});
+			const eventChannel = this.getOpenerEventChannel();
+			
+			eventChannel.on('acceptDataFromOpenerPage', (data) => {
+				 if (this.iOrder==1){
+					this.itemBelongGroup = data.data[0].responseList.map((item, index) => {
+
+						return ({
+							index: index,
+							id: item['id'],
+							checkItemId: item['checkItemId']
+						})
+					});
+				 }else if (this.iOrder==2){
+					 var Tindex=0;
+					 let itemList=[];
+					 data.data.filter(parentItem=>{
+						var tmp =parentItem.responseList.map((item) => {
+
+							return ({
+								index: Tindex++,
+								id: item['id'],
+								checkItemId: item['checkItemId']
+							})
+						});
+						itemList=itemList.concat(tmp);
+					 });
+					 this.itemBelongGroup=itemList;
+				 }
 				//重新导航进页面，删除缓存并设置最新数据
 				uni.removeStorageSync('itemBelongGroup');
 				uni.setStorageSync('itemBelongGroup', this.itemBelongGroup);

pages/mission-details/mission-details.vue

@@ -50,7 +50,7 @@
 				</view>
 			</view>
 		</scroll-view>
-		<view class="bottomBtn" @click="goBack">{{botBtnText}}</view>
+		<view class="bottomBtn" @click="goBack">返回改善任务列表</view>
 	</view>
 </template>
 
@@ -102,7 +102,8 @@
 				botBtnText: '',
 				// 跳转详情信息,
 				details:{},
-				linkTaskDetails: null
+				linkTaskDetails: null,
+				ptName:''
 			}
 		},
 		onLoad(option) {
@@ -111,11 +112,13 @@
 				pathName
 			} = option;
 			this.taskId = taskId;
+			//pathName == 'missionDetails' ? '返回改善任务列表' : '返回改善消息列表';
+			
 			
-			this.botBtnText = pathName == 'missionDetails' ? '返回改善任务列表' : '返回改善消息列表'
 		},
 		created() {
-			this.getMissionDetails();
+			this.getMissionDetails();
+			
 		},
 		methods: {
 			ifShowStepLinkBtn(item,i){
@@ -150,6 +153,7 @@
 					  // console.log({'details':data});
 					  if(data){
 						  this.details = data;
+						  
 					  }
 				})
 			},
@@ -244,14 +248,13 @@
 			 *  @param {Boolean} isLink 是否需要跳转页面（查看详情）
 			 *  @param {String} rowKey 任务流程中的key
 			 */
-			getContext(obj, isLink, rowKey) {
-						
+			getContext(obj, isLink, rowKey) {		
 				let currentTypeTask = null;
 				if (obj.taskType == 1) {
 					const {
 						checkResult
 					} = this.missionDetails;
-					
+
 					currentTypeTask = taskTypeList.find(item => (item.taskType == obj.taskType && item.checkResult ==
 						checkResult)) || {};
 				} else {
@@ -274,7 +277,8 @@
 					} else {
 						return name || '';
 					}
-				}
+				}
+				checkResult='';
 			},
 			// 公共改善任务接口
 			comTaskCirculation(data) {