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/equipments.js |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index cce2a78..55e58a7 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -20,7 +20,9 @@
         label: "名称",
         prop: "name",
         search: true,
-         rules: [{
+        searchSpan: 4,
+        searchLabelWidth: 50,
+        rules: [{
             required: true,
             message: "请输入名称",
             trigger: "blur"
@@ -29,7 +31,8 @@
     {
         label: "编号",
         prop: "number",
-         rules: [{
+        searchSpan: 4,
+        rules: [{
             required: true,
             message: "请输入编号",
             trigger: "blur"
@@ -39,7 +42,7 @@
     {
         label: "规格",
         prop: "specifications",
-         rules: [{
+        rules: [{
             required: true,
             message: "请输入规格",
             trigger: "blur"
@@ -50,7 +53,7 @@
         label: "型号",
         prop: "mode",
         width: 70,
-         rules: [{
+        rules: [{
             required: true,
             message: "请输入型号",
             trigger: "blur"
@@ -58,18 +61,32 @@
         // search: true,
     },
     {
-        label: "保安公司",
-        prop: "tenantName",
+        label: "数量",
+        prop: "num",
+        rules: [{
+            required: true,
+            message: "请输入数量",
+            trigger: "blur"
+        }]
+        // search: true,
+    },
+    {
+        label: "所属保安公司",
+        prop: "deptId",
+        searchSpan: 4,
+        searchLabelWidth: 110,
         rules: [{
             required: true,
             message: "请输入组织机构",
             trigger: "blur"
         }],
+        hide: false,
+        search: true,
         overHidden: true,
         // addDisplay: true,
         // editDisplay: true,
         // viewDisplay: true,
-        // searchSpan: 5,
+        // searchSpan: 4,
         dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
         props: {
             label: "title",
@@ -97,6 +114,7 @@
         prop: "brand",
         // search: true,
         width: 110,
+        searchSpan: 4,
         overHidden: true,
         search: true,
         rules: [{
@@ -108,11 +126,11 @@
     {
         label: "出厂日期",
         prop: "dateForProduction",
-        // search: true,
         type: "date",
-        format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        format: 'yyyy-MM-dd',
         searchSpan: 4,
+        // span:8,
+        valueFormat: 'yyyy-MM-dd',
         overHidden: true,
         rules: [{
             required: true,

--
Gitblit v1.9.3