policeManagement/src/global.d.ts

@@ -97,9 +97,6 @@ interface OptionsResponse {
     DeleteFlag: Option[];
 }
 
-interface TypeEnum<T> {
+
-    value: string;
-    label: string
-}
 
 

policeManagement/src/types/views/serviceManagement.ts

@@ -1,24 +0,0 @@
-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>,
-    twoType: BaseEnum<any>,
-    outsourceName: string,
-    isFiling: BaseEnum<number>,
-    idNumber: string,
-    serviceArea: number,
-    buildingTotal: number,
-    houseTotal: number,
-    staffTotal: number,
-    securityUserTotal: number,
-    remark: string,
-    createUserName: string,
-    createTime: string,
-    enterprisesUnitAdministrativeDivisionCodes: Record<string, any>
-}

policeManagement/src/views/query/publicUnit.vue

@@ -1,29 +1,12 @@
 <template>
   <div>
-    <!-- expand-column-widt 展开按钮宽度-->
+    <TableProMax ref="tableRef" :request-api="reqApi" :columns="columns" :searchFormOptions="searchFormOptions" :scroll="{ x }">
-    <!-- :expandRowByClick="true" 点击行展开 -->
-    <TableProMax
-      :expandedRowRender="expandedRowRender"
-      :expand-column-width="50"
-      :defaultExpandAllRows="false"
-      ref="tableRef"
-      :request-api="reqApi"
-      :columns="columns"
-      :searchFormOptions="searchFormOptions"
-      :scroll="{ x }"
-    >
       <template #tableHeader>
         <a-space>
           <a-button type="primary" @click="saveOrUpdateEnterprisesUnit">新增企事业单位</a-button>
         </a-space>
       </template>
-      <!-- <template #expandedRowRender="{ record }">
-        <p>{{ record }}</p>
-      </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>
 
@@ -35,7 +18,7 @@ import { AutoComplete, Button, Input, message, Modal, Space } from 'ant-design-v
 import { debounce } from 'lodash-es'
 import FormProMax from '@/components/form/FormProMax.vue'
 import api from '@/axios'
-import { ref, reactive, computed, onMounted } from 'vue'
+import { ref, reactive } from 'vue'
 import TableProMax from '@/components/table/TableProMax.vue'
 import { TableProMaxProps } from '@/types/components/table/index.ts'
 import { ComponentExposed } from 'vue-component-type-helpers'
@@ -43,13 +26,13 @@ import { dictSelectNodes } from '@/config/dict.ts'
 import { publicUnitPagerQueryParams } from '@/types/views/publicUnit.ts'
 import { FormProMaxItemOptions } from '@/types/components/form//index.ts'
 import { FormExpose } from 'ant-design-vue/es/form/Form'
-import { serviceProjectSaveOrUpdateParams_ } from '@/types/views/serviceManagement'
 type _FormType = EnterprisesUnitSaveOrUpdateParams & {
   contactPersonInfoName?: string
   contactPersonInfoTelephone?: string
 }
 type TableProps = TableProMaxProps<publicUnitPagerQueryParams>
 
+// const reqApi: TableProps['requestApi'] = (params) => api.post('/enterprisesUnit/pager', params) //分页
 const reqApi: TableProps['requestApi'] = (params) => api.post('/eu/pager', params) //分页
 const tableRef = ref<ComponentExposed<typeof TableProMax>>(null)
 const columns: TableProps['columns'] = [
@@ -298,7 +281,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
     content: () => <FormProMax ref={_formRef} v-model:value={_formParams.value} formItemOptions={_formOptions.value} />,
     onOk: async () => {
       await _formRef.value?.validate()
-
+      // const resp = await api.post('/enterprisesUnit/saveOrUpdate', {
       const resp = await api.post('/eu/add_upd', {
         ..._formParams.value,
         contactPersonInfo: {
@@ -309,6 +292,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => {
       message.success(resp.message)
       await tableRef.value?.requestGetTableData()
 
+      // reqApi(params)
       callback && callback()
     },
   })
@@ -329,365 +313,4 @@ const searchFormOptions = reactive<TableProps['searchFormOptions']>({
     label: '手机号',
   },
 })
-type _TableProps = TableProMaxProps<any>
-const isRecruitSecurityHidden = ref<boolean>(false)
-const visible = ref(false)
-const serviceTitle = ref('新增服务项目')
-const idNumberDisabled = ref<boolean>(true)
-const formRef = ref<FormExpose>(null)
-const enterprisesUnitId = ref('')
-const netType = computed(() => {
-  //@ts-ignore
-  return formParams.value.type === 'security' ? dictSelectNodes('ServiceProjectTwoType') : dictSelectNodes('UserType' as any)
-})
-const formParams = ref<{
-  snowFlakeId?: string
-  enterprisesUnitId: string
-  securityUnitId: string
-  administrativeDivisionCodes?: null
-  projectManagerMiniProgramUserId?: string
-  projectManagerMiniProgramUserName?: string
-  name: string
-  type: string
-  twoType?: number
-  outsourceName?: string
-  isFiling?: number
-  idNumber?: string
-  serviceArea?: number
-  buildingTotal?: number
-  houseTotal?: number
-  staffTotal?: number
-  securityUserTotal?: number
-  remark?: string
-}>({
-  name: '',
-  enterprisesUnitId: null,
-  type: 'security',
-  securityUnitId: null,
-})
-const securityUnitIdList = ref<any>([])
-const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdateParams_>>({
-  name: {
-    type: 'input',
-    label: '服务项目名称',
-    required: true,
-  },
-
-  securityUnitId: {
-    type: 'select',
-    label: '保安单位',
-    required: true,
-    options: securityUnitIdList,
-  },
-  type: {
-    type: 'radioGroup',
-    label: '服务类型',
-    //@ts-ignore
-    options: dictSelectNodes('ServiceProjectType'),
-    required: true,
-    componentsProps: {
-      onChange: (e) => {
-        if (e.target?.value === 'security') {
-          isRecruitSecurityHidden.value = false
-          formParams.value.twoType = null
-        } else {
-          formParams.value.twoType = null
-          isRecruitSecurityHidden.value = true
-        }
-      },
-    },
-  },
-  twoType: {
-    required: true,
-    type: 'radioGroup',
-    label: '二级类型',
-    options: netType,
-    componentsProps: {
-      onChange: (e) => {
-        if (e.target.value !== 'outsource') {
-          idNumberDisabled.value = true
-          formParams.value.outsourceName = ''
-        } else {
-          idNumberDisabled.value = false
-        }
-      },
-    },
-  },
-  outsourceName: {
-    type: 'input',
-    label: '外包公司名称',
-    hidden: idNumberDisabled as any,
-  },
-  isFiling: {
-    required: true,
-    type: 'radioGroup',
-    label: '是否备案',
-    options: dictSelectNodes('IsOrNot'),
-  },
-  idNumber: {
-    type: 'input',
-    label: '保安服务许可证',
-  },
-  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 _tableRef = ref<ComponentExposed<typeof TableProMax>>(null)
-const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) => {
-  console.log('🚀 ~ record:', record)
-
-  const _columns: _TableProps['columns'] = [
-    {
-      dataIndex: 'name',
-      title: '服务项目名称',
-    },
-    {
-      dataIndex: 'type',
-      title: '服务类型',
-      customRender: ({ text }) => <a-tag>{text?.label}</a-tag>,
-    },
-    {
-      dataIndex: 'twoType',
-      title: '二级类型',
-      customRender: ({ text }) => <a-tag>{text?.label}</a-tag>,
-    },
-    {
-      dataIndex: 'outsourceName',
-      title: '外包公司名称',
-      customRender: ({ record }) => {
-        if (record.twoType.value === 'outsource') {
-          return record.outsourceName
-        }
-      },
-    },
-    {
-      dataIndex: 'isFiling',
-      title: '是否备案',
-      customRender: ({ text }) => <a-tag>{text?.label}</a-tag>,
-    },
-    {
-      dataIndex: 'idNumber',
-      title: '保安服务许可证',
-    },
-
-    {
-      dataIndex: 'serviceArea',
-      title: '服务区域面积',
-    },
-    {
-      dataIndex: 'buildingTotal',
-      title: '楼栋数量',
-    },
-
-    {
-      dataIndex: 'houseTotal',
-      title: '户数',
-    },
-    {
-      dataIndex: 'staffTotal',
-      title: '工作人员数量',
-    },
-    {
-      dataIndex: 'securityUserTotal',
-      title: '保安人员数量',
-    },
-    {
-      dataIndex: 'remark',
-      title: '备注',
-    },
-    {
-      dataIndex: 'createUserInfo',
-      title: '创建人',
-      customRender: ({ record }) => {
-        return (
-          <div>
-            <p>创建人：{record.createUserInfo.name} </p>
-
-            <p>创建人单位：{record.createUserInfo.unitName} </p>
-          </div>
-        )
-      },
-    },
-    {
-      dataIndex: 'createTime',
-      title: '创建时间',
-    },
-    {
-      dataIndex: 'opt',
-      title: '操作',
-      fixed: 'right',
-
-      customRender({ record }) {
-        return (
-          <a-space>
-            <a-button
-              type='primary'
-              onClick={async () => {
-                console.log('🚀 ~ customRender ~ record:编辑回显参数', record)
-                visible.value = true
-                serviceTitle.value = '编辑服务项目'
-                idNumberDisabled.value = record.twoType.value !== 'outsource'
-                {
-                  /*  */
-                }
-
-                formParams.value.securityUnitId = record.securityUnitId //企事业单位id
-
-                formParams.value.enterprisesUnitId = record.enterprisesUnitId //企事业单位id
-                formParams.value.snowFlakeId = record.snowFlakeId //id
-                formParams.value.projectManagerMiniProgramUserId = record.projectManagerMiniProgramUserId //项目经理小程序用户id
-                formParams.value.name = record.name
-                formParams.value.type = record.type.value //服务类型
-                formParams.value.twoType = record.twoType.value //二级类型
-                formParams.value.outsourceName = record.outsourceName //外包公司名称
-                formParams.value.isFiling = record.isFiling.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.administrativeDivisionCodes = record.enterprisesUnitAdministrativeDivisionCodes */
-                }
-              }}
-            >
-              编辑
-            </a-button>
-            <a-popconfirm
-              title='确认删除账号吗?'
-              onConfirm={async () => {
-                const resp = await api.delete('/m2/eu/deleteSpById', {
-                  serviceProjectId: record.snowFlakeId,
-                })
-                message.success(resp.message)
-                await _tableRef.value?.requestGetTableData()
-              }}
-            >
-              <a-button danger>删除</a-button>
-            </a-popconfirm>
-          </a-space>
-        )
-      },
-    },
-  ]
-  const _reqApi: _TableProps['requestApi'] = async (params) => {
-    console.log('🚀 ~ params:', params)
-    // @ts-ignore
-    return await api.get('/m2/eu/listSp', { enterprisesUnitId: record?.snowFlakeId })
-  }
-  return (
-    <TableProMax
-      ref={_tableRef}
-      size='small'
-      columns={_columns}
-      requestApi={_reqApi}
-      isPagination={false}
-      v-slots={{
-        tableHeader: (_) => {
-          return (
-            <Space>
-              <Button class='btn-success' onClick={() => addService(record)}>
-                新增服务项目
-              </Button>
-            </Space>
-          )
-        },
-      }}
-    />
-  )
-}
-
-const closeModal = async () => {
-  visible.value = false
-  formParams.value = {
-    securityUnitId: '',
-    enterprisesUnitId: '',
-    administrativeDivisionCodes: '',
-    name: '',
-    type: 'security',
-    idNumber: '',
-    serviceArea: null,
-    buildingTotal: null,
-    houseTotal: null,
-    staffTotal: null,
-    securityUserTotal: null,
-    remark: '',
-  }
-  formRef.value.resetFields()
-  enterprisesUnitId.value = ''
-  serviceTitle.value = '新增服务项目'
-  idNumberDisabled.value = false
-}
-
-const submit = async () => {
-  console.log('formParams.value____________________', formParams.value)
-
-  await formRef.value.validate()
-
-  const serviceProjectSaveOrUpdateParams = { ...formParams.value }
-
-  const resp = await api.post('/m2/eu/add_upd_sp', serviceProjectSaveOrUpdateParams)
-  message.success(resp.message)
-  await _tableRef.value.requestGetTableData()
-  await closeModal()
-}
-
-onMounted(async () => {
-  const res = await api.get('/management/listSecurityUnit')
-  securityUnitIdList.value = res.data
-})
-const addService = function (record) {
-  console.log('🚀 ~ addService ~ record:', record)
-  formParams.value.enterprisesUnitId = record.snowFlakeId //企事业单位Id
-  visible.value = true
-}
 </script>