Merge branch 'master' into 'mhy'

Master

See merge request !49

xichongSys/src/utils/global.js

@@ -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

 <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

@@ -2,8 +2,9 @@
 <div>
   <div class="op">
 
+    <Candode v-on:childByValue="childByValue"></Candode>
 
-<div class="add" style="margin-left:0">
+<!--<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>
@@ -190,7 +191,12 @@ 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 {
@@ -199,11 +205,11 @@ import defaultImg from "../../assets/defaultPicture.jpg"
          town:"",
          village:"",
          defaultImg: defaultImg,
+        townList:"",
         cit:"",
         Page:1,
         totals:0,
         idcard:"",
-        ywtype:"",
         info:'',
         ywtype:'',
         tableData: [],
@@ -267,6 +273,9 @@ import defaultImg from "../../assets/defaultPicture.jpg"
       }
     },
     methods: {
+      childByValue(val){
+        this.townList=val
+      },
       //搜索
       serch(){
         Loading.service();
@@ -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,

xichongSys/src/views/Myvue/examRecord.vue

 <template>
 <div>
   <div class="op">
+    <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

 <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

@@ -139,7 +139,6 @@
     Candode
     },
    data() {
-
       return {
       townList:'',
        activities: [],

xichongSys/src/views/Sys/User.vue

@@ -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 {
+      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) {
+
+			if(data == null) {
+        this.pageRequest = { pageNum: 1, pageSize: 10 }
+			}else {
         this.pageRequest = data.pageRequest
       }
-			this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name}}
+			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:'')