Merge branch 'master' of ssh://1582597470426922.onaliyun.com@s1.nsloop.com:29418/web_TracerMethodology

README.md

@@ -16,3 +16,5 @@
 ---
  1. 在main.js中全局注册；
  2. 在components目录下创建文件夹=文件名的组件，会自动全局注册，但是需要注意：在模板中使用的名字也必须与定义的名字一致，比如定义了n-navigation/n-navigation.vue组件，必须是<n-navigation></n-navigation>；因为标签推荐kebab-case方式，所以定义的公共组件也推荐这种命名方式
+
+登录地址加：?hospSign=vdQpm2OvmLVTPnXL

pages.json

@@ -160,6 +160,8 @@
 	],
 	"globalStyle": {
 		"navigationStyle": "custom",
+		// "autoBackButton": true,
+		// "homeButton": true,
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "追踪方法学",
 		"navigationBarBackgroundColor": "#F8F8F8",

pages/checkMapList/checkMapList.vue

@@ -2,10 +2,11 @@
 	<view class="check-map-list">
 		<view class="item"
 			v-for="(item, index) in checkMap.list" 
+			v-if="item.status !== 'disable'"
 			:key="index">
 			<tm-check-map-list :item="item"></tm-check-map-list>
 		</view>
-		<view class="null" v-if="checkMap.list.length === 0">暂无数据</view>
+		<view class="null" v-if="dataIsNull">暂无数据</view>
 	</view>
 </template>
 
@@ -16,7 +17,11 @@
 		computed: {
 			...mapState({
 				checkMap: state => state.creatingSituations.checkMap,
-			})
+			}),
+			dataIsNull() {
+				let data = this.checkMap.list.filter((item)=> item.status !== 'disable');
+				return data.length === 0;
+			}
 		},
 	}
 </script>

pages/creatingSituations/components/checkRent.vue

@@ -72,7 +72,14 @@
 					key: 'checkGroupList',
 					data: { conditionIds: this.condition.conditionIds}
 				}).then((data)=> {
-					if(data) this.myCommit('list', data);
+					if(data) {
+						this.myCommit('list', data);
+						const {checkedItem} = this.checkRent;
+						if(checkedItem.id) { // 如果选中过，要去更新数据
+							let obj = data.find(({id})=>id === checkedItem.id);
+							this.myCommit('checkedItem', obj?obj:{id:null});
+						}
+					} 
 				});
 			}
 		},

pages/role-switching/role-switching.vue

@@ -19,32 +19,36 @@
  * 角色切换
  */
 <script>
+	const roleList = [
+		{permission: 1, name: '管理员', msg: '个改善任务待处理'}, 
+		{permission: 2, name: '查核组长', msg: '个情境待分配'},
+		{permission: 3, name: '查核组员', msg: '个单位待查核'},
+		{permission: 4, name: '单位负责人', msg: '个改善任务待处理'},
+		{permission: 5, name: '改善者', msg: '个改善任务待处理'}
+	];
 	export default {
 		data() {
 			return {
 				permissionList:[],//权限列表
 				nowPermission:'',//当前权限
 				oldPermission:'',//初始化选中的权限
-				roleList:[
-					{permission: 1, name: '管理员'}, 
-					{permission: 2, name: '查核组长'},
-					{permission: 3, name: '查核组员'},
-					{permission: 4, name: '单位负责人'},
-					{permission: 5, name: '改善者'}
-				]
 			}
 		},
 		created() {
 			let permissions=uni.getStorageSync('permissions');
 			this.nowPermission=uni.getStorageSync('nowPermission');
-			this.permissionList=permissions.map((item,index)=>{
-				let match=this.roleList.find(i => i.permission == item.permission);
-				return {
-					value:match.permission,
-					label:match.name,
-					todoNum:item.todoNum>0?item.todoNum+'个任务待处理':'暂无待处理',
-					isNowRole:this.nowPermission==match.permission?true:false,
-					isChecked:this.nowPermission==match.permission?true:false,
+			this.permissionList = permissions.map((item,index)=>{
+				let match = roleList.find(i => i.permission == item.permission);
+				if(match) {
+					return {
+						value: match.permission,
+						label: match.name,
+						todoNum: item.todoNum > 0 
+							? (match.permission === 3 ? '今日':'') + item.todoNum + match.msg 
+							: '暂无待处理',
+						isNowRole:this.nowPermission==match.permission?true:false,
+						isChecked:this.nowPermission==match.permission?true:false,
+					}
 				}
 			});
 			let obj = this.permissionList.find((item)=>item.isChecked);