From 48d34b0def9f848d1b7f9ddd2cd0861341fb208d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Dec 2021 17:15:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

---
 src/views/securityCompany/security.vue |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/views/securityCompany/security.vue b/src/views/securityCompany/security.vue
index 315ca18..049181d 100644
--- a/src/views/securityCompany/security.vue
+++ b/src/views/securityCompany/security.vue
@@ -2,7 +2,7 @@
  * @Author: Morpheus
  * @Date: 2021-07-07 17:30:05
  * @Last Modified by: liu
- * @Last Modified time: 2021-09-15 16:08:12
+ * @Last Modified time: 2021-12-04 14:40:34
  * menu-name 保安服务公司查询
  */
 <template>
@@ -56,9 +56,17 @@
           :type="type"
           icon="el-icon-warning"
           class="zhengJian-icon"
-          @click.stop="punish(row)"
+          @click.stop="punishtable(row)"
           >处罚</el-button
         >
+        <!-- <el-button
+          :size="size"
+          :type="type"
+          icon="el-icon-warning"
+          class="zhengJian-icon"
+          @click.stop="punish(row)"
+          >处罚</el-button
+        > -->
       </template>
     </avue-crud>
     <el-dialog
@@ -93,6 +101,18 @@
         >
       </span> -->
     </el-dialog>
+    <el-dialog
+      title="处罚详情"
+      :visible.sync="dialogVisiblepunishtable"
+      width="85%"
+      height="80vh"
+      :before-close="handleClose"
+      :modal-append-to-body="false"
+      center
+    >
+      <punish :form="dialogVisiblepunishData" v-if="dialogVisiblepunishtable">
+      </punish>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -107,10 +127,15 @@
 } from "@/api/securityCompany/security";
 import { mapGetters } from "vuex";
 import { companyColimn, punishColimn } from "./column";
-
+import punish from "./computents/punish.vue"; //处罚信息
 export default {
+  components: {
+    punish,
+  },
   data() {
     return {
+      dialogVisiblepunishData: {},
+      dialogVisiblepunishtable: false,
       objf: {},
       optionf: {
         column: punishColimn,
@@ -221,6 +246,7 @@
           type: "success",
           message: "操作成功!",
         });
+        this.dialogVisiblepunishData.news = !this.dialogVisiblepunishData.news;
         that.objf = {
           enterprisename: "",
           punishreason: "",
@@ -248,12 +274,21 @@
       };
       done();
     },
-    punish(row) {
+    punishtable(row) {
+      this.dialogVisiblepunishData = {
+        ...row,
+        see: true,
+        that: this,
+        news: false,
+      };
+      this.dialogVisiblepunishtable = true;
+    },
+    punish() {
       //打开处罚
       // console.log(row);
       this.objf = {
-        deptid: row.departmentid,
-        enterprisename: row.enterprisename,
+        deptid: this.dialogVisiblepunishData.departmentid,
+        enterprisename: this.dialogVisiblepunishData.enterprisename,
       };
       this.dialogVisible = true;
     },

--
Gitblit v1.9.3