From 79d9fc857559982b00b68b2d709807bdc4cd286f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:58:17 +0800
Subject: [PATCH] minio 地址修改

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

diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 3ad2692..ee32524 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,15 +1,4 @@
-var DIC = [
-    {
-        label: '招聘中',
-        value: 1,
-    }, {
-        label: '停止招聘',
-        value: 2,
-    }
-]
-
-export var column = [
-    {
+export var column = [{
         label: "id",
         prop: "id",
         hide: true,
@@ -17,91 +6,99 @@
         addDisplay: false,
         labelWidth: 160,
     },
+    // {
+    //     label: "公务用枪证编号",
+    //     prop: "gunCardNumber",
+    //     labelWidth: 160,
+    //     searchSpan: 4,
+    //     searchLabelWidth: 130,
+    //     search: true,
+    //     rules: [{
+    //         required: true,
+    //         message: "请输入公务用枪证编号",
+    //         trigger: "blur"
+    //     }]
+    // },
     {
-        label: "公务用枪证编号",
-        prop: "gunCardNumber",
-        labelWidth: 160,
-        searchSpan: 4,
-        searchLabelWidth: 130,
-        search: true,
-        rules: [{
-            required: true,
-            message: "请输入公务用枪证编号",
-            trigger: "blur"
-        }]
-    },
-    {
-        label: "发证单位名称",
+        label: "发证企业名称",
         searchLabelWidth: 110,
         labelWidth: 160,
         prop: "issueUnit",
         searchSpan: 4,
         rules: [{
-            required: true,
-            message: "请输入发证单位名称",
+            required: false,
+            message: "请输入发证企业名称",
             trigger: "blur"
         }],
         search: true,
-    },//上面不显示 
+    }, //上面不显示 
     {
         label: "公务用枪编号",
         prop: "cardNumber",
         labelWidth: 160,
+        search: true,
+        searchSpan: 4,
         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: [{
-            required: true,
+            required: false,
             message: "请输入枪型",
             trigger: "blur"
         }],
-        search: true,
+        // search: true,
     },
     {
-        label: "保安公司",
-        prop: "tenantName",
-        labelWidth: 160,
+        label: "企业名称",
+        prop: "deptId",
+        searchSpan: 6,
+        searchLabelWidth: 110,
         rules: [{
             required: true,
-            message: "请输入组织机构",
+            message: "请输入企业名称",
             trigger: "blur"
         }],
-        // addDisplay: true,
-        // editDisplay: true,
-        // viewDisplay: true,
+        hide: true,
+        addDisplay: false,
+        editDisplay: false,
+        search: false,
         overHidden: true,
-        // searchSpan: 4,
-        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        dicUrl: "",
         props: {
             label: "title",
             value: "id"
         },
-        // search: true,
-        type: "select",
-        // rules: [{
-        //     required: true,
-        //     message: "请选择学历",
-        //     trigger: "blur"
-        // }],
+        type: "tree",
+        width: 250,
     },
     {
         label: "责任人",
         prop: "personInCharge",
         labelWidth: 160,
         rules: [{
-            required: true,
+            required: false,
             message: "请输入责任人",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "责任人身份证号",
+        prop: "cardNo",
+        labelWidth: 160,
+        rules: [{
+            required: false,
+            message: "请输入责任人身份证号",
             trigger: "blur"
         }]
     },
@@ -112,7 +109,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         // width: 110,
         // overHidden: true,
         // search: true,
@@ -128,8 +125,9 @@
         labelWidth: 160,
         // search: true,
         type: "date",
+        row: true,
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         searchSpan: 4,
         overHidden: true,
         rules: [{
@@ -137,5 +135,6 @@
             message: "请输入有效日期",
             trigger: "blur"
         }]
-    }
-]
+    },
+
+]
\ No newline at end of file

--
Gitblit v1.9.3