1.筛选条件显示符合条件的数据数量

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

@@ -3,12 +3,11 @@
         <el-divider content-position="left"><span style="color:#ff6154;">测算表作价</span></el-divider>
         <div id="uploadDiv" class="uploadDiv">
             <el-descriptions title="基础信息" :column="1" border>
-                <el-descriptions-item label="评估基准日">{{ calculateBaseInfo.valuationBasisDate }}</el-descriptions-item>
-                <el-descriptions-item label="工期">{{ calculateBaseInfo.constructionPeriod }}</el-descriptions-item>
-                <el-descriptions-item label="利息">{{ calculateBaseInfo.interest }}%</el-descriptions-item>
-                <el-descriptions-item label="前期费用率">{{ calculateBaseInfo.preConstructionCostRatio }}%</el-descriptions-item>
-                <el-descriptions-item label="建设单位管理费率">{{ calculateBaseInfo.managementExpenseRatio
-                }}%</el-descriptions-item>
+                <el-descriptions-item width="45" label="评估基准日">{{ calculateBaseInfo.valuationBasisDate }}</el-descriptions-item>
+                <el-descriptions-item width="45" label="工期">{{ calculateBaseInfo.constructionPeriod }}</el-descriptions-item>
+                <el-descriptions-item width="45" label="利息">{{ calculateBaseInfo.interest }}%</el-descriptions-item>
+                <el-descriptions-item width="45" label="前期费用率">{{ calculateBaseInfo.preConstructionCostRatio }}%</el-descriptions-item>
+                <el-descriptions-item width="45" label="建设单位管理费率">{{ calculateBaseInfo.managementExpenseRatio }}%</el-descriptions-item>
             </el-descriptions>
             <el-upload ref="importEqptExcel" drag action="#" multiple style="width:100%;margin-top: 20px;" accept=".xls,.xlsx" :limit="1" :file-list="fileList" :on-exceed="handleExceed" :before-remove="beforeRemove" :auto-upload="false" :http-request="importEqptExcelData">
                 <el-icon class="el-icon--upload"><upload-filled /></el-icon>
@@ -54,10 +53,10 @@
                 <vxe-column field="equipmentName" title="设备名称" width="160" :edit-render="{ name: 'VxeInput' }">
                     <template #header>
                         <span>设备名称</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', null)" style="margin-bottom:5px" />
-                                <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;" :label="equipmentName" :value="equipmentName" size="small" />
+                                <el-checkbox v-for="item in equipmentNameFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.count" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
@@ -77,10 +76,10 @@
                 <vxe-column field="model" title="型号规格" width="160" :edit-render="{ name: 'VxeInput' }">
                     <template #header>
                         <span>型号规格</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', null)" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
@@ -99,10 +98,10 @@
                 <vxe-column field="purchaseDate" title="购买日期" width="160" :edit-render="dateEditRender">
                     <template #header>
                         <span>购买日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', null)" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
@@ -121,10 +120,10 @@
                 <vxe-column field="activationDate" title="启用日期" width="160" :edit-render="dateEditRender">
                     <template #header>
                         <span>启用日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate', null)" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
@@ -139,6 +138,10 @@
                             </template>
                         </el-popover>
                     </template>
+                    <template #default="{ row }">
+                        <span style="margin-top:10px">{{ row.activationDate }}</span>
+                        <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="usageSituation" title="使用情况" width="160" :edit-render="{}">
@@ -327,10 +330,10 @@
                 <vxe-column field="equipmentName" title="设备名称" width="160">
                     <template #header>
                         <span>设备名称</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', '进口设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;" :label="equipmentName" :value="equipmentName" size="small" />
+                                <el-checkbox v-for="item in equipmentNameFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
@@ -349,10 +352,10 @@
                 <vxe-column field="model" title="规格型号" width="160">
                     <template #header>
                         <span>规格型号</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', '进口设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
@@ -374,10 +377,10 @@
                 <vxe-column field="purchaseDate" title="购置日期" width="160">
                     <template #header>
                         <span>购置日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', '进口设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
@@ -396,10 +399,10 @@
                 <vxe-column field="activationDate" title="启用日期" width="160">
                     <template #header>
                         <span>启用日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate', '进口设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>
@@ -508,10 +511,10 @@
                 <vxe-column field="equipmentName" title="设备名称" width="160">
                     <template #header>
                         <span>设备名称</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptNameFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentName" placeholder="输入后回车搜索" @change="getEqptTableFilter('equipmentName', '非标设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="equipmentName in equipmentNameFilters" style="display:block;" :label="equipmentName" :value="equipmentName" size="small" />
+                                <el-checkbox v-for="item in equipmentNameFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptNameFilterArr = [], eqptDataQuery.eqptNameFilters = null">重置</el-button>
@@ -530,10 +533,10 @@
                 <vxe-column field="model" title="规格型号" width="160">
                     <template #header>
                         <span>规格型号</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptModelFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentModel" placeholder="输入后回车搜索" @change="getEqptTableFilter('model', '非标设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentModelFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptModelFilterArr = [], eqptDataQuery.modelFilters = null">重置</el-button>
@@ -556,10 +559,10 @@
                 <vxe-column field="purchaseDate" title="购置日期" width="160">
                     <template #header>
                         <span>购置日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptPurchaseDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentPurchaseDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('purchaseDate', '非标设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmenPurchaseDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptPurchaseDateFilterArr = [], eqptDataQuery.purchaseDateFilters = null">重置</el-button>
@@ -578,10 +581,10 @@
                 <vxe-column field="activationDate" title="启用日期" width="160">
                     <template #header>
                         <span>启用日期</span>
-                        <el-popover trigger="click" placement="top" :width="200" :hide-after="0">
+                        <el-popover trigger="click" placement="top" :width="300" :hide-after="0">
                             <el-checkbox-group v-model="eqptActivationDateFilterArr" style="overflow: auto;height: 300px">
                                 <el-input size="small" v-model="equipmentActivationDate" placeholder="输入后回车搜索" @change="getEqptTableFilter('activationDate', '非标设备')" style="margin-bottom:5px" />
-                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item" :value="item" size="small" />
+                                <el-checkbox v-for="item in equipmentActivationDateFilters" style="display:block;" :label="item.filter + '  （' +item.count + '）'" :value="item.filter" size="small" />
                             </el-checkbox-group>
                             <div style="text-align: center; margin: 0">
                                 <el-button size="small" text @click="eqptActivationDateFilterArr = [], eqptDataQuery.activationDateFilters = null">重置</el-button>

src/views/assets/workbench/report/eqptBaseInfo.vue

@@ -14,14 +14,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <!-- <el-row :gutter="10">
-                        <el-col :span="24">
-                            <el-form-item label="评估范围:" label-width="180" class="form-item" prop="scope">
-                                <el-input v-model="eqptBaseInfo.scope" :rows="3" type="textarea" clearable
-                                    style="width: 100%;" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row> -->
                     <el-row :gutter="10">
                         <el-col :span="24">
                             <el-form-item label="价值类型:" label-width="180" class="form-item" prop="valueType">
@@ -72,14 +64,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <!-- <el-row :gutter="10">
-                        <el-col :span="24">
-                            <el-form-item label="评估结论:" label-width="180" class="form-item" prop="conclusion">
-                                <el-input v-model="eqptBaseInfo.conclusion" :rows="3" type="textarea" clearable
-                                    style="width: 100%;" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row> -->
                     <el-row :gutter="10">
                         <el-col :span="24">
                             <el-form-item label="是否包含增值税:" label-width="180" class="form-item" prop="hasVAT">
@@ -197,25 +181,25 @@
                         <el-col :span="24">
                             <el-divider content-position="left"><span style="color:#ff6154;">委托人概况</span></el-divider>
                             <el-descriptions border v-for="item in eqptBaseInfo.consignorInfos" style="margin-bottom: 10px">
-                                <el-descriptions-item label="公司名称">
+                                <el-descriptions-item width="100" label="公司名称">
                                     {{ item.consignorCompanyName }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="统一社会信用代码">
+                                <el-descriptions-item width="100" label="统一社会信用代码">
                                     {{ item.consignorUnifiedSocialCreditCode }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="注册地址">
+                                <el-descriptions-item width="100" label="注册地址">
                                     {{ item.consignorRegisteredAddress }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="法定代表人/负责人">
+                                <el-descriptions-item width="45" label="法定代表人/负责人">
                                     {{ item.consignorLegalRepresentative }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="类型">
+                                <el-descriptions-item width="45" label="类型">
                                     {{ item.consignorType }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="成立日期">
+                                <el-descriptions-item width="45" label="成立日期">
                                     {{ item.consignorEstablishmentDate }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="经营范围">
+                                <el-descriptions-item width="45" label="经营范围">
                                     {{ item.consignorBusinessScope }}
                                     <el-button type="danger" size="small" style="float: right"
                                         @click="eqptBaseInfo.consignorInfos.splice(index, 1)">
@@ -233,25 +217,25 @@
                             <el-divider content-position="left"><span style="color:#ff6154;">产权持有人概况</span></el-divider>
                             <el-descriptions border v-for="(item, index) in eqptBaseInfo.propertyOwnerInfos"
                                 style="margin-bottom: 10px">
-                                <el-descriptions-item label="公司名称">
+                                <el-descriptions-item width="100" label="公司名称">
                                     {{ item.ownerCompanyName }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="统一社会信用代码">
+                                <el-descriptions-item width="100" label="统一社会信用代码">
                                     {{ item.ownerUnifiedSocialCreditCode }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="注册地址">
+                                <el-descriptions-item width="100" label="注册地址">
                                     {{ item.ownerRegisteredAddress }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="法定代表人/负责人">
+                                <el-descriptions-item width="45" label="法定代表人/负责人">
                                     {{ item.ownerLegalRepresentative }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="类型">
+                                <el-descriptions-item width="45" label="类型">
                                     {{ item.ownerType }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="成立日期">
+                                <el-descriptions-item width="45" label="成立日期">
                                     {{ item.ownerEstablishmentDate }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="经营范围">
+                                <el-descriptions-item width="45" label="经营范围">
                                     {{ item.ownerBusinessScope }}
                                     <el-button type="danger" size="small" style="float: right"
                                         @click="eqptBaseInfo.propertyOwnerInfos.splice(index, 1)">