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/management/computents/honor.vue |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/views/management/computents/honor.vue b/src/views/management/computents/honor.vue
index ade3bd9..ac17f99 100644
--- a/src/views/management/computents/honor.vue
+++ b/src/views/management/computents/honor.vue
@@ -20,7 +20,7 @@
 <script>
 import { getListhonor } from "@/api/register/honor";
 export default {
-  props: ["form"],
+  props: ["form", "see"],
   data() {
     return {
       punishOption: {
@@ -28,7 +28,7 @@
         delBtn: false,
         editBtn: false,
         addBtn: false,
-        searchShowBtn: false,
+        // searchShowBtn: false,
         selection: true,
         menu: false,
 
@@ -36,7 +36,7 @@
         height: "auto",
         calcHeight: 270,
         tip: false,
-        searchShow: false,
+        // searchShow: false,
         searchMenuSpan: 4,
         // index: false,
         viewBtn: true,
@@ -50,6 +50,9 @@
             label: "保安员名称",
             prop: "name",
             span: 24,
+            search: false,
+            searchLabelWidth: 100,
+            searchSpan: 4,
             labelWidth: 110,
             disabled: true,
             rules: [
@@ -64,7 +67,10 @@
             label: "身份证号码",
             prop: "cardid",
             span: 24,
+            search: false,
+            searchSpan: 5,
             labelWidth: 110,
+            searchLabelWidth: 100,
             width: 190,
             disabled: true,
             rules: [
@@ -84,6 +90,9 @@
           {
             label: "荣誉情况",
             prop: "honor",
+            search: false,
+            searchSpan: 5,
+            searchLabelWidth: 90,
             span: 24,
             labelWidth: 110,
           },
@@ -111,10 +120,38 @@
       i: 1,
     };
   },
-  mounted() {},
+  mounted() {
+    if (this.see) {
+      this.punishOption.height = "615";
+      this.punishOption.column[0].search = true;
+      this.punishOption.column[1].search = true;
+      this.punishOption.column[3].search = true;
+    }
+  },
   methods: {
     punishOnLoad(page, params = {}) {
       this.punishLoading = true;
+      if (this.see) {
+        getListhonor(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.punishQuery)
+        ).then((res) => {
+          this.i++;
+          const data = res.data.data;
+
+          this.punishPage.total = data.total;
+          this.punishData = data.records;
+          console.log(this.punishData);
+          this.punishLoading = false;
+          this.$refs.punishCrud.refreshTable();
+          this.$refs.punishCrud.doLayout();
+          if (this.i % 2 != 0) {
+            this.punishAngin();
+          }
+        });
+        return;
+      }
       getListhonor(
         page.currentPage,
         page.pageSize,

--
Gitblit v1.9.3