服务项目管理

securityManagement/src/components/form/FormProMax.vue

@@ -161,7 +161,7 @@ const props = withDefaults(defineProps<FormProMaxProps<T>>(), {
   labelCol: () => {
     return {
       style: {
-        width: '100px'
+        width: '120px'
       }
     }
   },

securityManagement/src/components/iconfont/IconFont.vue

@@ -9,7 +9,7 @@
 import {IconFontProps} from "@/types/components/iconfont/IconFont";
 
 withDefaults(defineProps<IconFontProps>(), {
-  size: 25,
+  size: 20,
   type: "svg"
 });
 

securityManagement/src/components/table/TableProMax.vue

@@ -154,7 +154,7 @@ const tableColumns = computed(() => {
     if (!(cols?.[0].dataIndex === 'index')) {
       cols?.unshift({
         dataIndex: 'index',
-        width: 60,
+        width: 80,
         title: '序号',
         customRender: ({index}) => index + 1
       })

securityManagement/src/config/dict.ts

@@ -6,6 +6,8 @@ type DictType =
     | 'IsEnable'
     | 'IsOrNot'
     | 'Sex'
+    | 'ServiceProjectType'
+    | 'MiniProgramUserIdentity'
 
 export const initEnums = () => {
     api.get<Record<DictType, SelectNodeVo<any>[]>>('/common/enums').then(resp => {

securityManagement/src/config/index.ts

@@ -1,7 +1,7 @@
 import {SystemMenu} from "@/types/config";
 
-export const ROUTER_WHITE_LIST: string[] = ['/login', '/test','/enterprise'];
+export const ROUTER_WHITE_LIST: string[] = ['/login', '/test', '/enterprise'];
-export const CLIENT_TYPE:string = "MANAGEMENT_SECURITY";
+export const CLIENT_TYPE: string = "MANAGEMENT_SECURITY";
 
 export const UNIT_TYPE = {
     security: 'SECURITY_UNIT',
@@ -12,27 +12,39 @@ export const SYSTEM_MENUS: SystemMenu[] = [
         title: '首页',
         name: 'index',
         path: '/index',
+        icon: 'icon-shouye',
         type: "menu",
         component: () => import('@/views/index.vue')
     }, {
         title: '用户管理',
         name: 'userManagement',
         path: '/userManagement',
+        icon: 'icon-yonghuguanli_huaban',
         type: 'dir',
         children: [
             {
                 title: '后台管理',
                 name: 'bgManagement',
                 path: '/bgManagement',
+                icon:'icon-guanlianbaoan',
                 type: 'menu',
                 component: () => import('@/views/userManagement/bgManagement/index.vue')
             }, {
                 title: '小程序管理',
                 name: 'uniManagement',
                 path: '/uniManagement',
+                icon:'icon-guanlianbaoan',
                 type: 'menu',
                 component: () => import('@/views/userManagement/uniManagement/index.vue')
             }
         ]
+    },
+    {
+        title: '服务项目管理',
+        name: 'serviceManagement',
+        path: '/serviceManagement',
+        icon:'icon-xiangmuguanli-',
+        type: 'menu',
+        component: () => import('@/views/serviceManagement/index.vue')
     }
 ]

securityManagement/src/global.d.ts

@@ -62,7 +62,10 @@ interface BaseEnum<T> {
     label: string
 }
 
-
+interface TypeEnum<T> {
+    value: string;
+    label: string
+}
 interface dataStatus {
     account: string;
     password: string;

securityManagement/src/types/views/serviceManagement.ts

@@ -0,0 +1,25 @@
+import {BaseTableRowRecord} from "@/types/components/table";
+
+export interface serviceProjectSaveOrUpdateParams extends BaseTableRowRecord {
+    snowFlakeId: string
+    enterprisesUnitId: string,
+    enterprisesUnitName: string,
+    projectManagerMiniProgramUserId: string,
+    projectManagerMiniProgramUserName: string,
+    name: string,
+    type: TypeEnum<string>,
+    isRecruitSecurity: BaseEnum<number>,
+    idNumber: string,
+    serviceArea: number,
+    buildingTotal: number,
+    houseTotal: number,
+    staffTotal: number,
+    securityUserTotal: number,
+    remark: string,
+    createUserName: string,
+    createTime: string,
+    enterprisesUnitAdministrativeDivisionCodes:Record<string, any>
+}
+
+
+

securityManagement/src/views/enterprise.vue

@@ -138,6 +138,7 @@ const rules: Record<string, Rule[]> = {
 const DivisionTree = async ()=>{
   const resp =  await api.get<TreeNodeVo<string>[]>('/common/administrativeDivisionTree')
   administrativeDivisionTree.value = resp.data as TreeNodeVo<string>[]
+  
 }
 
 // 可以进行搜索行政区划  2

securityManagement/src/views/serviceManagement/index.vue

@@ -1,12 +1,420 @@
-
 <template>
-   <div>服务项目管理</div>
+  <div>
-</template>
+    <TableProMax
-<script setup lang="ts">
+        ref="tableRef"
+        :request-api="reqApi"
+        :columns="columns"
+        :searchFormOptions="searchFormOptions"
+        :scroll="{x}"
+    >
+      <template #tableHeader>
+        <a-space>
+          <a-button type="primary" @click="addServiceProjects">新增服务项目</a-button>
+        </a-space>
+      </template>
+    </TableProMax>
+    <a-modal
+        v-model:open="visible"
+        :title="serviceTitle"
+        @ok="submit"
+        @cancel="closeModal"
+    >
+      <FormProMax ref="formRef"  v-model:value="formParams" :form-item-options="formItemOptions"/>
+    </a-modal>
+  </div>
 
+</template>
+
+<script setup lang="tsx">
+import TableProMax from "@/components/table/TableProMax.vue";
+import {TableProMaxProps} from "@/types/components/table";
+import api from "@/axios";
+import {onMounted, ref} from "vue";
+import {ComponentExposed} from "vue-component-type-helpers";
+import {dictSelectNodes} from "@/config/dict.ts";
+import {serviceProjectSaveOrUpdateParams} from "@/types/views/serviceManagement.ts";
+import {FormExpose} from "ant-design-vue/es/form/Form";
+import {FormProMaxItemOptions} from "@/types/components/form";
+import FormProMax from "@/components/form/FormProMax.vue";
+import {message} from "ant-design-vue";
+
+type TableProps = TableProMaxProps<serviceProjectSaveOrUpdateParams>  //需要修改
+
+const tableRef = ref<ComponentExposed<typeof TableProMax>>(null!)
+// table表格
+const reqApi: TableProps['requestApi'] = (params) => api.post('/serviceProject/pager', params)  //分页
+
+
+const searchFormOptions: TableProps["searchFormOptions"] = {
+  name: {
+    type: 'input',
+    label: '服务项目名称'
+  },
+  projectManagerMiniProgramUserName:{
+    type: 'input',
+    label: '服务经理用户名称'
+  },
+  remark: {
+    type: 'input',
+    label: '备注'
+  },
+  type: {
+    type: 'select',
+    label: '服务项目类型',
+    options: [
+      {
+        value: null,
+        label: '全部'
+      },...dictSelectNodes('ServiceProjectType')
+    ]
+  }
+}
+const visible = ref(false)
+const serviceTitle = ref('新增服务项目')
+const formRef = ref<FormExpose>(null)
+const formParams = ref<{
+  snowFlakeId?: string,
+  enterprisesUnitId:string,
+  administrativeDivisionCodes?:null,
+  projectManagerMiniProgramUserId?:string,
+  name: string,
+  type:string,
+  isRecruitSecurity:number,
+  idNumber?: string,
+  serviceArea?:number,
+  buildingTotal?:number,
+  houseTotal?:number,
+  staffTotal?:number,
+  securityUserTotal?:number
+  remark?: string,
+}>({
+  name:'',
+  isRecruitSecurity:0,
+  enterprisesUnitId:null,
+  type:'property'
+})
+
+const columns: TableProps['columns'] = [
+  {
+    dataIndex: 'enterprisesUnitName',
+    title: '企事业单位名称',
+    width: 150,
+    ellipsis: true
+  },
+  {
+    dataIndex: 'projectManagerMiniProgramUserName',
+    title: '项目经理小程序用户名称',
+    width: 200,
+    ellipsis: true
+  }, {
+    dataIndex: 'name',
+    title: '服务项目名称',
+    width: 150,
+    ellipsis: true
+  },
+  {
+    dataIndex:'type',
+    title: '服务类型',
+    customRender: ({text}) => <a-tag>{text?.label}</a-tag>,
+    width:100
+  },
+  {
+    dataIndex:'isRecruitSecurity',
+    title: '是否自招保安',
+    customRender: ({text}) => <a-tag>{text?.label}</a-tag>,
+    width:100
+  },
+  {
+    dataIndex:'idNumber',
+    title: '证件号',
+    width:200
+  },
+  {
+    dataIndex:'serviceArea',
+    title:'服务区域面积',
+    width:100
+  },
+  {
+    dataIndex:'buildingTotal',
+    title:'楼栋数量',
+    width:100
+  },
+  {
+    dataIndex:'houseTotal',
+    title:'户数',
+    width:100
+  },
+  {
+    dataIndex:'staffTotal',
+    title:'工作人员数量',
+    width:100
+  },
+  {
+    dataIndex:'securityUserTotal',
+    title:'保安人员数量',
+    width:100
+  },
+  {
+    dataIndex:'createUserName',
+    title:'创建人名称',
+    width:100
+  },
+  {
+    dataIndex: 'createTime',
+    title: '创建时间',
+    width: 100,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'remark',
+    title: '备注',
+    width: 200,
+    ellipsis: true
+  },{
+    dataIndex: 'opt',
+    title: '操作',
+    fixed: "right",
+    width:200,
+    customRender({record}){
+      return <a-space>
+        <a-popconfirm
+            title="确认删除账号吗?"
+            onConfirm={async () => {
+              const resp = await api.delete('/serviceProject/deleteById', {
+                serviceProjectId: record.snowFlakeId,
+              })
+              message.success(resp.message)
+              await tableRef.value?.requestGetTableData()
+            }}>
+          <a-button type="primary" danger>删除</a-button>
+        </a-popconfirm>
+        <a-button type="primary" onClick={ async ()=>{
+          console.log(record)
+          visible.value = true
+          serviceTitle.value = '编辑服务项目'
+          if(record.isRecruitSecurity === null ){
+            idNumberDisabled.value = false
+          }
+          if(record.type.value === 'security'){
+            isRecruitSecurityHidden.value = true
+            formParams.value.isRecruitSecurity = null
+          }else{
+            formParams.value.isRecruitSecurity = record.isRecruitSecurity.value
+            if(record.isRecruitSecurity.value === 1){
+              idNumberDisabled.value = true
+            }
+          }
+          formParams.value.snowFlakeId = record.snowFlakeId
+          formParams.value.name = record.name
+          formParams.value.type = record.type.value
+          formParams.value.remark = record.remark
+          formParams.value.idNumber = record.idNumber
+          formParams.value.serviceArea = record.serviceArea
+          formParams.value.buildingTotal = record.buildingTotal
+          formParams.value.houseTotal = record.houseTotal
+          formParams.value.staffTotal =  record.staffTotal
+          formParams.value. securityUserTotal = record.securityUserTotal
+
+          formParams.value.enterprisesUnitId = record.enterprisesUnitName
+          enterprisesUnitId.value = record.enterprisesUnitId
+          formParams.value.administrativeDivisionCodes = record.enterprisesUnitAdministrativeDivisionCodes
+        }}>编辑</a-button>
+      </a-space>
+    }
+  },
+]
+const x: number = columns.reduce((a, b) => a + (b.width as number), 0)
+
+
+const administrativeDivisionTree = ref<TreeNodeVo<string>[]>([])  //行政区划
+const getAdministrativeDivisionTree = async ()=>{
+  const resp =  await api.get<TreeNodeVo<string>[]>('/common/administrativeDivisionTree')
+  administrativeDivisionTree.value = resp.data as TreeNodeVo<string>[]
+}
+
+// 企事业单位接口
+const enterprisesUnitIdList = ref<SelectNodeVo<string>[]>([])
+const enterprisesUnitId = ref('')
+const isRecruitSecurityHidden = ref<boolean>(false)
+
+const idNumberDisabled = ref<boolean>(false)
+const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdateParams>>({
+  name: {
+    type: 'input',
+    label: '名称',
+    required: true,
+  },
+  administrativeDivisionCodes:{
+    type:'cascader',
+    label:'行政区划',
+    required: true,
+    options: administrativeDivisionTree,
+    componentsProps:{
+      showSearch:true,
+      onChange: async (values)=>{
+       const resp = await  api.post<SelectNodeVo<string>[]>('/enterprisesUnit/queryListByAdministrativeDivisionCodes',values)
+        enterprisesUnitIdList.value = resp.data
+      }
+    }
+  },
+  enterprisesUnitId:{
+     type:'select',
+     label:'企事业单位',
+     options:enterprisesUnitIdList,
+     componentsProps:{
+      allowClear:true
+    }
+  },
+  type: {
+    type: 'radioGroup',
+    label: '服务类型',
+    options: dictSelectNodes('ServiceProjectType'),
+    required: true,
+    componentsProps:{
+       onChange:(e)=>{
+         if(e.target.value === 'security'){
+           isRecruitSecurityHidden.value = true
+           formParams.value.isRecruitSecurity = null
+           idNumberDisabled.value = false
+         }else{
+           formParams.value.isRecruitSecurity = 0
+           isRecruitSecurityHidden.value = false
+         }
+       }
+    }
+  },
+  isRecruitSecurity: {
+    type: 'radioGroup',
+    label: '是否自招保安',
+    options:dictSelectNodes('IsOrNot'),
+    hidden:isRecruitSecurityHidden as any,
+    componentsProps:{
+       onChange:(e)=>{
+         idNumberDisabled.value = e.target.value !== 0;
+        formParams.value.idNumber = ''
+       }
+    }
+  },
+  idNumber: {
+    type: 'input',
+    label: '证件号',
+    componentsProps:{
+       disabled:idNumberDisabled as any
+    }
+  },
+  serviceArea:{
+    type:'inputNumber',
+    label:'服务区域面积',
+
+  },
+  buildingTotal:{
+     type:'inputNumber',
+     label:'楼栋数量',
+    componentsProps:{
+      formatter:(value:any)=>{
+        return Math.round(value)?Math.round(value):''  as any
+      },
+      min:0
+    }
+  },
+  houseTotal:{
+    type:'inputNumber',
+     label:'户数',
+    componentsProps:{
+      formatter:(value:any)=>{
+        return Math.round(value)?Math.round(value):''  as any
+      },
+      min:0
+    }
+  },
+  staffTotal:{
+    type:'inputNumber',
+    label:'工作人员数量',
+    componentsProps:{
+      formatter:(value:any)=>{
+        return Math.round(value)?Math.round(value):''  as any
+      },
+      min:0
+    }
+  },
+  securityUserTotal:{
+    type:'inputNumber',
+    label:'保安人员数量',
+    componentsProps:{
+      formatter:(value:any)=>{
+        return Math.round(value)?Math.round(value):''  as any
+      },
+      min:0
+    }
+  },
+  remark: {
+    type: 'inputTextArea',
+    label: '备注',
+  }
+})
+const submit = async()=>{
+  await formRef.value.validate()
+  const snowFlakeId = ref('')
+  const UnitId = ref('')
+  if (serviceTitle.value === '新增服务项目') {
+    snowFlakeId.value = ''
+    UnitId.value = formParams.value.enterprisesUnitId
+  } else {
+    snowFlakeId.value = formParams.value.snowFlakeId
+    UnitId.value = enterprisesUnitId.value
+  }
+  const serviceProjectSaveOrUpdateParams = {
+    snowFlakeId: snowFlakeId.value,
+    enterprisesUnitId:UnitId.value,
+    name: formParams.value.name,
+    type:formParams.value.type,
+    isRecruitSecurity:formParams.value.isRecruitSecurity,
+    idNumber: formParams.value.idNumber,
+    serviceArea:formParams.value.serviceArea,
+    buildingTotal:formParams.value.buildingTotal,
+    houseTotal:formParams.value.houseTotal,
+    staffTotal:formParams.value.staffTotal,
+    securityUserTotal:formParams.value.securityUserTotal,
+    remark: formParams.value.remark,
+  }
+  const resp = await  api.post('/serviceProject/saveOrUpdate',serviceProjectSaveOrUpdateParams)
+  message.success(resp.message)
+  await tableRef.value?.requestGetTableData()
+  await closeModal()
+
+}
+const closeModal = async()=>{
+    visible.value = false
+    formParams.value = {
+       enterprisesUnitId:'',
+       administrativeDivisionCodes:'',
+       name:'',
+       type:'property',
+       isRecruitSecurity:0,
+       idNumber:'',
+       serviceArea:null,
+       buildingTotal:null,
+       houseTotal:null,
+       staffTotal:null,
+       securityUserTotal:null,
+       remark:''
+   }
+    // await formRef.value.resetFields()
+    enterprisesUnitId.value = ''
+    serviceTitle.value = '新增服务项目'
+    isRecruitSecurityHidden.value = false
+    idNumberDisabled.value = false
+}
+const addServiceProjects = () => {
+  visible.value = true
+}
+
+onMounted(async ()=>{
+  await getAdministrativeDivisionTree()
+})
 </script>
 
 
 <style scoped lang="scss">
 
-</style>
+</style>

securityManagement/src/views/userManagement/bgManagement/index.vue

@@ -91,19 +91,18 @@ const columns: TableProps['columns'] = [
       return (
           record.isAdmin.value === 1?
           <a-space>
-            <a-button type="primary" danger>
+            <a-popconfirm
-              <a-popconfirm
+                style="width:100%"
-                  title="确认删除账号吗?"
+                title="确认删除账号吗?"
-                  onConfirm={async () => {
+                onConfirm={async () => {
-                    const resp = await api.delete('/managementSecurityUnitUser/deleteById', {
+                  const resp = await api.delete('/managementSecurityUnitUser/deleteById', {
-                      managementSecurityUnitUserId: record.snowFlakeId,
+                    managementSecurityUnitUserId: record.snowFlakeId,
-                    })
+                  })
-                    message.success(resp.message)
+                  message.success(resp.message)
-                    await tableRef.value?.requestGetTableData()
+                  await tableRef.value?.requestGetTableData()
-                  }}>
+                }}>
-                删除
+              <a-button type="primary" danger>删除</a-button>
-              </a-popconfirm>
+            </a-popconfirm>
-            </a-button>
             <a-button type="primary" onClick={async () => {
               visible.value = true
               title.value = "编辑用户"
@@ -118,7 +117,7 @@ const columns: TableProps['columns'] = [
             </a-button>
           </a-space>
               :
-              <i></i>
+              <div>超级管理员不能编辑</div>
       )
     }
   },
@@ -218,27 +217,24 @@ const submit = async () => {
   }
   const resp = await api.post('/managementSecurityUnitUser/saveOrUpdate', managementSecurityUnitUserSaveOrUpdateParams)
   message.success(resp.message)
-  close()
-}
-const close = () => {
   tableRef.value?.requestGetTableData()
-  visible.value = false
   closeModal()
+
 }
 const closeModal = () => {
   formParams.value = {
-    name: '',
+    name:'',
-    sex: 0,
+    sex:0,
-    telephone: '',
+    telephone:'',
-    isEnable: 0,
+    isEnable:0,
-    remark: ''
+    remark:''
   }
   visible.value = false
+  title.value = '新增用户'
 }
 //Form
 const addUserManagement = () => {
   visible.value = true
-  title.value = ''
 }
 </script>