Browse Source

处理框架搜索提交重置未能清空自定义组件value的问题

ljb 9 months ago
parent
commit
b1deec7cdd

+ 1 - 29
src/api/yfCostManage/yfCostStatistics/depreSummaryList.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/kd-scientific/lease/page',
+    url: '/api/kd-scientific/asset/zj-cqdt-wxzctx-fy-hzb',
     method: 'get',
     params: {
       ...params,
@@ -11,31 +11,3 @@ export const getList = (current, size, params) => {
     }
   })
 }
-
-export const add = (row) => {
-  return request({
-    url: '/api/kd-scientific/lease/submit',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const update = (row) => {
-  return request({
-    url: '/api/kd-scientific/lease/submit',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const remove = (ids) => {
-  return request({
-    url: '/api/kd-scientific/lease/remove',
-    method: 'post',
-    params: {
-      ids
-    }
-  })
-}

+ 28 - 15
src/mixins/crud.js

@@ -44,7 +44,7 @@ export default (app, option = {}) => {
           'refresh-change': this.refreshChange,
           'date-change': this.dateChange,
           'search-change': this.searchChange,
-          'search-reset': this.searchChange
+          'search-reset': this.searchReset
         }
       },
       rowKey() {
@@ -176,24 +176,37 @@ export default (app, option = {}) => {
       },
       searchChange(params, done) {
         if (done) done();
-        if (this.validatenull(params)) {
-          Object.keys(this.params).forEach(ele => {
-            if (!['createTime_dategt', 'createTime_datelt', 'yearAndMonth', 'xmId'].includes(ele)) {
-              delete this.params[ele];
-            }
-          })
-        } else {
-          Object.keys(params).forEach(ele => {
-            if (this.validatenull(params[ele])) {
-              delete this.params[ele];
-              delete params[ele];
-            }
-          })
-        }
+        // if (this.validatenull(params)) {
+        //   Object.keys(this.params).forEach(ele => {
+        //     if (!['createTime_dategt', 'createTime_datelt', 'yearAndMonth', 'xmId'].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);
         this.page.currentPage = 1;
         this.getList();
       },
+      searchReset() {
+        this.params = {
+          createTime_dategt: this.params.createTime_dategt,
+          createTime_datelt: this.params.createTime_datelt,
+          yearAndMonth: this.params.yearAndMonth,
+          xmId: this.params.xmId
+        };
+        // Object.keys(this.params).forEach(ele => {
+        //   if (!['createTime_dategt', 'createTime_datelt', 'yearAndMonth', 'xmId'].includes(ele)) {
+        //     delete this.params[ele];
+        //   }
+        // })
+      },
       dateChange(date) {
         if (date) {
           this.params.createTime_dategt = date[0];

+ 2 - 9
src/option/yfCostManage/yfCostStatistics/depreSummaryList.js

@@ -85,7 +85,7 @@ export default {
     },
     {
       label: '无形资产摊销费用',
-      prop: 'wxzctxfy',
+      prop: 'wxzcdtfy',
       type: 'number',
       span: 24,
       minWidth: 120,
@@ -93,18 +93,11 @@ export default {
     },
     {
       label: '研发费用合计(元)',
-      prop: 'amount',
+      prop: 'total',
       type: 'number',
       span: 24,
       minWidth: 120,
       align: 'center',
     },
-    {
-      label: '费用区间(元)',
-      prop: 'costRange',
-      type: 'number',
-      search: true,
-      display: false,
-    },
   ],
 };

+ 0 - 20
src/views/achievement/other-achievements.vue

@@ -136,26 +136,6 @@ export default window.$crudCommon({
       delete newParams.shenqingRq;
       return newParams;
     },
-    searchChange(params, done, type) {
-      if (done) done();
-      if (this.validatenull(params)) {
-        Object.keys(this.params).forEach(ele => {
-          if (!['createTime_dategt', 'createTime_datelt', 'shouquanRq', 'shenqingRq'].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);
-      this.page.currentPage = 1;
-      this.getList();
-    },
     validCustom() {
       if (!isAlphanumericCombination(this.form.cgbh)) {
         this.$message.warning("成果编号必须是英文字母加数字组合!");

+ 0 - 20
src/views/achievement/soft-works.vue

@@ -153,26 +153,6 @@ export default window.$crudCommon({
       delete newParams.djpzrq;
       return newParams;
     },
-    searchChange(params, done, type) {
-      if (done) done();
-      if (this.validatenull(params)) {
-        Object.keys(this.params).forEach(ele => {
-          if (!['createTime_dategt', 'createTime_datelt', 'kfwcrq', 'scfbrq', 'djpzrq'].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);
-      this.page.currentPage = 1;
-      this.getList();
-    },
     getFormData() {
       let newFormData = { ...this.form };
       if (!!newFormData.attachment) {

+ 0 - 24
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -172,30 +172,6 @@ export default window.$crudCommon({
     this.option = { ...newOption };
   },
   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();
-    },
     getFormData() {
       return { ...this.form, yearAndMonth: this.params.yearAndMonth };
     },

+ 1 - 11
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/depre-summary-list.vue

@@ -16,21 +16,12 @@
         >
           导出
         </el-button>
-        <print-table-btn @click="printTable" />
+        <!-- <print-table-btn @click="printTable" /> -->
         
         <div style="display: flex; align-items: center;">
           <year-month-select v-model="params.yearAndMonth"></year-month-select>
         </div>
       </template>
-
-      <template slot="costRangeSearch">
-        <div style="display: flex; align-items: center;">
-          <span>费用区间(元):</span>
-          <avue-input-number v-model="params.startSysm" :min="0" style="width: 100px !important;"></avue-input-number>
-          <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.endSysm" :min="0" style="width: 100px !important;"></avue-input-number>
-        </div>
-      </template>
       
     </avue-crud>
 
@@ -78,7 +69,6 @@ export default window.$crudCommon({
     }
   },
   methods: {
-    loadData() {},
     handleExport() {
       exportBlob(`/api/kd-scientific/lease/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}折旧费用、长期待摊费用、无形资产摊销费用汇总表.xlsx`);