From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityUnit/armedEscort.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/securityUnit/armedEscort.vue b/src/views/securityUnit/armedEscort.vue
index 5e28d14..5ad6d2f 100644
--- a/src/views/securityUnit/armedEscort.vue
+++ b/src/views/securityUnit/armedEscort.vue
@@ -358,11 +358,14 @@
       );
     },
     rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+      this.$confirm(
+        "该操作将会把保安员数据一并删除,不可恢复!确定将选择公司删除?",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
         .then(() => {
           console.log(row);
           return remove(row.creditcode, row.departmentid).then((res) => {
@@ -462,7 +465,10 @@
     //   this.nobumen = 1;
     // },
     handleSubmit(form, done) {
-      console.log(form);
+      form["createUserId"] = this.userInfo.Id;
+      // console.log(form);
+      // done();
+      // return;
       adddata(form).then((res) => {
         if (res.data.success) {
           this.$message({
@@ -477,6 +483,7 @@
             message: "提交失败",
             type: "warning",
           });
+          done();
         }
       });
     },

--
Gitblit v1.9.3