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

@@ -2,7 +2,7 @@
 <div>
   <h2 class="imtil">基础信息</h2>
 <div class="wrap">
-  
+
   <el-form :inline="true"  label-width="110px" :model="form" class="forme">
     <el-form-item label="姓名">
     <el-input v-model="form.name" readonly></el-input>
@@ -37,8 +37,8 @@
    <el-form-item label="户籍所在地">
     <el-input v-model="address" readonly></el-input>
   </el-form-item>
- 
-  
+
+
   <el-form-item label="利息">
     <el-input v-model="form.interest" readonly></el-input>
   </el-form-item>
@@ -50,8 +50,8 @@
   </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 class="headCon">   
+ <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>
 </div>
@@ -62,7 +62,7 @@
   <div class="block">
     <p class="demonstration">银行卡</p>
     <el-image :src="urls[0]"></el-image>
-     
+
   </div>
   <div class="block">
     <p class="demonstration">签名</p>
@@ -106,14 +106,14 @@ export default {
         return{
             address:"",
             form:{
-                
+
         },
           urls: [
-         
+
         ],
         show:""
         }
-    
+
     },
     methods:{
       //审核通过
@@ -121,7 +121,7 @@ export default {
          this.$confirm('是否审核通过?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-         
+
         }).then(() => {
            Loading.service();
            var data={
@@ -149,7 +149,7 @@ export default {
             message: res.message
           });
           }
-        
+
         }).catch((res) => {
                 let loadingInstance = Loading.service();
             that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -160,12 +160,12 @@ export default {
             message: '操作失败!'+res
           });
         });
-         
+
         }).catch(() => {
           this.$message({
             type: 'info',
             message: '已取消操作'
-          });          
+          });
         });
       },
       //审核不通过
@@ -174,7 +174,7 @@ export default {
         this.$prompt('请输入原因', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-        
+
         }).then(({ value }) => {
            if(value){
           Loading.service();
@@ -203,7 +203,7 @@ export default {
             message: res.message
           });
           }
-        
+
         }).catch((res) => {
                 let loadingInstance = Loading.service();
             that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -214,7 +214,7 @@ export default {
             message: '操作失败!'+res
           });
         });
-         
+
           }else{
               let loadingInstance = Loading.service();
             that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -229,7 +229,7 @@ export default {
           this.$message({
             type: 'info',
             message: '取消输入'
-          });       
+          });
         });
       },
         decrypt(word){
@@ -253,7 +253,7 @@ export default {
       if(this.$route.params.info){
       sessionStorage.setItem("info",this.$route.params.info)
       }
-      
+
       if(this.$route.params.info){
         var a=JSON.stringify(this.$route.params)
       sessionStorage.setItem("items",a)
@@ -266,18 +266,18 @@ export default {
         var obj=JSON.parse(sessionStorage.getItem("items"))
         this.form.personPhoto="http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic
         this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bankpic)
-     
-      
+
+
         this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.signpic)
-     
-     
-       
-     
-      
-        
+
+
+
+
+
+
          this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardfrontpic)
          this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic)
-     
+
       console.log(this.form)
          this.form.sex=  this.form.sex==1?"男":"女"
     }
@@ -301,7 +301,7 @@ export default {
     border: 1px solid lightgray;
 }
 /* .headCon{
-    
+
 } */
 .block{
   width: 23%
@@ -346,5 +346,5 @@ export default {
         text-align: justify
     }
     /* 这里去除必选字段的*,这个符号会造成一定影响,去掉之后我用了li列表进行定位,在前面加上" * ". */
-    
+
 </style>

xichongSys/src/views/Myvue/table.vue

@@ -50,8 +50,8 @@
       prop="nowExamine"
       label="当前状态">
     </el-table-column>
-    
-     <el-table-column 
+
+     <el-table-column
       width="180"
      label="操作">
       <template slot-scope="scope">
@@ -106,10 +106,10 @@
 .op{
   display: flex;
   align-items: center;
- 
+
 }
   .idc{
-  
+
     width: 200px
   }
   .ywtyoe{
@@ -158,11 +158,11 @@
     methods: {
       //搜索
       serch(){
-     
+
         var data={
           idcard:this.idcard?this.Encrypt(this.idcard):"",
           recordType:this.ywtype?parseInt(this.ywtype):""
-          
+
         }
       this.$api.getlist.getlist(data).then((res) => {
             for(var i in res.data.list){
@@ -170,15 +170,15 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             var d=new Date(res.data.list[i].createtime)
             var mon=(parseInt(d.getMonth()) + 1)
-            res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); 
+            res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
             res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":res.data.list[i].recordtype==3?"待遇申请":res.data.list[i].recordtype==4?"参保注销":""
           }
                this.tableData=res.data.list
                 this.totals=res.data.total
                 this.page=res.data.total.pageNum
-        
+
         }).catch((res) => {
-          
+
         });
       },
       //流程
@@ -199,7 +199,7 @@
                 size: 'large'
               })
               }else{
-                
+
               this.activities.push({
                 content:res.data[i].role,
                 timestamp:res.data[i].examinePerson?res.data[i].examineTime:"",
@@ -223,7 +223,7 @@
 
         })
       },
-     
+
       current_change(ss){
         var data={
           pageNum:ss,
@@ -241,13 +241,13 @@
             res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             var d=new Date(res.data.list[i].createtime)
-            res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); 
+            res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
             res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
           }
                this.tableData=res.data.list
                 this.totals=res.data.total
                 this.page=res.data.total.pageNum
-        
+
         }).catch((res) => {
           let loadingInstance = Loading.service();
               this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -266,7 +266,7 @@
             idcardbackpic:this.tableData[s].idcardbackpic,
             idcardfrontpic:this.tableData[s].idcardfrontpic,
             signpic:this.tableData[s].signpic,
-            
+
             show:true
             }
           })
@@ -285,7 +285,7 @@
             }
           })
           }else if(d.recordtype=="待遇申请"){
-         
+
              sessionStorage.setItem("recordId",this.tableData[s].recordId)
           this.$router.push({
             name:"待遇申请审核",
@@ -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){
@@ -330,14 +345,14 @@
                 return decrypted.toString(CryptoJS.enc.Utf8);
             }
     },
-   
+
     created(){
-       
+
         Loading.service();
         var data={
           idcard:'',
           recordType:''
-          
+
         }
          this.$api.getlist.getlist(data).then((res) => {
            let loadingInstance = Loading.service();
@@ -349,15 +364,15 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             var d=new Date(res.data.list[i].createtime)
             var mon=(parseInt(d.getMonth()) + 1)
-            res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); 
+            res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
              res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
           }
           console.log(12312312)
                this.tableData=res.data.list
                 this.totals=res.data.total
                 this.page=res.data.total.pageNum
-               
-        
+
+
         }).catch((res) => {
           let loadingInstance = Loading.service();
               this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭

xichongSys/src/views/Sys/User.vue

@@ -31,8 +31,8 @@
 			</el-form-item>
 		</el-form>
 		<!--表格显示列界面-->
-		<table-column-filter-dialog ref="tableColumnFilterDialog" :columns="columns" 
-			@handleFilterColumns="handleFilterColumns"> 
+		<table-column-filter-dialog ref="tableColumnFilterDialog" :columns="columns"
+			@handleFilterColumns="handleFilterColumns">
 		</table-column-filter-dialog>
 	</div>
 	<!--表格内容栏-->
@@ -48,27 +48,28 @@
 				<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>
-				<!-- <popup-tree-input 
-					:data="deptData" 
-					:props="deptTreeProps" 
-					:prop="dataForm.deptName" 
-					:nodeKey="''+dataForm.deptId" 
+    			clearable
+        ></el-cascader>
+				<!-- <popup-tree-input
+					:data="deptData"
+					:props="deptTreeProps"
+					:prop="dataForm.deptName"
+					:nodeKey="''+dataForm.deptId"
 					:currentChangeHandle="deptTreeCurrentChangeHandle">
 				</popup-tree-input> -->
 			</el-form-item>
@@ -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: []
@@ -167,7 +168,7 @@ export default {
 		findUserRoles: function () {
 			this.$api.role.findAll().then((res) => {
 				// 加载角色集合
-				this.roles = res.data	
+				this.roles = res.data
 			})
 		},
 		// 批量删除
@@ -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,14 +277,14 @@ 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:"mobile", label:"手机", minWidth:100},
-				{prop:"status", label:"状态", minWidth:70},
-				
+				{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:80},
+
 				// {prop:"createBy", label:"创建人", minWidth:120},
 				// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
 				// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
@@ -304,4 +304,4 @@ export default {
 .el-tree-node__children{
 	overflow: scroll
 }
-</style>
+</style>
\ No newline at end of file