companyProjecet.git

			@@ -6,7 +6,7 @@
			<div>
			<el-button size="small" @click="is_edit = false" v-if="is_edit">取消</el-button>
			<el-button size="small" type="success" @click="onSubmit" v-if="is_edit">完成</el-button>
			<el-button size="small" type="primary" @click="is_edit = true" v-else>编辑</el-button>
			<el-button size="small" type="primary" @click="onEdit" v-else>编辑</el-button>
			<el-button size="small" @click="drawerClose(false)">关闭</el-button>
			<!-- <el-dropdown>
			<el-button size="small">
			@@ -57,6 +57,7 @@
			branch_type: 20,
			is_recycle: 0,
			password: '',
			logo_id: '',
			},
			},
			detail: {},
			@@ -91,6 +92,7 @@
			self.form.branch_id = branch_id;
			self.form.branch = formatModel(self.form.branch, res.data.model);
			self.form.branch.branch_type = self.form.branch.branch_type.value;
			self.form.logo_file_path = self.detail.logo ? self.detail.logo.file_path : '';
			self.form.branch.password = '';
			if (self.form.branch.region_id == 0) {
			self.form.branch.region_id = '';
			@@ -102,12 +104,19 @@
			self.form.branch.user_name = res.data.model.superUser.user_name;
			self.user_info.avatarUrl = res.data.model.superUser.user.avatarUrl;
			}
			console.log(self.form)
			})
			.catch(error => {

			});
			},

			onEdit() {
			this.is_edit = true;
			console.log(this.form.branch.logo)
			// this.$refs.editForm.logo_file_path = this.form.branch.logo ? this.form.branch.logo.file_path : '';
			},

			onSubmit(){
			let self = this;
			self.$refs.editForm.onSubmit();