From 27c0c8c3769d5725b201ed897ca1ec2ff27a4e86 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 27 Aug 2021 09:34:05 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/securityCompany/computents/punish.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/securityCompany/computents/punish.vue b/src/views/securityCompany/computents/punish.vue
index 1dd8f8b..b585e5f 100644
--- a/src/views/securityCompany/computents/punish.vue
+++ b/src/views/securityCompany/computents/punish.vue
@@ -30,6 +30,7 @@
         searchShowBtn: false,
         addBtn: false,
         selection: true,
+        border: true,
         menu: false,
 
         align: "center",
@@ -49,8 +50,8 @@
           {
             label: "处罚原因",
             prop: "punishreason",
-            span: 24,
             labelWidth: 110,
+            // width: 160,
             rules: [
               {
                 required: true,
@@ -62,26 +63,29 @@
           {
             label: "处罚结果",
             prop: "punishresult",
-            span: 24,
             // type: "textarea",
+            // width: 160,
             labelWidth: 110,
           },
           {
             label: "处罚日期",
             prop: "punishtime",
-            span: 24,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
             // type: "textarea",
             labelWidth: 110,
+            width: 160,
           },
           {
-            label: "处罚批准文号",
+            label: "批准文号",
             prop: "punisnum",
-            span: 24,
-            // type: "textarea",
+            // type: "date",
+            // format: "yyyy-MM-dd",
+            // valueFormat: "yyyy-MM-dd",
+            // // type: "textarea",
             labelWidth: 110,
+            // width: 160,
           },
         ],
       },

--
Gitblit v1.9.3