Browse Source

科研资产清单时间范围和使用寿命范围查询条件处理

ljb 10 months ago
parent
commit
759097bb9a
1 changed files with 28 additions and 3 deletions
  1. 28 3
      src/views/basic-resource/comp-basic-info/ky-asset-list.vue

+ 28 - 3
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -57,11 +57,12 @@
       <!-- 开始时间 -->
       <!-- 开始时间 -->
       <template slot="kssjSearch">
       <template slot="kssjSearch">
         <el-date-picker
         <el-date-picker
-          v-model="params.kssj"
+          v-model="params.kssjRange"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         >
         >
         </el-date-picker>
         </el-date-picker>
       </template>
       </template>
@@ -69,9 +70,9 @@
       <!-- 使用寿命 -->
       <!-- 使用寿命 -->
       <template slot="sysmSearch">
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
-          <avue-input-number v-model="params.sysmStart" :min="0"></avue-input-number>
+          <avue-input-number v-model="params.startSysm" :min="0"></avue-input-number>
           <span style="width: 70px; text-align: center;">至</span>
           <span style="width: 70px; text-align: center;">至</span>
-          <avue-input-number v-model="params.sysmEnd" :min="0"></avue-input-number>
+          <avue-input-number v-model="params.endSysm" :min="0"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       
@@ -138,6 +139,30 @@ export default window.$crudCommon({
     },
     },
   },
   },
   methods: {
   methods: {
+    searchChange(params, done) {
+      if (done) done();
+      if (this.validatenull(params)) {
+        Object.keys(this.params).forEach(ele => {
+          if (!['createTime_dategt', 'createTime_datelt', 'yearAndMonth', 'kssjRange', 'startSysm', 'endSysm'].includes(ele)) {
+            delete this.params[ele];
+          }
+        })
+      } else {
+        Object.keys(params).forEach(ele => {
+          if (this.validatenull(params[ele])) {
+            delete this.params[ele];
+            delete params[ele];
+          }
+        })
+      }
+      this.params = Object.assign(this.params, params);
+      if (this.params.kssjRange && this.params.kssjRange.length) {
+        this.params.startTime = this.params.kssjRange[0];
+        this.params.endTime = this.params.kssjRange[1];
+      }
+      this.page.currentPage = 1;
+      this.getList();
+    },
     getDelParams(row) {
     getDelParams(row) {
       return [{ id: row.id, yearAndMonth: this.params.yearAndMonth }];
       return [{ id: row.id, yearAndMonth: this.params.yearAndMonth }];
     },
     },