Browse Source

fix: 登记时间查询控件修改

zhangying 10 months ago
parent
commit
8b8a887193

+ 17 - 7
vue/src/views/companyService/company/index.vue

@@ -86,13 +86,12 @@
             </a-select>
           </a-form-item>
         </a-col>
+      </a-row>
+      <a-row :gutter="24" v-show="expand">
         <a-col :span="6">
-          <a-form-item label="登记时间" :label-col="{span:4}">
-            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px"/>
+          <a-form-item label="登记时间" :label-col="{span:6}">
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -257,6 +256,7 @@ export default defineComponent({
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
     const dataList = ref([]);
+    const createDate = ref([]);
     const institutionEditModelRef = ref();
     const tabsViewStore = useTabsViewStore();
 
@@ -346,6 +346,14 @@ export default defineComponent({
       tabsViewStore.addTabByPath('/companyService/enterprise/detail', {id: item.companyID});
     };
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParams.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParams.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       formRef,
       modalShowRef,
@@ -372,7 +380,9 @@ export default defineComponent({
       onDetail,
       exportSearchParams,
       getAllSites,
-      siteList
+      siteList,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {

+ 15 - 6
vue/src/views/companyService/post/index.vue

@@ -80,11 +80,8 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{span:6}">
-            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -253,6 +250,8 @@ export default defineComponent({
     }));
     const tabsViewStore = useTabsViewStore();
     const dataList = ref([]);
+    const createDate = ref([]);
+
     const loadData = async function () {
       formState.loading = true;
       const result: any = await getList(searchParams);
@@ -347,6 +346,14 @@ export default defineComponent({
       })
     };
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParams.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParams.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       formRef,
       searchParams,
@@ -373,7 +380,9 @@ export default defineComponent({
       onDetail,
       exportSearchParams,
       siteList,
-      getAllSites
+      getAllSites,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {

+ 14 - 6
vue/src/views/jobUserManager/jobhunt/index.vue

@@ -131,11 +131,8 @@
       <a-row :gutter="24" v-show="expand">
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{ span: 8 }" name="isAccomplish">
-            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -296,6 +293,7 @@ export default defineComponent({
     const jobHuntTypeList = ref<SelectProps['options']>();
     const jobUserTypeList = ref<SelectProps['options']>();
     const isAccomplishList = ref<SelectProps['options']>();
+    const createDate = ref([]);
     const siteList = ref<Array<any>>([]);
     const regionList = ref<SelectProps['options']>();
     const showSalary = (minSalary: any, maxSalary: any) => {
@@ -423,6 +421,14 @@ export default defineComponent({
       });
     };
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParamsState.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParamsState.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       formRef,
       expand,
@@ -454,7 +460,9 @@ export default defineComponent({
       getAllSites,
       getAllRegion,
       siteList,
-      regionList
+      regionList,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {

+ 14 - 6
vue/src/views/jobUserManager/jobuser/index.vue

@@ -116,11 +116,8 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{ span: 8 }">
-            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -227,6 +224,7 @@ export default defineComponent({
       {title: '重点人员类别', dataIndex: 'keyTypeName', key: 'keyTypeName',align: "center"},
       {title: '操作', key: 'operation', width: 170, align: 'center'},
     ];
+    const createDate = ref([]);
     const pagination = computed(() => ({
       total: formState.total,
       current: searchParamsState.pageIndex,
@@ -344,6 +342,14 @@ export default defineComponent({
       })
     }
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParamsState.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParamsState.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       modalRoleUserRef,
       modalRoleEditRef,
@@ -372,7 +378,9 @@ export default defineComponent({
       onVitae,
       expand,
       exportSearchParams,
-      regionList
+      regionList,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {

+ 13 - 5
vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -116,11 +116,8 @@
       <a-row :gutter="24" v-show="expand">
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{ span: 8 }" name="isAccomplish">
-            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 115px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -221,6 +218,7 @@ export default defineComponent({
     ];
     const siteList = ref<Array<any>>([]);
     const regionList = ref<SelectProps['options']>();
+    const createDate = ref([]);
     const pagination = computed(() => ({
       total: formState.total,
       current: searchParamsState.pageIndex,
@@ -289,6 +287,14 @@ export default defineComponent({
       });
     };
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParamsState.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParamsState.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       modalRoleUserRef,
       modalRoleEditRef,
@@ -312,6 +318,8 @@ export default defineComponent({
       regionList,
       getAllSites,
       getAllRegion,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {

+ 13 - 6
vue/src/views/taskAndLog/dotask/index.vue

@@ -62,11 +62,8 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{ span: 6 }" name="isAccomplish">
-            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 130px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 130px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -183,6 +180,7 @@ export default defineComponent({
     const taskTypeList = ref<SelectProps['options']>();
     const orderDate = ref([]);
     const finishDate = ref([]);
+    const createDate = ref([]);
     const dataList = ref([]);
     const expand = ref(false);
 
@@ -249,6 +247,13 @@ export default defineComponent({
       loadData();
     }
 
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParams.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParams.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     const onReset = () => {
       orderDate.value = [];
       finishDate.value = [];
@@ -319,7 +324,9 @@ export default defineComponent({
       onEdit,
       dayjs,
       onDetail,
-      exportSearchParams
+      exportSearchParams,
+      onCreateTimeChange,
+      createDate
     };
   },
   created() {

+ 14 - 6
vue/src/views/taskAndLog/dowork/index.vue

@@ -79,11 +79,8 @@
       <a-row v-show="expand" :gutter="24">
         <a-col :span="6">
           <a-form-item :label-col="{span:6}" label="登记时间" name="regionCode">
-            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px;"/>
-            <label style="margin:10px;">-</label>
-            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
-                           style="width: 120px"/>
+            <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
+                            @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -225,6 +222,7 @@ export default defineComponent({
     const logTypeList = ref<SelectProps['options']>();
     const siteList = ref<any>([]);
     const dataList = ref([]);
+    const createDate = ref([]);
     // 企业数据表格对话框
     const companyTableComRef = ref();
     // 就业人员表格对话框
@@ -354,6 +352,14 @@ export default defineComponent({
       jobUserTableComRef.value.show(record)
     }
 
+    // 登记时间组件调整
+    const onCreateTimeChange = (dateString) => {
+      createDate.value = dateString;
+      searchParams.startDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      searchParams.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    }
+
     return {
       formRef,
       expand,
@@ -384,7 +390,9 @@ export default defineComponent({
       jobUserTableComRef,
       exportSearchParams,
       siteList,
-      getAllSites
+      getAllSites,
+      createDate,
+      onCreateTimeChange
     };
   },
   created() {