浏览代码

同步更新

yfb 1 月之前
父节点
当前提交
2ef1e70911
共有 3 个文件被更改,包括 24 次插入15 次删除
  1. 21 12
      pages/checkMainPoints/checkMainPoints.vue
  2. 1 1
      pages/login/login.vue
  3. 2 2
      utils/requestUrl.js

+ 21 - 12
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,v.code)" />
+				  			:type="setFilterBtnType(item.value,v.key)" v-on:btnClick="btnClick(item.value,v.key,item.code)" />
 				  	</view>
 				  </view>
 			</view>
@@ -209,9 +209,11 @@
 				nowPermission: uni.getStorageSync('nowPermission'),
 				active:{
 					result:['全部'],
+					resultCode:-1,
 					checkStatus:'全部',
+					checkStatusCode:-1,
 					other:'全部',
-					code:-1,
+					otherCode:-1,
 				},  //筛选tab下标
 				checkId: '',
 				deptId: '',
@@ -380,7 +382,7 @@
 						{key:'查核结果',list:_checkResults},
 						{key:'其他',list:_others},
 					];
-					
+					console.log('2023070503',this.btnArr);
 				})
 			},
 			//绑定当事人
@@ -442,8 +444,9 @@
 				}
 			},
 			loadItemData() {
-				
+				console.log('2023070404',this.active);
 				if(this.isZichaDucha){
+					console.log('2023070401',this.active);
 					
 					//自查督查的情况下
 					this.$store.dispatch({
@@ -451,10 +454,10 @@
 						key: 'getZichaduchaCheckItems',
 						data:{
 							functionId:this.functionId,
-							// filter:
-							checkStatus:this.active.checkStatus.code,
-							checkResult:this.active.result.code,
-							other:this.active.other.code
+							 //filter:"",
+							checkStatus:this.active.checkStatusCode,
+							checkResult:this.active.resultCode,//this.active.result.join(','),
+							checkImages:this.active.otherCode
 						}
 					}).then(data => {
 						if (data) {
@@ -702,8 +705,10 @@
 			},
 			btnClick(val,key,code) {
 				const _active = this.active;
+				console.log('2023070501',_active);
 				if(key == '查核结果'){
 					
+					//_active.result=val;
 					const index = _active.result.findIndex(t=>t == val);
 					 if(index >= 0){
 						   //当前已存在该id
@@ -712,15 +717,19 @@
 						   _active.result.push(val);
 						   console.log({_active});
 					 }
+					 _active.resultCode=code;
 				}
 				if(key == '查核状态'){
-					_active.checkStatus = val
+					_active.checkStatus = val;
+					_active.checkStatusCode=code;
 				}
 				if(key == '其他'){
-					_active.other = val
+					_active.other = val;
+					_active.otherCode=code;
 				}
-				_active.code=code;
+				
 				this.active = _active;
+				console.log('2023070502',_active);
 				//更新列表
 				this.loadItemData();
 			},
@@ -769,7 +778,7 @@
 					checkResult:this.active.result.join(','),
 					other:this.active.other
 				}
-				
+				console.log('2023070402',params);
 				//增加受访人
 				if (situationType == 2) params['investigationId'] = investigationId;
 				

+ 1 - 1
pages/login/login.vue

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

+ 2 - 2
utils/requestUrl.js

@@ -17,8 +17,8 @@ export const networkType = 1; //网络类型:内网=0,外网=1
 // export const URL = '112.12.21.134:8111/imed/pfm/'; //横店
   // export const URL = '47.97.190.5:8086/imed/pfm/'; 
   
- //export const URL = '47.96.149.190:8802/imed/pfm/'; //演示环境
-export const URL = '120.27.235.181:8802/imed/pfm/'; //开发环境
+ export const URL = '47.96.149.190:8802/imed/pfm/'; //演示环境
+//export const URL = '120.27.235.181:8802/imed/pfm/'; //开发环境
 //export const URL = '47.97.190.5:8802/imed/pfm/'; //正式环境
 //export const URL = '47.97.190.5:8086/imed/pfm/'; //正式环境dev