From 369f3d7763aa4c699a34861dfdfc8aa338c32c04 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 8 Nov 2022 17:50:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/admin/authRole.vue       |  3 +-
 src/views/userManage/customerManage.vue       |  8 ++--
 src/views/userManage/customerUser.vue         |  4 +-
 .../userManage/param/systemPDFTemplate.vue    |  2 +-
 src/views/userManage/phoneRegisterManage.vue  | 43 +++++++++++--------
 5 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue
index 62f89b2..50bd3b0 100644
--- a/src/views/userManage/admin/authRole.vue
+++ b/src/views/userManage/admin/authRole.vue
@@ -101,6 +101,7 @@
         <!--授权界面-->
         <el-dialog
             title="授权"
+            v-if="authFormVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :visible.sync="authFormVisible"
@@ -110,7 +111,7 @@
                 style="max-height: 75vh; overflow-y: auto"
                 :data="authList"
                 show-checkbox=""
-                default-expand-all=""
+                :default-expand-all="false"
                 node-key="id"
                 ref="tree"
                 :props="defaultProps"
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index 0b4b644..054aded 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -4,9 +4,9 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
-                        style="width: 400px"
+                        style="width: 300px"
                         v-model="filterQuery.key"
-                        placeholder="请输入"
+                        placeholder="企业名称"
                         clearable
                     ></el-input>
 
@@ -384,9 +384,9 @@ export default {
             updateCustomers(this.formData)
                 .then((response) => {
                     this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
                     if (response.code === 20000) {
+                        this.getList();
+                        this.cancelDialog();
                         this.$message({
                             type: "success",
                             message: "更新成功！"
diff --git a/src/views/userManage/customerUser.vue b/src/views/userManage/customerUser.vue
index d3ea846..468a566 100644
--- a/src/views/userManage/customerUser.vue
+++ b/src/views/userManage/customerUser.vue
@@ -216,10 +216,10 @@ export default {
             formData: formJson,
             formRules: {},
             addRules: {
-                userName: [{required: true, message: "请输入姓名", trigger: "blur"}],
+                userName: [{required: true, message: "请输入用户账号", trigger: "blur"}],
             },
             editRules: {
-                userName: [{required: true, message: "请输入姓名", trigger: "blur"}],
+                userName: [{required: true, message: "请输入用户账号", trigger: "blur"}],
                 userFlag: [
                     {required: true, message: "请选择状态", trigger: "change"}
                 ]
diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue
index 5368507..9b24447 100644
--- a/src/views/userManage/param/systemPDFTemplate.vue
+++ b/src/views/userManage/param/systemPDFTemplate.vue
@@ -55,7 +55,7 @@
                 <el-table-column label="更新时间" prop="update_time" width="180"></el-table-column>
                 <el-table-column label="所属客户" prop="customerName" width="240"></el-table-column>
                 <el-table-column label="单据类型" prop="bussinessTypeName" width="240"></el-table-column>
-                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="备注" prop="remark"  width="200" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index 77b963d..18aa665 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -286,24 +286,31 @@ export default {
             this.getList();
         },
         deleteDialog(row) {
-            let query = {
-                id: row.id
-            };
-            deleterKey(query)
-                .then((response) => {
-                    if (response.code === 20000) {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！"
-                        });
-                    } else {
-                        this.$message.warning("删除失败");
-                        this.loading = false;
-                    }
-                })
-                .catch(() => {
-                });
+            this.$confirm('是否确认删除此设备?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let query = {
+                    id: row.id
+                };
+                deleterKey(query)
+                    .then((response) => {
+                        if (response.code === 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "删除成功！"
+                            });
+                        } else {
+                            this.$message.warning("删除失败");
+                            this.loading = false;
+                        }
+                    })
+                    .catch(() => {
+                    });
+            }).catch(() => {
+            });
         },