From 2d50c51214f0ced8c992a415c72ea33b519fff59 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 03 Sep 2021 15:53:05 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/qualificationExamination/registrationTrainingQuery.vue |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/views/qualificationExamination/registrationTrainingQuery.vue b/src/views/qualificationExamination/registrationTrainingQuery.vue
index eded444..296cc3b 100644
--- a/src/views/qualificationExamination/registrationTrainingQuery.vue
+++ b/src/views/qualificationExamination/registrationTrainingQuery.vue
@@ -286,9 +286,32 @@
             // search: true,
             // searchSpan: 4,
           },
+          // {
+          //   label: "保安公司",
+          //   prop: "deptId",
+          //   // width: 70,
+          //   // search: true,
+          //   // searchSpan: 4,
+          //   dicUrl:
+          //     "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+          //   props: {
+          //     label: "title",
+          //     value: "id",
+          //   },
+          //   // search: true,
+          //   // type: "tree",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入组织机构",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          //   overHidden: true,
+          // },
           {
             label: "保安公司",
-            prop: "deptId",
+            prop: "deptName",
             // width: 70,
             // search: true,
             // searchSpan: 4,

--
Gitblit v1.9.3