Skip to content

X
xichonght
Commit 8f70311d authored by liucheng's avatar liucheng
Browse files
Options

Merge branch 'dev' into 'master' 

镇村修改

See merge request !47
parents 2827c5f3 20b7aa10
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 47 deletions
xichongSys/src/utils/global.js
View file @ 8f70311d
......@@ -6,8 +6,8 @@
// 后台管理系统服务器地址
export const baseUrl2 = 'http://xclc.rensheju.com'
export const baseUrl = 'http://xc.rensheju.com'
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://xc.rensheju.com'
export const baseUrl = 'http://172.16.10.33:9002'
export default {
......
xichongSys/src/views/Myvue/allbaseInfo.vue
View file @ 8f70311d
<template>
<div>
<div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam">
<el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input>
</div>
......@@ -229,7 +231,12 @@
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import {formatDate} from '../../utils/datetime'
import Candode from "../Core/candode"
export default {
components:{
Candode
},
data() {
return {
Page: 1,
......@@ -240,9 +247,13 @@
dialogFormVisible:false,
form:{},
tableData: [],
townList:'',
}
},
methods: {
childByValue(val){
this.townList=val
},
showDetail(index,row){
this.dialogFormVisible = true;
this.form = row;
......@@ -253,6 +264,8 @@
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
personName:this.personName?this.Encrypt(this.personName):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:''
}
Loading.service();
this.$api.getlist.listAllBaseInfo(data).then((res) => {
......
xichongSys/src/views/Myvue/authRecord.vue
View file @ 8f70311d
<template>
<div>
<div class="op">
<div class="add" style="margin-left:0">
<Candode v-on:childByValue="childByValue"></Candode>
<!--<div class="add" style="margin-left:0">
<el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
<el-option
v-for="item in list"
......@@ -22,7 +23,7 @@
:value="item2.village_id+','+item2.village_name">
</el-option>
</el-select>
</div>
</div>-->
<div class="nam">
<el-input v-model="name" clearable size="mini" placeholder="请输入姓名"></el-input>
</div>
......@@ -48,9 +49,9 @@
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div>
</div>
<div class="op" style="margin-top:10px">
<div class="add" style="margin-left:0">
......@@ -132,7 +133,7 @@
</el-popover>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone"
......@@ -151,10 +152,10 @@
.op{
display: flex;
align-items: center;
}
.idc{
width: 200px
}
.nam{
......@@ -190,20 +191,25 @@ import Cookies from "js-cookie";
import {listtown} from '../../utils/address'
import {baseUrl2} from "../../utils/global"
import defaultImg from "../../assets/defaultPicture.jpg"
import Candode from "../Core/candode"
export default {
components:{
Candode
},
data() {
return {
list:[],
name:"",
town:"",
village:"",
defaultImg: defaultImg,
townList:"",
cit:"",
Page:1,
totals:0,
idcard:"",
ywtype:"",
info:'',
ywtype:'',
tableData: [],
......@@ -267,13 +273,16 @@ import defaultImg from "../../assets/defaultPicture.jpg"
}
},
methods: {
childByValue(val){
this.townList=val
},
//搜索
serch(){
Loading.service();
this.serchs(1)
},
serchs(p){
var start=""
var end=""
if(this.time){
......@@ -283,9 +292,9 @@ import defaultImg from "../../assets/defaultPicture.jpg"
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
}
var data={
province_name:"四川省",
......@@ -293,8 +302,10 @@ import defaultImg from "../../assets/defaultPicture.jpg"
county_name:"西充县",
pageSize:10,
page:p,
town_name:this.town.split(",")[1],
village_name:this.village.split(",")[1],
// town_name:this.town.split(",")[1],
// village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
......@@ -303,7 +314,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
personName:this.name,
address:this.agemeth,
birthday:this.age
}
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
......@@ -321,20 +332,20 @@ import defaultImg from "../../assets/defaultPicture.jpg"
loadingInstance.close();
});
});
},
//流程
progress(d,s){
},
current_change(ss){
this.serchs(ss)
},
//
handleChange(){
Axios.get(baseUrl2+'/show/getVillageList.do?town_id='+this.town.split(",")[0],{
})
.then(res => {
this.list2=res.data
......@@ -348,7 +359,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
},
//查看
handle(s,d){
},
handleDelete(g,h){
console.log(g)
......@@ -379,7 +390,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
return decrypted.toString(CryptoJS.enc.Utf8);
}
},
created(){
// for(var i in listtown){
// this.list.push({
......@@ -397,7 +408,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
// console.log(this.list)
Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
})
.then(res => {
this.list=res.data
......@@ -405,8 +416,8 @@ Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
.catch(err => {
console.log(err);
});
}
}
</script>
xichongSys/src/views/Myvue/examRecord.vue
View file @ 8f70311d
<template>
<div>
<div class="op">
<div class="nam">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam">
<el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input>
</div>
</div>
<div class="idc">
<el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
</div>
......@@ -151,8 +153,13 @@
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import {listtown} from '../../utils/address'
// import baseUrl from "../../globe/globeUrl"
import Candode from "../Core/candode"
// import baseUrl from "../../globe/globeUrl"
export default {
components:{
Candode
},
data() {
return {
......@@ -165,19 +172,23 @@
idcard:"",
ywtype:"",
info:'',
ywtype:'',
tableData: []
tableData: [],
townList:""
}
},
methods: {
childByValue(val){
this.townList=val
},
//搜索
serch(){
var data={
name:this.name?this.Encrypt(this.name):"",
idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):"",
townName:'',
villageName:''
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:''
}
this.$api.getlist.record(data).then((res) => {
......
xichongSys/src/views/Myvue/payInfo.vue
View file @ 8f70311d
<template>
<div>
<div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam">
<el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input>
</div>
......@@ -132,7 +134,12 @@
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import {formatDate} from '../../utils/datetime'
import Candode from "../Core/candode"
export default {
components:{
Candode
},
data() {
return {
Page: 1,
......@@ -143,13 +150,19 @@
dialogFormVisible:false,
form:{},
tableData: [],
townList:'',
}
},
methods: {
childByValue(val){
this.townList=val
},
serch(){
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
personName:this.personName?this.Encrypt(this.personName):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:''
}
Loading.service();
this.$api.getlist.listPayInfo(data).then((res) => {
......
xichongSys/src/views/Myvue/table.vue
View file @ 8f70311d
......@@ -136,10 +136,9 @@
// import baseUrl from "../../globe/globeUrl"
export default {
components:{
Candode
},
data() {
Candode
},
data() {
return {
townList:'',
activities: [],
......
xichongSys/src/views/Sys/User.vue
View file @ 8f70311d
......@@ -3,6 +3,9 @@
<!--工具栏-->
<div class="toolbar" style="float:left;padding-top:10px;padding-left:15px;">
<el-form :inline="true" :model="filters" :size="size">
<el-form-item>
<Candode v-on:childByValue="childByValue"></Candode>
</el-form-item>
<el-form-item>
<el-input v-model="filters.name" placeholder="用户名"></el-input>
</el-form-item>
......@@ -109,20 +112,26 @@ import KtTable from "@/views/Core/KtTable"
import KtButton from "@/views/Core/KtButton"
import TableColumnFilterDialog from "@/views/Core/TableColumnFilterDialog"
import { format } from "@/utils/datetime"
import Candode from "../Core/candode"
export default {
components:{
PopupTreeInput,
KtTable,
KtButton,
TableColumnFilterDialog
},
TableColumnFilterDialog,
Candode
},
data() {
return {
list:[],
townList:"",
list:[],
address:"",
size: 'small',
filters: {
name: '',
townName:'',
villageName:''
},
columns: [],
filterColumns: [],
......@@ -168,14 +177,22 @@ export default {
}
},
methods: {
childByValue(val){
this.townList=val
},
// 获取分页数据
findPage: function (data) {
if(data !== null) {
this.pageRequest = data.pageRequest
}
this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name}}
if(data == null) {
this.pageRequest = { pageNum: 1, pageSize: 10 }
}else {
this.pageRequest = data.pageRequest
}
this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name},
townName: {townName: 'townName',value: this.townList?this.townList[0]:'',},
villageName: {villageName: 'villageName',value: this.townList?this.townList[1]:''}
}
this.$api.user.findPage(this.pageRequest).then((res) => {
console.log(res.data)
this.pageResult = res.data
this.findUserRoles()
}).then(data!=null?data.callback:'')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment