zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

页面居中，时间排序

dev-V1.10.2-temp
wangmingyong 4 months ago
parent
880cd00801
commit
4bdba0b094
5 changed files with 80 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts
  2. 2
      zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts
  3. 14
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue
  4. 65
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
  5. 12
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue

2
zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts
View File

@ -12,6 +12,8 @@ export interface EINOFTQuery {
beginTime?: string; beginTime?: string;
endTime?: string; endTime?: string;
enterpriseNumber?: string; enterpriseNumber?: string;
orderByColumn?: string;
isAsc?: string;
} }
/** 企业受检次数行VO */ /** 企业受检次数行VO */

2
zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts
View File

@ -25,6 +25,8 @@ export interface RegistrationReportQuery {
dateSearch?: string; dateSearch?: string;
beginTime?: string; beginTime?: string;
endTime?: string; endTime?: string;
orderByColumn?: string;
isAsc?: string;
} }
/** 统计指标VO */ /** 统计指标VO */

14
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue
View File

@ -129,6 +129,16 @@ const loadStatistics = async () => {
} }
}; };
/** 排序变更 */
const handleSortChange = (sortObj: { prop: string; order: 'ascending' | 'descending' | null }) => {
if (sortObj.prop === 'enforcementTime') {
queryParams.orderByColumn = 'enforcement_time';
queryParams.isAsc = sortObj.order === 'ascending' ? 'asc' : 'desc';
queryParams.pageNum = 1;
getList();
}
};
/** 点击详情 */ /** 点击详情 */
const handleShowDetail = async (row: EnterprisesInspectedVo) => { const handleShowDetail = async (row: EnterprisesInspectedVo) => {
detailEnterpriseName.value = row.enterpriseName; detailEnterpriseName.value = row.enterpriseName;
@ -190,10 +200,10 @@ const handleShowDetail = async (row: EnterprisesInspectedVo) => {
<!-- 表格区域 --> <!-- 表格区域 -->
<el-card shadow="hover"> <el-card shadow="hover">
<el-table ref="tableRef" v-loading="loading" :data="tableData" :height="tableHeight" border stripe> <el-table ref="tableRef" v-loading="loading" :data="tableData" :height="tableHeight" border stripe @sort-change="handleSortChange">
<el-table-column label="企业名称" prop="enterpriseName" :show-overflow-tooltip="true" align="center" /> <el-table-column label="企业名称" prop="enterpriseName" :show-overflow-tooltip="true" align="center" />
<el-table-column label="执法次数" prop="num" align="center" /> <el-table-column label="执法次数" prop="num" align="center" />
<el-table-column label="最后一次执法时间" prop="enforcementTime" align="center" /> <el-table-column label="最后一次执法时间" prop="enforcementTime" align="center" sortable="custom" />
<el-table-column label="操作" width="100" align="center" fixed="right"> <el-table-column label="操作" width="100" align="center" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link size="small" @click="handleShowDetail(row)">详情</el-button> <el-button type="primary" link size="small" @click="handleShowDetail(row)">详情</el-button>

65
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
View File

@ -47,6 +47,9 @@ const stats = ref<RegistrationStatisticsVo>({
checkPercent: '0.00%' checkPercent: '0.00%'
}); });
const detailDialogVisible = ref(false);
const detailRow = ref<any>(null);
// 字典 // 字典
const lawEnforceCategoryOptions = ref<any[]>([]); const lawEnforceCategoryOptions = ref<any[]>([]);
const checkCategoryOptions = ref<any[]>([]); const checkCategoryOptions = ref<any[]>([]);
@ -308,6 +311,28 @@ const formatDate = (row: any) => {
const d = new Date(row.enforcementTime); const d = new Date(row.enforcementTime);
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`; return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
}; };
/** 排序变更 */
const handleSortChange = (sortObj: { prop: string; order: 'ascending' | 'descending' | null }) => {
if (sortObj.prop === 'enforcementTime') {
queryParams.orderByColumn = 'enforcement_time';
queryParams.isAsc = sortObj.order === 'ascending' ? 'asc' : 'desc';
queryParams.pageNum = 1;
getListV2();
}
};
/** 查看详情 */
const handleViewDetail = (row: any) => {
detailRow.value = row;
detailDialogVisible.value = true;
};
/** 关闭详情弹窗 */
const closeDetailDialog = () => {
detailDialogVisible.value = false;
detailRow.value = null;
};
</script> </script>
<template> <template>
@ -430,18 +455,18 @@ const formatDate = (row: any) => {
</div> </div>
<!-- 列表表格 --> <!-- 列表表格 -->
<div ref="tableRef"> <div ref="tableRef">
<el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" :height="tableHeight"> <el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" :height="tableHeight" @sort-change="handleSortChange">
<el-table-column label="执法单位" prop="bureauDeptName" min-width="150" show-overflow-tooltip /> <el-table-column label="执法单位" prop="bureauDeptName" align="center" min-width="150" show-overflow-tooltip />
<el-table-column label="被执法企业名称" prop="enterpriseName" min-width="180" show-overflow-tooltip /> <el-table-column label="被执法企业名称" prop="enterpriseName" align="center" min-width="180" show-overflow-tooltip />
<el-table-column label="企业注册地" prop="district" width="100" align="center" /> <el-table-column label="企业注册地" prop="district" width="100" align="center" />
<el-table-column label="企业所属街道" prop="street" width="120" align="center" /> <el-table-column label="企业所属街道" prop="street" width="120" align="center" />
<el-table-column label="执法人员" min-width="120"> <el-table-column label="执法人员" min-width="120" align="center">
<template #default="{ row }"> <template #default="{ row }">
{{ row.lawEnforcer }}{{ row.lawEnforcerTwo ? ',\n' + row.lawEnforcerTwo : '' }} {{ row.lawEnforcer }}{{ row.lawEnforcerTwo ? ',\n' + row.lawEnforcerTwo : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执法事项" prop="lawEnforcementItemText" min-width="150" show-overflow-tooltip /> <el-table-column label="执法事项" prop="lawEnforcementItemText" align="center" min-width="150" show-overflow-tooltip />
<el-table-column label="执法时间" width="110" align="center"> <el-table-column label="执法时间" width="110" align="center" sortable="custom" prop="enforcementTime">
<template #default="{ row }">{{ formatDate(row) }}</template> <template #default="{ row }">{{ formatDate(row) }}</template>
</el-table-column> </el-table-column>
<el-table-column label="联合执法" width="90" align="center"> <el-table-column label="联合执法" width="90" align="center">
@ -456,7 +481,7 @@ const formatDate = (row: any) => {
<span v-else>否</span> <span v-else>否</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="委托单位" prop="entrustDeptName" width="130" show-overflow-tooltip /> <el-table-column label="委托单位" prop="entrustDeptName" align="center" width="130" show-overflow-tooltip />
<el-table-column label="执法类别" width="100" align="center"> <el-table-column label="执法类别" width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
{{ lawEnforceCategoryOptions.find(d => d.dictValue === row.lawEnforceCategory)?.dictLabel || row.lawEnforceCategory || '-' }} {{ lawEnforceCategoryOptions.find(d => d.dictValue === row.lawEnforceCategory)?.dictLabel || row.lawEnforceCategory || '-' }}
@ -484,6 +509,11 @@ const formatDate = (row: any) => {
<span v-else>否</span> <span v-else>否</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button type="primary" link size="small" @click="handleViewDetail(row)">详情</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
@ -498,6 +528,27 @@ const formatDate = (row: any) => {
@current-change="getListV2" @current-change="getListV2"
class="mt-4" class="mt-4"
/> />
<!-- 详情弹窗 -->
<el-dialog v-model="detailDialogVisible" title="执法详情" width="700px" append-to-body @close="closeDetailDialog">
<el-descriptions v-if="detailRow" :column="2" border>
<el-descriptions-item label="执法单位">{{ detailRow.bureauDeptName || '-' }}</el-descriptions-item>
<el-descriptions-item label="被执法企业名称">{{ detailRow.enterpriseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="企业注册地">{{ detailRow.district || '-' }}</el-descriptions-item>
<el-descriptions-item label="企业所属街道">{{ detailRow.street || '-' }}</el-descriptions-item>
<el-descriptions-item label="执法人员">{{ detailRow.lawEnforcer }}{{ detailRow.lawEnforcerTwo ? ', ' + detailRow.lawEnforcerTwo : '' }}</el-descriptions-item>
<el-descriptions-item label="执法事项">{{ detailRow.lawEnforcementItemText || '-' }}</el-descriptions-item>
<el-descriptions-item label="执法时间">{{ detailRow.enforcementTime ? formatDate(detailRow) : '-' }}</el-descriptions-item>
<el-descriptions-item label="联合执法">{{ detailRow.hasUnion === 1 && detailRow.unionNo ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item label="受委托">{{ detailRow.hasAuto === 1 ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item label="委托单位">{{ detailRow.entrustDeptName || '-' }}</el-descriptions-item>
<el-descriptions-item label="执法类别">{{ lawEnforceCategoryOptions.find(d => d.dictValue === detailRow.lawEnforceCategory)?.dictLabel || detailRow.lawEnforceCategory || '-' }}</el-descriptions-item>
<el-descriptions-item label="任务来源">{{ checkCategoryOptions.find(d => d.dictValue === detailRow.checkCategory)?.dictLabel || '-' }}</el-descriptions-item>
<el-descriptions-item label="是否扫码">{{ detailRow.checkCss ? '否' : '是' }}</el-descriptions-item>
<el-descriptions-item label="未扫码原因">{{ noScanReasonOptions.find(d => d.dictValue === detailRow.checkCss)?.dictLabel || '-' }}</el-descriptions-item>
<el-descriptions-item label="是否投诉" :span="2">{{ detailRow.isComplaint === 1 ? '是' : '否' }}</el-descriptions-item>
</el-descriptions>
</el-dialog>
</div> </div>
</template> </template>

12
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue
View File

@ -432,9 +432,9 @@ const handleExportType = async () => {
<el-table :data="detailPageData" border stripe> <el-table :data="detailPageData" border stripe>
<el-table-column label="区域" prop="qy" width="100" align="center" /> <el-table-column label="区域" prop="qy" width="100" align="center" />
<el-table-column label="街道" prop="jd" width="120" align="center" /> <el-table-column label="街道" prop="jd" width="120" align="center" />
<el-table-column label="企业名称" prop="enterpriseName" min-width="180" :show-overflow-tooltip="true" /> <el-table-column label="企业名称" prop="enterpriseName" min-width="180" :show-overflow-tooltip="true" align="center" />
<el-table-column label="纳税识别号" prop="enterpriseNumber" width="180" :show-overflow-tooltip="true" /> <el-table-column label="纳税识别号" prop="enterpriseNumber" width="180" :show-overflow-tooltip="true" align="center" />
<el-table-column label="企业类型" prop="companyOrgType" width="150" :show-overflow-tooltip="true" /> <el-table-column label="企业类型" prop="companyOrgType" width="150" :show-overflow-tooltip="true" align="center"/>
<el-table-column label="是否注销" width="90" align="center"> <el-table-column label="是否注销" width="90" align="center">
<template #default="{ row }"> <template #default="{ row }">
<span :style="{ color: row.isUnsubscribe === 1 ? '#f56c6c' : '' }"> <span :style="{ color: row.isUnsubscribe === 1 ? '#f56c6c' : '' }">
@ -442,12 +442,12 @@ const handleExportType = async () => {
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="企业地址" prop="enterpriseAddress" min-width="200" :show-overflow-tooltip="true" /> <el-table-column label="企业地址" prop="enterpriseAddress" min-width="200" :show-overflow-tooltip="true" align="center" />
<el-table-column label="法人代表" prop="legalPerson" width="100" align="center" /> <el-table-column label="法人代表" prop="legalPerson" width="100" align="center" />
<el-table-column label="注册资本" prop="registeredCapital" width="120" align="center" /> <el-table-column label="注册资本" prop="registeredCapital" width="120" align="center" />
<el-table-column label="成立日期" prop="establishmentTime" width="110" align="center" /> <el-table-column label="成立日期" prop="establishmentTime" width="110" align="center" />
<el-table-column label="营业期限" prop="operatingTerm" width="120" :show-overflow-tooltip="true" /> <el-table-column label="营业期限" prop="operatingTerm" width="120" :show-overflow-tooltip="true" align="center" />
<el-table-column label="经营范围" prop="businessScope" min-width="200" :show-overflow-tooltip="true" /> <el-table-column label="经营范围" prop="businessScope" min-width="200" :show-overflow-tooltip="true" align="center" />
</el-table> </el-table>
<pagination v-show="detailList.length > detailPageSize" <pagination v-show="detailList.length > detailPageSize"
v-model:page="detailPageNum" v-model:limit="detailPageSize" v-model:page="detailPageNum" v-model:limit="detailPageSize"

Write Preview
Loading…
Cancel
Save