人员配置
@@ -640,7 +640,7 @@ onMounted(() => {
diff --git a/src/views/design/volumeCatalog/comm/TableContent.vue b/src/views/design/volumeCatalog/comm/TableContent.vue
index 9cd535b..9f7bc63 100644
--- a/src/views/design/volumeCatalog/comm/TableContent.vue
+++ b/src/views/design/volumeCatalog/comm/TableContent.vue
@@ -14,23 +14,20 @@
-
-
+
{{ scope.row.version }}
-
-
+
-
+
-
-
+
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index b4805a7..7594c60 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -58,9 +58,9 @@
-
+
-
+ 查看文件
@@ -69,11 +69,6 @@
-
-
- 查看文件
-
-
上传图纸
-
@@ -161,7 +137,7 @@
-
+
@@ -182,40 +158,56 @@
-
- 审核
+ 查看流程
+ 下载
+ 查看单据
+
+
+
+
+ 审核
查看流程
下载
-
-
-
-
- 审核查看单据
- 查看流程
- 下载
-
下载
-
下载1
-
+
@@ -240,7 +232,7 @@ import {
updateVolumeCatalog,
uploadVolumeFile,
getVolumeCatafileList,
- lookViewerFile
+ volumeFileList
} from '@/api/design/volumeCatalog';
import { VolumeCatalogVO } from '@/api/design/volumeCatalog/types';
import { useUserStoreHook } from '@/store/modules/user';
@@ -260,7 +252,8 @@ const histroyRef = ref>();
const TableContentRef = ref>();
const single = ref(true);
const multiple = ref(true);
-const activeName = ref('first');
+const activeName = ref('3');
+const design = ref('');
const total = ref(0);
const dialogHistory = ref(false);
// 获取用户 store
@@ -371,7 +364,7 @@ const handleViewHistory = async (row) => {
dialogHistory.value = true;
// 查看历史流程记录
nextTick(() => {
- histroyRef.value?.getList(row.design);
+ histroyRef.value?.getList(row.id);
});
};
const handleShowInfo = (val) => {
@@ -421,7 +414,8 @@ const handleAdd = () => {
const handleView = (row?: any) => {
fileList.value = row.fileVoList;
-
+ design.value = row.design;
+ getVolumeFileList('3');
viewVisible.value = true;
};
@@ -511,12 +505,33 @@ const handleUploadSuccess = async (flieList: any, res: any) => {
proxy?.$modal.msgSuccess('文件上传成功');
getList();
};
-
-/** 审核按钮操作 */
+/** 审核蓝图按钮操作 */
+const handleAuditLantu = async (row) => {
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/volumeCatalog/blueprintEdit`,
+ query: {
+ id: row.id,
+ type: 'update'
+ }
+ });
+};
+/** 查看蓝图按钮操作 */
+const handleAuditViewLantu = async (row) => {
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/volumeCatalog/blueprintEdit`,
+ query: {
+ id: row.id,
+ type: 'view'
+ }
+ });
+};
+/** 审核过程按钮操作 */
const handleAudit = async (row) => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
- path: `/approval/drawingreview/indexEdit`,
+ path: `/approval/volumeCatalog/indexEdit`,
query: {
id: row.id,
type: 'update'
@@ -527,7 +542,7 @@ const handleAudit = async (row) => {
const handleAuditView = async (row) => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
- path: `/approval/drawingreview/indexEdit`,
+ path: `/approval/volumeCatalog/indexEdit`,
query: {
id: row.id,
type: 'view'
@@ -543,9 +558,17 @@ const handleUpdate = async (row?: VolumeCatalogVO) => {
dialog.visible = true;
dialog.title = '修改设计出图计划';
};
-// 过程图纸
-const handleClick = () => {
- //
+// 获取文件列表
+const getVolumeFileList = async (type) => {
+ let res = await volumeFileList({ volumeCatalogId: design.value, type });
+ fileList.value = [];
+ if (res.code === 200) {
+ fileList.value = res.rows;
+ }
+};
+// 切换
+const handleClick = (val) => {
+ getVolumeFileList(val.props.name);
};
const handleAuditInfo = (row) => {
// 审核图纸
diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue
new file mode 100644
index 0000000..ecf0b5f
--- /dev/null
+++ b/src/views/design/volumeCatalog/indexEdit.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+
+
+
+
+
过程图纸审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/materials/appointment/index.vue b/src/views/materials/appointment/index.vue
index c142742..3af5ac1 100644
--- a/src/views/materials/appointment/index.vue
+++ b/src/views/materials/appointment/index.vue
@@ -1,6 +1,6 @@
-
+
人员配置
@@ -196,7 +196,7 @@ onUnmounted(() => {
.main {
height: calc(100vh - 90px);
}
-.appWidth {
+.appWidth1 {
width: 50vw;
max-width: 1200px;
.el-select__wrapper {
@@ -315,7 +315,7 @@ onUnmounted(() => {
// 适配小屏幕
@media (max-width: 768px) {
- .appWidth {
+ .appWidth1 {
width: 95vw;
}