Merge branch 'mhy' into 'master'

Mhy

See merge request !30

xichongSys/src/views/Myvue/application.vue

@@ -49,6 +49,32 @@
     <el-input v-model="form.mon_annuityGov" readonly></el-input>
   </el-form-item>
 </el-form>
+  <h2 class="imtil">待遇领取信息</h2>
+  <div class="wrap">
+    <div class="masks"></div>
+    <el-form ref="form" :model="form" class="forml" label-width="auto">
+      <el-form-item label="领取方式">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+      <el-form-item label="集体补助">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+      <el-form-item label="利息">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form ref="form" :model="form" class="formr" label-width="auto">
+      <el-form-item label="个人缴费">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+      <el-form-item label="财政补贴">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+      <el-form-item label="个人账户积累额">
+        <el-input v-model="form.reason"></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
 <div class="headImg">
  <div style="text-align:center;padding:9px;border-bottom:1px solid #EFF0F2;font-size:14px">领取人照片</div>
  <div class="headCon">
@@ -318,6 +344,17 @@ export default {
   z-index: 200
 }
 
+.forml {
+  float: left;
+  width: 45%
+}
+
+.formr {
+  float: left;
+  width: 45%;
+  margin-left: 20px
+}
+
 .imgcon{
   margin: 0 auto;
   box-shadow: 0 0 15px lightgray;

xichongSys/src/views/Sys/User.vue

@@ -48,22 +48,26 @@
 				<el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input>
 			</el-form-item>
 			<el-form-item label="用户名" prop="name">
-				<el-input v-model="dataForm.name" auto-complete="off" :disabled="true"></el-input>
+        <el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" :disabled="true"></el-input>
+        <el-input v-if="operation" v-model="dataForm.name" auto-complete="off"></el-input>
 			</el-form-item>
 			<el-form-item label="真实姓名" prop="truename">
-				<el-input v-model="dataForm.truename" auto-complete="off" :disabled="true"></el-input>
+        <el-input v-if="!operation" v-model="dataForm.truename" auto-complete="off" :disabled="true"></el-input>
+        <el-input v-if="operation" v-model="dataForm.truename" auto-complete="off"></el-input>
 			</el-form-item>
 			<el-form-item label="密码" prop="password">
 				<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
 			</el-form-item>
 			<el-form-item label="机构" prop="deptName">
 				<el-cascader
+          ref="deptTree"
 				v-model="dataForm.deptId"
     			size="medium"
     			:options="list"
     			:props="{ checkStrictly: true }"
 				style="width:100%"
     			clearable
+        @change="deptTreeCurrentChangeHandle"
         ></el-cascader>
 				<!-- <popup-tree-input
 					:data="deptData"
@@ -115,7 +119,8 @@ export default {
 			address:"",
 			size: 'small',
 			filters: {
-				name: ''
+				name: '',
+        truename: ''
 			},
 			columns: [],
 			filterColumns: [],
@@ -256,6 +261,9 @@ export default {
 		},
 		// 菜单树选中
       	deptTreeCurrentChangeHandle (data) {
+          console.log(data);
+          console.log(data.Id);
+		  console.log(this.$refs['deptTree'].currentLabels);
           // this.dataForm.deptId = data.id
 			//this.dataForm.deptName = data.name
 			// this.dataForm.deptName = data.name