diff --git a/.env.development b/.env.development
index fe20df3..21892b7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
VITE_APP_ENV = 'development'
# 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.159:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8898'
# 无人机接口地址
diff --git a/src/views/design/Professional/indexEdit.vue b/src/views/design/Professional/indexEdit.vue
index 363031b..09e9365 100644
--- a/src/views/design/Professional/indexEdit.vue
+++ b/src/views/design/Professional/indexEdit.vue
@@ -26,7 +26,7 @@
基本信息
-
+
- 上传变更图
+ 上传
查看
+
+
+
+
+
+
+
图纸评审
+
+
+
+
+
+
+
+
+
+ 点击打开
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/design/drawingreview/indexEdit.vue b/src/views/design/drawingreview/indexEdit.vue
index 302492c..55205ee 100644
--- a/src/views/design/drawingreview/indexEdit.vue
+++ b/src/views/design/drawingreview/indexEdit.vue
@@ -8,8 +8,8 @@
@approvalVerifyOpen="approvalVerifyOpen"
@handleApprovalRecord="handleApprovalRecord"
:buttonLoading="buttonLoading"
- :id="form.id"
- :status="form.auditType"
+ :id="form.design"
+ :status="form.auditStatus"
:pageType="routeParams.type"
/>
@@ -29,25 +29,11 @@
class="space-y-4"
>
-
-
-
-
-
- 点击打开
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -95,10 +81,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { useUserStoreHook } from '@/store/modules/user';
const { design_change_reason_type } = toRefs(proxy?.useDict('design_change_reason_type'));
-import { getKnowledgeDocument } from '@/api/design/technicalStandard';
-import { getCollectFile } from '@/api/design/condition';
-import { drawingreviewzQuery } from '@/api/design/drawingreview';
-
+import { getVolumeCatalog } from '@/api/design/volumeCatalog';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
@@ -120,7 +103,7 @@ const approvalRecordRef = ref>();
//按钮组件
const flowCodeOptions = [
{
- value: currentProject.value?.id + '_desDrawingReview',
+ value: currentProject.value?.id + '_designTheDiagram',
label: '图纸评审'
}
];
@@ -143,7 +126,8 @@ const initFormData = {
fileName: undefined,
fileUrl: undefined,
status: undefined,
- originalName: undefined
+ originalName: undefined,
+ fileVoList: []
};
const data = reactive({
form: { ...initFormData },
@@ -170,7 +154,7 @@ const getInfo = () => {
loading.value = true;
buttonLoading.value = false;
nextTick(async () => {
- const res = await drawingreviewzQuery(routeParams.value.id);
+ const res = await getVolumeCatalog(routeParams.value.id);
Object.assign(form.value, res.data);
loading.value = false;
buttonLoading.value = false;
@@ -191,7 +175,7 @@ const submitFlow = async () => {
const handleStartWorkFlow = async (data: LeaveForm) => {
try {
submitFormData.value.flowCode = flowCode.value;
- submitFormData.value.businessId = data.id;
+ submitFormData.value.businessId = data.design;
//流程变量
taskVariables.value = {
// leave4/5 使用的流程变量
@@ -209,7 +193,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
};
//审批记录
const handleApprovalRecord = () => {
- approvalRecordRef.value.init(form.value.id);
+ approvalRecordRef.value.init(form.value.design);
};
//提交回调
const submitCallback = async () => {
@@ -229,7 +213,7 @@ const submit = async (status, data) => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.go(-1);
} else {
- if ((form.value.auditType === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+ if ((form.value.auditStatus === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
flowCode.value = flowCodeOptions[0].value;
dialogVisible.visible = true;
return;
@@ -245,7 +229,6 @@ const submit = async (status, data) => {
onMounted(() => {
nextTick(async () => {
routeParams.value = proxy.$route.query;
-
reset();
loading.value = false;
console.log(routeParams.value.type);
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index bb0632f..d8df48a 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -28,16 +28,6 @@
新增
-
- 修改
-
-
- 删除
-
-
+
-
+
-
-
{{ scope.row.fileVoList[0]?.explainText }}
-
+
查看文件
- 审核
- 修改
- 上传
- 删除
+
+
+
+ 修改
+ 上传图纸
+ 审核
+ 查看流程
-
-
+
@@ -157,25 +156,11 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
确定
取消
@@ -209,7 +194,6 @@
-
暂无文件
@@ -231,7 +215,7 @@ import {
getVolumeCatafileList,
lookViewerFile
} from '@/api/design/volumeCatalog';
-import { VolumeCatalogVO, VolumeCatalogQuery, VolumeCatalogForm } from '@/api/design/volumeCatalog/types';
+import { VolumeCatalogVO } from '@/api/design/volumeCatalog/types';
import { useUserStoreHook } from '@/store/modules/user';
const fileList = ref([]);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -350,16 +334,6 @@ const handleAdd = () => {
dialog.title = '添加设计出图计划';
};
-/** 修改按钮操作 */
-const handleUpdate = async (row?: VolumeCatalogVO) => {
- reset();
- const _id = row?.design || ids.value[0];
- const res = await getVolumeCatalog(_id);
- Object.assign(form.value, res.data);
- dialog.visible = true;
- dialog.title = '修改设计出图计划';
-};
-
const handleView = (row?: any) => {
fileList.value = row.fileVoList;
@@ -417,8 +391,13 @@ const handleDownload = (row: any) => {
/** 上传文件提交 */
const onSubmit = async () => {
buttonLoading.value = true;
+ let obj = {
+ volumeCatalogId: uploadForm.volumeCatalogId,
+ fileIds: uploadForm.fileId.split(','),
+ explainText: ''
+ };
try {
- await uploadVolumeFile(uploadForm);
+ await uploadVolumeFile(obj);
proxy?.$modal.msgSuccess('文件上传成功');
uploadVisible.value = false;
await getList();
@@ -443,24 +422,37 @@ const handleUploadSuccess = async (flieList: any, res: any) => {
getList();
};
-/** 导出按钮操作 */
-const handleExport = () => {
- proxy?.download(
- 'design/volumeCatalog/export',
- {
- ...queryParams.value
- },
- `volumeCatalog_${new Date().getTime()}.xlsx`
- );
-};
-
/** 审核按钮操作 */
-const handleAudit = async (row?: VolumeCatalogVO) => {
- proxy?.$tab.openPage('/design-management/volumeCatalog/indexEdit', '审核设计出图计划', {
- id: row?.design,
- type: 'update'
+const handleAudit = async (row) => {
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/design-management/drawingreview/indexEdit`,
+ query: {
+ id: row.design,
+ type: 'update'
+ }
});
};
+/** 查看按钮操作 */
+const handleAuditView = async (row) => {
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/design-management/drawingreview/indexEdit`,
+ query: {
+ id: row.design,
+ type: 'view'
+ }
+ });
+};
+/** 修改按钮操作 */
+const handleUpdate = async (row?: VolumeCatalogVO) => {
+ reset();
+ const _id = row?.design || ids.value[0];
+ const res = await getVolumeCatalog(_id);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = '修改设计出图计划';
+};
onMounted(() => {
getList();