Browse Source

fix: bug修改

zhangying 10 months ago
parent
commit
99f07fb3d3

+ 10 - 11
h5app/src/views/pages/work/log/list.vue

@@ -231,16 +231,8 @@ export default defineComponent({
     }
 
     const reload = () => {
-      // 设置查询初始截止日期为当天
-      const firstDay = new Date();
-      // 设置查询初始开始时间为当天的一个月前
-      const lastDay = new Date();
-      lastDay.setDate(firstDay.getDate() - 30);
-
       dataList.value = [];
       searchParamsState.pageIndex = 1;
-      searchParamsState.workStartDate=dayjs(lastDay.toLocaleDateString()).format('YYYY-MM-DD');
-      searchParamsState.workEndDate = dayjs(firstDay.toLocaleDateString()).format('YYYY-MM-DD');
       loadData();
     }
 
@@ -272,9 +264,16 @@ export default defineComponent({
       reload();
     });
 
-    // onMounted(() => {
-    //   reload();
-    // })
+    // 页面初始化设置值,防止onIonViewDidEnter时没有查询时间
+    onMounted(() => {
+      // 设置查询初始截止日期为当天
+      const firstDay = new Date();
+      // 设置查询初始开始时间为当天的一个月前
+      const lastDay = new Date();
+      lastDay.setDate(firstDay.getDate() - 30);
+      searchParamsState.workStartDate = dayjs(lastDay.toLocaleDateString()).format('YYYY-MM-DD') + "T00:00:00.000+08:00";
+      searchParamsState.workEndDate = dayjs(firstDay.toLocaleDateString()).format('YYYY-MM-DD') + "T00:00:00.000+08:00";
+    })
 
     return {
       router,

+ 1 - 1
vue/src/views/baseSettings/siteUser/index.vue

@@ -233,7 +233,7 @@ export default defineComponent({
     };
 
     const onEdit = (id: string) => {
-      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id:id,op:2});
+      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id: id, op: 1});
     };
 
     const onDetail = (id: string) => {

+ 2 - 1
vue/src/views/companyService/company/edit.vue

@@ -339,7 +339,8 @@
             name="insuredCount"
             :rules="[{ required: false, message: '请输入参保人数!' }]"
           >
-            <a-input v-model:value="dataModel.insuredCount" placeholder=""/>
+            <a-input-number :min="0" style="width: 100%" :controls="false" v-model:value="dataModel.insuredCount"
+                            placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>

+ 3 - 3
vue/src/views/companyService/post/index.vue

@@ -198,15 +198,15 @@ export default defineComponent({
         }
       },
       // {title: '工种名称', dataIndex: 'workName', key: 'workName', align: "center"},
-      {title: '文化程度', dataIndex: 'cultureLevelName', key: 'cultureLevelName', width: 150, align: "center"},
+      {title: '学历要求', dataIndex: 'cultureLevelName', key: 'cultureLevelName', width: 150, align: "center"},
       {
         title: '薪酬', dataIndex: 'postSalary', key: 'postSalary', align: "center", customRender: (item) => {
           const salary = showSalary(item.record.minSalary,item.record.maxSalary);/*`${item.record.minSalary ?? ""}-${item.record.maxSalary ?? ""}`*/
           return salary;
         }
       },
-      {title: '联系人', dataIndex: 'userName', key: 'userName', align: "center"},
-      {title: '联系电话', dataIndex: 'userMobile', key: 'userMobile', width: 200, align: "center"},
+      {title: '联系人', dataIndex: 'contactName', key: 'contactName', align: "center"},
+      {title: '联系电话', dataIndex: 'contactMobile', key: 'contactMobile', width: 200, align: "center"},
       {title: '推荐数量', dataIndex: 'recommendNum',key: 'recommendNum',width: 100, align: "center"},
       {title: '操作', key: 'operation', fixed: 'right', width: 240, align: "center"},
     ];

+ 9 - 4
vue/src/views/jobUserManager/jobhunt/index.vue

@@ -19,9 +19,11 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="工作年限" :label-col="{ span: 6 }" name="workYear">
-            <a-input type="number" v-model:value="searchParamsState.minWorkYear" style="width:110px;" placeholder=""/>
+            <a-input-number :min="0" :controls="false" v-model:value="searchParamsState.minWorkYear"
+                            style="width:110px;" placeholder=""/>
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder=""/>
+            <a-input-number :min="searchParamsState.minWorkYear" :controls="false"
+                            v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left">
@@ -76,9 +78,12 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="月薪要求" :label-col="{ span: 6 }" name="salary">
-            <a-input type="number" v-model:value="searchParamsState.minSalary" style="width:110px;" placeholder=""/>
+            <a-input-number style="width: 110px" :controls="false" :min="0" v-model:value="searchParamsState.minSalary"
+                            placeholder=""/>
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxSalary" style="width:110px;" placeholder=""/>
+            <a-input-number style="width: 110px" :controls="false" :min="searchParamsState.minSalary"
+                            v-model:value="searchParamsState.maxSalary"
+                            placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left"></a-col>

+ 1 - 1
vue/src/views/jobUserManager/jobuser/index.vue

@@ -276,7 +276,7 @@ export default defineComponent({
     };
 
     const getEducationList = () => {
-      getSysDictionaryList('CultureLevel').then((data) => {
+      getSysDictionaryList('HighestDegree').then((data) => {
         educationTypeList.value = data;
       });
     };