Merge remote-tracking branch 'origin/master'

doc/就业驿站管理系统.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1714093631" Name="就业驿站管理系统" Objects="567" Symbols="48" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
+<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1714285878" Name="就业驿站管理系统" Objects="566" Symbols="48" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4694,7 +4694,7 @@ Reference.ParentRole 1</a:SymbolContent>
 <o:ReferenceSymbol Id="o53">
 <a:CreationDate>1701934197</a:CreationDate>
 <a:ModificationDate>1701934341</a:ModificationDate>
-<a:Rect>((-121277,70117), (-86530,74445))</a:Rect>
+<a:Rect>((-121277,70117), (-86530,74446))</a:Rect>
 <a:ListOfPoints>((-120877,73349),(-89530,73349),(-89530,70517))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -4782,7 +4782,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o63">
 <a:CreationDate>1713147065</a:CreationDate>
 <a:ModificationDate>1713147241</a:ModificationDate>
-<a:Rect>((-48679,26477), (-31746,43454))</a:Rect>
+<a:Rect>((-48679,26476), (-31746,43454))</a:Rect>
 <a:ListOfPoints>((-48279,27573),(-34746,27573),(-34746,43054))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -6345,12 +6345,13 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Column Id="o175">
 <a:ObjectID>F1FC6ADD-8263-4397-82B4-DD07B3A5011C</a:ObjectID>
 <a:Name>所属行业</a:Name>
-<a:Code>ProfessionID</a:Code>
+<a:Code>IndustryID</a:Code>
 <a:CreationDate>1713851392</a:CreationDate>
 <a:Creator>bowin_89</a:Creator>
-<a:ModificationDate>1713851578</a:ModificationDate>
+<a:ModificationDate>1714285878</a:ModificationDate>
 <a:Modifier>bowin_89</a:Modifier>
-<a:DataType>int</a:DataType>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
 </o:Column>
 <o:Column Id="o176">
 <a:ObjectID>F1C4EA97-F9B6-44D5-BD0E-700937F301D9</a:ObjectID>

doc/待更新脚本

@@ -42,4 +42,9 @@ alter table pc_label_company add index pc_label_company_CompanyID(CompanyID);
  ('f06c44b6-a77a-11ed-a6c5-7085c2a00003', '', 'BigType', 2, '人员', 1, 1, 0);
 
 -- 2024-4-30
-ALTER TABLE pc_company MODIFY RegisteredCapital DECIMAL(10, 2);
+ALTER TABLE pc_company MODIFY RegisteredCapital DECIMAL(10, 2);
+
+-- 2024-5-6
+ALTER TABLE `employmentsitedb`.`pc_jobuser` 
+ADD COLUMN `Longitude` varchar(50) NULL COMMENT '经度' AFTER `OccupationalLevel`,
+ADD COLUMN `Latitude` varchar(50) NULL COMMENT '纬度' AFTER `Longitude`;

h5app/src/views/pages/company/edit.vue

@@ -302,6 +302,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import IndustrySelection from "@/components/industrySelection.vue";
+import {getPosition} from "@/utils/position";
 
 interface StepParams{
   name: string,
@@ -374,7 +375,9 @@ export default defineComponent({
         workSituation: null,
         insuredCount: null,
         businScope: null,
-        companyDesc: null
+        companyDesc: null,
+        longitude: null,
+        latitude: null
     }});
     const stepList = ref([
         {title: '基础信息', desc: '企业基础信息', val: 1},
@@ -569,6 +572,7 @@ export default defineComponent({
     }
 
     const onNext = async () => {
+      console.log(formState.dataModel)
       const isFormCorrect = await v$.value.$validate();
       if (!isFormCorrect) {
         await presentAlert('请输入完整信息！');
@@ -618,6 +622,9 @@ export default defineComponent({
       isLongDate.value = formState.dataModel.validDate == "2099-12-31T00:00:00.000+08:00";
       console.log('dataModel',formState.dataModel);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
+      if (companyID == null) {
+        setLongitudeLatitude();
+      }
     };
 
    /* watch(() => route.query, () => {
@@ -649,6 +656,16 @@ export default defineComponent({
       await alert.present();
     }
 
+    // 设置经纬度
+    function setLongitudeLatitude() {
+      getPosition().then((data: any) => {
+        if (data.longitude != null && data.latitude != null) {
+          formState.dataModel.longitude = data.longitude;
+          formState.dataModel.latitude = data.latitude;
+        }
+      })
+    }
+
     return {
       ...toRefs(formState),
       arrowBackOutline,

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -299,6 +299,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import IndustrySelection from "@/components/industrySelection.vue";
+import {getPosition} from "@/utils/position";
 
 interface StepParams{
   loginUserID: string,
@@ -372,7 +373,9 @@ export default defineComponent({
         businScope: null,
         companyDesc: null,
         openId:null,
-        loginUserID:''
+        loginUserID: '',
+        longitude: null,
+        latitude: null
       }});
     const stepList = ref([
       {title: '基础信息', desc: '企业基础信息', val: 1},
@@ -582,6 +585,9 @@ export default defineComponent({
       formState.dataModel.openId = openId;
       console.log('dataModel',formState.dataModel);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
+      if (companyID == null) {
+        setLongitudeLatitude();
+      }
     };
 
 
@@ -608,10 +614,15 @@ export default defineComponent({
       await alert.present();
     }
 
-
-
-
-
+    // 设置经纬度
+    function setLongitudeLatitude() {
+      getPosition().then((data: any) => {
+        if (data.longitude != null && data.latitude != null) {
+          formState.dataModel.longitude = data.longitude;
+          formState.dataModel.latitude = data.latitude;
+        }
+      })
+    }
 
     return {
       ...toRefs(formState),