Merge branch 'mhy' into 'master'

Mhy

See merge request !62

xichongSys/src/views/Myvue/drbjbf.vue

@@ -9,22 +9,32 @@
       <el-table-column
         prop="idcard"
         label="身份证号码"
-        min-width="20%">
+        min-width="15%">
       </el-table-column>
       <el-table-column
         prop="name"
         label="姓名"
-        min-width="20%">
+        min-width="10%">
       </el-table-column>
       <el-table-column
         prop="bankAccount"
         label="银行账号"
-        min-width="20%">
+        min-width="15%">
       </el-table-column>
       <el-table-column
         prop="bank"
         label="所属银行"
-        min-width="20%">
+        min-width="10%">
+      </el-table-column>
+      <el-table-column
+        prop="payType"
+        label="补缴类型"
+        min-width="15%">
+      </el-table-column>
+      <el-table-column
+        prop="payNumTol"
+        label="补缴合计"
+        min-width="15%">
       </el-table-column>
       <el-table-column label="操作"
         min-width="20%">

xichongSys/src/views/Myvue/examRecord.vue

@@ -326,6 +326,7 @@
                name:"待遇申请审核",
                params:{
                  treApp: {
+                   name: this.tableData[s].name,
                    recordId: this.tableData[s].recordId,
                    info:this.tableData[s].info,
                    bankpic:this.tableData[s].bankpic,
@@ -344,6 +345,7 @@
                name:"参保注销审核",
                params:{
                  insCan: {
+                   name: this.tableData[s].name,
                    recordId: this.tableData[s].recordId,
                    info:this.tableData[s].info,
                    bankpic:this.tableData[s].bankpic,
@@ -362,6 +364,7 @@
                name:"补缴保费审核",
                params:{
                  supPay: {
+                   name: this.tableData[s].name,
                    recordId: this.tableData[s].recordId,
                    info:this.tableData[s].info,
                    bankpic:this.tableData[s].bankpic,
@@ -380,6 +383,7 @@
                name:"升档改办审核",
                params:{
                  upgReo: {
+                   name: this.tableData[s].name,
                    recordId: this.tableData[s].recordId,
                    info:this.tableData[s].info,
                    bankpic:this.tableData[s].bankpic,
@@ -398,6 +402,7 @@
                name:"关系转移审核",
                params:{
                  traRel: {
+                   name: this.tableData[s].name,
                    recordId: this.tableData[s].recordId,
                    info:this.tableData[s].info,
                    bankpic:this.tableData[s].bankpic,

xichongSys/src/views/Myvue/insuranceCancellationAudit.vue

@@ -2,7 +2,7 @@
   <div>
     <h2 class="imtil">基础信息</h2>
     <div class="wrap">
-      <!--      <div class="masks"></div>-->
+      <div v-if="!this.show" class="masks"></div>
       <el-form ref="form4" :model="form4" class="form4" label-width="auto">
         <el-form-item label="被终止人姓名姓名">
           <el-input v-model="form4.name"></el-input>
@@ -28,7 +28,7 @@
     </div>
     <h2 class="imtil">参保注销信息</h2>
     <div class="wrap">
-      <!--      <div class="masks"></div>-->
+      <div v-if="!this.show" class="masks"></div>
       <el-form ref="form4" :model="form4" class="form4" label-width="auto">
         <el-form-item label="终止原因">
           <el-input v-model="form4.cancel_res"></el-input>
@@ -54,13 +54,14 @@
           <el-input v-model="form4.reback_money"></el-input>
         </el-form-item>
         <el-form-item label="重复地区及险种的追回金额">
-          <el-input placeholder="如有金额请输入"></el-input>
+          <el-input v-if="this.show" placeholder="如有金额请输入"></el-input>
+          <el-input v-if="!this.show"></el-input>
         </el-form-item>
       </el-form>
     </div>
     <h2 class="imtil">个人账户终止结算信息</h2>
     <div class="wrap">
-      <!--      <div class="masks"></div>-->
+      <div v-if="!this.show" class="masks"></div>
       <el-form ref="form4" :model="form4" class="form4" label-width="auto">
         <el-form-item label="个人账户余额">
           <el-input v-model="form4.account_balance"></el-input>
@@ -92,7 +93,7 @@
     </div>
     <h2 class="imtil">指定受益人或法定继承人</h2>
     <div class="wrap">
-      <!--      <div class="masks"></div>-->
+      <div v-if="!this.show" class="masks"></div>
       <el-form ref="form4" :model="form4" class="form4" label-width="auto">
         <el-form-item label="姓名">
           <el-input v-model="form4.bailor_name"></el-input>
@@ -390,7 +391,7 @@
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
       this.form4.sex = this.form4.sex === 1 ? "男" : "女";
       this.form4.bailor_sex = this.form4.bailor_sex === 1 ? "男" : "女";
-      if (this.form4.birth_day !== null) {
+      if (this.form4.birth_day) {
         this.form4.birth_day = formatDate(this.form4.birth_day.time);
       }
     },

xichongSys/src/views/Myvue/receivePersonnel.vue

 <template>
   <div>
     <div class="op">
-      <Candode v-on:childByValue="childByValue"></Candode>
+      <Candode class="candode" v-on:childByValue="childByValue"></Candode>
       <div class="nam">
         <el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input>
       </div>
@@ -18,8 +18,13 @@
           </el-option>
         </el-select>
       </div>
-      <el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search"
-                 @click="search">搜索
+      <el-button
+        type="primary"
+        size="mini"
+        style="background:#148A9B;margin-left:10px"
+        icon="el-icon-search"
+        @click="search">
+        搜索
       </el-button>
     </div>
     <el-table
@@ -79,7 +84,8 @@
             type="primary"
             size="mini"
             icon="el-icon-s-check"
-            @click="handle(scope.$index, scope.row)">详情</el-button>
+            @click="handle(scope.$index, scope.row)">详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -215,26 +221,27 @@
   </div>
 </template>
 
-<style>
+<style scoped>
   .op {
     display: flex;
     align-items: center;
   }
 
+  .candode {
+    margin-right: 20px;
+  }
+
   .idc {
-    margin-left: 20px;
-    min-width: 200px;
+    margin-right: 20px;
   }
 
   .nam {
-    margin-left: 20px;
-    min-width: 200px;
+    margin-right: 20px;
   }
 
-  .grantState {
-    margin-left: 20px;
-    /*min-width: 200px;*/
-  }
+  /*.grantState {*/
+  /*  margin-right: 20px;*/
+  /*}*/
 
   .el-table .warning-row {
     background: oldlace;
@@ -259,7 +266,7 @@
   import Candode from "../Core/candode"
 
   export default {
-    components:{
+    components: {
       Candode
     },
     data() {
@@ -296,21 +303,17 @@
           idCard: this.idCard ? this.Encrypt(this.idCard) : "",
           name: this.name ? this.Encrypt(this.name) : "",
           grantState: this.grantState,
-          townName: this.townList?this.townList[0]:"",
-          villageName:this.townList?this.townList[1]:"",
+          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) {
-            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)
-            // 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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+            res.data.list[i].idcard = res.data.list[i].idcard ? this.decrypt(res.data.list[i].idcard) : "";
+            res.data.list[i].name = res.data.list[i].name ? this.decrypt(res.data.list[i].name) : "";
           }
-          this.tableData = res.data.content
-          this.totals = res.data.totalSize
-          this.pageNum = res.data.pageNum
+          this.tableData = res.data.content;
+          this.totals = res.data.totalSize;
+          this.pageNum = res.data.pageNum;
           let loadingInstance = Loading.service();
           this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
             loadingInstance.close();
@@ -329,8 +332,8 @@
           idCard: this.idCard ? this.Encrypt(this.idCard) : "",
           name: this.name ? this.Encrypt(this.name) : "",
           grantState: this.grantState,
-          townName: this.townList?this.townList[0]:"",
-          villageName:this.townList?this.townList[1]:"",
+          townName: this.townList ? this.townList[0] : "",
+          villageName: this.townList ? this.townList[1] : "",
         };
         Loading.service();
         this.$api.getlist.getGrantList(data).then((res) => {
@@ -339,16 +342,12 @@
             loadingInstance.close();
           });
           for (var i in res.data.list) {
-            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)
-            // 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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+            res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard);
+            res.data.list[i].name = this.decrypt(res.data.list[i].name);
           }
-          this.tableData = res.data.content
-          this.totals = res.data.totalSize
-          this.pageNum = res.data.pageNum
+          this.tableData = res.data.content;
+          this.totals = res.data.totalSize;
+          this.pageNum = res.data.pageNum;
         }).catch((res) => {
           let loadingInstance = Loading.service();
           this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -365,8 +364,8 @@
         this.data.retirementDate = d.getFullYear() + "-" + mon + "-" + d.getDate();
       },
       handleDelete(g, h) {
-        console.log(g)
-        console.log(h)
+        console.log(g);
+        console.log(h);
       },
       Encrypt(word) { //aes加密
         var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
@@ -388,7 +387,7 @@
           ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
         }, keyHex, {
           mode: CryptoJS.mode.ECB,
-          padding: CryptoJS.pad.Pkcs7
+          padding: CryptoJS.pad.Pkcs7,
         });
         return decrypted.toString(CryptoJS.enc.Utf8);
       },
@@ -397,9 +396,10 @@
           .then(_ => {
             done();
           })
-          .catch(_ => {});
+          .catch(_ => {
+          });
       },
-      childByValue(val){
+      childByValue(val) {
         this.townList = val;
       },
     },
@@ -412,15 +412,11 @@
           loadingInstance.close();
         });
         for (var i in res.data.list) {
-          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)
-          // 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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+          res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard);
+          res.data.list[i].name = this.decrypt(res.data.list[i].name);
         }
-        this.tableData = res.data.content
-        this.totals = res.data.totalSize
+        this.tableData = res.data.content;
+        this.totals = res.data.totalSize;
         this.pageNum = res.data.pageNum
       }).catch((res) => {
         let loadingInstance = Loading.service();

xichongSys/src/views/Myvue/supPaymentAudit.vue

@@ -167,7 +167,7 @@
             this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
-            for(let j = 0, len = closeAll.length; j < len; j++) {
+            for (let j = 0, len = closeAll.length; j < len; j++) {
               if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
                 closeAll[j].click();
                 return;
@@ -227,7 +227,7 @@
               this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
-              for(let j = 0, len = closeAll.length; j < len; j++) {
+              for (let j = 0, len = closeAll.length; j < len; j++) {
                 if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
                   closeAll[j].click();
                   return;
@@ -274,10 +274,10 @@
           padding: CryptoJS.pad.Pkcs7
         });
         return decrypted.toString(CryptoJS.enc.Utf8);
-      }
+      },
     },
     created() {
-      if (typeof(this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) {
+      if (typeof (this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) {
         this.show = this.$route.params.supPay.show;
         sessionStorage.setItem("supPayInfo", this.$route.params.supPay.info);
         sessionStorage.setItem("supPayItems", JSON.stringify(this.$route.params.supPay));
@@ -307,7 +307,11 @@
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
       this.form.sex = this.form.sex === 1 ? "男" : "女";
+      if (this.form.address) {
+        const address = JSON.parse(this.form.address);
+        this.form.address = address.province + address.city + address.county + address.town + address.village + address.group;
       }
+    },
   }
 </script>
 <style>