From 6940bdec72ef961c2103947986bf30eaf2341205 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 23 十二月 2024 17:28:52 +0800
Subject: [PATCH] MergeItem
---
src/views/model/mpk/project/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/views/model/mpk/project/index.vue b/src/views/model/mpk/project/index.vue
index eb1aa63..7bc116d 100644
--- a/src/views/model/mpk/project/index.vue
+++ b/src/views/model/mpk/project/index.vue
@@ -115,7 +115,7 @@
</el-table>
<!-- 分页 -->
<Pagination
- v-model:limit="queryParams.pageSize"
+ v-model:limit="queryParams.limit"
v-model:page="queryParams.page"
:total="total"
@pagination="getList"
@@ -133,6 +133,7 @@
import ProjectForm from './ProjectForm.vue'
import ProjectPackage from './ProjectPackage.vue'
import RelevanceModel from './ProjectPackageModelDialog.vue'
+ import * as projectApi from "@/api/model/mpk/project";
defineOptions({name: 'MpkProject'})
@@ -144,7 +145,7 @@
const list = ref([]) // 字典表格数据
const queryParams = reactive({
page: 1,
- pageSize: 10,
+ limit: 10,
projectName: '',
projectCode: ''
})
@@ -165,7 +166,7 @@
const handleCommand = (command: string, row) => {
switch (command) {
case 'packageModel':
- packageModel(row.id, row.projectName, row.projectCode, row.models)
+ packageModel(row.id, row.projectName, row.projectCode)
break
default:
break
@@ -174,13 +175,14 @@
//打包
const projectPackageRef = ref();
- const packageModel = (projectId, projectName, projectCode, models) => {
- let ids = models.map(e => e.id);
- if (ids && ids.length > 0) {
- projectPackageRef.value.open(projectId, projectName, projectCode, ids.join(","));
- } else {
+ const packageModel = async (projectId, projectName, projectCode) => {
+ //校验是否关联模型
+ const data = await projectApi.getProjectModel({page: 1, pageSize: 1, projectId: projectId})
+ if (data.total === 0) {
message.error("请先为项目添加模型！")
+ return
}
+ projectPackageRef.value.open(projectId, projectName, projectCode);
}
/** 搜索按钮操作 */
--
Gitblit v1.9.3