Browse Source

处理查询条件清除内容后,还保留上一次查询条件的bug

ljb 9 months ago
parent
commit
e63330723b

+ 24 - 26
src/mixins/crud.js

@@ -8,6 +8,7 @@ export default (app, option = {}) => {
         data: [],
         data: [],
         form: {},
         form: {},
         params: {},
         params: {},
+        extraParams: {},
         loading: false,
         loading: false,
         api: require(`@/api/${option.name}`),
         api: require(`@/api/${option.name}`),
         option: require(`@/option/${option.name}`).default,
         option: require(`@/option/${option.name}`).default,
@@ -56,7 +57,7 @@ export default (app, option = {}) => {
         this.loadData();
         this.loadData();
       },
       },
       getSearchParams() {
       getSearchParams() {
-        return this.params;
+        return { ...this.params, ...this.extraParams };
       },
       },
       loadData() {
       loadData() {
         this.loading = true;
         this.loading = true;
@@ -176,36 +177,33 @@ export default (app, option = {}) => {
       },
       },
       searchChange(params, done) {
       searchChange(params, done) {
         if (done) 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.params = Object.assign(this.params, params);
         this.page.currentPage = 1;
         this.page.currentPage = 1;
         this.getList();
         this.getList();
       },
       },
       searchReset() {
       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];
-        //   }
-        // })
+        Object.keys(this.params).forEach(ele => {
+          if (!['createTime_dategt', 'createTime_datelt', 'yearAndMonth', 'xmId'].includes(ele)) {
+            delete this.params[ele];
+          }
+        })
+        if (!!this.extraParams) {
+          this.extraParams = {};
+        }
       },
       },
       dateChange(date) {
       dateChange(date) {
         if (date) {
         if (date) {

+ 14 - 3
src/option/techPerson/cyPersonRoster.js

@@ -144,6 +144,7 @@ export default {
         width: 70,
         width: 70,
         align: 'center',
         align: 'center',
         search: true,
         search: true,
+        showOverflowTooltip: true,
       }]
       }]
     },
     },
     {
     {
@@ -157,6 +158,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '2月',
         label: '2月',
         prop: '2',
         prop: '2',
@@ -164,6 +166,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '3月',
         label: '3月',
         prop: '3',
         prop: '3',
@@ -171,6 +174,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '4月',
         label: '4月',
         prop: '4',
         prop: '4',
@@ -178,6 +182,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '5月',
         label: '5月',
         prop: '5',
         prop: '5',
@@ -185,6 +190,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '6月',
         label: '6月',
         prop: '6',
         prop: '6',
@@ -192,6 +198,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '7月',
         label: '7月',
         prop: '7',
         prop: '7',
@@ -199,6 +206,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '8月',
         label: '8月',
         prop: '8',
         prop: '8',
@@ -206,6 +214,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '9月',
         label: '9月',
         prop: '9',
         prop: '9',
@@ -213,9 +222,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
-        // format: (val) {
-        //   console.log(val)
-        // }
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '10月',
         label: '10月',
         prop: '10',
         prop: '10',
@@ -223,6 +230,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '11月',
         label: '11月',
         prop: '11',
         prop: '11',
@@ -230,6 +238,7 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '12月',
         label: '12月',
         prop: '12',
         prop: '12',
@@ -237,12 +246,14 @@ export default {
         span: 12,
         span: 12,
         width: 50,
         width: 50,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }, {
       }, {
         label: '天数合计',
         label: '天数合计',
         prop: 'total',
         prop: 'total',
         display: false,
         display: false,
         width: 70,
         width: 70,
         align: 'center',
         align: 'center',
+        showOverflowTooltip: true,
       }]
       }]
     },
     },
   ],
   ],

+ 7 - 7
src/views/achievement/other-achievements.vue

@@ -48,7 +48,7 @@
       <template slot="shenqingRqSearch">
       <template slot="shenqingRqSearch">
         <span>申请日期:</span>
         <span>申请日期:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.shenqingRq"
+          v-model="extraParams.shenqingRq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -62,7 +62,7 @@
       <template slot="shouquanRqSearch">
       <template slot="shouquanRqSearch">
         <span>授权日期:</span>
         <span>授权日期:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.shouquanRq"
+          v-model="extraParams.shouquanRq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -122,14 +122,14 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     getSearchParams() {
     getSearchParams() {
-      const newParams = { ...this.params };
+      const newParams = { ...this.params, ...this.extraParams };
       if (newParams.shouquanRq && newParams.shouquanRq.length) {
       if (newParams.shouquanRq && newParams.shouquanRq.length) {
-        newParams.shouquanRqStart = newParams.shouquanRq[0];
-        newParams.shouquanRqEnd = newParams.shouquanRq[1];
+        newParams.shouquanRqMix = newParams.shouquanRq[0];
+        newParams.shouquanRqMax = newParams.shouquanRq[1];
       }
       }
       if (newParams.shenqingRq && newParams.shenqingRq.length) {
       if (newParams.shenqingRq && newParams.shenqingRq.length) {
-        newParams.shenqingRqStart = newParams.shenqingRq[0];
-        newParams.shenqingRqEnd = newParams.shenqingRq[1];
+        newParams.shenqingRqMix = newParams.shenqingRq[0];
+        newParams.shenqingRqMax = newParams.shenqingRq[1];
       }
       }
 
 
       delete newParams.shouquanRq;
       delete newParams.shouquanRq;

+ 10 - 10
src/views/achievement/soft-works.vue

@@ -49,7 +49,7 @@
       <template slot="kfwcrqSearch">
       <template slot="kfwcrqSearch">
         <span>开发完成时间:</span>
         <span>开发完成时间:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.kfwcrq"
+          v-model="extraParams.kfwcrq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -63,7 +63,7 @@
       <template slot="scfbrqSearch">
       <template slot="scfbrqSearch">
         <span>首次发布时间:</span>
         <span>首次发布时间:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.scfbrq"
+          v-model="extraParams.scfbrq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -77,7 +77,7 @@
       <template slot="djpzrqSearch">
       <template slot="djpzrqSearch">
         <span>登记批准日期:</span>
         <span>登记批准日期:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.djpzrq"
+          v-model="extraParams.djpzrq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -135,18 +135,18 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     getSearchParams() {
     getSearchParams() {
-      const newParams = { ...this.params };
+      const newParams = { ...this.params, ...this.extraParams };
       if (newParams.kfwcrq && newParams.kfwcrq.length) {
       if (newParams.kfwcrq && newParams.kfwcrq.length) {
-        newParams.kfwcrqStart = newParams.kfwcrq[0];
-        newParams.kfwcrqEnd = newParams.kfwcrq[1];
+        newParams.kfwcrqMin = newParams.kfwcrq[0];
+        newParams.kfwcrqMax = newParams.kfwcrq[1];
       }
       }
       if (newParams.scfbrq && newParams.scfbrq.length) {
       if (newParams.scfbrq && newParams.scfbrq.length) {
-        newParams.scfbrqStart = newParams.scfbrq[0];
-        newParams.scfbrqEnd = newParams.scfbrq[1];
+        newParams.scfbrqMin = newParams.scfbrq[0];
+        newParams.scfbrqMax = newParams.scfbrq[1];
       }
       }
       if (newParams.djpzrq && newParams.djpzrq.length) {
       if (newParams.djpzrq && newParams.djpzrq.length) {
-        newParams.djpzrqStart = newParams.djpzrq[0];
-        newParams.djpzrqEnd = newParams.djpzrq[1];
+        newParams.djpzrqMin = newParams.djpzrq[0];
+        newParams.djpzrqMax = newParams.djpzrq[1];
       }
       }
       delete newParams.kfwcrq;
       delete newParams.kfwcrq;
       delete newParams.scfbrq;
       delete newParams.scfbrq;

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

@@ -66,7 +66,7 @@
       <!-- 开始时间 -->
       <!-- 开始时间 -->
       <template slot="kssjSearch">
       <template slot="kssjSearch">
         <el-date-picker
         <el-date-picker
-          v-model="params.kssjRange"
+          v-model="extraParams.kssjRange"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -81,9 +81,9 @@
       <template slot="sysmSearch">
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>使用寿命:</span>
           <span>使用寿命:</span>
-          <avue-input-number v-model="params.startSysm" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.endSysm" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       
@@ -171,6 +171,16 @@ export default window.$crudCommon({
     this.option = { ...newOption };
     this.option = { ...newOption };
   },
   },
   methods: {
   methods: {
+    getSearchParams() {
+      let searchParams = { ...this.params, ...this.extraParams };
+      if (!!searchParams.kssjRange) {
+        searchParams.kssjMin = searchParams.kssjRange[0];
+        searchParams.kssjMax = searchParams.kssjRange[1];
+      }
+
+      delete searchParams.kssjRange;
+      return searchParams;
+    },
     handleEdit(row) {
     handleEdit(row) {
       this.$refs.crud.rowEdit(row);
       this.$refs.crud.rowEdit(row);
     },
     },

+ 2 - 6
src/views/tech-person/cy-person-roster.vue

@@ -22,16 +22,12 @@
         </div>
         </div>
       </template>
       </template>
 
 
-      <template slot="cygsSearch">
-        <el-input v-model="params.cygs" />
-      </template>
-
       <template slot="situationCountSearch">
       <template slot="situationCountSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>参研个数:</span>
           <span>参研个数:</span>
-          <avue-input-number v-model="params.situationCountMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.situationCountMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.situationCountMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.situationCountMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 

+ 2 - 2
src/views/yf-cost-manage/basic-data-setting/dev-work-hours-register.vue

@@ -47,9 +47,9 @@
       <template slot="monthlyHoursSearch">
       <template slot="monthlyHoursSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>使用工时:</span>
           <span>使用工时:</span>
-          <avue-input-number v-model="params.monthlyHoursStart" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.monthlyHoursStart" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.monthlyHoursEnd" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.monthlyHoursEnd" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       

+ 8 - 8
src/views/yf-cost-manage/basic-data-setting/dt-cost-allocation-list.vue

@@ -51,7 +51,7 @@
       <template slot="txksrqSearch">
       <template slot="txksrqSearch">
         <span>摊销开始时间:</span>
         <span>摊销开始时间:</span>
         <el-date-picker
         <el-date-picker
-          v-model="params.txksrq"
+          v-model="extraParams.txksrq"
           type="daterange"
           type="daterange"
           range-separator="至"
           range-separator="至"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
@@ -65,27 +65,27 @@
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzStart" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzStart" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzEnd" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzEnd" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ysyysSearch">
       <template slot="ysyysSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已使用月数:</span>
           <span>已使用月数:</span>
-          <avue-input-number v-model="params.ysyysStart" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysyysStart" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.ysyysEnd" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysyysEnd" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ytxeSearch">
       <template slot="ytxeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月摊销额(每节点/套):</span>
           <span>月摊销额(每节点/套):</span>
-          <avue-input-number v-model="params.ytxeStart" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ytxeStart" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.ytxeEnd" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ytxeEnd" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
@@ -144,7 +144,7 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     getSearchParams() {
     getSearchParams() {
-      const newParams = { ...this.params };
+      const newParams = { ...this.params, ...this.extraParams };
       if (newParams.txksrq && newParams.txksrq.length) {
       if (newParams.txksrq && newParams.txksrq.length) {
         newParams.txksrqStart = newParams.txksrq[0];
         newParams.txksrqStart = newParams.txksrq[0];
         newParams.txksrqEnd = newParams.txksrq[1];
         newParams.txksrqEnd = newParams.txksrq[1];

+ 8 - 8
src/views/yf-cost-manage/basic-data-setting/hourse-details-list.vue

@@ -55,36 +55,36 @@
       <template slot="sysmSearch">
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>使用寿命:</span>
           <span>使用寿命:</span>
-          <avue-input-number v-model="params.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ysysmSearch">
       <template slot="ysysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已使用月数:</span>
           <span>已使用月数:</span>
-          <avue-input-number v-model="params.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="yzjeSearch">
       <template slot="yzjeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月折旧额(每台/套):</span>
           <span>月折旧额(每台/套):</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 

+ 8 - 8
src/views/yf-cost-manage/basic-data-setting/ky-device-list.vue

@@ -55,36 +55,36 @@
       <template slot="sysmSearch">
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>使用寿命:</span>
           <span>使用寿命:</span>
-          <avue-input-number v-model="params.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ysysmSearch">
       <template slot="ysysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已使用月数:</span>
           <span>已使用月数:</span>
-          <avue-input-number v-model="params.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="yzjeSearch">
       <template slot="yzjeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月折旧额(每台/套):</span>
           <span>月折旧额(每台/套):</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 

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

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

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

@@ -60,9 +60,9 @@
       <template slot="amountSearch">
       <template slot="amountSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>金额区间(元):</span>
           <span>金额区间(元):</span>
-          <avue-input-number v-model="params.amountMin" :min="0" style="width: 120px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.amountMin" :min="0" style="width: 120px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.amountMax" :min="0" style="width: 120px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.amountMax" :min="0" style="width: 120px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 

+ 8 - 8
src/views/yf-cost-manage/basic-data-setting/wxzc-details.vue

@@ -55,36 +55,36 @@
       <template slot="sysmSearch">
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>使用寿命:</span>
           <span>使用寿命:</span>
-          <avue-input-number v-model="params.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.sysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ysysmSearch">
       <template slot="ysysmSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已使用月数:</span>
           <span>已使用月数:</span>
-          <avue-input-number v-model="params.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="yzjeSearch">
       <template slot="yzjeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月折旧额(每台/套):</span>
           <span>月折旧额(每台/套):</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 90px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 90px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 

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

@@ -51,9 +51,9 @@
       <template slot="amountSearch">
       <template slot="amountSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>金额(元):</span>
           <span>金额(元):</span>
-          <avue-input-number v-model="params.amountMin" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.amountMin" :min="0" style="width: 140px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.amountMax" :min="0" style="width: 90px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.amountMax" :min="0" style="width: 140px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       

+ 11 - 11
src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue

@@ -39,45 +39,45 @@
       <template slot="jczSearch">
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>净残值:</span>
           <span>净残值:</span>
-          <avue-input-number v-model="params.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="ytxeSearch">
       <template slot="ytxeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月摊销额:</span>
           <span>月摊销额:</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="attendanceHoursSearch">
       <template slot="attendanceHoursSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月使用工时:</span>
           <span>月使用工时:</span>
-          <avue-input-number v-model="params.attendanceHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.attendanceHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.attendanceHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.attendanceHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="workHoursSearch">
       <template slot="workHoursSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已研发工时:</span>
           <span>已研发工时:</span>
-          <avue-input-number v-model="params.workHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.workHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.workHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.workHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       
@@ -155,7 +155,7 @@ export default window.$crudCommon({
       item.gl = item.asset ? item.asset.gl : '';
       item.gl = item.asset ? item.asset.gl : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
-      item.jcz = item.asset ? item.asset.jcz : '';
+      item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
       item.ytxe = item.asset ? item.asset.yzje : '';
       item.ytxe = item.asset ? item.asset.yzje : '';
       item.attendanceHours = (item.attendanceHours || 0).toFixed(1);
       item.attendanceHours = (item.attendanceHours || 0).toFixed(1);
       item.workHours = (item.workHours || 0).toFixed(1);
       item.workHours = (item.workHours || 0).toFixed(1);

+ 11 - 11
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/dev-depre-allocation.vue

@@ -26,45 +26,45 @@
       <template slot="jczSearch">
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>净残值:</span>
           <span>净残值:</span>
-          <avue-input-number v-model="params.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="yzjeSearch">
       <template slot="yzjeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月折旧额:</span>
           <span>月折旧额:</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="attendanceHoursSearch">
       <template slot="attendanceHoursSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月使用工时:</span>
           <span>月使用工时:</span>
-          <avue-input-number v-model="params.attendanceHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.attendanceHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.attendanceHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.attendanceHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="workHoursSearch">
       <template slot="workHoursSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>已研发工时:</span>
           <span>已研发工时:</span>
-          <avue-input-number v-model="params.workHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.workHoursMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.workHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.workHoursMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       
@@ -143,7 +143,7 @@ export default window.$crudCommon({
       item.zclb = item.asset ? item.asset.zclb : '';
       item.zclb = item.asset ? item.asset.zclb : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
-      item.jcz = item.asset ? item.asset.jcz : '';
+      item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
       item.yzje = item.asset ? item.asset.yzje : '';
       item.yzje = item.asset ? item.asset.yzje : '';
       item.attendanceHours = item.asset ? item.asset.zgs : '';
       item.attendanceHours = item.asset ? item.asset.zgs : '';
       item.yanfaFenTanLv = new Decimal(item.yanfaFenTanLv).mul(new Decimal(100));
       item.yanfaFenTanLv = new Decimal(item.yanfaFenTanLv).mul(new Decimal(100));

+ 7 - 7
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/hourse-depre-allocation.vue

@@ -26,27 +26,27 @@
       <template slot="jczSearch">
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>净残值:</span>
           <span>净残值:</span>
-          <avue-input-number v-model="params.ysysmMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.ysysmMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="zcyzSearch">
       <template slot="zcyzSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>资产原值:</span>
           <span>资产原值:</span>
-          <avue-input-number v-model="params.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.zcyzMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
 
 
       <template slot="yzjeSearch">
       <template slot="yzjeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>月折旧额:</span>
           <span>月折旧额:</span>
-          <avue-input-number v-model="params.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
-          <avue-input-number v-model="params.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
+          <avue-input-number v-model="extraParams.yzjeMax" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
       </template>
       </template>
       
       
@@ -123,7 +123,7 @@ export default window.$crudCommon({
       item.zclb = item.asset ? item.asset.zclb : '';
       item.zclb = item.asset ? item.asset.zclb : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
-      item.jcz = item.asset ? item.asset.jcz : '';
+      item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
       item.yzje = item.asset ? item.asset.yzje : '';
       item.yzje = item.asset ? item.asset.yzje : '';
       item.yanfaTanXiao = Number(new Decimal(item.yzje || 0).mul(item.yanfaFenTanLv || 0) / 100).toFixed(2);
       item.yanfaTanXiao = Number(new Decimal(item.yzje || 0).mul(item.yanfaFenTanLv || 0) / 100).toFixed(2);
       return item;
       return item;