From bb85dd8eeb2f2c2c56392ba7cab51300138e8932 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 23:02:30 +0800
Subject: [PATCH] 保安管理组织机构回显

---
 src/views/securityGuard/securityGuard.vue |   86 +++++++++++++++++++++++++++++++------------
 1 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0abb569..94256a5 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -421,7 +421,7 @@
                 slot: true,
                 rules: [
                   {
-                    required: true,
+                    required: false,
                     message: "请选择所属角色",
                     trigger: "click",
                   },
@@ -438,7 +438,7 @@
                 },
                 rules: [
                   {
-                    required: true,
+                    required: false,
                     message: "请选择所属岗位",
                     trigger: "click",
                   },
@@ -833,24 +833,64 @@
         });
       },
       rowSave(row, done, loading) {
-        row.deptId = row.deptId.join(",");
-        row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
-        add(row).then(() => {
-          this.initFlag = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+        debugger;
+        if(row.deptId){
+            row.deptId = row.deptId;
+        }
+        if(row.roleId){
+            row.roleId = row.roleId.join(",");
+        }
+        if(row.postId){
+            row.postId = row.postId.join(",");
+        }
+        const userPractitionersList = [];
+        var userPractitionersInfo = row.UserPractitionersInfo;
+        if (userPractitionersInfo.length > 0) {
+          userPractitionersInfo.forEach((item) => {
+            const info = {
+              companyname: item.companyname,
+              department: item.department,
+              departureTime: item.departureTime,
+              entryTime: item.entryTime,
+              name: row.realName,
+              leaving: item.leaving,
+              cardid: row.cardid,
+              post: item.post,
+              responsibilities: item.responsibilities,
+            };
+            userPractitionersList.push(info);
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
+        }
+        var IdCardNo = row.cardid;
+        add(row).then(
+          () => {
+            const experience = {
+              cardid: IdCardNo,
+              userPractitionersInfo: userPractitionersList,
+            };
+            //新增从业信息
+            saveOrUpdateUserPractitionersInfo(experience).then(() => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+            });
+            this.initFlag = false;
+            this.onLoad(this.page);
+            // this.$message({
+            //   type: "success",
+            //   message: "操作成功!",
+            // });
+            done();
+          },
+          (error) => {
+            window.console.log(error);
+            loading();
+          }
+        );
       },
       rowUpdate(row, index, done, loading) {
-        row.deptId = row.deptId.join(",");
+        row.deptId = row.deptId;
         row.roleId = row.roleId.join(",");
         row.postId = row.postId.join(",");
         const userPractitionersList = [];
@@ -872,8 +912,6 @@
           });
         }
         var IdCardNo = row.cardid;
-        row.deptId = row.deptId.join(",");
-        row.postId = row.postId.join(",");
         update(row).then(
           () => {
             const experience = {
@@ -889,10 +927,10 @@
             });
             this.initFlag = false;
             this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "操作成功!",
+            // });
             done();
           },
           (error) => {
@@ -1024,7 +1062,7 @@
           getUser(this.form.id).then(res => {
             this.form = res.data.data;
             if(this.form.hasOwnProperty("deptId")){
-              this.form.deptId = this.form.deptId.split(",");
+              this.form.deptId = this.form.deptId;
             }
             if(this.form.hasOwnProperty("roleId")){
               this.form.roleId = this.form.roleId.split(",");

--
Gitblit v1.9.3