From f322ebaa19cffd209d606c62d817d94a42168998 Mon Sep 17 00:00:00 2001 From: chenxf Date: Tue, 6 Jan 2026 10:49:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E7=A7=BB=E9=99=A4ElementUI?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=BC=95=E5=85=A5=E5=B9=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除ElementUI的直接import，改为通过plugins/element/index统一管理 - 移除locale配置和相关CSS引入 - 统一企业列表组件中的字段名从驼峰命名改为小写加下划线格式 - 修复EntList组件中row-key和formatter的字段引用错误 - 更新文档和办理页面中的实体名称字段映射 - 修复包含列表中的字段名不一致问题 fix(table): 统一数据字段名格式 - 将pripId统一改为pripid - 将uniscId统一改为uniscid - 将entName统一改为entname - 修复localadm字段的显示逻辑 - 更新API响应数据的解构方式 --- src/main.js | 14 +------------- src/views/forceNotice/component/EntList.vue | 13 +++++++------ src/views/forceNotice/inclusion/doc.vue | 4 ++-- src/views/forceNotice/inclusion/handle.vue | 10 +++++----- src/views/forceNotice/inclusion/list.vue | 6 +++--- 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/src/main.js b/src/main.js index d38c998..81d1289 100644 --- a/src/main.js +++ b/src/main.js @@ -3,11 +3,7 @@ import Vue from 'vue' import 'normalize.css/normalize.css' // A modern alternative to CSS resets -import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' -import locale from 'element-ui/lib/locale/lang/zh-CN' // 中文 import './assets/font/iconfont.css' -import '@/styles/element-variables.scss' import moment from 'moment' import echarts from 'echarts' import './utils/rem' @@ -26,6 +22,7 @@ import { parseTime } from '@/utils/index.js' import hevueImgPreview from 'hevue-img-preview' import '@/plugins/EasyComponent/index' +import '@/plugins/element/index' Vue.use(hevueImgPreview) /** @@ -43,8 +40,6 @@ Vue.use(hevueImgPreview) // } Vue.prototype.$echarts = echarts Vue.prototype.$moment = moment -// set ElementUI lang to EN -Vue.use(ElementUI, { locale }) // 工具类 Vue.prototype.$util = util Vue.prototype.$utils = utils @@ -65,13 +60,6 @@ new Vue({ render: h => h(App) }) -const confirm = Vue.prototype.$confirm -Vue.prototype.$confirm = function(message, title, options = {}) { - return confirm(message, title, { - type: 'info', - ...options - }) -} // 离开删除 window.onbeforeunload = function() { sessionStorage.removeItem('ssoToken') diff --git a/src/views/forceNotice/component/EntList.vue b/src/views/forceNotice/component/EntList.vue index 6249870..ab1be6d 100644 --- a/src/views/forceNotice/component/EntList.vue +++ b/src/views/forceNotice/component/EntList.vue @@ -12,7 +12,7 @@ :table-prop="tableProp" :fields="fields" :show-search-form="true" - row-key="pripId" + row-key="pripid" :search-form-prop="searchFormProp" :search-loader="searchLoader" :selected.sync="selected" @@ -55,7 +55,7 @@ export default { tableProps: { showOverflowTooltip: true, formatter: (row, column, cellValue, index) => { - return `${row.uniscId || row.regNO || ''}` + return `${row.uniscid || row.regNO || ''}` } } }, @@ -69,7 +69,7 @@ export default { tableProps: { showOverflowTooltip: true, formatter: (row, column, cellValue, index) => { - return `${row.entName || ''}` + return `${row.entname || ''}` } } }, @@ -153,13 +153,13 @@ export default { { type: 'input', label: '属地机关', - prop: 'localadmCn', + prop: 'localadm', span: 6, isView: false, tableProps: { width: '200px', formatter: (row, column, cellValue, index) => { - return `${row.localadmCn || ''}` + return `${row.localadmCn || cellValue}` } }, showInForm: false @@ -188,6 +188,7 @@ export default { showIndex: true, indexWidth: '100px', showPagination: true, + rowKey: 'pripid', tableProps: { headerCellStyle: { background: '#F5F5F5!important', color: '#333333!important', padding: '0px' }, headerRowStyle: { height: '48px' }, @@ -225,7 +226,7 @@ export default { entity: { ...parseSearchFormData } - }).then((data) => { + }).then(({ data }) => { this.showNoDataMessage = !searchUscc && !entName return { tableData: data.dataPage.records, diff --git a/src/views/forceNotice/inclusion/doc.vue b/src/views/forceNotice/inclusion/doc.vue index 5ae09cf..f0ee784 100644 --- a/src/views/forceNotice/inclusion/doc.vue +++ b/src/views/forceNotice/inclusion/doc.vue @@ -25,11 +25,11 @@ - + - + diff --git a/src/views/forceNotice/inclusion/handle.vue b/src/views/forceNotice/inclusion/handle.vue index 3b55e1e..ac96f16 100644 --- a/src/views/forceNotice/inclusion/handle.vue +++ b/src/views/forceNotice/inclusion/handle.vue @@ -171,24 +171,24 @@ export default { { type: 'input', label: '统一社会信用代码/注册号', - prop: 'uniscId', + prop: 'uniscid', tableProps: { showOverflowTooltip: true, width: '220px', formatter: (row, column, cellValue, index) => { - return `${row.uniscId || row.regNo || ''}` + return `${row.uniscid || row.regNo || ''}` } } }, { type: 'input', label: '主体名称', - prop: 'entName', + prop: 'entname', tableProps: { showOverflowTooltip: true, width: '300px', formatter: (row, column, cellValue, index) => { - return `${row.entName || ''}` + return `${row.entname || ''}` } } }, @@ -542,7 +542,7 @@ export default { }, currentNodeID: this.currentNodeID }).then((data) => { - this.$message.success(`已完成对“${formData.entName}”的业务办理!`) + this.$message.success(`已完成对“${formData.entname}”的业务办理!`) this.$router.push({ path: `/forceNotice/inclusion/${this.$route.meta.type}` }) diff --git a/src/views/forceNotice/inclusion/list.vue b/src/views/forceNotice/inclusion/list.vue index 22c0784..16e51a7 100644 --- a/src/views/forceNotice/inclusion/list.vue +++ b/src/views/forceNotice/inclusion/list.vue @@ -190,7 +190,7 @@ export default { width: '180px', showOverflowTooltip: true, formatter: (row, column, cellValue, index) => { - return `${row.uniscId || row.regNo}` + return `${row.uniscid || row.regNo}` } }, showInTable: () => { @@ -200,7 +200,7 @@ export default { { type: 'input', label: '主体名称', - prop: 'entName', + prop: 'entname', span: 6, tableProps: { width: '200px', @@ -401,7 +401,7 @@ export default { confirmHandlerPromise: () => { return xrForceDeregisterSpeSaveIvdAcceptNew({ pripIdList: entlist.map((item) => { - return item.pripId + return item.pripid }), busType: 'inclusion' }).then((data) => {
主体名称{{ data.entName }}{{ data.entname }}
统一社会信用代码/注册号{{ data.uniscId }}{{ data.uniscid }}
事实和理由