|
|
@@ -37,7 +37,7 @@
|
|
|
{
|
|
|
label: '删除',
|
|
|
tooltip: '删除',
|
|
|
- onClick: handleDel.bind(null, record.vid),
|
|
|
+ onClick: handleDel.bind(null, record.FID),
|
|
|
},
|
|
|
]" />
|
|
|
</template>
|
|
|
@@ -45,7 +45,7 @@
|
|
|
</div>
|
|
|
|
|
|
<VersionManageModal @register="registerModal" @success="onSubmit"></VersionManageModal>
|
|
|
- <VersionModal v-if="ifShowModal" @closeModal="ifShowModal = false" :versionId="versionId" />
|
|
|
+ <VersionResModal @register="registerResModal"></VersionResModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -56,7 +56,8 @@ import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
|
|
import { Button, notification } from 'ant-design-vue';
|
|
|
import { useModal } from '/@/components/Modal';
|
|
|
import VersionManageModal from './VersionManageModal.vue';
|
|
|
-import VersionModal from './VersionModal.vue';
|
|
|
+// import VersionModal from './VersionModal.vue';
|
|
|
+import VersionResModal from './VersionResModal.vue';
|
|
|
import { getVersionList, delVersion } from '/@/api/sys/version';
|
|
|
import { message } from 'ant-design-vue';
|
|
|
import moment from 'moment'
|
|
|
@@ -65,13 +66,12 @@ import uiTool from '/@/utils/uiTool';
|
|
|
|
|
|
export default defineComponent({
|
|
|
name: 'version',
|
|
|
- components: { VersionManageModal, VersionModal, BasicTable, TableAction, Button },
|
|
|
+ components: { VersionManageModal, VersionResModal, BasicTable, TableAction, Button },
|
|
|
setup() {
|
|
|
const [registerModal, { openModal }] = useModal();
|
|
|
+ const [registerResModal, { openModal: openResModal }] = useModal();
|
|
|
const data = reactive({
|
|
|
searchValue: "",//查询值
|
|
|
- ifShowModal: false,
|
|
|
- versionId: ''
|
|
|
});
|
|
|
//获取所有标签
|
|
|
const getVersionData = () => {
|
|
|
@@ -81,17 +81,7 @@ export default defineComponent({
|
|
|
}
|
|
|
getVersionList(params).then(res => {
|
|
|
if (res.resp_code === 0 && res.datas) {
|
|
|
- // resolve(res.datas.pageData)
|
|
|
- resolve([
|
|
|
- {
|
|
|
- fid: "12312",
|
|
|
- version_NAME: '版本1',
|
|
|
- version_NO: 'V1.0',
|
|
|
- version_DISP: '说明',
|
|
|
- updateTime: '2023-12-11 00:00:00',
|
|
|
- insertTime: '2023-12-11 00:00:00'
|
|
|
- }
|
|
|
- ])
|
|
|
+ resolve(res.datas.pageData)
|
|
|
}
|
|
|
else {
|
|
|
resolve([])
|
|
|
@@ -105,32 +95,38 @@ export default defineComponent({
|
|
|
{
|
|
|
title: '版本名称',
|
|
|
align: 'center',
|
|
|
- dataIndex: 'version_NAME',
|
|
|
- key: 'version_NAME'
|
|
|
+ dataIndex: 'VERSION_NAME',
|
|
|
+ key: 'VERSION_NAME'
|
|
|
},
|
|
|
{
|
|
|
title: '版本号',
|
|
|
align: 'center',
|
|
|
- dataIndex: 'version_NO',
|
|
|
- key: 'version_NO'
|
|
|
+ dataIndex: 'VERSION_NO',
|
|
|
+ key: 'VERSION_NO'
|
|
|
},
|
|
|
{
|
|
|
- title: '版本号',
|
|
|
+ title: '备注',
|
|
|
+ align: 'center',
|
|
|
+ dataIndex: 'VERSION_DISP',
|
|
|
+ key: 'VERSION_DISP'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '创建时间',
|
|
|
align: 'center',
|
|
|
- dataIndex: 'version_DISP',
|
|
|
- key: 'version_DISP'
|
|
|
+ dataIndex: 'CREATE_DATE',
|
|
|
+ key: 'CREATE_DATE'
|
|
|
},
|
|
|
{
|
|
|
- title: '发布时间',
|
|
|
+ title: '创建人',
|
|
|
align: 'center',
|
|
|
- dataIndex: 'insertTime',
|
|
|
- key: 'insertTime'
|
|
|
+ dataIndex: 'CREATENAME',
|
|
|
+ key: 'CREATENAME'
|
|
|
},
|
|
|
{
|
|
|
title: '修改时间',
|
|
|
align: 'center',
|
|
|
- dataIndex: 'updateTime',
|
|
|
- key: 'updateTime'
|
|
|
+ dataIndex: 'MODIFY_DATE',
|
|
|
+ key: 'MODIFY_DATE'
|
|
|
}
|
|
|
];
|
|
|
//表格查询功能
|
|
|
@@ -156,32 +152,29 @@ export default defineComponent({
|
|
|
}
|
|
|
//查看
|
|
|
const handleLook = (record) => {
|
|
|
- const { fid, version_NAME, version_NO, version_DISP } = record;
|
|
|
- openModal(true, {
|
|
|
+ const { FID, VERSION_NAME, VERSION_NO, VERSION_DISP } = record;
|
|
|
+ openResModal(true, {
|
|
|
status: 'look',
|
|
|
- form: { fid, version_NAME, version_NO, version_DISP }
|
|
|
+ form: { FID, VERSION_NAME, VERSION_NO, VERSION_DISP }
|
|
|
});
|
|
|
}
|
|
|
//修改
|
|
|
const handleEdit = (record) => {
|
|
|
- const { fid, version_NAME, version_NO, version_DISP } = record;
|
|
|
+ const { FID, VERSION_NAME, VERSION_NO, VERSION_DISP } = record;
|
|
|
openModal(true, {
|
|
|
status: 'edit',
|
|
|
- form: { fid, version_NAME, version_NO, version_DISP }
|
|
|
+ form: { FID, VERSION_NAME, VERSION_NO, VERSION_DISP }
|
|
|
});
|
|
|
}
|
|
|
//删除单个数据
|
|
|
const handleDel = (id) => {
|
|
|
uiTool.delModal('确定删除版本?', (() => {
|
|
|
- const rowKeys = getSelectRowKeys();
|
|
|
- let ids = rowKeys.toString()
|
|
|
let param = {
|
|
|
- 1: session.getItem('tokenV2'),
|
|
|
- 2: id,
|
|
|
+ fid: id
|
|
|
}
|
|
|
delVersion(param).then(res => {
|
|
|
- if (res.status === "0") {
|
|
|
- message.success('操作成功');
|
|
|
+ if (res.resp_code === 0) {
|
|
|
+ // message.success('操作成功');
|
|
|
reload();
|
|
|
setSelectedRowKeys([])
|
|
|
}
|
|
|
@@ -194,11 +187,10 @@ export default defineComponent({
|
|
|
const rowKeys = getSelectRowKeys();
|
|
|
let ids = rowKeys.toString()
|
|
|
let param = {
|
|
|
- 1: session.getItem('tokenV2'),
|
|
|
- 2: ids,
|
|
|
+ fid: ids
|
|
|
}
|
|
|
delVersion(param).then(res => {
|
|
|
- if (res.status === "0") {
|
|
|
+ if (res.resp_code === 0) {
|
|
|
message.success('操作成功');
|
|
|
reload();
|
|
|
setSelectedRowKeys([])
|
|
|
@@ -218,7 +210,7 @@ export default defineComponent({
|
|
|
api: getVersionData, //加载数据
|
|
|
columns: columns,
|
|
|
useSearchForm: false, //开启搜索区域
|
|
|
- bordered: true,
|
|
|
+ bordered: false,
|
|
|
showTableSetting: true, // 显示表格设置
|
|
|
tableSetting: {
|
|
|
redo: true,
|
|
|
@@ -230,7 +222,7 @@ export default defineComponent({
|
|
|
pagination: {
|
|
|
hideOnSinglePage: false
|
|
|
},
|
|
|
- rowKey: (record) => record.fid,
|
|
|
+ rowKey: (record) => record.FID,
|
|
|
actionColumn: {
|
|
|
width: 200,
|
|
|
title: '操作',
|
|
|
@@ -248,6 +240,7 @@ export default defineComponent({
|
|
|
// func
|
|
|
registerTable,
|
|
|
registerModal,
|
|
|
+ registerResModal,
|
|
|
getVersionData,
|
|
|
searchTable,
|
|
|
resetTable,
|