conditionIds 新加的参数名称

pages/creatingSituations/components/checkMap.vue

@@ -72,7 +72,7 @@
 				} else if(this.needReload) { // 点击上一步不用获取数据
 					if(!checkedItem.points) return;
 					let checkPointIds = checkedItem.points.map(({id})=> id);
-					this.dispatch('checkDeptList', { depType, checkPointIds })
+					this.dispatch('checkDeptList', { depType, checkPointIds,conditionIds: this.condition.conditionIds })
 						.then((data)=> {
 							if(data) {
 								let _data = this.checkDep(data);

pages/creatingSituations/creatingSituations.vue

@@ -255,6 +255,7 @@
 				}
 			},
 			myCommit: function(key, data) {
+				console.log({key, data});
 				this.$store.commit({type: 'creatingSituations/comChangeState',key,data});
 			},
 			dispatch: function(key, data) {

pages/mainPointsDetail/mainPointsDetail.vue

@@ -443,6 +443,24 @@ export default {
       });
     },
     toHistory() {
+	  // const situationId = this.data.situationId;
+	  // this.$store.dispatch({
+	  // 	type: 'mission/commActions',
+	  // 	payload: {
+	  // 		key: "getMissionList",
+	  // 		situationId:situationId
+	  // 	}
+	  // }).then(data => {
+	  // 	if(data) {
+	  		
+	  // 		// this.improvingTaskList = data.improvingTaskResponses || [];
+	  // 		// this.completeTaskList = data.improveCompleteResponses || [];
+	  // 	}
+	  // });
+	  /** 请求参数 data
+	   * situationId: 情境id 当管路员或者查核者通过情境进入任务列表时 必传
+	   * checkItemId 单位负责人通过 查核要点进入改善任务列表时 必传
+	   */
       uni.navigateTo({
         url: `/pages/improve-mission-list/improve-mission-list?situationId=${this.data.situationId}`,
       });
@@ -477,7 +495,11 @@ export default {
 		let needItemIndex = num>0?current[0].index+1:current[0].index-1;
 		let needItemId = this.itemBelongGroup[needItemIndex].id;
 		this.checkTaskDetail(needItemId);	
-	}
+	},
+	// // 获取改善任务列表
+	// getMissionList(situationId) {
+		
+	// },
   },
   onLoad({ id, checkPointId }) {
     this.id = id;

pages/mission-action/components/assign-mission.vue

@@ -17,7 +17,7 @@
 		  <tm-radio-group
 			  :list="empDeptList"
 			  :setting="{value: 'empId',name: 'empName'}"
-        :defaultValue='desPersopn.empId'
+             :defaultValue='desPersopn.empId'
 			  @change="changeDesPersopn"
 		  />
 		</scroll-view>