From c4e67a8942e514b65ab41bb19781d50576c15725 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 19:56:52 +0800
Subject: [PATCH] 用户

---
 src/views/securityEquipment/gun.js |   57 ++++++++++++++++++++++++---------------------------------
 1 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 3ad2692..cc2ae69 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,15 +1,12 @@
-var DIC = [
-    {
-        label: '招聘中',
-        value: 1,
-    }, {
-        label: '停止招聘',
-        value: 2,
-    }
-]
+var DIC = [{
+    label: '招聘中',
+    value: 1,
+}, {
+    label: '停止招聘',
+    value: 2,
+}]
 
-export var column = [
-    {
+export var column = [{
         label: "id",
         prop: "id",
         hide: true,
@@ -42,23 +39,23 @@
             trigger: "blur"
         }],
         search: true,
-    },//上面不显示 
+    }, //上面不显示 
     {
         label: "公务用枪编号",
         prop: "cardNumber",
         labelWidth: 160,
         searchLabelWidth: 110,
         rules: [{
-            required: true,
-            message: "请输入公务用枪编号",
-            trigger: "blur"
-        }]
-        // search: true,
+                required: true,
+                message: "请输入公务用枪编号",
+                trigger: "blur"
+            }]
+            // search: true,
     },
     {
         label: "枪型",
         prop: "gunMode",
-        searchSpan: 4,
+        // searchSpan: 4,
         width: 70,
         labelWidth: 160,
         rules: [{
@@ -66,20 +63,20 @@
             message: "请输入枪型",
             trigger: "blur"
         }],
-        search: true,
+        // 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 +84,7 @@
             label: "title",
             value: "id"
         },
-        // search: true,
         type: "select",
-        // rules: [{
-        //     required: true,
-        //     message: "请选择学历",
-        //     trigger: "blur"
-        // }],
     },
     {
         label: "责任人",
@@ -112,7 +103,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         // width: 110,
         // overHidden: true,
         // search: true,
@@ -129,7 +120,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         searchSpan: 4,
         overHidden: true,
         rules: [{
@@ -138,4 +129,4 @@
             trigger: "blur"
         }]
     }
-]
+]
\ No newline at end of file

--
Gitblit v1.9.3