From 0caae4016eb87ea3a5d5ee472c1ddd22c38fe0c9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 25 Jun 2023 17:41:09 +0800
Subject: [PATCH] 晋城保安系统

---
 src/views/securityGuard/securityGuard.vue |   63 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index ddd3730..96c421b 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -70,6 +70,7 @@
             </el-button>
             <el-button
               type="primary"
+              style="display: none;"
               size="small"
               plain
               v-if="permission.securityGuard_security_apply"
@@ -79,6 +80,7 @@
             </el-button>
             <el-button
               type="primary"
+              style="display: none;"
               size="small"
               plain
               v-if="permission.securityGuard_security_paper_apply"
@@ -98,10 +100,10 @@
 
             <el-button
               type="danger"
-              style="display: none"
               size="small"
               plain
               icon="el-icon-delete"
+              v-if="permission.securityGuard_delete"
               @click="handleDelete"
               >注 销
             </el-button>
@@ -297,6 +299,10 @@
               >{{ row.deptName }}
             </el-tag>
           </template>
+          <template slot-scope="{ row }" slot="unitName">
+            <el-tag>{{ row.unitName }}
+            </el-tag>
+          </template>
           <template slot-scope="{ row }" slot="tenantName">
             <el-tag>{{ row.tenantName }}</el-tag>
           </template>
@@ -470,7 +476,7 @@
               <div class="security_m_l_titleName widt">
                 {{ certificateObj.realName }}
               </div>
-              <div class="security_m_r_o_jg widt">南昌市公安局</div>
+              <div class="security_m_r_o_jg widt">晋城市公安局</div>
               <div class="security_m_l_titlepaperTimenian widt">
                 {{ certificateYear }}
               </div>
@@ -996,17 +1002,17 @@
         tip: true,
         searchShow: true,
         reserveSelection: true,
-        selectable: row => {
-          if (
-            row.hold !== "1" ||
-            row.securitynumber == null ||
-            row.securitynumber == ""
-          ) {
-            return false;
-          } else {
-            return true;
-          }
-        },
+        // selectable: row => {
+        //   if (
+        //     row.hold !== "1" ||
+        //     row.securitynumber == null ||
+        //     row.securitynumber == ""
+        //   ) {
+        //     return false;
+        //   } else {
+        //     return true;
+        //   }
+        // },
         indexWidth: 55,
         searchMenuSpan: 6,
         stripe: true,
@@ -1284,14 +1290,14 @@
                 label: "政治面貌",
                 prop: "politicaloutlook"
               },
-              {
-                label: "健康状态",
-                prop: "healstats"
-              },
-              {
-                label: "身高",
-                prop: "height"
-              },
+              // {
+              //   label: "健康状态",
+              //   prop: "healstats"
+              // },
+              // {
+              //   label: "身高",
+              //   prop: "height"
+              // },
               {
                 label: "联系地址",
                 prop: "address"
@@ -1328,15 +1334,12 @@
                 ]
               },
               {
-                label: "入职时间",
-                prop: "rtime",
-                type: "date",
-                format: "yyyy-MM-dd",
-                valueFormat: "yyyy-MM-dd",
+                label: "从业单位",
+                prop: "unitName",
                 rules: [
                   {
                     required: true,
-                    message: "请输入入职时间",
+                    message: "请输入从业单位",
                     trigger: "click"
                   }
                 ]
@@ -1717,7 +1720,7 @@
     // });
 
     if (
-      this.userInfo.account == "南昌市保安服务总公司" ||
+      this.userInfo.account == "晋城市保安服务总公司" ||
       this.userInfo.account == "押运分公司"
     ) {
       this.option.column.push({
@@ -1972,7 +1975,7 @@
     },
     handleTemplate1() {
       if (
-        this.userInfo.account == "南昌市保安服务总公司" ||
+        this.userInfo.account == "晋城市保安服务总公司" ||
         this.userInfo.account == "押运分公司"
       ) {
         window.open(
@@ -2510,7 +2513,7 @@
       done();
     },
     selectionChange(list) {
-      // this.selectionList = list;
+      this.selectionList = list;
       this.choiceList = [];
       for (let k in list) {
         this.choiceList.push({

--
Gitblit v1.9.3