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

xichongSys/src/views/Myvue/table.vue

@@ -299,10 +299,13 @@
           })
           }else if(d.recordtype=="待遇申请"){
 
-             sessionStorage.setItem("recordId",this.tableData[s].recordId)
+             // sessionStorage.setItem("recordId",this.tableData[s].recordId)
           this.$router.push({
             name:"待遇申请审核",
-            params:{info:this.tableData[s].info,
+            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,
@@ -311,12 +314,15 @@
                 bookPic:this.tableData[s].bookPic,
                 show:true
               }
+            }
           })
           } else if(d.recordtype=="参保注销") {
-            sessionStorage.setItem("recordId",this.tableData[s].recordId)
+            // 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,
@@ -326,6 +332,7 @@
                   bookPic:this.tableData[s].bookPic,
                   show:true
                 }
+              }
             })
           }
         },

xichongSys/src/views/Myvue/treatmentApplicationAudit.vue

@@ -145,7 +145,7 @@
         }).then(() => {
           Loading.service();
           var data = {
-            recordId: sessionStorage.getItem("recordId"),
+            recordId: this.$route.params.treApp.recordId,
             examineState: 1,
             remark: "",
             userId: 1
@@ -196,7 +196,7 @@
           if (value) {
             Loading.service();
             var data = {
-              recordId: sessionStorage.getItem("recordId"),
+              recordId: this.$route.params.treApp.recordId,
               examineState: 2,
               remark: value,
               userId: 1
@@ -220,6 +220,14 @@
                   message: res.message
                 });
               }
+              // 关闭当前标签
+              var closeAll = document.querySelectorAll(".el-icon-close");
+              closeAll.forEach(icon => {
+                if (icon.previousSibling.innerText === "待遇申请审核 ") {
+                  icon.click();
+                  throw new Error();
+                }
+              })
             }).catch((res) => {
               let loadingInstance = Loading.service();
               this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -264,10 +272,10 @@
       }
     },
     created() {
-      this.show = this.$route.params.show;
-      if (this.$route.params.info) {
-        sessionStorage.setItem("info", this.$route.params.info);
-        var a = JSON.stringify(this.$route.params);
+      this.show = this.$route.params.treApp.show;
+      if (this.$route.params.treApp.info) {
+        sessionStorage.setItem("info", this.$route.params.treApp.info);
+        var a = JSON.stringify(this.$route.params.treApp);
         sessionStorage.setItem("items", a);
       }
       this.form = JSON.parse(sessionStorage.getItem("info"));

xichongSys/src/views/Sys/User.vue

@@ -57,7 +57,10 @@
 			<el-form-item label="密码" prop="password">
 				<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
 			</el-form-item>
-			<el-form-item label="机构" prop="deptName">
+      <el-form-item label="身份证" prop="bangIdcard">
+        <el-input v-model="dataForm.bangIdcard" auto-complete="off"></el-input>
+      </el-form-item>
+			<el-form-item label="机构" prop="deptId">
 				<el-cascader
           ref="deptTree"
 				v-model="dataForm.deptId"
@@ -82,7 +85,7 @@
 			<el-form-item label="手机" prop="mobile">
 				<el-input v-model="dataForm.mobile" auto-complete="off"></el-input>
 			</el-form-item>
-			<el-form-item label="角色" prop="userRoles" v-if="!operation">
+			<el-form-item label="角色" prop="userRoles">
 				<el-select v-model="dataForm.userRoles" multiple placeholder="请选择"
 					 style="width: 100%;">
 					<el-option v-for="item in roles" :key="item.id"
@@ -90,6 +93,9 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
+      <el-form-item label="职务" prop="job">
+        <el-input v-model="dataForm.job" auto-complete="off"></el-input>
+      </el-form-item>
 		</el-form>
 		<div slot="footer" class="dialog-footer">
 			<el-button :size="size" @click.native="dialogVisible = false" @click="cancelRules('dataForm')">{{$t('action.cancel')}}</el-button>
@@ -134,6 +140,9 @@ export default {
 				],
         truename: [
           { required: true, message: '请输入真实姓名', trigger: 'blur' }
+        ],
+        deptId: [
+          { type: 'array', required: true, message: '请选择机构', trigger: 'change'}
         ]
 			},
 			// 新增编辑界面数据
@@ -142,10 +151,12 @@ export default {
 				name: '',
 				truename:'',
 				password: '',
+        bangIdcard: '',
 				deptId: '',
 				deptName: '',
-				email: 'test@qq.com',
-				mobile: '13889700023',
+				email: '',
+				mobile: '',
+        job: '',
 				status: 1,
 				userRoles: []
 			},
@@ -189,10 +200,12 @@ export default {
 				id: 0,
 				name: '',
 				password: '',
-				deptId: 1,
+        bangIdcard: '',
+				deptId: '',
 				deptName: '',
-				email: 'test@qq.com',
-				mobile: '13889700023',
+				email: '',
+				mobile: '',
+        job: '',
 				status: 1,
 				userRoles: []
 			}
@@ -288,6 +301,7 @@ export default {
 				{prop:"id", label:"ID", minWidth:50},
 				{prop:"name", label:"用户名", minWidth:100},
         {prop:"truename", label:"真实姓名", minWidth:80},
+        {prop:"idCard", label:"身份证", minWidth:100},
 				{prop:"deptName", label:"机构", minWidth:100},
         {prop:"roleNames", label:"角色", minWidth:80},
         {prop:"job", label:"职务", minWidth:80},
@@ -301,6 +315,7 @@ export default {
 			]
 			this.filterColumns = JSON.parse(JSON.stringify(this.columns));
       	},
+    // 清空验证的提示信息
     cancelRules: function (formName) {
       this.$refs[formName].resetFields();
     }