Merge remote-tracking branch 'origin/main'

policeManagement/src/views/query/index.tsx

@@ -55,6 +55,7 @@ const searchSecurityUnitId = debounce(async () => {
     const res = await axios.get(`https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard?idCard=${_formParams.idCard}`)
     if (res.data?.data?.hasOwnProperty('bayzh')) {
       _formParams.securityNumber = res.data.data.bayzh
+      _formParams.name = res.data.name
       message.success(res.data.message)
     } else {
       message.error('未查询到保安证件号')
@@ -64,6 +65,7 @@ const searchSecurityUnitId = debounce(async () => {
     console.log(res)
     if (res.data?.hasOwnProperty('bayzh')) {
       _formParams.securityNumber = res.data.bayzh
+      _formParams.name = res.data.name
       message.success(res.message)
     } else {
       message.error('未查询到保安证件号')
@@ -125,7 +127,7 @@ const saveOrUpdateEnterprisesUnit = (callback: Function, params, type: string) =
     telephone: {
       type: 'input',
       label: '手机号',
-      required: true,
+      // required: true,
     },
     sex: {
       type: 'radioGroup',

policeManagement/src/views/query/publicUnit.vue

@@ -369,9 +369,9 @@ const formParams = ref<{
   remark?: string
 }>({
   name: '',
-  enterprisesUnitId: null,
+  enterprisesUnitId: '',
   type: 'security',
-  securityUnitId: null,
+  securityUnitId: '',
 })
 const securityUnitIdList = ref<any>([])
 const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdateParams_>>({
@@ -547,13 +547,13 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) =>
     {
       dataIndex: 'serviceArea',
       title: '服务区域面积',
-      width: 60,
+      width: 120,
       ellipsis: true,
     },
     {
       dataIndex: 'buildingTotal',
       title: '楼栋数量',
-      width: 60,
+      width: 100,
       ellipsis: true,
     },
 
@@ -566,13 +566,13 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) =>
     {
       dataIndex: 'staffTotal',
       title: '工作人员数量',
-      width: 60,
+      width: 120,
       ellipsis: true,
     },
     {
       dataIndex: 'securityUserTotal',
       title: '保安人员数量',
-      width: 60,
+      width: 120,
       ellipsis: true,
     },
     {