From 6150cb98194814c285e8f72d7e8c11bbd8b9a121 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 21:09:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

---
 src/views/securityCompany/column.js |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/src/views/securityCompany/column.js b/src/views/securityCompany/column.js
index f713bb1..62725e0 100644
--- a/src/views/securityCompany/column.js
+++ b/src/views/securityCompany/column.js
@@ -137,9 +137,16 @@
     },
     {
         label: "所属辖区",
-        prop: "region",
+        // prop: "region",
         labelWidth: 160,
         // width: 110,
+        prop: "jurisdiction",
+        type: "tree",
+        dicUrl: "/api/jurisdiction/lazy-tree",
+        props: {
+            label: "title",
+            value: "id",
+        },
         // search: true,
         overHidden: true
     },
@@ -161,4 +168,72 @@
         // search: true,
         // width: 88,
     },
-]
\ No newline at end of file
+]
+
+export var punishColimn = [
+    {
+        label: "公司名称",
+        prop: "enterprisename",
+        span: 24,
+        labelWidth: 110,
+        disabled: true,
+        rules: [
+            {
+                required: true,
+                message: "请输入公司名称",
+                trigger: "blur",
+            },
+        ],
+    },
+    {
+        label: "处罚情况",
+        prop: "punishreason",
+        span: 24,
+        labelWidth: 110,
+        rules: [
+            {
+                required: true,
+                message: "请输入处罚情况",
+                trigger: "blur",
+            },
+        ],
+    },
+    {
+        label: "处罚结果",
+        prop: "punishresult",
+        span: 24,
+        // type: "textarea",
+        labelWidth: 110,
+    },
+    {
+        label: "处罚日期",
+        prop: "punishtime",
+        span: 24,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        // type: "textarea",
+        labelWidth: 110,
+    },
+    {
+        label: "处罚单位",
+        prop: "penalty",
+        span: 24,
+        // type: "textarea",
+        labelWidth: 110,
+    },
+    {
+        label: "处罚批准文号",
+        prop: "punisnum",
+        span: 24,
+        // type: "textarea",
+        labelWidth: 110,
+    }
+    //   {
+    //     label: "授予单位名称",
+    //     prop: "sex2",
+    //     span: 24,
+    //     labelWidth: 110,
+    //   },
+
+]

--
Gitblit v1.9.3