Merge branch 'mhy' into 'master'

Mhy

See merge request !41

xichongSys/src/views/Myvue/receivePersonnel.vue

 <template>
   <div>
     <div class="op">
+      <Candode v-on:childByValue="childByValue"></Candode>
       <div class="nam">
         <el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input>
       </div>
@@ -13,7 +14,7 @@
             v-for="item in options1"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
+            :value="item.label">
           </el-option>
         </el-select>
       </div>
@@ -37,9 +38,19 @@
       </el-table-column>
       <el-table-column
         prop="grantState"
-        min-width="15%"
+        min-width="10%"
         label="待遇发放状态">
       </el-table-column>
+      <el-table-column
+        prop="townName"
+        min-width="10%"
+        label="乡镇">
+      </el-table-column>
+      <el-table-column
+        prop="villageName"
+        min-width="10%"
+        label="村（社区）">
+      </el-table-column>
       <el-table-column
         prop="lastGrantMonth"
         min-width="10%"
@@ -57,7 +68,7 @@
       </el-table-column>
       <el-table-column
         prop="presentBenchmark"
-        min-width="15%"
+        min-width="10%"
         label="当前月领取标准">
       </el-table-column>
       <el-table-column
@@ -81,7 +92,6 @@
       @current-change="current_change"
     >
     </el-pagination>
-
     <div>
       <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px">
         <el-form :model="data" label-width="auto">
@@ -212,16 +222,18 @@
   }
 
   .idc {
-    min-width: 200px
+    margin-left: 20px;
+    /*min-width: 200px;*/
   }
 
   .nam {
-    margin-right: 20px
+    margin-left: 20px;
+    /*min-width: 200px;*/
   }
 
   .grantState {
-    min-width: 200px;
-    margin-left: 20px
+    margin-left: 20px;
+    /*min-width: 200px;*/
   }
 
   .el-table .warning-row {
@@ -244,9 +256,12 @@
 <script>
   import CryptoJS from 'crypto-js'
   import {Loading} from 'element-ui';
-  import {listtown} from '../../utils/address'
+  import Candode from "../Core/candode"
 
   export default {
+    components:{
+      Candode
+    },
     data() {
       return {
         list: [],
@@ -269,7 +284,8 @@
         info: '',
         tableData: [],
         dialogTableVisible: false,
-        data: {}
+        data: {},
+        townList: "",
       }
     },
     methods: {
@@ -278,7 +294,9 @@
         let data = {
           idCard: this.idCard ? this.Encrypt(this.idCard) : "",
           name: this.name ? this.Encrypt(this.name) : "",
-          grantState: this.grantState
+          grantState: this.grantState,
+          townName: this.townList?this.townList[0]:"",
+          villageName:this.townList?this.townList[1]:"",
         };
         this.$api.getlist.getGrantList(data).then((res) => {
           for (var i in res.data.list) {
@@ -302,7 +320,9 @@
           pageSize: 10,
           idCard: this.idCard ? this.Encrypt(this.idCard) : "",
           name: this.name ? this.Encrypt(this.name) : "",
-          grantState: this.grantState
+          grantState: this.grantState,
+          townName: this.townList?this.townList[0]:"",
+          villageName:this.townList?this.townList[1]:"",
         };
         Loading.service();
         this.$api.getlist.getGrantList(data).then((res) => {
@@ -370,23 +390,12 @@
             done();
           })
           .catch(_ => {});
-      }
+      },
+      childByValue(val){
+        this.townList = val;
+      },
     },
     created() {
-      for (var i in listtown) {
-        this.list.push({
-          value: listtown[i].town_name,
-          label: listtown[i].town_name,
-          children: []
-        })
-        for (var j in listtown[i].chirld) {
-          this.list[i].children.push({
-            value: listtown[i].chirld[j].village_name,
-            label: listtown[i].chirld[j].village_name
-          })
-        }
-      }
-      console.log(this.list)
       Loading.service();
       let data = {};
       this.$api.getlist.getGrantList(data).then((res) => {

xichongSys/src/views/Myvue/table.vue

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

xichongSys/src/views/Myvue/treatmentApplicationAudit.vue

@@ -292,9 +292,9 @@
         sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp));
       }
       this.form = JSON.parse(sessionStorage.getItem("treAppInfo"));
-      this.form.name = this.decrypt(this.form.name);
-      this.form.identity_number = this.decrypt(this.form.identity_number);
-      this.form.telphoneValue = this.decrypt(this.form.telphoneValue);
+      this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
+      this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
+      this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
       var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
       if (obj.bankpic) {
         this.bb = true;