From f1ba84aea2a62bd2c4b6fd650535da0f657dc2c3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 14 Aug 2021 10:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/securityCompany/security.vue |  175 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 112 insertions(+), 63 deletions(-)

diff --git a/src/views/securityCompany/security.vue b/src/views/securityCompany/security.vue
index 76d7993..ebce1ea 100644
--- a/src/views/securityCompany/security.vue
+++ b/src/views/securityCompany/security.vue
@@ -36,8 +36,8 @@
           @click.stop="punish(row)"
           >处罚</el-button
         >
-      </template></avue-crud
-    >
+      </template>
+    </avue-crud>
     <el-dialog
       title="处罚"
       :visible.sync="dialogVisible"
@@ -83,6 +83,7 @@
   savePunish,
 } from "@/api/securityCompany/security";
 import { mapGetters } from "vuex";
+import { companyColimn } from "./column";
 
 export default {
   data() {
@@ -149,6 +150,7 @@
         ],
       },
       dialogVisible: false,
+
       form: {},
       query: {},
       loading: true,
@@ -178,63 +180,86 @@
         viewBtn: true,
         dialogClickModal: false,
 
-        column: [
-          {
-            label: "公司名称",
-            prop: "enterprisename",
-            search: true,
-            searchSpan: 4,
-            width: 300,
-            overHidden: true,
-            display: false,
-          },
-          {
-            label: "法定代表人",
-            prop: "representative",
-            display: false,
-            width: 80,
-          },
-          {
-            label: "成立日期",
-            prop: "establishtime",
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
-            mock: {
-              type: "datetime",
-              format: "yyyy-MM-dd",
-            },
-            search: true,
-            searchSpan: 4,
-            display: false,
-            width: 140,
-          },
-          {
-            label: "注册资金",
-            prop: "registeredcapital",
-            display: false,
-            width: 130,
-          },
-          {
-            label: "实缴资金",
-            prop: "capital",
-            display: false,
-            width: 130,
-          },
-          {
-            label: "公司类型",
-            prop: "enterprises",
-            display: false,
-            width: 220,
-            overHidden: true,
-          },
-          {
-            label: "注册地址",
-            prop: "address",
-            display: false,
-            overHidden: true,
-          },
-        ],
+        column: companyColimn,
+        // [
+        //   {
+        //     label: "公司名称",
+        //     prop: "enterprisename",
+        //     search: true,
+        //     searchSpan: 4,
+        //     // width: 300,
+        //     minWidth: 120,
+        //     overHidden: true,
+        //     display: false,
+        //   },
+        //   {
+        //     label: "法定代表人",
+        //     prop: "representative",
+        //     display: false,
+        //     width: 86,
+        //   },
+        //   {
+        //     label: "法人电话",
+        //     prop: "representativecell",
+        //     display: false,
+        //     width: 95,
+        //   },
+        //   {
+        //     label: "成立日期",
+        //     prop: "establishtime",
+        //     type: "date",
+        //     format: "yyyy-MM-dd",
+        //     valueFormat: "yyyy-MM-dd",
+        //     mock: {
+        //       type: "datetime",
+        //       format: "yyyy-MM-dd",
+        //     },
+        //     search: true,
+        //     searchSpan: 4,
+        //     display: false,
+        //     width: 140,
+        //   },
+        //   {
+        //     label: "注册资金",
+        //     prop: "registeredcapital",
+        //     display: false,
+        //     width: 110,
+        //   },
+        //   {
+        //     label: "实缴资金",
+        //     prop: "capital",
+        //     display: false,
+        //     width: 110,
+        //   },
+        //   // {
+        //   //   label: "公司类型",
+        //   //   prop: "enterprises",
+        //   //   display: false,
+        //   //   width: 220,
+        //   //   overHidden: true,
+        //   // },
+
+        //   {
+        //     label: "联系人",
+        //     prop: "contacts",
+        //     display: false,
+        //     overHidden: true,
+        //     width: 95,
+        //   },
+        //   {
+        //     label: "联系电话",
+        //     prop: "contactscell",
+        //     display: false,
+        //     overHidden: true,
+        //     width: 95,
+        //   },
+        //   {
+        //     label: "注册地址",
+        //     prop: "address",
+        //     display: false,
+        //     overHidden: true,
+        //   },
+        // ],
         group: [
           {
             label: "详细信息",
@@ -286,12 +311,29 @@
   methods: {
     close(row) {
       this.dialogVisible = false;
-      this.objf = {};
+      this.objf = {
+        enterprisename: "",
+        punishreason: "",
+        punishresult: "",
+        punishtime: "",
+        punisnum: "",
+      };
     },
     submitf(form, done) {
       console.log(form);
+      var that = this;
       savePunish(form).then((res) => {
-        console.log(res);
+        this.$message({
+          type: "success",
+          message: "操作成功!",
+        });
+        that.objf = {
+          enterprisename: "",
+          punishreason: "",
+          punishresult: "",
+          punishtime: "",
+          punisnum: "",
+        };
       });
       // this.$message.success(JSON.stringify(form));
       done();
@@ -303,7 +345,13 @@
       console.log(err);
     },
     handleClose(done) {
-      this.objf = {};
+      this.objf = {
+        enterprisename: "",
+        punishreason: "",
+        punishresult: "",
+        punishtime: "",
+        punisnum: "",
+      };
       done();
     },
     punish(row) {
@@ -403,7 +451,8 @@
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query)
+        Object.assign(params, this.query),
+        2
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;

--
Gitblit v1.9.3