From 17424172feca809a503db358aba5a8663e705696 Mon Sep 17 00:00:00 2001 From: 252535409 <252535409@qq.com> Date: Fri, 8 Dec 2023 23:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/JeecgListMixin.js | 2 +- src/views/ai/YsDirectory.vue | 3 +++ src/views/ai/YsMaterial.vue | 10 ++++----- src/views/ai/YsRecord.vue | 4 ++-- src/views/ai/modules/MaterialBagModal.vue | 3 +++ src/views/ai/modules/YsDirectoryAddModal.vue | 21 +++++++++++-------- .../ai/modules/YsDirectoryFieldModal.vue | 6 +++--- src/views/ai/modules/YsMaterialAddModal.vue | 11 ++++++---- src/views/ai/modules/YsRecordDetailModal.vue | 3 +++ 9 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 8c4e420..3ef8dc5 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -97,7 +97,7 @@ export const JeecgListMixin = { } var params = this.getQueryParams(); //查询条件 this.loading = true; - + console.log("------刷新------",this.url.list); getAction(this.url.list, params).then((res) => { if (res.success) { //update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ diff --git a/src/views/ai/YsDirectory.vue b/src/views/ai/YsDirectory.vue index cce672f..be46fa2 100644 --- a/src/views/ai/YsDirectory.vue +++ b/src/views/ai/YsDirectory.vue @@ -911,4 +911,7 @@ } } } + .ant-modal-footer .ant-btn-primary{ + display:block; +} \ No newline at end of file diff --git a/src/views/ai/YsMaterial.vue b/src/views/ai/YsMaterial.vue index b3f96f5..1f7dc35 100644 --- a/src/views/ai/YsMaterial.vue +++ b/src/views/ai/YsMaterial.vue @@ -159,11 +159,11 @@ dataIndex: 'materialCode', align: 'center', }, - { - title: '核发部门', - dataIndex: 'departName', - align: 'center', - }, + //{ + // title: '核发部门', + // dataIndex: 'departName', + // align: 'center', + //}, { title: '材料类型', dataIndex: 'materialType', diff --git a/src/views/ai/YsRecord.vue b/src/views/ai/YsRecord.vue index a4f5055..511e6c5 100644 --- a/src/views/ai/YsRecord.vue +++ b/src/views/ai/YsRecord.vue @@ -62,8 +62,8 @@ 查看预审情况 - | - 下载 +
diff --git a/src/views/ai/modules/MaterialBagModal.vue b/src/views/ai/modules/MaterialBagModal.vue index 72359fe..6b0f8d8 100644 --- a/src/views/ai/modules/MaterialBagModal.vue +++ b/src/views/ai/modules/MaterialBagModal.vue @@ -216,4 +216,7 @@ div.ant-modal-footer { text-align: center !important; } +.ant-modal-footer{ + display:block; +} diff --git a/src/views/ai/modules/YsDirectoryAddModal.vue b/src/views/ai/modules/YsDirectoryAddModal.vue index b3e9446..f249ab1 100644 --- a/src/views/ai/modules/YsDirectoryAddModal.vue +++ b/src/views/ai/modules/YsDirectoryAddModal.vue @@ -66,7 +66,7 @@ - + @@ -207,18 +207,18 @@ { title: '事项类型', align: 'center', - dataIndex: 'evtentType', - }, - { - title: '权利来源', - align: 'center', - width: 120, - dataIndex: 'sourceOfRights', + dataIndex: 'eventTypeName', } + //{ + // title: '权利来源', + // align: 'center', + // width: 120, + // dataIndex: 'sourceOfRights', + //} ], url: { list: '/ai/ysDirectory/page', - treeList: '/sys/sysDepart/queryTreeListTest', + treeList: '/sys/sysDepart/queryTreeList', }, aSpinLoading: '', spinning: false, @@ -562,4 +562,7 @@ div.ant-modal-footer { text-align: center !important; } +.ant-modal-footer .ant-btn-primary{ + display:block !important; +} diff --git a/src/views/ai/modules/YsDirectoryFieldModal.vue b/src/views/ai/modules/YsDirectoryFieldModal.vue index 0c71e76..acf57b2 100644 --- a/src/views/ai/modules/YsDirectoryFieldModal.vue +++ b/src/views/ai/modules/YsDirectoryFieldModal.vue @@ -210,8 +210,8 @@ } } - \ No newline at end of file +--> \ No newline at end of file diff --git a/src/views/ai/modules/YsMaterialAddModal.vue b/src/views/ai/modules/YsMaterialAddModal.vue index 56423d8..317441a 100644 --- a/src/views/ai/modules/YsMaterialAddModal.vue +++ b/src/views/ai/modules/YsMaterialAddModal.vue @@ -105,14 +105,14 @@ dataIndex: 'materialName' }, { - title: '材料类型', + title: '材料编码', align: "center", - dataIndex: 'materialType' + dataIndex: 'materialCode' }, { - title: '核发部门', + title: '材料种类', align: "center", - dataIndex: 'departName' + dataIndex: 'uploadMaterialType' }, ], tableData: [], @@ -194,4 +194,7 @@ div.ant-modal-footer { text-align: center !important; } +.ant-modal-footer .ant-btn-primary{ + display:block !important; +} diff --git a/src/views/ai/modules/YsRecordDetailModal.vue b/src/views/ai/modules/YsRecordDetailModal.vue index 4f9cdf1..1964dca 100644 --- a/src/views/ai/modules/YsRecordDetailModal.vue +++ b/src/views/ai/modules/YsRecordDetailModal.vue @@ -176,4 +176,7 @@ div.ant-modal-footer { text-align: center !important; } +.ant-modal-footer .ant-btn-primary{ + display:block !important; +}