1.修复重置筛选条件，选项消失的bug

2.修复筛选数据后数据没保存的bug

src/components/TableFilter/index.vue

@@ -65,7 +65,7 @@ export default {
     methods: {
         // 重置筛选
         reset() {
-            this.filterOptions = []; 
+            // this.filterOptions = []; 
             this.filters = []; 
             this.search = null;
             this.$emit('reset', this.filters);

src/views/assets/workbench/calculate/importInfo.vue

@@ -122,7 +122,7 @@
         <vxe-column field="equipmentName" title="设备名称" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>设备名称</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'equipmentName')">
+            <span @click="getEqptTableFilter(eqptPageData, 'equipmentName'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptNameFilterArr"
                 :filterOptionsProp="eqptNameOptions"
@@ -135,7 +135,7 @@
         <vxe-column field="manufacturer" title="生产厂家" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>生产厂家</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'manufacturer')">
+            <span @click="getEqptTableFilter(eqptPageData, 'manufacturer'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptManufacturerFilterArr"
                 :filterOptionsProp="eqptManufacturerOptions"
@@ -148,7 +148,7 @@
         <vxe-column field="model" title="型号规格" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>型号规格</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'model')">
+            <span @click="getEqptTableFilter(eqptPageData, 'model'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptModelFilterArr"
                 :filterOptionsProp="eqptModelOptions"
@@ -161,7 +161,7 @@
         <vxe-column field="purchaseDate" title="购买日期" width="160" :edit-render="dateEditRender">
           <template #header>
             <span>购买日期</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'purchaseDate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'purchaseDate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptPurchaseDateFilterArr"
                 :filterOptionsProp="eqptPurchaseDateOptions"
@@ -174,7 +174,7 @@
         <vxe-column field="activationDate" title="启用日期" width="160" :edit-render="dateEditRender">
           <template #header>
             <span>启用日期</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'activationDate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'activationDate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptActivationDateFilterArr"
                 :filterOptionsProp="eqptActivationDateOptions"
@@ -191,7 +191,7 @@
         <vxe-column field="storageLocation" title="存放地点" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>存放地点</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'storageLocation')">
+            <span @click="getEqptTableFilter(eqptPageData, 'storageLocation'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptStorageLocationFilterArr"
                 :filterOptionsProp="eqptStorageLocationOptions"
@@ -204,7 +204,7 @@
         <vxe-column field="usageSituation" title="使用情况" width="160" :edit-render="{}">
           <template #header>
             <span>使用情况</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'usageSituation')">
+            <span @click="getEqptTableFilter(eqptPageData, 'usageSituation'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptUsageSituationFilterArr"
                 :filterOptionsProp="eqptUsageSituationOptions"
@@ -226,7 +226,7 @@
         <vxe-column field="quantity" title="数量" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>数量</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'quantity')">
+            <span @click="getEqptTableFilter(eqptPageData, 'quantity'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptQuantityFilterArr"
                 :filterOptionsProp="eqptQuantityOptions"
@@ -239,7 +239,7 @@
         <vxe-column field="unitOfMeasurement" title="计量单位" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>计量单位</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'unitOfMeasurement')">
+            <span @click="getEqptTableFilter(eqptPageData, 'unitOfMeasurement'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptUnitOfMeasurementFilterArr"
                 :filterOptionsProp="eqptUnitOfMeasurementOptions"
@@ -252,7 +252,7 @@
         <vxe-column field="bookOriginalValue" title="账面原值" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>账面原值</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'bookOriginalValue')">
+            <span @click="getEqptTableFilter(eqptPageData, 'bookOriginalValue'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptBookOriginalValueFilterArr"
                 :filterOptionsProp="eqptBookOriginalValueOptions"
@@ -265,7 +265,7 @@
         <vxe-column field="bookNetValue" title="账面净值" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>账面净值</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'bookNetValue')">
+            <span @click="getEqptTableFilter(eqptPageData, 'bookNetValue'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptBookNetValueFilterArr"
                 :filterOptionsProp="eqptBookNetValueOptions"
@@ -278,7 +278,7 @@
         <vxe-column field="taxedUnitPrice" title="合同/发票含税单价" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>合同/发票含税单价</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'taxedUnitPrice')">
+            <span @click="getEqptTableFilter(eqptPageData, 'taxedUnitPrice'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptTaxedUnitPriceFilterArr"
                 :filterOptionsProp="eqptTaxedUnitPriceOptions"
@@ -291,7 +291,7 @@
         <vxe-column field="taxRate" title="购置时税率%" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>购置时税率%</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'taxRate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'taxRate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptTaxRateFilterArr"
                 :filterOptionsProp="eqptTaxRateOptions"
@@ -354,7 +354,7 @@
         <vxe-column field="economicServiceLife" title="经济使用年数" width="160" :edit-render="{}">
           <template #header>
             <span>经济使用年数</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'economicServiceLife')">
+            <span @click="getEqptTableFilter(eqptPageData, 'economicServiceLife'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptEconomicServiceLifeFilterArr"
                 :filterOptionsProp="eqptEconomicServiceLifeOptions"
@@ -398,7 +398,7 @@
         <vxe-column field="directObservationDepreciationRate" title="直接观察成新率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>直接观察成新率</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'directObservationDepreciationRate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'directObservationDepreciationRate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptDirectObservationDepreciationRateFilterArr"
                 :filterOptionsProp="eqptDirectObservationDepreciationRateOptions"
@@ -425,7 +425,7 @@
         <vxe-column field="equipmentType" title="设备类型" width="160" :edit-render="{}">
           <template #header>
             <span>设备类型</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'equipmentType')">
+            <span @click="getEqptTableFilter(eqptPageData, 'equipmentType'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptEquipmentTypeFilterArr"
                 :filterOptionsProp="eqptTypeOptions"
@@ -445,7 +445,7 @@
         <vxe-column field="valuationMethod" title="作价方法" width="160" :edit-render="{}">
           <template #header>
             <span>作价方法</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'valuationMethod')">
+            <span @click="getEqptTableFilter(eqptPageData, 'valuationMethod'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptValuationMethodFilterArr"
                 :filterOptionsProp="eqptValuationMethodOptions"
@@ -477,7 +477,7 @@
         <vxe-column field="price" title="询价单价" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>询价单价</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'price')">
+            <span @click="getEqptTableFilter(eqptPageData, 'price'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptPriceFilterArr"
                 :filterOptionsProp="eqptPriceOptions"
@@ -495,7 +495,7 @@
         <vxe-column field="freightAndMiscellaneousFeeRate" title="运杂费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>运杂费率</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'freightAndMiscellaneousFeeRate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'freightAndMiscellaneousFeeRate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptFreightAndMiscellaneousFeeRateFilterArr"
                 :filterOptionsProp="eqptFreightAndMiscellaneousFeeRateOptions"
@@ -517,7 +517,7 @@
         <vxe-column field="baseRate" title="基础费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>基础费率</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'baseRate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'baseRate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptBaseRateFilterArr"
                 :filterOptionsProp="eqptBaseRateOptions"
@@ -535,7 +535,7 @@
         <vxe-column field="installationRate" title="安装费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>安装费率</span>
-            <span @click="getEqptTableFilter(eqptPageData, 'installationRate')">
+            <span @click="getEqptTableFilter(eqptPageData, 'installationRate'), autoSaveBatch()">
               <TableFilter
                 :filtersProp="eqptInstallationRateFilterArr"
                 :filterOptionsProp="eqptInstallationRateOptions"
@@ -615,7 +615,7 @@
         <vxe-column field="equipmentName" title="设备名称" width="160">
           <template #header>
             <span>设备名称</span>
-            <span @click="getEqptTableFilter(eqptImpPageData, 'equipmentName')">
+            <span @click="getEqptTableFilter(eqptImpPageData, 'equipmentName'), autoSaveBatchImp()">
               <TableFilter
                 :filtersProp="eqptNameFilterArr"
                 :filterOptionsProp="eqptNameOptions"
@@ -628,7 +628,7 @@
         <vxe-column field="model" title="规格型号" width="160">
           <template #header>
             <span>规格型号</span>
-            <span @click="getEqptTableFilter(eqptImpPageData, 'model')">
+            <span @click="getEqptTableFilter(eqptImpPageData, 'model'), autoSaveBatchImp()">
               <TableFilter
                 :filtersProp="eqptModelFilterArr"
                 :filterOptionsProp="eqptModelOptions"
@@ -641,7 +641,7 @@
         <vxe-column field="manufacturer" title="生产厂家" width="160">
           <template #header>
             <span>生产厂家</span>
-            <span @click="getEqptTableFilter(eqptImpPageData, 'manufacturer')">
+            <span @click="getEqptTableFilter(eqptImpPageData, 'manufacturer'), autoSaveBatchImp()">
               <TableFilter
                 :filtersProp="eqptManufacturerFilterArr"
                 :filterOptionsProp="eqptManufacturerOptions"
@@ -656,7 +656,7 @@
         <vxe-column field="purchaseDate" title="购置日期" width="160">
           <template #header>
             <span>购置日期</span>
-            <span @click="getEqptTableFilter(eqptImpPageData, 'purchaseDate')">
+            <span @click="getEqptTableFilter(eqptImpPageData, 'purchaseDate'), autoSaveBatchImp()">
               <TableFilter
                 :filtersProp="eqptPurchaseDateFilterArr"
                 :filterOptionsProp="eqptPurchaseDateOptions"
@@ -669,7 +669,7 @@
         <vxe-column field="activationDate" title="启用日期" width="160">
           <template #header>
             <span>启用日期</span>
-            <span @click="getEqptTableFilter(eqptImpPageData, 'activationDate')">
+            <span @click="getEqptTableFilter(eqptImpPageData, 'activationDate'), autoSaveBatchImp()">
               <TableFilter
                 :filtersProp="eqptActivationDateFilterArr"
                 :filterOptionsProp="eqptActivationDateOptions"
@@ -788,7 +788,7 @@
         <vxe-column field="equipmentName" title="设备名称" width="160">
           <template #header>
             <span>设备名称</span>
-            <span @click="getEqptTableFilter(eqptNonSPageData, 'equipmentName')">
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'equipmentName'), autoSaveBatchNonS()">
               <TableFilter
                 :filtersProp="eqptNameFilterArr"
                 :filterOptionsProp="eqptNameOptions"
@@ -801,7 +801,7 @@
         <vxe-column field="model" title="规格型号" width="160">
           <template #header>
             <span>规格型号</span>
-            <span @click="getEqptTableFilter(eqptNonSPageData, 'model')">
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'model'), autoSaveBatchNonS()">
               <TableFilter
                 :filtersProp="eqptModelFilterArr"
                 :filterOptionsProp="eqptModelOptions"
@@ -814,7 +814,7 @@
         <vxe-column field="manufacturer" title="生产厂家" width="160">
           <template #header>
             <span>生产厂家</span>
-            <span @click="getEqptTableFilter(eqptNonSPageData, 'manufacturer')">
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'manufacturer'), autoSaveBatchNonS()">
               <TableFilter
                 :filtersProp="eqptManufacturerFilterArr"
                 :filterOptionsProp="eqptManufacturerOptions"
@@ -830,7 +830,7 @@
         <vxe-column field="purchaseDate" title="购置日期" width="160">
           <template #header>
             <span>购置日期</span>
-            <span @click="getEqptTableFilter(eqptNonSPageData, 'purchaseDate')">
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'purchaseDate'), autoSaveBatchNonS()">
               <TableFilter
                 :filtersProp="eqptPurchaseDateFilterArr"
                 :filterOptionsProp="eqptPurchaseDateOptions"
@@ -843,7 +843,7 @@
         <vxe-column field="activationDate" title="启用日期" width="160">
           <template #header>
             <span>启用日期</span>
-            <span @click="getEqptTableFilter(eqptNonSPageData, 'activationDate')">
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'activationDate'), autoSaveBatchNonS()">
               <TableFilter
                 :filtersProp="eqptActivationDateFilterArr"
                 :filterOptionsProp="eqptActivationDateOptions"
@@ -1634,6 +1634,9 @@ export default {
         }
       })
     },
+    autoSaveBatch() {
+      updateBatch(this.eqptPageData);
+    },
     // 批量更新设备测算
     saveBatch() {
       let verify = true
@@ -1790,6 +1793,9 @@ export default {
         }
       })
     },
+    autoSaveBatchImp() {
+      updateBatchImpData(this.eqptImpPageData);
+    },
     // 批量更新进口设备测算
     saveBatchImp() {
       updateBatchImpData(this.eqptImpPageData).then((res) => {
@@ -1816,6 +1822,9 @@ export default {
         }
       })
     },
+    autoSaveBatchNonS() {
+      updateBatchNonSData(this.eqptNonSPageData);
+    },
     // 批量更新非标设备测算
     saveBatchNonS() {
       updateBatchNonSData(this.eqptNonSPageData).then((res) => {