Merge branch 'mhy' into 'master'

mhy

See merge request !29

xichongSys/src/router/index.js

@@ -141,7 +141,6 @@ const router = new Router({
           name:"参保注销审核",
           component: insuranceCancellationAudit
         }
-
       ]
     },
     {

xichongSys/src/views/Myvue/application.vue

@@ -50,7 +50,7 @@
   </el-form-item>
 </el-form>
 <div class="headImg">
- <div style="text-align;center;padding:9px;border-bottom:1px solid #EFF0F2;font-size:14px">领取人照片</div>
+ <div style="text-align:center;padding:9px;border-bottom:1px solid #EFF0F2;font-size:14px">领取人照片</div>
  <div class="headCon">
 <img :src="form.personPhoto" alt="">
 </div>

xichongSys/src/views/Myvue/table.vue

@@ -299,6 +299,21 @@
             show:true
             }
           })
+          } else if(d.recordtype=="参保注销") {
+            sessionStorage.setItem("recordId",this.tableData[s].recordId)
+            this.$router.push({
+              name:"参保注销审核",
+              params:{
+                info:this.tableData[s].info,
+                bankpic:this.tableData[s].bankpic,
+                idcardbackpic:this.tableData[s].idcardbackpic,
+                idcardfrontpic:this.tableData[s].idcardfrontpic,
+                signpic:this.tableData[s].signpic,
+                specialPhotoPic:this.tableData[s].specialPhotoPic,
+                bookPic:this.tableData[s].bookPic,
+                show:true
+              }
+            })
           }
         },
         handleDelete(g,h){

xichongSys/src/views/Sys/User.vue

@@ -48,22 +48,23 @@
 				<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"></el-input>
+				<el-input v-model="dataForm.name" auto-complete="off" :disabled="true"></el-input>
 			</el-form-item>
 			<el-form-item label="真实姓名" prop="truename">
-				<el-input v-model="dataForm.truename" auto-complete="off"></el-input>
+				<el-input v-model="dataForm.truename" auto-complete="off" :disabled="true"></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
-				v-model="dataForm.deptName"
+				v-model="dataForm.deptId"
     			size="medium"
     			:options="list"
     			:props="{ checkStrictly: true }"
 				style="width:100%"
-    			clearable></el-cascader>
+    			clearable
+        ></el-cascader>
 				<!-- <popup-tree-input
 					:data="deptData"
 					:props="deptTreeProps"
@@ -135,9 +136,9 @@ export default {
 				name: '',
 				truename:'',
 				password: '',
-				deptId: 1,
+				deptId: '',
 				deptName: '',
-				//email: 'test@qq.com',
+				email: 'test@qq.com',
 				mobile: '13889700023',
 				status: 1,
 				userRoles: []
@@ -206,8 +207,8 @@ export default {
 			this.$refs.dataForm.validate((valid) => {
 				if (valid) {
 					this.$confirm('确认提交吗？', '提示', {}).then(() => {
-						this.dataForm.deptName=this.dataForm.deptName[this.dataForm.deptName.length-1]
-						this.editLoading = true
+						this.dataForm.deptId = this.dataForm.deptId[this.dataForm.deptId.length-1];
+						this.dataForm.deptName = "";
 						let params = Object.assign({}, this.dataForm)
 						let userRoles = []
 						for(let i=0,len=params.userRoles.length; i<len; i++) {
@@ -237,28 +238,27 @@ export default {
 		findDeptTree: function () {
 			this.$api.dept.findDeptTree().then((res) => {
 				for(var i in res.data){
-					res.data[i].value=res.data[i].name
+					res.data[i].value=res.data[i].id
 					res.data[i].label=res.data[i].name
 					for(var j in res.data[i].children){
-						res.data[i].children[j].value=res.data[i].children[j].name
+						res.data[i].children[j].value=res.data[i].children[j].id
 						res.data[i].children[j].label=res.data[i].children[j].name
 						for(var n in res.data[i].children[j].children){
-							res.data[i].children[j].children[n].value=res.data[i].children[j].children[n].name
+							res.data[i].children[j].children[n].value=res.data[i].children[j].children[n].id
 						res.data[i].children[j].children[n].label=res.data[i].children[j].children[n].name
 						}
 					}
 				}
 
 				this.list=res.data
-			
 				//this.deptData = res.data
 			})
 		},
 		// 菜单树选中
-      	deptTreeCurrentChangeHandle (data, node) {
-        	this.dataForm.deptId = data.id
+      	deptTreeCurrentChangeHandle (data) {
+          // this.dataForm.deptId = data.id
 			//this.dataForm.deptName = data.name
-			this.dataForm.deptName = data.name
+			// this.dataForm.deptName = data.name
 		},
 		// 时间格式化
       	dateFormat: function (row, column, cellValue, index){
@@ -277,13 +277,13 @@ export default {
       	initColumns: function () {
 			this.columns = [
 				{prop:"id", label:"ID", minWidth:50},
-				{prop:"name", label:"用户名", minWidth:120},
-				{prop:"truename", label:"真实姓名", minWidth:100},
-				{prop:"deptName", label:"机构", minWidth:120},
-				{prop:"roleNames", label:"角色", minWidth:100},
+				{prop:"name", label:"用户名", minWidth:100},
+				{prop:"truename", label:"真实姓名", minWidth:80},
+				{prop:"deptName", label:"机构", minWidth:100},
+        {prop:"roleNames", label:"角色", minWidth:80},
+        {prop:"job", label:"职务", minWidth:80},
 
-				{prop:"mobile", label:"手机", minWidth:100},
-				{prop:"status", label:"状态", minWidth:70},
+				{prop:"mobile", label:"手机", minWidth:80},
 
 				// {prop:"createBy", label:"创建人", minWidth:120},
 				// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}