Forráskód Böngészése

1.优化获取筛选条件的流畅性,修改为点击筛选后才会加载筛选条件

GouGengquan 6 hónapja
szülő
commit
781b167b71
1 módosított fájl, 347 hozzáadás és 259 törlés
  1. 347 259
      src/views/assets/workbench/calculate/importInfo.vue

+ 347 - 259
src/views/assets/workbench/calculate/importInfo.vue

@@ -121,56 +121,66 @@
         <vxe-column field="equipmentName" title="设备名称" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>设备名称</span>
-            <TableFilter
-              :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="eqptNameOptions"
-              @reset="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'equipmentName')">
+              <TableFilter
+                :filtersProp="eqptNameFilterArr"
+                :filterOptionsProp="eqptNameOptions"
+                @reset="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="manufacturer" title="生产厂家" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>生产厂家</span>
-            <TableFilter
-              :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="eqptManufacturerOptions"
-              @reset="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'manufacturer')">
+              <TableFilter
+                :filtersProp="eqptManufacturerFilterArr"
+                :filterOptionsProp="eqptManufacturerOptions"
+                @reset="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="model" title="型号规格" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>型号规格</span>
-            <TableFilter
-              :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="eqptModelOptions"
-              @reset="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'model')">
+              <TableFilter
+                :filtersProp="eqptModelFilterArr"
+                :filterOptionsProp="eqptModelOptions"
+                @reset="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="purchaseDate" title="购买日期" width="160" :edit-render="dateEditRender">
           <template #header>
             <span>购买日期</span>
-            <TableFilter
-              :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="eqptPurchaseDateOptions"
-              @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'purchaseDate')">
+              <TableFilter
+                :filtersProp="eqptPurchaseDateFilterArr"
+                :filterOptionsProp="eqptPurchaseDateOptions"
+                @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="activationDate" title="启用日期" width="160" :edit-render="dateEditRender">
           <template #header>
             <span>启用日期</span>
-            <TableFilter
-              :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="eqptActivationDateOptions"
-              @reset="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'activationDate')">
+              <TableFilter
+                :filtersProp="eqptActivationDateFilterArr"
+                :filterOptionsProp="eqptActivationDateOptions"
+                @reset="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
           <template #default="{ row }">
             <span style="margin-top:10px">{{ row.activationDate }}</span>
@@ -180,23 +190,27 @@
         <vxe-column field="storageLocation" title="存放地点" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>存放地点</span>
-            <TableFilter
-              :filtersProp="eqptStorageLocationFilterArr"
-              :filterOptionsProp="eqptStorageLocationOptions"
-              @reset="(filters) => {eqptStorageLocationFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptStorageLocationFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'storageLocation')">
+              <TableFilter
+                :filtersProp="eqptStorageLocationFilterArr"
+                :filterOptionsProp="eqptStorageLocationOptions"
+                @reset="(filters) => {eqptStorageLocationFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptStorageLocationFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="usageSituation" title="使用情况" width="160" :edit-render="{}">
           <template #header>
             <span>使用情况</span>
-            <TableFilter
-              :filtersProp="eqptUsageSituationFilterArr"
-              :filterOptionsProp="eqptUsageSituationOptions"
-              @reset="(filters) => {eqptUsageSituationFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptUsageSituationFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'usageSituation')">
+              <TableFilter
+                :filtersProp="eqptUsageSituationFilterArr"
+                :filterOptionsProp="eqptUsageSituationOptions"
+                @reset="(filters) => {eqptUsageSituationFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptUsageSituationFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
           <template #edit="{ row }">
             <el-select v-model="row.usageSituation" placeholder="使用情况" filterable allow-create>
@@ -211,67 +225,79 @@
         <vxe-column field="quantity" title="数量" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>数量</span>
-            <TableFilter
-              :filtersProp="eqptQuantityFilterArr"
-              :filterOptionsProp="eqptQuantityOptions"
-              @reset="(filters) => {eqptQuantityFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptQuantityFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'quantity')">
+              <TableFilter
+                :filtersProp="eqptQuantityFilterArr"
+                :filterOptionsProp="eqptQuantityOptions"
+                @reset="(filters) => {eqptQuantityFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptQuantityFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="unitOfMeasurement" title="计量单位" width="160" :edit-render="{ name: 'VxeInput' }">
           <template #header>
             <span>计量单位</span>
-            <TableFilter
-              :filtersProp="eqptUnitOfMeasurementFilterArr"
-              :filterOptionsProp="eqptUnitOfMeasurementOptions"
-              @reset="(filters) => {eqptUnitOfMeasurementFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptUnitOfMeasurementFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'unitOfMeasurement')">
+              <TableFilter
+                :filtersProp="eqptUnitOfMeasurementFilterArr"
+                :filterOptionsProp="eqptUnitOfMeasurementOptions"
+                @reset="(filters) => {eqptUnitOfMeasurementFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptUnitOfMeasurementFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="bookOriginalValue" title="账面原值" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>账面原值</span>
-            <TableFilter
-              :filtersProp="eqptBookOriginalValueFilterArr"
-              :filterOptionsProp="eqptBookOriginalValueOptions"
-              @reset="(filters) => {eqptBookOriginalValueFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptBookOriginalValueFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'bookOriginalValue')">
+              <TableFilter
+                :filtersProp="eqptBookOriginalValueFilterArr"
+                :filterOptionsProp="eqptBookOriginalValueOptions"
+                @reset="(filters) => {eqptBookOriginalValueFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptBookOriginalValueFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="bookNetValue" title="账面净值" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>账面净值</span>
-            <TableFilter
-              :filtersProp="eqptBookNetValueFilterArr"
-              :filterOptionsProp="eqptBookNetValueOptions"
-              @reset="(filters) => {eqptBookNetValueFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptBookNetValueFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'bookNetValue')">
+              <TableFilter
+                :filtersProp="eqptBookNetValueFilterArr"
+                :filterOptionsProp="eqptBookNetValueOptions"
+                @reset="(filters) => {eqptBookNetValueFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptBookNetValueFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="taxedUnitPrice" title="合同/发票含税单价" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>合同/发票含税单价</span>
-            <TableFilter
-              :filtersProp="eqptTaxedUnitPriceFilterArr"
-              :filterOptionsProp="eqptTaxedUnitPriceOptions"
-              @reset="(filters) => {eqptTaxedUnitPriceFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptTaxedUnitPriceFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'taxedUnitPrice')">
+              <TableFilter
+                :filtersProp="eqptTaxedUnitPriceFilterArr"
+                :filterOptionsProp="eqptTaxedUnitPriceOptions"
+                @reset="(filters) => {eqptTaxedUnitPriceFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptTaxedUnitPriceFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="taxRate" title="购置时税率%" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>购置时税率%</span>
-            <TableFilter
-              :filtersProp="eqptTaxRateFilterArr"
-              :filterOptionsProp="eqptTaxRateOptions"
-              @reset="(filters) => {eqptTaxRateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptTaxRateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'taxRate')">
+              <TableFilter
+                :filtersProp="eqptTaxRateFilterArr"
+                :filterOptionsProp="eqptTaxRateOptions"
+                @reset="(filters) => {eqptTaxRateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptTaxRateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="unTaxedUnitPrice" title="不含税单价/发票价(元)" width="160">
@@ -318,12 +344,14 @@
         <vxe-column field="economicServiceLife" title="经济使用年数" width="160" :edit-render="{}">
           <template #header>
             <span>经济使用年数</span>
-            <TableFilter
-              :filtersProp="eqptEconomicServiceLifeFilterArr"
-              :filterOptionsProp="eqptEconomicServiceLifeOptions"
-              @reset="(filters) => {eqptEconomicServiceLifeFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptEconomicServiceLifeFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'economicServiceLife')">
+              <TableFilter
+                :filtersProp="eqptEconomicServiceLifeFilterArr"
+                :filterOptionsProp="eqptEconomicServiceLifeOptions"
+                @reset="(filters) => {eqptEconomicServiceLifeFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptEconomicServiceLifeFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
           <template #edit="{ $rowIndex, row }">
             <vxe-input v-model="row.economicServiceLife" @change="countDepreciationRate(row)" placeholder="整数类型" type="integer"></vxe-input>
@@ -356,12 +384,14 @@
         <vxe-column field="directObservationDepreciationRate" title="直接观察成新率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>直接观察成新率</span>
-            <TableFilter
-              :filtersProp="eqptDirectObservationDepreciationRateFilterArr"
-              :filterOptionsProp="eqptDirectObservationDepreciationRateOptions"
-              @reset="(filters) => {eqptDirectObservationDepreciationRateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptDirectObservationDepreciationRateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'directObservationDepreciationRate')">
+              <TableFilter
+                :filtersProp="eqptDirectObservationDepreciationRateFilterArr"
+                :filterOptionsProp="eqptDirectObservationDepreciationRateOptions"
+                @reset="(filters) => {eqptDirectObservationDepreciationRateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptDirectObservationDepreciationRateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="weight02" title="权重" width="160">
@@ -381,12 +411,14 @@
         <vxe-column field="equipmentType" title="设备类型" width="160" :edit-render="{}">
           <template #header>
             <span>设备类型</span>
-            <TableFilter
-              :filtersProp="eqptEquipmentTypeFilterArr"
-              :filterOptionsProp="eqptTypeOptions"
-              @reset="(filters) => {eqptEquipmentTypeFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptEquipmentTypeFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'equipmentType')">
+              <TableFilter
+                :filtersProp="eqptEquipmentTypeFilterArr"
+                :filterOptionsProp="eqptTypeOptions"
+                @reset="(filters) => {eqptEquipmentTypeFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptEquipmentTypeFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
           <template #edit="{ row }">
             <vxe-select v-model="row.equipmentType">
@@ -399,12 +431,14 @@
         <vxe-column field="valuationMethod" title="作价方法" width="160" :edit-render="{}">
           <template #header>
             <span>作价方法</span>
-            <TableFilter
-              :filtersProp="eqptValuationMethodFilterArr"
-              :filterOptionsProp="eqptValuationMethodOptions"
-              @reset="(filters) => {eqptValuationMethodFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptValuationMethodFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'valuationMethod')">
+              <TableFilter
+                :filtersProp="eqptValuationMethodFilterArr"
+                :filterOptionsProp="eqptValuationMethodOptions"
+                @reset="(filters) => {eqptValuationMethodFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptValuationMethodFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
           <template #edit="{ row }">
             <vxe-select v-model="row.valuationMethod" @change="setPPItoInquiryBasis(row)">
@@ -429,12 +463,14 @@
         <vxe-column field="price" title="询价单价" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>询价单价</span>
-            <TableFilter
-              :filtersProp="eqptPriceFilterArr"
-              :filterOptionsProp="eqptPriceOptions"
-              @reset="(filters) => {eqptPriceFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptPriceFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'price')">
+              <TableFilter
+                :filtersProp="eqptPriceFilterArr"
+                :filterOptionsProp="eqptPriceOptions"
+                @reset="(filters) => {eqptPriceFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptPriceFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="quotation" title="报价(含税不含运费不含安装调试费)" width="160">
@@ -445,12 +481,14 @@
         <vxe-column field="freightAndMiscellaneousFeeRate" title="运杂费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>运杂费率</span>
-            <TableFilter
-              :filtersProp="eqptFreightAndMiscellaneousFeeRateFilterArr"
-              :filterOptionsProp="eqptFreightAndMiscellaneousFeeRateOptions"
-              @reset="(filters) => {eqptFreightAndMiscellaneousFeeRateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptFreightAndMiscellaneousFeeRateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'freightAndMiscellaneousFeeRate')">
+              <TableFilter
+                :filtersProp="eqptFreightAndMiscellaneousFeeRateFilterArr"
+                :filterOptionsProp="eqptFreightAndMiscellaneousFeeRateOptions"
+                @reset="(filters) => {eqptFreightAndMiscellaneousFeeRateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptFreightAndMiscellaneousFeeRateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column title="运杂费" width="160">
@@ -465,12 +503,14 @@
         <vxe-column field="baseRate" title="基础费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>基础费率</span>
-            <TableFilter
-              :filtersProp="eqptBaseRateFilterArr"
-              :filterOptionsProp="eqptBaseRateOptions"
-              @reset="(filters) => {eqptBaseRateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptBaseRateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'baseRate')">
+              <TableFilter
+                :filtersProp="eqptBaseRateFilterArr"
+                :filterOptionsProp="eqptBaseRateOptions"
+                @reset="(filters) => {eqptBaseRateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptBaseRateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column title="基础费" width="160">
@@ -481,12 +521,14 @@
         <vxe-column field="installationRate" title="安装费率" width="160" :edit-render="{ name: 'VxeNumberInput' }">
           <template #header>
             <span>安装费率</span>
-            <TableFilter
-              :filtersProp="eqptInstallationRateFilterArr"
-              :filterOptionsProp="eqptInstallationRateOptions"
-              @reset="(filters) => {eqptInstallationRateFilterArr = filters;getEqptDataPage()}"
-              @confirm="(filters) => {eqptInstallationRateFilterArr = filters;getEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptPageData, 'installationRate')">
+              <TableFilter
+                :filtersProp="eqptInstallationRateFilterArr"
+                :filterOptionsProp="eqptInstallationRateOptions"
+                @reset="(filters) => {eqptInstallationRateFilterArr = filters;getEqptDataPage()}"
+                @confirm="(filters) => {eqptInstallationRateFilterArr = filters;getEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column title="安装费" width="160">
@@ -551,34 +593,40 @@
         <vxe-column field="equipmentName" title="设备名称" width="160">
           <template #header>
             <span>设备名称</span>
-            <TableFilter
-              :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="eqptNameOptions"
-              @reset="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
-              @confirm="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptImpPageData, 'equipmentName')">
+              <TableFilter
+                :filtersProp="eqptNameFilterArr"
+                :filterOptionsProp="eqptNameOptions"
+                @reset="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
+                @confirm="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="model" title="规格型号" width="160">
           <template #header>
             <span>规格型号</span>
-            <TableFilter
-              :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="eqptModelOptions"
-              @reset="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
-              @confirm="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptImpPageData, 'model')">
+              <TableFilter
+                :filtersProp="eqptModelFilterArr"
+                :filterOptionsProp="eqptModelOptions"
+                @reset="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
+                @confirm="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="manufacturer" title="生产厂家" width="160">
           <template #header>
             <span>生产厂家</span>
-            <TableFilter
-              :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="eqptManufacturerOptions"
-              @reset="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
-              @confirm="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptImpPageData, 'manufacturer')">
+              <TableFilter
+                :filtersProp="eqptManufacturerFilterArr"
+                :filterOptionsProp="eqptManufacturerOptions"
+                @reset="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
+                @confirm="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="unitOfMeasurement" title="计量单位" width="160"></vxe-column>
@@ -586,23 +634,27 @@
         <vxe-column field="purchaseDate" title="购置日期" width="160">
           <template #header>
             <span>购置日期</span>
-            <TableFilter
-              :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="eqptPurchaseDateOptions"
-              @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
-              @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptImpPageData, 'purchaseDate')">
+              <TableFilter
+                :filtersProp="eqptPurchaseDateFilterArr"
+                :filterOptionsProp="eqptPurchaseDateOptions"
+                @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
+                @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="activationDate" title="启用日期" width="160">
           <template #header>
             <span>启用日期</span>
-            <TableFilter
-              :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="eqptActivationDateOptions"
-              @reset="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
-              @confirm="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptImpPageData, 'activationDate')">
+              <TableFilter
+                :filtersProp="eqptActivationDateFilterArr"
+                :filterOptionsProp="eqptActivationDateOptions"
+                @reset="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
+                @confirm="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="bookOriginalValue" title="账面原值(元)" width="160"></vxe-column>
@@ -713,34 +765,40 @@
         <vxe-column field="equipmentName" title="设备名称" width="160">
           <template #header>
             <span>设备名称</span>
-            <TableFilter
-              :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="eqptNameOptions"
-              @reset="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
-              @confirm="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'equipmentName')">
+              <TableFilter
+                :filtersProp="eqptNameFilterArr"
+                :filterOptionsProp="eqptNameOptions"
+                @reset="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
+                @confirm="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="model" title="规格型号" width="160">
           <template #header>
             <span>规格型号</span>
-            <TableFilter
-              :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="eqptModelOptions"
-              @reset="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
-              @confirm="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'model')">
+              <TableFilter
+                :filtersProp="eqptModelFilterArr"
+                :filterOptionsProp="eqptModelOptions"
+                @reset="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
+                @confirm="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="manufacturer" title="生产厂家" width="160">
           <template #header>
             <span>生产厂家</span>
-            <TableFilter
-              :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="eqptManufacturerOptions"
-              @reset="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
-              @confirm="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'manufacturer')">
+              <TableFilter
+                :filtersProp="eqptManufacturerFilterArr"
+                :filterOptionsProp="eqptManufacturerOptions"
+                @reset="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
+                @confirm="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="affiliatedSystem" title="所属系统/生产线名称" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
@@ -749,23 +807,27 @@
         <vxe-column field="purchaseDate" title="购置日期" width="160">
           <template #header>
             <span>购置日期</span>
-            <TableFilter
-              :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="eqptPurchaseDateOptions"
-              @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
-              @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'purchaseDate')">
+              <TableFilter
+                :filtersProp="eqptPurchaseDateFilterArr"
+                :filterOptionsProp="eqptPurchaseDateOptions"
+                @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
+                @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-column field="activationDate" title="启用日期" width="160">
           <template #header>
             <span>启用日期</span>
-            <TableFilter
-              :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="eqptActivationDateOptions"
-              @reset="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
-              @confirm="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
-            />
+            <span @click="getEqptTableFilter(eqptNonSPageData, 'activationDate')">
+              <TableFilter
+                :filtersProp="eqptActivationDateFilterArr"
+                :filterOptionsProp="eqptActivationDateOptions"
+                @reset="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
+                @confirm="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
+              />
+            </span>
           </template>
         </vxe-column>
         <vxe-colgroup title="账面价值">
@@ -1330,7 +1392,7 @@ export default {
           })
         }
         this.getEqptLifeIfrRefs()
-        this.getEqptTableFilter(this.eqptPageData)
+        // this.getEqptTableFilter(this.eqptPageData)
       })
     },
     // 分页查询进口设备信息
@@ -1354,7 +1416,7 @@ export default {
             })
           })
         }
-        this.getEqptTableFilter(this.eqptImpPageData)
+        // this.getEqptTableFilter(this.eqptImpPageData)
       })
     },
     // 分页查询非标设备信息
@@ -1379,7 +1441,7 @@ export default {
           })
         }
         this.getEqptGnEvpList()
-        this.getEqptTableFilter(this.eqptNonSPageData)
+        // this.getEqptTableFilter(this.eqptNonSPageData)
       })
     },
     // 获取测算表基础信息
@@ -1729,76 +1791,102 @@ export default {
       })
     },
     // 获取表格过滤条件
-    getEqptTableFilter(eqptData) {
-      // 设备名称
-      this.eqptNameOptions = this.uniqueProperties(eqptData, 'equipmentName')
-      this.eqptDataQuery.eqptNameFilters = null
-
-      // 设备型号
-      this.eqptModelOptions = this.uniqueProperties(eqptData, 'model')
-      this.eqptDataQuery.modelFilters = null
-
-      // 购买日期
-      this.eqptPurchaseDateOptions = this.uniqueProperties(eqptData, 'purchaseDate')
-      this.eqptDataQuery.purchaseDateFilters = null
-
-      // 启用日期
-      this.eqptActivationDateOptions = this.uniqueProperties(eqptData, 'activationDate')
-      this.eqptDataQuery.activationDateFilters = null
-
-      // 生产厂家
-      this.eqptManufacturerOptions = this.uniqueProperties(eqptData, 'manufacturer')
-      this.eqptDataQuery.manufacturerFilters = null
-
-      // 存储地点
-      this.eqptStorageLocationOptions = this.uniqueProperties(eqptData, 'storageLocation')
-      this.eqptDataQuery.storageLocationFilters = null
-
-      // 使用情况
-      this.eqptUsageSituationOptions = this.uniqueProperties(eqptData, 'usageSituation')
-      this.eqptDataQuery.usageSituationFilters = null
-
-      this.eqptQuantityOptions = this.uniqueProperties(eqptData, 'quantity')
-      this.eqptDataQuery.quantityFilters = null
-
-      this.eqptUnitOfMeasurementOptions = this.uniqueProperties(eqptData, 'unitOfMeasurement')
-      this.eqptDataQuery.unitOfMeasurementFilters = null
-
-      this.eqptBookOriginalValueOptions = this.uniqueProperties(eqptData, 'bookOriginalValue')
-      this.eqptDataQuery.bookOriginalValueFilters = null
-
-      this.eqptBookNetValueOptions = this.uniqueProperties(eqptData, 'bookNetValue')
-      this.eqptDataQuery.bookNetValueFilters = null
-
-      this.eqptTaxedUnitPriceOptions = this.uniqueProperties(eqptData, 'taxedUnitPrice')
-      this.eqptDataQuery.taxedUnitPriceFilters = null
-
-      this.eqptTaxRateOptions = this.uniqueProperties(eqptData, 'taxRate')
-      this.eqptDataQuery.taxRateFilters = null
-
-      this.eqptEconomicServiceLifeOptions = this.uniqueProperties(eqptData, 'economicServiceLife')
-      this.eqptDataQuery.economicServiceLifeFilters = null
-
-      this.eqptTypeOptions = this.uniqueProperties(eqptData, 'equipmentType')
-      this.eqptDataQuery.equipmentTypeFilters = null
-
-      this.eqptValuationMethodOptions = this.uniqueProperties(eqptData, 'valuationMethod')
-      this.eqptDataQuery.valuationMethodFilters = null
-
-      this.eqptFreightAndMiscellaneousFeeRateOptions = this.uniqueProperties(eqptData, 'freightAndMiscellaneousFeeRate')
-      this.eqptDataQuery.freightAndMiscellaneousFeeRateFilters = null
-
-      this.eqptBaseRateOptions = this.uniqueProperties(eqptData, 'baseRate')
-      this.eqptDataQuery.baseRateFilters = null
-
-      this.eqptInstallationRateOptions = this.uniqueProperties(eqptData, 'installationRate')
-      this.eqptDataQuery.installationRateFilters = null
-
-      this.eqptDirectObservationDepreciationRateOptions = this.uniqueProperties(eqptData, 'directObservationDepreciationRate')
-      this.eqptDataQuery.directObservationDepreciationRateFilters = null
-
-      this.eqptPriceOptions = this.uniqueProperties(eqptData, 'price')
-      this.eqptDataQuery.priceFilters = null
+    getEqptTableFilter(eqptData, column) {
+      switch (column) {
+        case 'equipmentName':
+          // 设备名称
+          this.eqptNameOptions = this.uniqueProperties(eqptData, 'equipmentName')
+          this.eqptDataQuery.eqptNameFilters = null
+          break
+        case 'model':
+          // 设备型号
+          this.eqptModelOptions = this.uniqueProperties(eqptData, 'model')
+          this.eqptDataQuery.modelFilters = null
+          break
+        case 'purchaseDate':
+          // 购买日期
+          this.eqptPurchaseDateOptions = this.uniqueProperties(eqptData, 'purchaseDate')
+          this.eqptDataQuery.purchaseDateFilters = null
+          break
+        case 'activationDate':
+          // 启用日期
+          this.eqptActivationDateOptions = this.uniqueProperties(eqptData, 'activationDate')
+          this.eqptDataQuery.activationDateFilters = null
+          break
+        case 'manufacturer':
+          // 生产厂家
+          this.eqptManufacturerOptions = this.uniqueProperties(eqptData, 'manufacturer')
+          this.eqptDataQuery.manufacturerFilters = null
+          break
+        case 'storageLocation':
+          // 存储地点
+          this.eqptStorageLocationOptions = this.uniqueProperties(eqptData, 'storageLocation')
+          this.eqptDataQuery.storageLocationFilters = null
+          break
+        case 'usageSituation':
+          // 使用情况
+          this.eqptUsageSituationOptions = this.uniqueProperties(eqptData, 'usageSituation')
+          this.eqptDataQuery.usageSituationFilters = null
+          break
+        case 'quantity':
+          this.eqptQuantityOptions = this.uniqueProperties(eqptData, 'quantity')
+          this.eqptDataQuery.quantityFilters = null
+          break
+        case 'unitOfMeasurement':
+          this.eqptUnitOfMeasurementOptions = this.uniqueProperties(eqptData, 'unitOfMeasurement')
+          this.eqptDataQuery.unitOfMeasurementFilters = null
+          break
+        case 'bookOriginalValue':
+          this.eqptBookOriginalValueOptions = this.uniqueProperties(eqptData, 'bookOriginalValue')
+          this.eqptDataQuery.bookOriginalValueFilters = null
+          break
+        case 'bookNetValue':
+          this.eqptBookNetValueOptions = this.uniqueProperties(eqptData, 'bookNetValue')
+          this.eqptDataQuery.bookNetValueFilters = null
+          break
+        case 'taxedUnitPrice':
+          this.eqptTaxedUnitPriceOptions = this.uniqueProperties(eqptData, 'taxedUnitPrice')
+          this.eqptDataQuery.taxedUnitPriceFilters = null
+          break
+        case 'taxRate':
+          this.eqptTaxRateOptions = this.uniqueProperties(eqptData, 'taxRate')
+          this.eqptDataQuery.taxRateFilters = null
+          break
+        case 'economicServiceLife':
+          this.eqptEconomicServiceLifeOptions = this.uniqueProperties(eqptData, 'economicServiceLife')
+          this.eqptDataQuery.economicServiceLifeFilters = null
+          break
+        case 'equipmentType':
+          this.eqptTypeOptions = this.uniqueProperties(eqptData, 'equipmentType')
+          this.eqptDataQuery.equipmentTypeFilters = null
+          break
+        case 'valuationMethod':
+          this.eqptValuationMethodOptions = this.uniqueProperties(eqptData, 'valuationMethod')
+          this.eqptDataQuery.valuationMethodFilters = null
+          break
+        case 'freightAndMiscellaneousFeeRate':
+          this.eqptFreightAndMiscellaneousFeeRateOptions = this.uniqueProperties(eqptData, 'freightAndMiscellaneousFeeRate')
+          this.eqptDataQuery.freightAndMiscellaneousFeeRateFilters = null
+          break
+        case 'baseRate':
+          this.eqptBaseRateOptions = this.uniqueProperties(eqptData, 'baseRate')
+          this.eqptDataQuery.baseRateFilters = null
+          break
+        case 'installationRate':
+          this.eqptInstallationRateOptions = this.uniqueProperties(eqptData, 'installationRate')
+          this.eqptDataQuery.installationRateFilters = null
+          break
+        case 'directObservationDepreciationRate':
+          this.eqptDirectObservationDepreciationRateOptions = this.uniqueProperties(eqptData, 'directObservationDepreciationRate')
+          this.eqptDataQuery.directObservationDepreciationRateFilters = null
+          break
+        case 'price':
+          this.eqptPriceOptions = this.uniqueProperties(eqptData, 'price')
+          this.eqptDataQuery.priceFilters = null
+          break
+        default:
+          break
+      }
     },
     // 给表格列进行统一赋值
     bathchSetTableValue(propName, value) {