Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght

xichongSys/src/views/Myvue/drdysq.vue

@@ -14,13 +14,17 @@
         label="姓名">
       </el-table-column>
       <el-table-column
-        prop="socialSecurityNumber"
+        prop="applyWay"
         label="领取方式">
       </el-table-column>
       <el-table-column
-        prop="nation"
+        prop="payNum"
         label="缴费年限">
       </el-table-column>
+      <el-table-column
+        prop="accountBalance"
+        label="个人账户积累额">
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button

xichongSys/src/views/Myvue/examRecord.vue

@@ -322,18 +322,92 @@
             }
           })
           }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: false
+               name:"待遇申请审核",
+               params:{
+                 treApp: {
+                   recordId: this.tableData[s].recordId,
+                   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:false
+                 }
+               }
+             })
+           } else if(d.recordtype === "参保注销") {
+             // sessionStorage.setItem("recordId",this.tableData[s].recordId)
+             this.$router.push({
+               name:"参保注销审核",
+               params:{
+                 insCan: {
+                   recordId: this.tableData[s].recordId,
+                   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:false
+                 }
+               }
+             })
+           } else if(d.recordtype === "补缴保费") {
+             // sessionStorage.setItem("recordId",this.tableData[s].recordId)
+             this.$router.push({
+               name:"补缴保费审核",
+               params:{
+                 supPay: {
+                   recordId: this.tableData[s].recordId,
+                   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:false
+                 }
+               }
+             })
+           } else if(d.recordtype === "升档改办") {
+             // sessionStorage.setItem("recordId",this.tableData[s].recordId)
+             this.$router.push({
+               name:"升档改办审核",
+               params:{
+                 upgReo: {
+                   recordId: this.tableData[s].recordId,
+                   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:false
+                 }
+               }
+             })
+           } else if(d.recordtype === "关系转移") {
+             // sessionStorage.setItem("recordId",this.tableData[s].recordId)
+             this.$router.push({
+               name:"关系转移审核",
+               params:{
+                 traRel: {
+                   recordId: this.tableData[s].recordId,
+                   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:false
+                 }
                }
              })
            }

xichongSys/src/views/Myvue/insuranceCancellationAudit.vue

@@ -2,7 +2,7 @@
   <div>
     <h2 class="imtil">基础信息</h2>
     <div class="wrap">
-<!--      <div class="masks"></div>-->
+      <!--      <div 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 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>
@@ -60,7 +60,7 @@
     </div>
     <h2 class="imtil">个人账户终止结算信息</h2>
     <div class="wrap">
-<!--      <div class="masks"></div>-->
+      <!--      <div 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>
@@ -71,8 +71,8 @@
         <el-form-item label="应抵扣重复领取其他社会保险待遇">
           <el-input v-model="form4.other_overApply"></el-input>
         </el-form-item>
-        <el-form-item label="发放账户">
-          <el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
+        <el-form-item label="发放账户类型">
+          <el-input v-model="form4.provide_account"></el-input>
         </el-form-item>
       </el-form>
       <el-form ref="form4" :model="form4" class="form4" label-width="auto">
@@ -86,13 +86,13 @@
           <el-input v-model="form4.account_totle"></el-input>
         </el-form-item>
         <el-form-item label="发放账户的账号">
-          <el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
+          <el-input v-model="form4.bankAccount"></el-input>
         </el-form-item>
       </el-form>
     </div>
     <h2 class="imtil">指定受益人或法定继承人</h2>
     <div class="wrap">
-<!--      <div class="masks"></div>-->
+      <!--      <div 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>
@@ -156,6 +156,7 @@
   import CryptoJS from 'crypto-js'
 
   import {Loading} from 'element-ui';
+  import {formatDate} from "@/utils/datetime";
 
   export default {
     data() {
@@ -206,6 +207,7 @@
           wuserId: "",
           address: "",
           birth_day: "",
+          bankAccount: "",
         },
         urls: [],
         show: ""
@@ -242,7 +244,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;
@@ -308,7 +310,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;
@@ -358,15 +360,15 @@
       },
     },
     created() {
-      if (typeof(this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) {
+      if (typeof (this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) {
         this.show = this.$route.params.insCan.show;
         sessionStorage.setItem("insCanInfo", this.$route.params.insCan.info);
         sessionStorage.setItem("insCanItems", JSON.stringify(this.$route.params.insCan));
       }
+      let obj = JSON.parse(sessionStorage.getItem("insCanItems"));
       this.form4 = JSON.parse(sessionStorage.getItem("insCanInfo"));
-      this.form4.name = this.form4.name ? this.decrypt(this.form4.name) : "";
+      this.form4.name = this.form4.name ? this.decrypt(this.form4.name) : obj.name;
       this.form4.identity_number = this.form4.identity_number ? this.decrypt(this.form4.identity_number) : "";
-      let obj = JSON.parse(sessionStorage.getItem("insCanItems"));
       if (obj.bankpic) {
         this.bb = true;
         this.itmebs = "银行卡";
@@ -388,7 +390,10 @@
       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) {
+        this.form4.birth_day = formatDate(this.form4.birth_day.time);
+      }
+    },
   }
 </script>
 <style>

xichongSys/src/views/Myvue/receivePersonnel.vue

@@ -291,6 +291,7 @@
     methods: {
       //搜索
       search() {
+        Loading.service();
         let data = {
           idCard: this.idCard ? this.Encrypt(this.idCard) : "",
           name: this.name ? this.Encrypt(this.name) : "",
@@ -310,8 +311,15 @@
           this.tableData = res.data.content
           this.totals = res.data.totalSize
           this.pageNum = res.data.pageNum
+          let loadingInstance = Loading.service();
+          this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+            loadingInstance.close();
+          });
         }).catch((res) => {
-
+          let loadingInstance = Loading.service();
+          this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+            loadingInstance.close();
+          });
         });
       },
       current_change(ss) {

xichongSys/src/views/Myvue/supPaymentAudit.vue

@@ -282,11 +282,11 @@
         sessionStorage.setItem("supPayInfo", this.$route.params.supPay.info);
         sessionStorage.setItem("supPayItems", JSON.stringify(this.$route.params.supPay));
       }
+      let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
       this.form = JSON.parse(sessionStorage.getItem("supPayInfo"));
-      this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
+      this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.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) : "";
-      let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
       if (obj.bankpic) {
         this.bb = true;
         this.itmebs = "银行卡";

xichongSys/src/views/Myvue/table.vue

@@ -292,6 +292,7 @@
               name:"待遇申请审核",
               params:{
                 treApp: {
+                  name: this.tableData[s].name,
                   recordId: this.tableData[s].recordId,
                   info:this.tableData[s].info,
                   bankpic:this.tableData[s].bankpic,
@@ -310,6 +311,7 @@
               name:"参保注销审核",
               params:{
                 insCan: {
+                  name: this.tableData[s].name,
                   recordId: this.tableData[s].recordId,
                   info:this.tableData[s].info,
                   bankpic:this.tableData[s].bankpic,
@@ -328,6 +330,7 @@
               name:"补缴保费审核",
               params:{
                 supPay: {
+                  name: this.tableData[s].name,
                   recordId: this.tableData[s].recordId,
                   info:this.tableData[s].info,
                   bankpic:this.tableData[s].bankpic,
@@ -346,6 +349,7 @@
               name:"升档改办审核",
               params:{
                 upgReo: {
+                  name: this.tableData[s].name,
                   recordId: this.tableData[s].recordId,
                   info:this.tableData[s].info,
                   bankpic:this.tableData[s].bankpic,
@@ -364,6 +368,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/traRelationsAudit.vue

@@ -38,7 +38,7 @@
         </el-form-item>
       </el-form>
       <el-form ref="form" :model="form" class="form" label-width="auto">
-        <el-form-item label="原户籍地地址">
+        <el-form-item label="转移后户籍地地址">
           <el-input v-model="form.new_Address"></el-input>
         </el-form-item>
         <el-form-item label="银行账号">
@@ -270,11 +270,11 @@
         sessionStorage.setItem("traRelInfo", this.$route.params.traRel.info);
         sessionStorage.setItem("traRelItems", JSON.stringify(this.$route.params.traRel));
       }
+      let obj = JSON.parse(sessionStorage.getItem("traRelItems"));
       this.form = JSON.parse(sessionStorage.getItem("traRelInfo"));
-      this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
+      this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.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) : "";
-      let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
       if (obj.bankpic) {
         this.bb = true;
         this.itmebs = "银行卡";

xichongSys/src/views/Myvue/treatmentApplicationAudit.vue

@@ -301,11 +301,11 @@
         sessionStorage.setItem("treAppInfo", this.$route.params.treApp.info);
         sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp));
       }
+      var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
       this.form = JSON.parse(sessionStorage.getItem("treAppInfo"));
-      this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
+      this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.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;
         this.itmebs = "银行卡";

xichongSys/src/views/Myvue/upgradeReoAudit.vue

@@ -277,11 +277,11 @@
         sessionStorage.setItem("upgReoInfo", this.$route.params.upgReo.info);
         sessionStorage.setItem("upgReoItems", JSON.stringify(this.$route.params.upgReo));
       }
+      let obj = JSON.parse(sessionStorage.getItem("upgReoItems"));
       this.form = JSON.parse(sessionStorage.getItem("upgReoInfo"));
-      this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
+      this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.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) : "";
-      let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
       if (obj.bankpic) {
         this.bb = true;
         this.itmebs = "银行卡";

xichongSys/src/views/Sys/Role.vue

@@ -34,7 +34,7 @@
 			</el-form-item>
       <el-form-item label="签章" prop="seal" align="left">
         <el-popover
-          v-if="dataForm.sealStr !== null && dataForm.sealStr != ''"
+          v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
           placement="left"
           title=""
           trigger="hover">
@@ -48,11 +48,18 @@
           action=""
           accept=".png,.jpg"
           :on-change="changeSeal"
-          :limit="1"
           :file-list="sealUrl"
           :auto-upload="false">
           <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-          <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
+          <el-button
+            v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
+            icon="el-icon-delete"
+            size="small"
+            type="warning"
+            @click="cancelSeal">
+            取消签章
+          </el-button>
+<!--          <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>-->
         </el-upload>
       </el-form-item>
 		</el-form>
@@ -170,6 +177,8 @@ export default {
 				id: 0,
 				name: '',
 				remark: '',
+        seal: '',
+        sealStr: '',
 			}
 			this.sealUrl = [];
 		},
@@ -303,7 +312,8 @@ export default {
           	return format(row[column.property])
       	},
     changeSeal(file) {
-		  var This = this;
+		  let This = this;
+		  this.dataForm.sealStr = "";
 		  this.sealUrl = [];
 		  this.sealUrl.push(file);
       if (this.sealUrl.length > 0) {
@@ -318,6 +328,11 @@ export default {
 		  reader.onload = function (e) {
 		    callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
       }
+    },
+    cancelSeal() {
+		  this.sealUrl = [];
+		  this.dataForm.sealStr = null;
+		  this.dataForm.seal = null;
     }
 	},
 	mounted() {

xichongSys/src/views/Sys/User.vue

@@ -150,7 +150,11 @@ export default {
         ],
         deptId: [
           { required: true, message: '请选择机构', trigger: 'change'}
-        ]
+        ],
+        password: [
+          { required: true, message: '请输入密码', trigger: 'blur'},
+          { pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
+        ],
 			},
 			// 新增编辑界面数据
 			dataForm: {
@@ -201,7 +205,14 @@ export default {
 		findUserRoles: function () {
 			this.$api.role.findAll().then((res) => {
 				// 加载角色集合
-				this.roles = res.data
+				this.roles = res.data;
+				console.log("roles:", this.roles);
+				for (let i = 0,len = this.roles.length;i < len;i++) {
+				  if (this.roles[i].name === "超级管理员") {
+				    this.roles.splice(i, 1);
+				    break;
+          }
+        }
 			})
 		},
 		// 批量删除