1.机器设备测算表给常用列加上筛选条件

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

@@ -123,7 +123,7 @@
             <span>设备名称</span>
             <TableFilter
               :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="equipmentNameOptions"
+              :filterOptionsProp="eqptNameOptions"
               @reset="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
               @confirm="(filters) => {eqptNameFilterArr = filters;getEqptDataPage()}"
             />
@@ -134,7 +134,7 @@
             <span>生产厂家</span>
             <TableFilter
               :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="equipmentManufacturerOptions"
+              :filterOptionsProp="eqptManufacturerOptions"
               @reset="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
               @confirm="(filters) => {eqptManufacturerFilterArr = filters;getEqptDataPage()}"
             />
@@ -145,7 +145,7 @@
             <span>型号规格</span>
             <TableFilter
               :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="equipmentModelOptions"
+              :filterOptionsProp="eqptModelOptions"
               @reset="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
               @confirm="(filters) => {eqptModelFilterArr = filters;getEqptDataPage()}"
             />
@@ -156,7 +156,7 @@
             <span>购买日期</span>
             <TableFilter
               :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="equipmenPurchaseDateOptions"
+              :filterOptionsProp="eqptPurchaseDateOptions"
               @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
               @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getEqptDataPage()}"
             />
@@ -167,7 +167,7 @@
             <span>启用日期</span>
             <TableFilter
               :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="equipmentActivationDateOptions"
+              :filterOptionsProp="eqptActivationDateOptions"
               @reset="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
               @confirm="(filters) => {eqptActivationDateFilterArr = filters;getEqptDataPage()}"
             />
@@ -177,8 +177,27 @@
             <p v-if="new Date(row.activationDate) < new Date(row.purchaseDate)" style="color: red;font-size: 9px;">启用日期在购买日期之前</p>
           </template>
         </vxe-column>
-        <vxe-column field="storageLocation" title="存放地点" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
+        <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()}"
+            />
+          </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()}"
+            />
+          </template>
           <template #edit="{ row }">
             <el-select v-model="row.usageSituation" placeholder="使用情况" filterable allow-create>
               <el-option label="在用" value="在用"></el-option>
@@ -189,12 +208,72 @@
             </el-select>
           </template>
         </vxe-column>
-        <vxe-column field="quantity" title="数量" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
-        <vxe-column field="unitOfMeasurement" title="计量单位" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="bookOriginalValue" title="账面原值" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
-        <vxe-column field="bookNetValue" title="账面净值" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
-        <vxe-column field="taxedUnitPrice" title="合同/发票含税单价" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
-        <vxe-column field="taxRate" title="购置时税率%" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </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()}"
+            />
+          </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()}"
+            />
+          </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()}"
+            />
+          </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()}"
+            />
+          </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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column field="unTaxedUnitPrice" title="不含税单价/发票价(元)" width="160">
           <template #default="{ row }">
             <!-- 计算不含税单价 -->
@@ -237,6 +316,15 @@
           </vxe-column>
         </vxe-colgroup>
         <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()}"
+            />
+          </template>
           <template #edit="{ $rowIndex, row }">
             <el-input v-model="row.economicServiceLife" @change="countDepreciationRate(row)" />
           </template>
@@ -264,7 +352,17 @@
             <span>{{ row.weight01 * 100 }}%</span>
           </template>
         </vxe-column>
-        <vxe-column field="directObservationDepreciationRate" title="直接观察成新率" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column field="weight02" title="权重" width="160">
           <template #default="{ row }">
             <span>{{ row.weight02 * 100 }}%</span>
@@ -280,6 +378,15 @@
           </template>
         </vxe-column>
         <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()}"
+            />
+          </template>
           <template #edit="{ row }">
             <vxe-select v-model="row.equipmentType">
               <vxe-option label="国产设备" value="国产设备"></vxe-option>
@@ -289,6 +396,15 @@
           </template>
         </vxe-column>
         <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()}"
+            />
+          </template>
           <template #edit="{ row }">
             <vxe-select v-model="row.valuationMethod" @change="setPPItoInquiryBasis(row)">
               <vxe-option label="询价" value="询价"></vxe-option>
@@ -309,13 +425,33 @@
         </vxe-column>
         <vxe-column field="inquiryWeb" title="询价网址" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
         <vxe-column field="inquiryLocation" title="询价地点" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="price" title="询价单价" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column field="quotation" title="报价（含税不含运费不含安装调试费）" width="160">
           <template #default="{ row }">
             <span>{{ row.quotation = (row.price * row.quantity).toFixed(2) }}</span>
           </template>
         </vxe-column>
-        <vxe-column field="freightAndMiscellaneousFeeRate" title="运杂费率" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column title="运杂费" width="160">
           <template #default="{ row }">
             <span>
@@ -325,13 +461,33 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column field="baseRate" title="基础费率" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column title="基础费" width="160">
           <template #default="{ row }">
             <span>{{ row.baseFee = (row.quotation * row.baseRate / 100).toFixed(0) }}</span>
           </template>
         </vxe-column>
-        <vxe-column field="installationRate" title="安装费率" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <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()}"
+            />
+          </template>
+        </vxe-column>
         <vxe-column title="安装费" width="160">
           <template #default="{ row }">
             <span>
@@ -396,7 +552,7 @@
             <span>设备名称</span>
             <TableFilter
               :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="equipmentNameOptions"
+              :filterOptionsProp="eqptNameOptions"
               @reset="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
               @confirm="(filters) => {eqptNameFilterArr = filters;getImpEqptDataPage()}"
             />
@@ -407,7 +563,7 @@
             <span>规格型号</span>
             <TableFilter
               :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="equipmentModelOptions"
+              :filterOptionsProp="eqptModelOptions"
               @reset="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
               @confirm="(filters) => {eqptModelFilterArr = filters;getImpEqptDataPage()}"
             />
@@ -418,7 +574,7 @@
             <span>生产厂家</span>
             <TableFilter
               :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="equipmentManufacturerOptions"
+              :filterOptionsProp="eqptManufacturerOptions"
               @reset="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
               @confirm="(filters) => {eqptManufacturerFilterArr = filters;getImpEqptDataPage()}"
             />
@@ -431,7 +587,7 @@
             <span>购置日期</span>
             <TableFilter
               :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="equipmenPurchaseDateOptions"
+              :filterOptionsProp="eqptPurchaseDateOptions"
               @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
               @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getImpEqptDataPage()}"
             />
@@ -442,7 +598,7 @@
             <span>启用日期</span>
             <TableFilter
               :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="equipmentActivationDateOptions"
+              :filterOptionsProp="eqptActivationDateOptions"
               @reset="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
               @confirm="(filters) => {eqptActivationDateFilterArr = filters;getImpEqptDataPage()}"
             />
@@ -558,7 +714,7 @@
             <span>设备名称</span>
             <TableFilter
               :filtersProp="eqptNameFilterArr"
-              :filterOptionsProp="equipmentNameOptions"
+              :filterOptionsProp="eqptNameOptions"
               @reset="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
               @confirm="(filters) => {eqptNameFilterArr = filters;getNonSEqptDataPage()}"
             />
@@ -569,7 +725,7 @@
             <span>规格型号</span>
             <TableFilter
               :filtersProp="eqptModelFilterArr"
-              :filterOptionsProp="equipmentModelOptions"
+              :filterOptionsProp="eqptModelOptions"
               @reset="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
               @confirm="(filters) => {eqptModelFilterArr = filters;getNonSEqptDataPage()}"
             />
@@ -580,7 +736,7 @@
             <span>生产厂家</span>
             <TableFilter
               :filtersProp="eqptManufacturerFilterArr"
-              :filterOptionsProp="equipmentManufacturerOptions"
+              :filterOptionsProp="eqptManufacturerOptions"
               @reset="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
               @confirm="(filters) => {eqptManufacturerFilterArr = filters;getNonSEqptDataPage()}"
             />
@@ -594,7 +750,7 @@
             <span>购置日期</span>
             <TableFilter
               :filtersProp="eqptPurchaseDateFilterArr"
-              :filterOptionsProp="equipmenPurchaseDateOptions"
+              :filterOptionsProp="eqptPurchaseDateOptions"
               @reset="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
               @confirm="(filters) => {eqptPurchaseDateFilterArr = filters;getNonSEqptDataPage()}"
             />
@@ -605,7 +761,7 @@
             <span>启用日期</span>
             <TableFilter
               :filtersProp="eqptActivationDateFilterArr"
-              :filterOptionsProp="equipmentActivationDateOptions"
+              :filterOptionsProp="eqptActivationDateOptions"
               @reset="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
               @confirm="(filters) => {eqptActivationDateFilterArr = filters;getNonSEqptDataPage()}"
             />
@@ -846,6 +1002,22 @@ export default {
                 purchaseDateFilters: null,
                 activationDateFilters: null,
                 manufacturerFilters: null,
+                storageLocationFilters: null,
+                usageSituationFilters: null,
+                quantityFilters: null,
+                unitOfMeasurementFilters: null,
+                bookOriginalValueFilters: null,
+                bookNetValueFilters: null,
+                taxedUnitPriceFilters: null,
+                taxRateFilters: null,
+                economicServiceLifeFilters: null,
+                equipmentTypeFilters: null,
+                valuationMethodFilters: null,
+                freightAndMiscellaneousFeeRateFilters: null,
+                baseRateFilters: null,
+                installationRateFilters: null,
+                directObservationDepreciationRateFilters: null,
+                priceFilters: null
             },
             eqptPageData: [],
             eqptImpPageData: [],
@@ -855,15 +1027,32 @@ export default {
             ppiOptions: [],
             eqptGnEvp: [],
             // 设备名称过滤选项
-            equipmentNameOptions: [],
+            eqptNameOptions: [],
             // 设备型号过滤选项
-            equipmentModelOptions: [],
+            eqptModelOptions: [],
             // 设备购置日期过滤选项
-            equipmenPurchaseDateOptions: [],
+            eqptPurchaseDateOptions: [],
             // 生产厂家过滤选项
-            equipmentManufacturerOptions: [],
+            eqptManufacturerOptions: [],
             // 设备启用日期过滤选项
-            equipmentActivationDateOptions: [],
+            eqptActivationDateOptions: [],
+            // 存放地点过滤选项
+            eqptStorageLocationOptions: [],
+            eqptUsageSituationOptions: [],
+            eqptQuantityOptions: [],
+            eqptUnitOfMeasurementOptions: [],
+            eqptBookOriginalValueOptions: [],
+            eqptBookNetValueOptions: [],
+            eqptTaxedUnitPriceOptions: [],
+            eqptTaxRateOptions: [],
+            eqptEconomicServiceLifeOptions: [],
+            eqptTypeOptions: [],
+            eqptValuationMethodOptions: [],
+            eqptFreightAndMiscellaneousFeeRateOptions: [],
+            eqptBaseRateOptions: [],
+            eqptInstallationRateOptions: [],
+            eqptDirectObservationDepreciationRateOptions: [],
+            eqptPriceOptions: [],
             // 设备名称查询条件
             eqptNameFilterArr: [],
             // 设备型号查询条件
@@ -874,6 +1063,23 @@ export default {
             eqptActivationDateFilterArr: [],
             // 生产厂家查询条件
             eqptManufacturerFilterArr: [],
+            // 存放地点查询条件
+            eqptStorageLocationFilterArr: [],
+            eqptUsageSituationFilterArr: [],
+            eqptQuantityFilterArr: [],
+            eqptUnitOfMeasurementFilterArr: [],
+            eqptBookOriginalValueFilterArr: [],
+            eqptBookNetValueFilterArr: [],
+            eqptTaxedUnitPriceFilterArr: [],
+            eqptTaxRateFilterArr: [],
+            eqptEconomicServiceLifeFilterArr: [],
+            eqptEquipmentTypeFilterArr: [],
+            eqptValuationMethodFilterArr: [],
+            eqptFreightAndMiscellaneousFeeRateFilterArr: [],
+            eqptBaseRateFilterArr: [],
+            eqptInstallationRateFilterArr: [],
+            eqptDirectObservationDepreciationRateFilterArr: [],
+            eqptPriceFilterArr: [],
             // 机器设备表单
             eqptDataForm: {},
         }
@@ -955,16 +1161,32 @@ export default {
                 activationDateFilters: null,
                 manufacturerFilters: null,
             }
-            this.equipmentNameOptions = []
-            this.equipmentModelOptions = []
-            this.equipmenPurchaseDateOptions = []
-            this.equipmentActivationDateOptions = []
-            this.equipmentManufacturerOptions = []
+            this.eqptNameOptions = []
+            this.eqptModelOptions = []
+            this.eqptPurchaseDateOptions = []
+            this.eqptActivationDateOptions = []
+            this.eqptManufacturerOptions = []
             this.eqptNameFilterArr = []
             this.eqptModelFilterArr = []
             this.eqptPurchaseDateFilterArr = []
             this.eqptActivationDateFilterArr = []
             this.eqptManufacturerFilterArr = []
+            this.eqptStorageLocationFilterArr = []
+            this.eqptUsageSituationFilterArr = []
+            this.eqptQuantityFilterArr = []
+            this.eqptUnitOfMeasurementFilterArr = []
+            this.eqptBookOriginalValueFilterArr = []
+            this.eqptBookNetValueFilterArr = []
+            this.eqptTaxedUnitPriceFilterArr = []
+            this.eqptTaxRateFilterArr = []
+            this.eqptEconomicServiceLifeFilterArr = []
+            this.eqptEquipmentTypeFilterArr = []
+            this.eqptValuationMethodFilterArr = []
+            this.eqptFreightAndMiscellaneousFeeRateFilterArr = []
+            this.eqptBaseRateFilterArr = []
+            this.eqptInstallationRateFilterArr = []
+            this.eqptDirectObservationDepreciationRateFilterArr = []
+            this.eqptPriceFilterArr = []
             if (this.activeName === 'all') {
                 this.getEqptDataPage()
             }
@@ -1077,6 +1299,22 @@ export default {
             this.eqptDataQuery.purchaseDateFilters = this.eqptPurchaseDateFilterArr.join()
             this.eqptDataQuery.activationDateFilters = this.eqptActivationDateFilterArr.join()
             this.eqptDataQuery.manufacturerFilters = this.eqptManufacturerFilterArr.join()
+            this.eqptDataQuery.storageLocationFilters = this.eqptStorageLocationFilterArr.join()
+            this.eqptDataQuery.usageSituationFilters = this.eqptUsageSituationFilterArr.join()
+            this.eqptDataQuery.quantityFilters = this.eqptQuantityFilterArr.join()
+            this.eqptDataQuery.unitOfMeasurementFilters = this.eqptUnitOfMeasurementFilterArr.join()
+            this.eqptDataQuery.bookOriginalValueFilters = this.eqptBookOriginalValueFilterArr.join()
+            this.eqptDataQuery.bookNetValueFilters = this.eqptBookNetValueFilterArr.join()
+            this.eqptDataQuery.taxedUnitPriceFilters = this.eqptTaxedUnitPriceFilterArr.join()
+            this.eqptDataQuery.taxRateFilters = this.eqptTaxRateFilterArr.join()
+            this.eqptDataQuery.economicServiceLifeFilters = this.eqptEconomicServiceLifeFilterArr.join()
+            this.eqptDataQuery.equipmentTypeFilters = this.eqptEquipmentTypeFilterArr.join()
+            this.eqptDataQuery.valuationMethodFilters = this.eqptValuationMethodFilterArr.join()
+            this.eqptDataQuery.freightAndMiscellaneousFeeRateFilters = this.eqptFreightAndMiscellaneousFeeRateFilterArr.join()
+            this.eqptDataQuery.baseRateFilters = this.eqptBaseRateFilterArr.join()
+            this.eqptDataQuery.installationRateFilters = this.eqptInstallationRateFilterArr.join()
+            this.eqptDataQuery.directObservationDepreciationRateFilters = this.eqptDirectObservationDepreciationRateFilterArr.join()
+            this.eqptDataQuery.priceFilters = this.eqptPriceFilterArr.join()
             this.eqptDataQuery.calculateId = this.projectStore.calculateProgress.id
             getDataPage(this.eqptDataQuery).then((res) => {
                 this.eqptPageData = res.data
@@ -1277,7 +1515,7 @@ export default {
                         let ppi = parts[1].trim()
                         row.price = (row.unTaxedUnitPrice * ppi).toFixed(2)
                     }
-                }else {
+                } else {
                     row.price = (row.unTaxedUnitPrice * row.inquiryBasis).toFixed(2)
                 }
             }
@@ -1303,6 +1541,7 @@ export default {
                         message: res.message,
                         type: 'success',
                     })
+                    this.getEqptDataPage();
                 }
             })
         },
@@ -1463,24 +1702,74 @@ export default {
         // 获取表格过滤条件
         getEqptTableFilter(eqptData) {
             // 设备名称
-            this.equipmentNameOptions = this.uniqueProperties(eqptData, 'equipmentName')
+            this.eqptNameOptions = this.uniqueProperties(eqptData, 'equipmentName')
             this.eqptDataQuery.eqptNameFilters = null
 
             // 设备型号
-            this.equipmentModelOptions = this.uniqueProperties(eqptData, 'model')
+            this.eqptModelOptions = this.uniqueProperties(eqptData, 'model')
             this.eqptDataQuery.modelFilters = null
 
             // 购买日期
-            this.equipmenPurchaseDateOptions = this.uniqueProperties(eqptData, 'purchaseDate')
+            this.eqptPurchaseDateOptions = this.uniqueProperties(eqptData, 'purchaseDate')
             this.eqptDataQuery.purchaseDateFilters = null
 
             // 启用日期
-            this.equipmentActivationDateOptions = this.uniqueProperties(eqptData, 'activationDate')
+            this.eqptActivationDateOptions = this.uniqueProperties(eqptData, 'activationDate')
             this.eqptDataQuery.activationDateFilters = null
 
             // 生产厂家
-            this.equipmentManufacturerOptions = this.uniqueProperties(eqptData, 'manufacturer')
+            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
         },
         // 给表格列进行统一赋值
         bathchSetTableValue(propName, value) {
@@ -1526,7 +1815,10 @@ export default {
             const uniqueMap = new Map()
             data.forEach((item) => {
                 if (!uniqueMap.has(item[columnName])) {
-                    uniqueMap.set(item[columnName], data.filter((obj) => obj[columnName] === item[columnName]).length)
+                    uniqueMap.set(
+                        item[columnName] !== null ? item[columnName] : '空',
+                        data.filter((obj) => obj[columnName] === item[columnName]).length
+                    )
                 }
             })
             return Array.from(uniqueMap, ([key, value]) => ({ filter: key, count: value }))