lizeyu 9 months ago
parent
commit
a21dd898c5

+ 16 - 16
h5app/src/views/pages/company/edit.vue

@@ -138,27 +138,27 @@
               <div>
                 <ion-radio v-model:checked="isLongDate" justify="start" labelPlacement="end"
                            @click="changeLongDate" style="height:30px;">至长期</ion-radio>
-<!--                <ion-datetime-button datetime="validDate" style="position:relative;right:105px;"></ion-datetime-button>-->
-<!--                <ion-modal :keep-contents-mounted="true" >-->
-<!--                  <ion-datetime id="validDate" name="validDate"-->
-<!--                                v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"-->
-<!--                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"-->
-<!--                                :show-default-buttons="true" >-->
-<!--                  </ion-datetime>-->
-<!--                </ion-modal>-->
+                <ion-datetime-button datetime="validDate" style="position:relative;right:105px;"></ion-datetime-button>
+                <ion-modal :keep-contents-mounted="true" >
+                  <ion-datetime id="validDate" name="validDate"
+                                v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"
+                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                                :show-default-buttons="true" >
+                  </ion-datetime>
+                </ion-modal>
               </div>
             </div>
 
             <div class="form-input">
               <ion-label>成立日期</ion-label>
-<!--                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;" ></ion-datetime-button>-->
-<!--                <ion-modal :keep-contents-mounted="true" >-->
-<!--                  <ion-datetime id="establishmentTime" name="establishmentTime"-->
-<!--                                v-model="dataModel.establishmentTime"  :prefer-wheel="true"-->
-<!--                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"-->
-<!--                                :show-default-buttons="true" >-->
-<!--                  </ion-datetime>-->
-<!--                </ion-modal>-->
+                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;" ></ion-datetime-button>
+                <ion-modal :keep-contents-mounted="true" >
+                  <ion-datetime id="establishmentTime" name="establishmentTime"
+                                v-model="dataModel.establishmentTime"  :prefer-wheel="true"
+                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                                :show-default-buttons="true" >
+                  </ion-datetime>
+                </ion-modal>
             </div>
             <div class="form-input" >
               <ion-label>注册资本(万元)</ion-label>

+ 3 - 8
h5app/src/views/pages/company/editPost.vue

@@ -199,10 +199,8 @@
                 </ion-col>
                 <ion-col>
                   <ion-item style="float: right;padding:0px;margin: 0px;">
-                    <label-selection :key="'refLabelSelectionKey2'" :ref="refLabelSelection2" :big-type="3" :list-label="dataModel.listLabel" :title="'岗位标签'"
-                                     v-bind="$attrs" @resultBack="onResultBackLabels"></label-selection>
-<!--                    <component :is="refLabelSelection2" :big-type="3" :list-label="dataModel.listLabel" :title="'岗位标签'"-->
-<!--                               @resultBack="onResultBackLabels"></component>-->
+                    <label-selection :big-type="3" :list-label="dataModel.listLabel" :title="'岗位标签'"
+                                     @resultBack="onResultBackLabels"></label-selection>
                  </ion-item>
                 </ion-col>
               </ion-row>
@@ -219,7 +217,7 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {computed, defineAsyncComponent, defineComponent, reactive, ref, toRefs, watch} from "vue";
+import {computed, defineComponent, reactive, ref, toRefs} from "vue";
 import {arrowBackOutline} from 'ionicons/icons';
 import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
@@ -301,7 +299,6 @@ export default defineComponent({
     const cultureRankList = ref([]);
     const workNatureList = ref([]);
     const refPostSelectionLike = ref();
-    const refLabelSelection2 = ref();
 
     const presentAlert = async (message: string) => {
       const alert = await alertController.create({
@@ -340,7 +337,6 @@ export default defineComponent({
 
     const onResultBackLabels = (data: any) => {
       formState.dataModel.listLabel = data;
-      refLabelSelection2.value = null;
     }
 
     const onResultInfo = (data: any) => {
@@ -528,7 +524,6 @@ export default defineComponent({
       workNatureList,
       cultureRankList,
       v$,
-      refLabelSelection2,
       onResultBackLabels,
       refPostSelectionLike,
       onOpenPost,

+ 3 - 3
h5app/src/views/pages/company/postList.vue

@@ -233,13 +233,13 @@ export default defineComponent({
     }
 
     const onAdd = () => {
-      router.push({path: './editPost', query: {reload:1,id: null,companyID:pageParams.companyID,isEdit:isEditCompany.value, random: Math.random()}});
+      router.push({path: './editPost', query: {reload:1,id: null,companyID:pageParams.companyID,isEdit:isEditCompany.value}});
     };
     const onEdit = (postID:any) => {
-      router.push({path: './editPost', query: {reload:1,id:postID,companyID:pageParams.companyID,isEdit:isEditCompany.value, random: Math.random()}});
+      router.push({path: './editPost', query: {reload:1,id:postID,companyID:pageParams.companyID,isEdit:isEditCompany.value}});
     };
     const onBack = () => {
-      router.push({path: './edit', query: {reload:1,id:pageParams.companyID,status:1, random: Math.random()}});
+      router.push({path: './edit', query: {reload:1,id:pageParams.companyID,status:1}});
     };
     const onRedirect = (statusValue:any) => {
       if(isEditCompany.value==1 && statusValue==1) router.push({path: './edit', query: {reload:1,id:pageParams.companyID,status:1}});

+ 2 - 2
h5app/src/views/pages/jobhunt/edit.vue

@@ -330,8 +330,8 @@
               </ion-col>
               <ion-col>
                 <ion-item style="float: right;padding:0px;margin: 0px;">
-                  <label-selection :key="'refLabelSelectionKey3'"  :big-type="2" :list-label="baseData.listLabel" :title="'人员标签'"
-                                   v-bind="$attrs" @resultBack="onResultBackLabels"></label-selection>
+                  <label-selection :big-type="2" :list-label="baseData.listLabel" :title="'人员标签'"
+                                   @resultBack="onResultBackLabels"></label-selection>
                 </ion-item>
               </ion-col>
             </ion-row>