diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue index e02963b..10b9a5c 100644 --- a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue +++ b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue @@ -3,7 +3,7 @@ {{ item?.name }} - 单位类型：{{ item?.type.label }} + 单位类型：{{ item?.type?.label }} 地址： @@ -15,18 +15,17 @@ - - - 项目名称：{{serviceProject.name}} - 项目类型：{{serviceProject.type.label}} - - - 项目负责人：{{serviceProject.projectManagerMiniProgramUserInfo?.name?serviceProject.projectManagerMiniProgramUserInfo?.name:'无分配项目经理'}} - - 责任单位：{{serviceProject.securityUnitName}} + + + 项目名称：{{ serviceProject.name }} + 项目类型：{{ serviceProject.type?.label }} + + 项目负责人：{{ serviceProject.projectManagerMiniProgramUserInfo?.name ? serviceProject.projectManagerMiniProgramUserInfo?.name : '无分配项目经理' }} + + 责任单位：{{ serviceProject.securityUnitName }} + - diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue index 306fcdd..d71dd8a 100644 --- a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue @@ -2,14 +2,12 @@ - + {{ enterprisesUnitName }}-----{{ serviceProject?.name }}项目 - - 经理名称:{{ serviceProject?.projectManagerMiniProgramUserInfo.name }} - + 经理名称:{{ serviceProject?.projectManagerMiniProgramUserInfo.name }} 手机号:{{ serviceProject?.projectManagerMiniProgramUserInfo.telephone }} @@ -47,26 +45,33 @@ 项目人员 - - + - + 姓名:{{ item?.name ? item?.name : '创建者' }} 性别:{{ item.sex?.label ? item.sex?.label : ' 隐藏' }} 职位:{{ item.workPost ? item.workPost : '创建者' }} - + 保安证件:{{ item.securityNumber ? item.securityNumber : '无' }} 出生年月:{{ dayjs(item.dateOfBirth).format('YYYY-MM-DD') }} - + 创建时间:{{ item.createTime }} - 身份证:{{ item.idCard }} + 身份证:{{ item.idCard?.desensitizedValue }} @@ -74,16 +79,15 @@ - + + + \ No newline at end of file diff --git a/securityManagement/src/config/dict.ts b/securityManagement/src/config/dict.ts index 01bd579..3cb857e 100644 --- a/securityManagement/src/config/dict.ts +++ b/securityManagement/src/config/dict.ts @@ -8,6 +8,7 @@ type DictType = | 'Sex' | 'ServiceProjectType' | 'MiniProgramUserIdentity' + | 'ServiceProjectTwoType' export const initEnums = () => { api.get[]>>('/common/enums').then(resp => { diff --git a/securityManagement/src/stores/modules/userStore.ts b/securityManagement/src/stores/modules/userStore.ts index bdd8060..3c1f82e 100644 --- a/securityManagement/src/stores/modules/userStore.ts +++ b/securityManagement/src/stores/modules/userStore.ts @@ -2,7 +2,7 @@ import {defineStore} from "pinia"; import {TokenInfo, UserStore} from "@/types/stores/userStore.ts"; export const useUserStore = defineStore({ - id: 'useUserStore', + id: 'baUserStore', state: (): UserStore => { return { tokenInfo: undefined, @@ -20,7 +20,7 @@ export const useUserStore = defineStore({ getTokenInfo: (state): TokenInfo => state.tokenInfo as TokenInfo, }, persist: { - key: "useUserStore", + key: "baUserStore", //spUserStore storage: window.localStorage, paths: ["tokenInfo"], } diff --git a/securityManagement/src/types/views/serviceManagement.ts b/securityManagement/src/types/views/serviceManagement.ts index 285a344..26340e5 100644 --- a/securityManagement/src/types/views/serviceManagement.ts +++ b/securityManagement/src/types/views/serviceManagement.ts @@ -8,7 +8,9 @@ export interface serviceProjectSaveOrUpdateParams extends BaseTableRowRecord { projectManagerMiniProgramUserName: string, name: string, type: TypeEnum, - isRecruitSecurity: BaseEnum, + twoType: BaseEnum, + outsourceName:string, + isFiling:BaseEnum, idNumber: string, serviceArea: number, buildingTotal: number, diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue index 1d7523e..095ec84 100644 --- a/securityManagement/src/views/serviceManagement/index.vue +++ b/securityManagement/src/views/serviceManagement/index.vue @@ -29,7 +29,7 @@ import TableProMax from "@/components/table/TableProMax.vue"; import {TableProMaxProps} from "@/types/components/table"; import api from "@/axios"; -import {onMounted, ref} from "vue"; +import {computed, onMounted, ref} from "vue"; import {ComponentExposed} from "vue-component-type-helpers"; import {dictSelectNodes} from "@/config/dict.ts"; import {serviceProjectSaveOrUpdateParams} from "@/types/views/serviceManagement.ts"; @@ -81,7 +81,9 @@ const formParams = ref<{ projectManagerMiniProgramUserName?:string name: string, type:string, - isRecruitSecurity:number, + twoType?: number, + outsourceName?:string, + isFiling?:number, idNumber?: string, serviceArea?:number, buildingTotal?:number, @@ -91,9 +93,8 @@ const formParams = ref<{ remark?: string, }>({ name:'', - isRecruitSecurity:0, enterprisesUnitId:null, - type:'property' + type:'security' }) const columns: TableProps['columns'] = [ @@ -123,8 +124,19 @@ const columns: TableProps['columns'] = [ width:100 }, { - dataIndex:'isRecruitSecurity', - title: '是否自招保安', + dataIndex:'twoType', + title: '二级类型', + customRender: ({text}) => {text?.label}, + width:120 + }, + { + dataIndex:'outsourceName', + title: '外包公司名称', + width:120 + }, + { + dataIndex:'isFiling', + title: '是否备案', customRender: ({text}) => {text?.label}, width:120 }, @@ -196,22 +208,14 @@ const columns: TableProps['columns'] = [ console.log(record,'9999999') 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 - } - } + idNumberDisabled.value = record.twoType.value !== 'outsource'; formParams.value.projectManagerMiniProgramUserId = record.projectManagerMiniProgramUserId formParams.value.snowFlakeId = record.snowFlakeId 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 @@ -246,9 +250,14 @@ const projectManagerMiniProgram = async()=>{ // 企事业单位接口 const enterprisesUnitIdList = ref[]>([]) const enterprisesUnitId = ref('') -const isRecruitSecurityHidden = ref(false) +const isRecruitSecurityHidden = ref(false) const idNumberDisabled = ref(false) + +// 切换options +const netType = computed(() => { + return formParams.value.type === 'security' ? dictSelectNodes("ServiceProjectTwoType") : dictSelectNodes("UserType" as any) +}) const formItemOptions = ref>({ name: { type: 'input', @@ -292,35 +301,47 @@ const formItemOptions = ref{ - if(e.target.value === 'security'){ - isRecruitSecurityHidden.value = true - formParams.value.isRecruitSecurity = null - idNumberDisabled.value = false - }else{ - formParams.value.isRecruitSecurity = 0 + if(e.target?.value === 'security'){ isRecruitSecurityHidden.value = false + formParams.value.twoType = null + }else{ + formParams.value.twoType = null + isRecruitSecurityHidden.value = true } } } }, - isRecruitSecurity: { + twoType: { type: 'radioGroup', - label: '是否自招保安', - options:dictSelectNodes('IsOrNot'), - hidden:isRecruitSecurityHidden as any, + label: '二级类型', + options:netType, componentsProps:{ onChange:(e)=>{ - idNumberDisabled.value = e.target.value !== 0; - formParams.value.idNumber = '' - } + if(e.target.value !== "outsource"){ + idNumberDisabled.value = true + formParams.value.outsourceName = '' + }else{ + idNumberDisabled.value = false + } + }, } }, + outsourceName:{ + type: 'input', + label: '外包公司名称', + hidden:idNumberDisabled as any + }, + isFiling:{ + type: 'radioGroup', + label: '是否备案', + options:dictSelectNodes('IsOrNot'), + }, idNumber: { type: 'input', label: '保安服务许可证', - componentsProps:{ - disabled:idNumberDisabled as any - } + // componentsProps:{ + // disabled:idNumberDisabled as any + // } }, serviceArea:{ type:'inputNumber', @@ -372,6 +393,10 @@ const formItemOptions = ref{ await formRef.value.validate() @@ -389,7 +414,9 @@ const submit = async()=>{ projectManagerMiniProgramUserId:formParams.value.projectManagerMiniProgramUserId, name: formParams.value.name, type:formParams.value.type, - isRecruitSecurity:formParams.value.isRecruitSecurity, + twoType: formParams.value.twoType, + outsourceName:formParams.value.outsourceName, + isFiling:formParams.value.isFiling, idNumber: formParams.value.idNumber, serviceArea:formParams.value.serviceArea, buildingTotal:formParams.value.buildingTotal, @@ -410,8 +437,7 @@ const closeModal = async()=>{ enterprisesUnitId:'', administrativeDivisionCodes:'', name:'', - type:'property', - isRecruitSecurity:0, + type:'security', idNumber:'', serviceArea:null, buildingTotal:null, @@ -420,10 +446,10 @@ const closeModal = async()=>{ securityUserTotal:null, remark:'' } - await formRef.value.resetFields() + formRef.value.resetFields() enterprisesUnitId.value = '' serviceTitle.value = '新增服务项目' - isRecruitSecurityHidden.value = false + // isRecruitSecurityHidden.value = false idNumberDisabled.value = false } const addServiceProjects = () => { diff --git a/securityManagement/src/views/test.vue.bak b/securityManagement/src/views/test.vue.bak new file mode 100644 index 0000000..7898fe3 --- /dev/null +++ b/securityManagement/src/views/test.vue.bak @@ -0,0 +1,114 @@ + + + + + +