From bcde6a1839f9b02dd8c8d55d94f5925c9b72154a Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Tue, 10 Sep 2024 10:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/layout/layout.vue          |  4 +--
 .../src/types/views/enterprise.ts             | 15 ++++++++++
 securityManagement/src/views/enterprise.vue   | 29 ++++---------------
 .../src/views/serviceManagement/index.vue     | 19 +++++++++++-
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/securityManagement/src/components/layout/layout.vue b/securityManagement/src/components/layout/layout.vue
index 09ce243..682ed00 100644
--- a/securityManagement/src/components/layout/layout.vue
+++ b/securityManagement/src/components/layout/layout.vue
@@ -7,10 +7,10 @@
         collapsible
     >
       <div v-if="!collapsed" class="title flex-center">
-        <div>超级后台</div>
+        <div>保安后台</div>
       </div>
       <div v-else class="logo flex-center">
-        <img src="@/assets/vue.svg" title="超级后台" alt="xx">
+        <img src="@/assets/vue.svg" title="保安后台" alt="xx">
       </div>
       <SystemMenus/>
     </a-layout-sider>
diff --git a/securityManagement/src/types/views/enterprise.ts b/securityManagement/src/types/views/enterprise.ts
index e69de29..e8bdb4b 100644
--- a/securityManagement/src/types/views/enterprise.ts
+++ b/securityManagement/src/types/views/enterprise.ts
@@ -0,0 +1,15 @@
+export interface formDatePort {
+    name:string,
+    socialCode:string,
+    businessLicense:string,
+    legalPersonInfo:string,
+    telephone:string,
+    administrativeDivisionCodes:Record<string, any>,
+    address:string,
+    nature:string
+}
+
+export interface  statusPort {
+    onlyCode:string,
+    unitOptType:string
+}
\ No newline at end of file
diff --git a/securityManagement/src/views/enterprise.vue b/securityManagement/src/views/enterprise.vue
index 8c86b33..2b04a73 100644
--- a/securityManagement/src/views/enterprise.vue
+++ b/securityManagement/src/views/enterprise.vue
@@ -27,11 +27,11 @@
             <a-form-item label="公司性质" name="nature">
               <a-input :allowClear="true" v-model:value="formDate.nature"/>
             </a-form-item>
-            <a-form-item label="行政区划" >
+            <a-form-item label="行政区划"  name="administrativeDivisionCodes">
               <a-cascader v-model:value="formDate.administrativeDivisionCodes" :show-search="{ filter }" :options="administrativeDivisionTree" @change="searchAdministrativeDivisionTree" />
             </a-form-item>
             <a-form-item label="营业执照" name="businessLicense">
-              <SingleImageFileUpload v-model:value="formDate.businessLicense"></SingleImageFileUpload>
+              <SingleImageFileUpload v-model:value="formDate.businessLicense" ref="fileUpload"></SingleImageFileUpload>
             </a-form-item>
             <a-form-item label="法人名称">
               <a-input :allowClear="true" v-model:value="formDate.legalPersonInfo" />
@@ -76,42 +76,25 @@ import api from "@/axios";
 import {message, Modal} from 'ant-design-vue';
 import SingleImageFileUpload from "@/components/upload/SingleImageFileUpload.vue";
 import {useRouter} from "vue-router";
+import {formDatePort, statusPort} from "@/types/views/enterprise.ts";
 const activeKey = ref('1');
 const labelCol = { style: { width: '120px' } };
 const wrapperCol = { span: 14 };
 const administrativeDivisionTree = ref<TreeNodeVo<string>[]>([])
 const formDateRef = ref();
-
+const fileUpload = ref()
 const router = useRouter()
 
-
-interface formDatePort {
-  name:string,
-  socialCode:string,
-  businessLicense:string,
-  legalPersonInfo:string,
-  telephone:string,
-  administrativeDivisionCodes:Record<string, any>,
-  address:string,
-  nature:string
-}
-
-interface  statusPort {
-  onlyCode:string,
-  unitOptType:string
-}
-
 const formDate = ref<formDatePort>({
   name:'',
   socialCode:'',
   businessLicense:'',
   legalPersonInfo:'',
   telephone:'',
-  administrativeDivisionCodes:[''],
+  administrativeDivisionCodes:undefined,
   address:'',
   nature:''
 })
-
 const statusDate  = ref<statusPort>({
   onlyCode:'',
   unitOptType:'SECURITY_UNIT'
@@ -177,7 +160,7 @@ const onFinish = async ()=>{
     businessLicense:'',
     legalPersonInfo:'',
     telephone:'',
-    administrativeDivisionCodes:[''],
+    administrativeDivisionCodes:undefined,
     address:'',
     nature:''
   }
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index d28a2e0..dd9a46c 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -52,7 +52,8 @@ const searchFormOptions: TableProps["searchFormOptions"] = {
   },
   projectManagerMiniProgramUserName:{
     type: 'input',
-    label: '服务经理用户名称'
+    label: '服务经理用户名称',
+
   },
   remark: {
     type: 'input',
@@ -77,6 +78,7 @@ const formParams = ref<{
   enterprisesUnitId:string,
   administrativeDivisionCodes?:null,
   projectManagerMiniProgramUserId?:string,
+  projectManagerMiniProgramUserName?:string
   name: string,
   type:string,
   isRecruitSecurity:number,
@@ -204,6 +206,7 @@ const columns: TableProps['columns'] = [
               idNumberDisabled.value = true
             }
           }
+          formParams.value.projectManagerMiniProgramUserId = record.projectManagerMiniProgramUserName
           formParams.value.snowFlakeId = record.snowFlakeId
           formParams.value.name = record.name
           formParams.value.type = record.type.value
@@ -232,6 +235,13 @@ const getAdministrativeDivisionTree = async ()=>{
   administrativeDivisionTree.value = resp.data as TreeNodeVo<string>[]
 }
 
+// 项目经理接口
+const userNameOptions = ref([])
+const projectManagerMiniProgram = async()=>{
+  const resp = await api.get('/securityUnit/listProjectManager')
+  userNameOptions.value = resp.data as any
+}
+
 // 企事业单位接口
 const enterprisesUnitIdList = ref<SelectNodeVo<string>[]>([])
 const enterprisesUnitId = ref('')
@@ -244,6 +254,11 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
     label: '名称',
     required: true,
   },
+  projectManagerMiniProgramUserId:{
+      type:'select',
+      label:'项目经理',
+      options:userNameOptions,
+  },
   administrativeDivisionCodes:{
     type:'cascader',
     label:'行政区划',
@@ -366,6 +381,7 @@ const submit = async()=>{
   const serviceProjectSaveOrUpdateParams = {
     snowFlakeId: snowFlakeId.value,
     enterprisesUnitId:UnitId.value,
+    projectManagerMiniProgramUserId:formParams.value.projectManagerMiniProgramUserId,
     name: formParams.value.name,
     type:formParams.value.type,
     isRecruitSecurity:formParams.value.isRecruitSecurity,
@@ -411,6 +427,7 @@ const addServiceProjects = () => {
 
 onMounted(async ()=>{
   await getAdministrativeDivisionTree()
+  await projectManagerMiniProgram()
 })
 </script>