This commit is contained in:
Teo
2025-08-14 01:58:00 +08:00
parent 606722f19e
commit 3158dc84f7
99 changed files with 620 additions and 554 deletions

View File

@ -1,312 +1,339 @@
<template>
<div class="billof-quantities">
<!-- tabPosition="left" -->
<el-tabs type="border-card" @tab-change="handleTabChange">
<el-tab-pane v-for="item, index in work_order_type" :key="item.value" :label="item.label">
<el-card v-if="index < 3" shadow="always">
<el-form :model="state.queryForm" :inline="true">
<el-form-item label="版本号" prop="versions">
<el-select v-model="state.queryForm.versions" placeholder="选择版本号">
<el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
</el-select>
</el-form-item>
<el-form-item label="表名" prop="sheet">
<el-select v-model="state.queryForm.sheet" placeholder="选择表名" @change="handleChange">
<el-option v-for="item in state.sheets" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="openTable(true, index)">一键展开</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="openTable(false, index)">一键收起</el-button>
</el-form-item>
<el-form-item>
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel"
:show-file-list="false">
<template #trigger>
<el-button type="primary">导入excel</el-button>
</template>
</el-upload>
</el-form-item>
</el-form>
</el-card>
<el-card v-if="index == 3" shadow="always">
<el-form :model="state.queryForm" :inline="true">
<el-form-item label="版本号" prop="versions">
<el-select v-model="state.queryForm.versions" placeholder="选择版本号"
@change="handleChangeVersion">
<el-option v-for="item in state.options" :key="item.versions" :label="item.versions"
:value="item.versions" />
</el-select>
</el-form-item>
<el-form-item>
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" style="margin-right: 12px;"
v-if="Object.keys(state.versionsData).length === 0 ||state.versionsData.status=='cancel'||state.versionsData.status=='draft'"
:show-file-list="false">
<template #trigger>
<el-button type="primary">导入excel</el-button>
</template>
</el-upload>
<el-button v-if="state.versionsData.status=='draft'" type="primary"con="edit" @click="clickApprovalSheet()">审核</el-button>
<el-button v-if="state.versionsData.status=='warning'||state.versionsData.status=='finish'" icon="view" @click="lookApprovalSheet()" type="warning">查看流程</el-button>
</el-form-item>
</el-form>
</el-card>
<el-table v-if="index < 3" :ref="(el) => tableRef[index] = el" :data="state.tableData"
style="width: 100%; margin-bottom: 20px;height: calc(100vh - 305px);" row-key="id" border
:default-expand-all="state.isOpen">
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="工程或费用名称" />
<el-table-column prop="unit" label="单位" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
</el-table>
<el-table v-if="index == 3" :data="state.tableData"
style="width: 100%; margin-bottom: 20px;height: calc(100vh - 305px);" row-key="id" border>
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="specification" label="规格" />
<el-table-column prop="unit" label="单位" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
</el-table>
</el-tab-pane>
</el-tabs>
</div>
<div class="billof-quantities">
<!-- tabPosition="left" -->
<el-tabs type="border-card" @tab-change="handleTabChange">
<el-tab-pane v-for="(item, index) in work_order_type" :key="item.value" :label="item.label">
<el-card v-if="index < 3" shadow="always">
<el-form :model="state.queryForm" :inline="true">
<el-form-item label="版本号" prop="versions">
<el-select v-model="state.queryForm.versions" placeholder="选择版本号">
<el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
</el-select>
</el-form-item>
<el-form-item label="表名" prop="sheet">
<el-select v-model="state.queryForm.sheet" placeholder="选择表名" @change="handleChange">
<el-option v-for="item in state.sheets" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="openTable(true, index)">一键展开</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="openTable(false, index)">一键收起</el-button>
</el-form-item>
<el-form-item>
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false">
<template #trigger>
<el-button type="primary">导入excel</el-button>
</template>
</el-upload>
</el-form-item>
</el-form>
</el-card>
<el-card v-if="index == 3" shadow="always">
<el-form :model="state.queryForm" :inline="true">
<el-form-item label="版本号" prop="versions">
<el-select v-model="state.queryForm.versions" placeholder="选择版本号" @change="handleChangeVersion">
<el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
</el-select>
</el-form-item>
<el-form-item>
<el-upload
ref="uploadRef"
class="upload-demo"
:http-request="importExcel"
style="margin-right: 12px"
v-if="Object.keys(state.versionsData).length === 0 || state.versionsData.status == 'cancel' || state.versionsData.status == 'draft'"
:show-file-list="false"
>
<template #trigger>
<el-button type="primary">导入excel</el-button>
</template>
</el-upload>
<el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" @click="clickApprovalSheet()">审核</el-button>
<el-button
v-if="state.versionsData.status == 'warning' || state.versionsData.status == 'finish'"
icon="view"
@click="lookApprovalSheet()"
type="warning"
>查看流程</el-button
>
</el-form-item>
</el-form>
</el-card>
<el-table
v-if="index < 3"
:ref="(el) => (tableRef[index] = el)"
:data="state.tableData"
style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
row-key="id"
border
:default-expand-all="state.isOpen"
>
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="工程或费用名称" />
<el-table-column prop="unit" label="单位" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
</el-table>
<el-table v-if="index == 3" :data="state.tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="specification" label="规格" />
<el-table-column prop="unit" label="单位" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup name="billofQuantities">
import { ref, reactive, onMounted, computed, toRefs, getCurrentInstance, nextTick } from 'vue'
import { obtainAllVersionNumbers, importExcelFile, obtainTheList, sheetList, detailsMaterialAndEquipmentApproval } from "@/api/design/billofQuantities/index"
import { ref, reactive, onMounted, computed, toRefs, getCurrentInstance, nextTick } from 'vue';
import {
obtainAllVersionNumbers,
importExcelFile,
obtainTheList,
sheetList,
detailsMaterialAndEquipmentApproval
} from '@/api/design/billofQuantities/index';
import { useUserStoreHook } from '@/store/modules/user';
const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
const { proxy } = getCurrentInstance();
const { work_order_type } = toRefs(proxy?.useDict('work_order_type'));
const tableRef = ref({})
const tableRef = ref({});
console.log(currentProject.value);
// tableData
// 版本号
const state = reactive({
work_order_type: 0,
// 版本号
version_num: '',
options: [],// 版本号选项
sheets: [], // sheet选项
queryForm: {
projectId: currentProject.value?.id,
versions: '',
sheet: '',
pageSize: 20,
pageNum: 1
},
loading: {
versions: false,
sheets: false,
list: false
},
error: null,
// 前三个
tableData: [],
// 物质设备清单
// tableData_sdsqd: [],
// 展开收起
isOpen: false,
// 版本号
versionsData:{}
})
work_order_type: 0,
// 版本号
version_num: '',
options: [], // 版本号选项
sheets: [], // sheet选项
queryForm: {
projectId: currentProject.value?.id,
versions: '',
sheet: '',
pageSize: 20,
pageNum: 1
},
loading: {
versions: false,
sheets: false,
list: false
},
error: null,
// 前三个
tableData: [],
// 物质设备清单
// tableData_sdsqd: [],
// 展开收起
isOpen: false,
// 版本号
versionsData: {}
});
// tab切换
const handleTabChange = tab => {
state.tableData = [];
state.options = [];
state.sheets = [];
state.queryForm.sheet = '';
state.queryForm.versions = '';
state.work_order_type = tab
if (tab <= 2) {
getVersionNums()
} else {
getVersionNums(false)
}
}
onMounted(() => {
const handleTabChange = (tab) => {
state.tableData = [];
state.options = [];
state.sheets = [];
state.queryForm.sheet = '';
state.queryForm.versions = '';
state.work_order_type = tab;
if (tab <= 2) {
getVersionNums();
})
} else {
getVersionNums(false);
}
};
onMounted(async () => {
await getVersionNums();
openTable(true, state.work_order_type);
});
// 获取版本号
async function getVersionNums(isSheet = true) {
try {
state.loading.versions = true;
state.error = null;
try {
state.loading.versions = true;
state.error = null;
const res = await obtainAllVersionNumbers({
projectId: currentProject.value?.id,
workOrderType: state.work_order_type,
pageSize: 1000,
pageNum: 1,
});
const res = await obtainAllVersionNumbers({
projectId: currentProject.value?.id,
workOrderType: state.work_order_type,
pageSize: 1000,
pageNum: 1
});
const { code, rows } = res || {};
if (code === 200) {
state.options = rows || [];
if (state.options.length > 0) {
state.queryForm.versions = state.options[0].versions;
// 等待表名加载完成
console.log(isSheet, state.sheets.length);
if (isSheet) {
await handleSheetName();
} else {
await handleQueryList(isSheet);
}
}
const { code, rows } = res || {};
if (code === 200) {
state.options = rows || [];
if (state.options.length > 0) {
state.queryForm.versions = state.options[0].versions;
// 等待表名加载完成
console.log(isSheet, state.sheets.length);
if (isSheet) {
await handleSheetName();
} else {
state.error = `获取版本号失败: 错误码 ${code}`;
console.error(state.error);
await handleQueryList(isSheet);
}
} catch (err) {
state.error = `获取版本号时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.versions = false;
}
} else {
state.error = `获取版本号失败: 错误码 ${code}`;
console.error(state.error);
}
} catch (err) {
state.error = `获取版本号时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.versions = false;
}
}
// 获取表名
async function handleSheetName() {
if (!state.queryForm.versions) {
console.warn('版本号不存在,无法获取表名');
return;
if (!state.queryForm.versions) {
console.warn('版本号不存在,无法获取表名');
return;
}
try {
state.loading.sheets = true;
state.error = null;
const { data } = await sheetList({
projectId: currentProject.value?.id,
workOrderType: state.work_order_type,
versions: state.queryForm.versions
});
state.sheets = data || [];
if (state.sheets.length > 0) {
state.queryForm.sheet = state.sheets[0];
}
try {
state.loading.sheets = true;
state.error = null;
const { data } = await sheetList({
projectId: currentProject.value?.id,
workOrderType: state.work_order_type,
versions: state.queryForm.versions
});
state.sheets = data || [];
if (state.sheets.length > 0) {
state.queryForm.sheet = state.sheets[0];
}
// 获取列表数据
await handleQueryList();
} catch (err) {
state.error = `获取表名时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.sheets = false;
}
// 获取列表数据
await handleQueryList();
} catch (err) {
state.error = `获取表名时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.sheets = false;
}
}
// 获取列表
async function handleQueryList(isSheet = true) {
if (isSheet && !state.queryForm.sheet) {
console.warn('表名不存在,无法获取列表数据');
return;
}
try {
state.loading.list = true;
state.error = null;
const result = await obtainTheList(state.queryForm);
if (result?.code === 200) {
if (state.work_order_type == 3) {
state.versionsData = result.data || [];
}
state.tableData = result.data || [];
} else {
state.error = `获取列表数据失败: 错误码 ${result?.code}`;
console.error(state.error);
}
} catch (err) {
state.error = `获取列表数据时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.list = false;
if (isSheet && !state.queryForm.sheet) {
console.warn('表名不存在,无法获取列表数据');
return;
}
try {
state.loading.list = true;
state.error = null;
const result = await obtainTheList(state.queryForm);
if (result?.code === 200) {
if (state.work_order_type == 3) {
state.versionsData = result.data || [];
}
state.tableData = result.data || [];
} else {
state.error = `获取列表数据失败: 错误码 ${result?.code}`;
console.error(state.error);
}
} catch (err) {
state.error = `获取列表数据时发生错误: ${err.message}`;
console.error(state.error, err);
} finally {
state.loading.list = false;
}
}
// 上传excel
function importExcel(options) {
console.log(options);
let formData = new FormData();
formData.append("file", options.file);
importExcelFile({ workOrderType: state.work_order_type, projectId: currentProject.value?.id }, formData).then(res => {
const { code } = res;
if (code == 200) {
proxy.$modal.msgSuccess(res.msg || '导入成功');
// 更新列表
getVersionNums(false)
} else {
proxy.$modal.msgError(res.msg || '导入失败');
}
console.log(options);
const loading = ElLoading.service({
lock: true,
text: '正在导入,请稍候...',
background: 'rgba(0, 0, 0, 0.7)'
});
let formData = new FormData();
formData.append('file', options.file);
importExcelFile({ workOrderType: state.work_order_type, projectId: currentProject.value?.id }, formData)
.then((res) => {
const { code } = res;
if (code == 200) {
proxy.$modal.msgSuccess(res.msg || '导入成功');
// 更新列表
getVersionNums(false);
} else {
proxy.$modal.msgError(res.msg || '导入失败');
}
})
.finally(() => {
loading.close();
});
}
// 切换表名
function handleChange(sheet) {
state.queryForm.sheet = sheet;
handleQueryList();
state.queryForm.sheet = sheet;
handleQueryList();
}
// 切换版本号
function handleChangeVersion(versions) {
state.queryForm.versions = versions;
state.versionsData = state.options.find(e => e.versions == versions)
console.log('state.versionsData',state.versionsData);
state.sheets = [];
handleQueryList();
state.queryForm.versions = versions;
state.versionsData = state.options.find((e) => e.versions == versions);
console.log('state.versionsData', state.versionsData);
state.sheets = [];
handleQueryList();
}
// 在 openTable 方法中通过索引获取对应的表格实例
function openTable(flag, index) {
nextTick(() => {
// 通过索引获取当前标签页的表格实例
const currentTable = tableRef.value[index]
if (currentTable) {
handleArr(state.tableData, flag, currentTable);
}
});
nextTick(() => {
// 通过索引获取当前标签页的表格实例
const currentTable = tableRef.value[index];
if (currentTable) {
handleArr(state.tableData, flag, currentTable);
}
});
}
function handleArr(arr, flag, table) {
arr.forEach((i) => {
table.toggleRowExpansion(i, flag);
if (i.children) {
handleArr(i.children, flag, table);
}
});
arr.forEach((i) => {
table.toggleRowExpansion(i, flag);
if (i.children) {
handleArr(i.children, flag, table);
}
});
}
// 审批
function clickApprovalSheet(row) {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
path: `/design-management/billofQuantities/indexEdit`,
query: {
id: state.queryForm.versions,
type: 'update'
},
});
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
path: `/design-management/billofQuantities/indexEdit`,
query: {
id: state.queryForm.versions,
type: 'update'
}
});
}
// 审核流程
function lookApprovalFlow(row) {
proxy.$router.push({
path: `/design-management/billofQuantities/indexEdit`,
query: {
id: state.queryForm.versions,
type: 'view'
}
});
proxy.$router.push({
path: `/design-management/billofQuantities/indexEdit`,
query: {
id: state.queryForm.versions,
type: 'view'
}
});
}
</script>
<style>
.billof-quantities {
padding: 20px;
padding: 20px;
}
</style>
</style>

View File

@ -60,7 +60,7 @@ const props = defineProps({
const uploadParams = computed(() => {
return {
catalogueId: props.catalogueId,
projectId: currentProject.value.id
projectId: currentProject.value?.id
};
});

View File

@ -209,7 +209,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -1,7 +1,7 @@
<template>
<el-table v-loading="loading" :data="drawingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="版本号" align="center" prop="versionNumber" width="100" />
<!-- <el-table-column label="版本号" align="center" prop="versionNumber" width="100" />
<el-table-column label="文件名称" align="center" prop="fileName">
<template #default="scope">
<span style="color: #409eff" @click="handleView(scope.row)">{{ scope.row.fileName }}</span>
@ -26,7 +26,16 @@
<dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column label="上传时间" align="center" prop="createTime" />
<el-table-column label="上传时间" align="center" prop="createTime" /> -->
<el-table-column label="子项名称" align="center" prop="designSubitem" />
<el-table-column label="专业" align="center" prop="specialty">
<template #default="scope">
<dict-tag :options="des_user_major" :value="scope.row.specialty" />
</template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="principal" />
<el-table-column label="卷册号" align="center" prop="volumeNumber" />
<el-table-column label="资料名称" align="center" prop="fileName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding " width="240">
<template #default="scope">
@ -55,6 +64,9 @@
<script setup lang="ts">
import { ref, defineProps, defineEmits } from 'vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
const props = defineProps({
drawingList: {

View File

@ -38,7 +38,7 @@
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<!-- <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="过程图纸" name="1">
<DrawingTable
:drawingList="drawingList"
@ -81,7 +81,19 @@
@cancel-process-apply="handleCancelProcessApply"
/>
</el-tab-pane>
</el-tabs>
</el-tabs> -->
<DrawingTable
:drawingList="drawingList"
:loading="loading"
:drawing_file_type="drawing_file_type"
:wf_business_status="wf_business_status"
@selection-change="handleSelectionChange"
@view="handleView"
@update="handleUpdate"
@delete="handleDelete"
@view-info="handleViewInfo"
@cancel-process-apply="handleCancelProcessApply"
/>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
</div>
@ -118,7 +130,6 @@ const data = reactive({
pageSize: 10,
projectId: currentProject.value?.id,
fileName: undefined,
fileType: 1,
fileSuffix: undefined,
fileStatus: undefined,
originalName: undefined,
@ -219,18 +230,12 @@ const handleCancelProcessApply = async (id: string) => {
proxy?.$modal.msgSuccess('撤销成功');
};
const handleClick = (val) => {
queryParams.value.pageNum = 1;
queryParams.value.fileType = val.props.name;
getList();
};
onMounted(() => {
getList();
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -207,8 +207,8 @@ const formData = reactive<FormData>({
professional: '',
stage: '',
volume: '',
projectId: currentProject.value.id || '',
projectName: currentProject.value.name || '',
projectId: currentProject.value?.id || '',
projectName: currentProject.value?.name || '',
subprojectId: '',
subprojectName: '',
designer: '',
@ -243,7 +243,7 @@ watch(
);
// 通过项目获取子项目 - 监听项目 id 变化,可自动获取子项目
const getSubProject = async () => {
let res = await subProjectListAll(currentProject.value.id);
let res = await subProjectListAll(currentProject.value?.id);
subProjectList.value = res.data;
subProjectList.value.forEach((item: any) => {
subProjectMap.set(item.id, item.projectName);

View File

@ -214,7 +214,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -306,7 +306,7 @@ const onLoad = async () => {
};
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
getDeptAllUser(userStore.deptId).then(() => {
byProjectIdAll();

View File

@ -213,7 +213,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -210,7 +210,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -103,7 +103,7 @@ const dialog = reactive<DialogOption>({
const initFormData: SubcontractForm = {
id: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
subContent: undefined
};
const data = reactive<PageData<SubcontractForm, SubcontractQuery>>({
@ -111,7 +111,7 @@ const data = reactive<PageData<SubcontractForm, SubcontractQuery>>({
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
subContent: undefined,
params: {}
},
@ -224,7 +224,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();

View File

@ -58,7 +58,7 @@ const ids = ref<string>('');
const tableData = ref<any[]>([]);
const param = reactive({
type: 2,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
pageNum: 1,
pageSize: 10
});

View File

@ -456,7 +456,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
state.projectId = nid;
state.paramsQuery.projectId = nid;

View File

@ -468,7 +468,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;