Browse Source

bug修改

ljb 9 months ago
parent
commit
76b86f2705

+ 24 - 0
src/views/tech-person/high-tech-person-sum-list.vue

@@ -25,6 +25,20 @@
         </div>
         
       </template>
+
+      <template slot="hireDateSearch">
+        <span>入职时间:</span>
+        <el-date-picker
+          v-model="extraParams.hireDateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          style="width: 240px !important;"
+        >
+        </el-date-picker>
+      </template>
       
     </avue-crud>
 
@@ -68,6 +82,16 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    getSearchParams() {
+      let searchParams = { ...this.params, ...this.extraParams };
+      if (!!searchParams.hireDateRange) {
+        searchParams.hireDateMin = searchParams.hireDateRange[0];
+        searchParams.hireDateMax = searchParams.hireDateRange[1];
+      }
+
+      delete searchParams.hireDateRange;
+      return searchParams;
+    },
     handleExport() {
       exportBlob(`/api/kd-scientific/technician/ndgkjryhzb/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}年度高新科技人员汇总表.xlsx`);

+ 2 - 2
src/views/yf-cost-manage/basic-data-setting/sjzbsy-cost-ledger.vue

@@ -46,7 +46,7 @@
 
       <template slot="recordDateSearch">
         <el-date-picker
-          v-model="params.recordDateRange"
+          v-model="extraParams.recordDateRange"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -135,7 +135,7 @@ export default window.$crudCommon({
   },
   methods: {
     getSearchParams() {
-      const newParams = { ...this.params };
+      const newParams = { ...this.params, ...this.extraParams };
       if (newParams.recordDateRange && newParams.recordDateRange.length) {
         newParams.recordDateMin = newParams.recordDateRange[0];
         newParams.recordDateMax = newParams.recordDateRange[1];