From 376197bfa70b05527abd762fb7303226f8e9cc76 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Tue, 24 Sep 2024 15:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/src/app.config.ts         |  1 -
 securityManagement/src/main.ts                |  6 +--
 .../src/views/serviceManagement/index.vue     | 17 ++++----
 .../userManagement/uniManagement/index.vue    | 40 ++++++++++++-------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts
index c2b33bf..2adbd2d 100644
--- a/collect_information/src/app.config.ts
+++ b/collect_information/src/app.config.ts
@@ -54,5 +54,4 @@ export default defineAppConfig({
       },
     ]
   }
-
 })
diff --git a/securityManagement/src/main.ts b/securityManagement/src/main.ts
index 635dd94..a2ab554 100644
--- a/securityManagement/src/main.ts
+++ b/securityManagement/src/main.ts
@@ -2,12 +2,12 @@ import {createApp} from 'vue'
 import App from '@/App.vue'
 import '@/reset.css'
 import './index.css'
+
+// iconfont css
+import "@/assets/iconfont/iconfont.css";
 // 公共样式
 import '@/assets/scss/common.scss'
 import '@/assets/scss/myAntD.scss'
-// iconfont css
-import "@/assets/iconfont/iconfont.css";
-
 // vue Router
 import router from "@/router";
 // pinia stores
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index 817c081..bb325e2 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -126,17 +126,17 @@ const columns: TableProps['columns'] = [
     dataIndex:'isRecruitSecurity',
     title: '是否自招保安',
     customRender: ({text}) => <a-tag>{text?.label}</a-tag>,
-    width:100
+    width:120
   },
   {
     dataIndex:'idNumber',
-    title: '证件号',
+    title: '保安服务许可证',
     width:170
   },
   {
     dataIndex:'serviceArea',
     title:'服务区域面积',
-    width:100
+    width:120
   },
   {
     dataIndex:'buildingTotal',
@@ -151,17 +151,17 @@ const columns: TableProps['columns'] = [
   {
     dataIndex:'staffTotal',
     title:'工作人员数量',
-    width:100
+    width:120
   },
   {
     dataIndex:'securityUserTotal',
     title:'保安人员数量',
-    width:100
+    width:120
   },
   {
     dataIndex:'createUserName',
     title:'创建人名称',
-    width:100
+    width:110
   },
   {
     dataIndex: 'createTime',
@@ -190,7 +190,7 @@ const columns: TableProps['columns'] = [
               message.success(resp.message)
               await tableRef.value?.requestGetTableData()
             }}>
-          <a-button type="primary" danger>删除</a-button>
+          <a-button  danger>删除</a-button>
         </a-popconfirm>
         <a-button type="primary" onClick={ async ()=>{
           // console.log(record)
@@ -275,6 +275,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
   enterprisesUnitId:{
      type:'select',
      label:'企事业单位',
+     required: true,
      options:enterprisesUnitIdList,
      componentsProps:{
       allowClear:true,
@@ -316,7 +317,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
   },
   idNumber: {
     type: 'input',
-    label: '证件号',
+    label: '保安服务许可证',
     componentsProps:{
        disabled:idNumberDisabled as any
     }
diff --git a/securityManagement/src/views/userManagement/uniManagement/index.vue b/securityManagement/src/views/userManagement/uniManagement/index.vue
index 53b18db..5551883 100644
--- a/securityManagement/src/views/userManagement/uniManagement/index.vue
+++ b/securityManagement/src/views/userManagement/uniManagement/index.vue
@@ -96,21 +96,31 @@ const columns: TableProps['columns'] = [
           </a-popconfirm>
         </a-space>
       }
-      return <a-space >
-        <a-button
-            type="primary"
-            className={record.isEnable.value === 0 ? 'btn-danger' : 'btn-success'}
-            onClick={async () => {
-              const resp = await api.post('/management/disableOrEnableMiniProgramUser', {
-                dataId: record.snowFlakeId,
-                unitOptType: UNIT_TYPE.security
-              })
-              message.success(resp.message)
-              await tableRef.value?.requestGetTableData()
-            }}
-        >{record.isEnable.value === 0 ? '禁用' : '启用'}
-        </a-button>
-      </a-space>
+      return (
+          record.isEnable.value === 0?<a-button
+                  danger
+                  onClick={async () => {
+                    const resp = await api.post('/management/disableOrEnableMiniProgramUser', {
+                      dataId: record.snowFlakeId,
+                      unitOptType: UNIT_TYPE.security
+                    })
+                    message.success(resp.message)
+                    await tableRef.value?.requestGetTableData()
+                  }}
+              >{record.isEnable.value === 0 ? '禁用' : '启用'}
+              </a-button>:<a-button
+              type="primary"
+              onClick={async () => {
+                const resp = await api.post('/management/disableOrEnableMiniProgramUser', {
+                  dataId: record.snowFlakeId,
+                  unitOptType: UNIT_TYPE.security
+                })
+                message.success(resp.message)
+                await tableRef.value?.requestGetTableData()
+              }}
+          >{record.isEnable.value === 0 ? '禁用' : '启用'}
+          </a-button>
+      )
     }
   },
 ]