fix bug

manifest.json

@@ -2,7 +2,7 @@
     "name" : "追踪方法学",
     "appid" : "__UNI__03C4C69",
     "description" : "",
-    "versionName" : "0.8.2",
+    "versionName" : "0.8.3",
     "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {
@@ -43,7 +43,9 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ],
                 "minSdkVersion" : 19
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* ios打包配置 */
             "sdkConfigs" : {
                 "ad" : {}

pages/batchDistribution/batchDistribution.vue

@@ -158,7 +158,7 @@
 			//初始化默认时间
 			// console.log({data,_details});
 			const currentDate = new Date();
-			_details.startDate = `${currentDate.getFullYear()}-${currentDate.getMonth()+1}-${currentDate.getDate()} 00:00`;
+			_details.startDate = _details.startDate?_details.startDate:`${currentDate.getFullYear()}-${currentDate.getMonth()+1}-${currentDate.getDate()} 00:00`;
 			_details.endDate = _details.endDate;
 
 			this.isZichaducha = _details.isZichaducha;

pages/editCheckList/editCheckList.vue

@@ -552,8 +552,8 @@
 						title, // 标题
 						empId,
 						empName,
-						startDate,
-						endDate,
+						startDate:startDate?startDate:this.startDate, //未分配时间时，取计划时间
+						endDate:endDate?endDate:this.endDate,//未分配时间时，取计划时间
 						deptId,
 						categoryId,
 						isDistribution,
@@ -577,7 +577,7 @@
 							...details,
 							checkedList: [deptId]
 						}
-						
+								
 						uni.navigateTo({
 							url: `/pages/batchDistribution/batchDistribution?details=${encodeURIComponent(JSON.stringify(_detailsTwo))}`
 						});

pages/home/home.vue

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

pages/improve-mission-list/improve-mission-list.vue

@@ -30,8 +30,10 @@
 				completeTaskList: []
 			}
     },
-    onLoad({ situationId,systemSituationType }){ // situationId：情景id,systemSituationType 情境类型
-      this.getMissionList({situationId,planType:systemSituationType});
+    onLoad({ situationId,systemSituationType }){ // situationId：情景id,systemSituationType 情境标签类型
+	  
+	  //当systemSituationType == 2时查看改善列表planType传1，查看督查改善列表
+      this.getMissionList({situationId,planType:systemSituationType==2?1:0});
     },
 		methods: {
     	    // 获取改善任务列表

pages/login/login.vue

@@ -34,7 +34,7 @@
 		data() {
 			return {
 				index:0,
-				appHospSign:'8CJYqxlGIdLEIwaG',//app端更新hospSign
+				appHospSign:'AbRZOSfygQ1xCxoZ',//app端更新hospSign
 				showInputModal:false,
 				hospSign: '', // 医院标识
 				username: '', // 用户名

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

@@ -139,7 +139,7 @@
 						}
 					}
 				});
-				console.log({'1':requestParams});
+				// console.log({'1':requestParams});
 				this.$emit('comRequest', requestParams);
 			},
 			// 查询部门人员树

pages/mission-action/mission-action.vue

@@ -120,28 +120,24 @@
 			// 公共改善任务接口
 			comTaskCirculation(data) {
                
-			   
-				if(data.taskPlan.length == 0){
+				if(data.taskPlan&&data.taskPlan.length == 0){
 					 uni.showModal({title: '请填写改善计划！'}); 
 					 return;
 				}
-				if(data.taskDoRequestList.length == 0||data.taskDoRequestList[0].taskDoProcess.length == 0){
+				if((data.taskDoRequestList&&data.taskDoRequestList.length == 0)||(data.taskDoRequestList&&data.taskDoRequestList.length>0&&data.taskDoRequestList[0].taskDoProcess.length == 0)){
 					 uni.showModal({title: '请填写执行过程！'});  
 					 return;
 				}
-				if(data.taskCheckRequestList.length == 0||data.taskCheckRequestList[0].taskCheckProcess.length == 0){
+				if(data.taskCheckRequestList&&data.taskCheckRequestList.length == 0||(data.taskCheckRequestList&&data.taskCheckRequestList.length>0&&data.taskCheckRequestList[0].taskCheckProcess.length == 0)){
 					 uni.showModal({title: '请填写改善确认！'});   
 					 return;
 				}
-				if(data.taskAction.length == 0){
+				if(data.taskAction&&data.taskAction.length == 0){
 					 uni.showModal({title: '请填写对策处置！'});  
 					 return;
 				}
-				
-				
-				
-				
-			
+								
+				
 				this.$store.dispatch({
 					type: 'mission/commActions',
 					payload: {

pages/planList/planList.vue

@@ -186,6 +186,7 @@
 				if(this.systemSituationType != 2){
 					//非自查督查
 					//跳转到查核列表
+					
 					this.$store.commit('planList/comChangeState', {
 						key: 'ifReloadData',
 						data: false
@@ -210,8 +211,7 @@
 						empId:(empList.map(item=>item.empId)).join(','),
 						empName:(empList.map(item=>item.empName)).join(','),
 					}
-					
-				
+									
 					const _details = encodeURIComponent(JSON.stringify(details))
 
 					uni.navigateTo({

pages/situationsCenter/situationsCenter.vue

@@ -179,19 +179,13 @@
 		},
 		methods: {
 			filterClickHandle(filterData) {
-				console.log({filterData});
-
+	
 				if (filterData.key != 0) {
 					const _situationList = this.copied_situationList.filter(item => item.situationStatus == Number(
 						filterData.key));
-					console.log({
-						_situationList,
-						filterData,
-						'this.copied_situationList':this.copied_situationList,'this.situationList':this.situationList
-					});
 					this.situationList = _situationList;
-				} else {
-					this.initSituationList();
+				}else{
+					this.situationList = this.copied_situationList
 				}
 
 			},

utils/requestUrl.js

@@ -12,6 +12,7 @@ export const networkType = 1; //网络类型：内网=0，外网=1
 
 // export const URL = '192.168.3.28:8801/imed/pfm/'; // 本地
 export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
+// export const URL = '118.31.245.65:8086/imed/pfm/'; //65测试环境
 // export const URL = '118.31.245.65:8802/imed/pfm/'; //线上
 // export const URL = '112.12.21.134:8111/imed/pfm/'; //横店