From e4100ecc3a88273dcdbc2c1452d4e9f00736f3db Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 10:17:44 +0800
Subject: [PATCH] 派遣单位管理修改,考试成绩查询样式微调

---
 src/views/securityEquipment/gun.js |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 3ad2692..ce39f63 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -69,17 +69,17 @@
         search: true,
     },
     {
-        label: "保安公司",
-        prop: "tenantName",
+        label: "所属保安公司",
+        prop: "deptId",
+        search: true,
+        searchSpan: 4,
+        searchLabelWidth: 110,
         labelWidth: 160,
         rules: [{
             required: true,
             message: "请输入组织机构",
             trigger: "blur"
         }],
-        // addDisplay: true,
-        // editDisplay: true,
-        // viewDisplay: true,
         overHidden: true,
         // searchSpan: 4,
         dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
@@ -87,13 +87,7 @@
             label: "title",
             value: "id"
         },
-        // search: true,
         type: "select",
-        // rules: [{
-        //     required: true,
-        //     message: "请选择学历",
-        //     trigger: "blur"
-        // }],
     },
     {
         label: "责任人",
@@ -112,7 +106,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         // width: 110,
         // overHidden: true,
         // search: true,
@@ -129,7 +123,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         searchSpan: 4,
         overHidden: true,
         rules: [{

--
Gitblit v1.9.3