选择部门修正

src/projects/business/views/Master/Company/RegisterSelectDepartment.vue

@@ -8,7 +8,7 @@
 		<div class="mui-content vongi-fpbm">
 			<div class="vongi-bread">
 				<template v-for="(item,index) in navList">
-					<a :class="item.hasNext?'color4fc5f7':''" @click="reloadItem(item,index)" v-text="item.name"></a>
+					<a :class="navCanClick(item,index)?'color4fc5f7':''" @click="reloadItem(item,index)" v-text="item.name"></a>
 					<span v-if="index!=navList.length-1" class="mui-icon mui-icon-forward"></span>
 				</template>
 			</div>
@@ -66,13 +66,6 @@
 
 				pageTitle: '分配部门',
 
-				rightLink: {
-					show: true,
-					icon: 'mui-btn mui-btn-primary',
-					style: 'width: 55px;height: 25px;margin-top:5px;margin-right: 0px;line-height: 5px;color: #fff;font-size:16px;border-radius:20px;',
-					title: '确认'
-				},
-
 				companyId: '',
 				companyList: [],
 				nowLevel: 0,
@@ -99,7 +92,7 @@
 			}
 
 			if ((!this.subForm.ids || !this.subForm.status) && this.hasSceneId4 == '0') {
-				this.$router.go(-1);
+				//this.$router.go(-1);
 			}
 		},
 		methods: {
@@ -133,13 +126,29 @@
 			},
 			//确认
 			doRightLink() {
-				this.set_register_examine_form(this.subForm);
-				this.$router.push({
-					name: 'MasterCompanyRegisterSelectDevice',
-					query: {
-						hasSceneId4: '0'
+				if (!this.subForm.companyId || !this.companyName) {
+					mui.toast('请选择所属公司或部门');
+				} else {
+					this.set_register_examine_form(this.subForm);
+					this.$router.push({
+						name: 'MasterCompanyRegisterSelectDevice',
+						query: {
+							hasSceneId4: '0'
+						}
+					})
+				}
+			},
+			//判断面包屑是否可点击
+			navCanClick(item, index) {
+				if (index > 0) {
+					if (index == this.nowLevel) {
+						return false;
+					} else {
+						return true;
 					}
-				})
+				} else {
+					return true;
+				}
 			},
 			asynCallBack() {
 
@@ -171,6 +180,22 @@
 					console.log(newValue)
 				}
 			},
+			rightLink: {
+				// getter
+				get: function() {
+					var link = {
+						show: true,
+						icon: this.companyName ? 'mui-btn mui-btn-primary' : 'mui-btn mui-btn-grey mui-btn-primary',
+						style: 'width: 55px;height: 25px;margin-top:5px;margin-right: 0px;line-height: 5px;color: #fff;font-size:16px;border-radius:20px;',
+						title: '确认'
+					}
+					return link;
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',

src/projects/business/views/Master/Company/RegisterSelectDevice.vue

@@ -117,7 +117,10 @@
 			},
 			//成功后的点击
 			successTo() {
-				this.$router.go(-1);
+				//this.$router.go(-1);
+				this.$router.push({
+					name: 'MasterCompanyRegisterExamine'
+				})
 			},
 			asynCallBack() {