diff --git a/src/api/materials/cailiaoshebei/types.ts b/src/api/materials/cailiaoshebei/types.ts index d9346d0..a042328 100644 --- a/src/api/materials/cailiaoshebei/types.ts +++ b/src/api/materials/cailiaoshebei/types.ts @@ -158,6 +158,7 @@ export interface CailiaoshebeiQuery extends PageQuery { */ batchId?: string | number; projectId?: string | number; + batchNumber?: string; /** * 供货商ID */ diff --git a/src/api/out/outDesignTable/index.ts b/src/api/out/outDesignTable/index.ts new file mode 100644 index 0000000..15ccfa6 --- /dev/null +++ b/src/api/out/outDesignTable/index.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export function listOutTable(query: any) { + return request({ + url: '/out/table/monthlyPurchase', + method: 'get', + params: query + }); +} diff --git a/src/api/out/outDesignTableVS/index.ts b/src/api/out/outDesignTableVS/index.ts new file mode 100644 index 0000000..788d797 --- /dev/null +++ b/src/api/out/outDesignTableVS/index.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export function listOutTable(query: any) { + return request({ + url: '/out/table/comparisonOfCompletionAndSettlement', + method: 'get', + params: query + }); +} diff --git a/src/api/out/outTable/index.ts b/src/api/out/outTable/index.ts new file mode 100644 index 0000000..b0e4760 --- /dev/null +++ b/src/api/out/outTable/index.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export function listOutTable(query: any) { + return request({ + url: '/out/table/monthlyConstruct', + method: 'get', + params: query + }); +} diff --git a/src/api/out/ownerSettlement/index.ts b/src/api/out/ownerSettlement/index.ts new file mode 100644 index 0000000..6f434a6 --- /dev/null +++ b/src/api/out/ownerSettlement/index.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export function listOutTable(query: any) { + return request({ + url: '/out/table/comparisonOfOwnerAndSub', + method: 'get', + params: query + }); +} diff --git a/src/views/materials/cailiaoshebei/index.vue b/src/views/materials/cailiaoshebei/index.vue index 1e342b8..af6d36f 100644 --- a/src/views/materials/cailiaoshebei/index.vue +++ b/src/views/materials/cailiaoshebei/index.vue @@ -64,7 +64,7 @@ - + + @@ -166,14 +173,6 @@ - - @@ -267,7 +266,6 @@ const single = ref(true); const multiple = ref(true); const total = ref(0); const batchOptions = ref([]); -const batchId = ref(''); const queryFormRef = ref(); const cailiaoshebeiFormRef = ref(); @@ -305,6 +303,7 @@ const data = reactive>({ supplier: undefined, name: undefined, projectId: currentProject.value.id, + batchNumber: undefined, supply: undefined, specification: undefined, signalment: undefined, @@ -328,19 +327,15 @@ const getList = async () => { loading.value = true; const res = await listCailiaoshebei(queryParams.value); cailiaoshebeiList.value = res.rows; - total.value = res.total; + loading.value = false; }; //查询批次列表 const getBatchList = async () => { - const res = await listBatch({ - pageNum: 1, - pageSize: 1000, - projectId: currentProject.value.id, - batchNumber: batchId.value - }); + const res = await listBatch(queryParams.value); batchOptions.value = res.rows; + total.value = res.total; try { queryParams.value.batchId = res.rows[0].id; form.value.batchId = res.rows[0].id; diff --git a/src/views/out/outDesignTable/index.vue b/src/views/out/outDesignTable/index.vue new file mode 100644 index 0000000..2599207 --- /dev/null +++ b/src/views/out/outDesignTable/index.vue @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/out/outDesignTableVS/index.vue b/src/views/out/outDesignTableVS/index.vue new file mode 100644 index 0000000..2c14553 --- /dev/null +++ b/src/views/out/outDesignTableVS/index.vue @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + + + + + + + + + + 联查分包结算 + + + + + + + + + diff --git a/src/views/out/outTable/index.vue b/src/views/out/outTable/index.vue index 67bddd4..83f13b9 100644 --- a/src/views/out/outTable/index.vue +++ b/src/views/out/outTable/index.vue @@ -1,16 +1,127 @@ - init + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + - - +const { queryParams } = toRefs(data); + +/** 查询项目总产值分配列表 */ +const getList = async () => { + loading.value = true; + + const res = await listOutTable(queryParams.value); + valueAllocationList.value = res.rows; + total.value = res.total; + loading.value = false; +}; + +/** 搜索按钮操作 */ +const handleQuery = () => { + queryParams.value.pageNum = 1; + getList(); +}; + +/** 重置按钮操作 */ +const resetQuery = () => { + queryFormRef.value?.resetFields(); + handleQuery(); +}; + +/** 导出按钮操作 */ +const handleExport = () => { + proxy?.download( + 'out/valueAllocation/export', + { + ...queryParams.value + }, + `valueAllocation_${new Date().getTime()}.xlsx` + ); +}; + +onMounted(() => { + // 也可以使用字符串格式(例如 YYYY-MM) + const currentMonthString = ref(dayjs().format('YYYY-MM')); + queryParams.value.month = currentMonthString.value; + getList(); +}); + +//监听项目id刷新数据 +const listeningProject = watch( + () => currentProject.value.id, + (nid, oid) => { + queryParams.value.projectId = nid; + getList(); + } +); + +onUnmounted(() => { + listeningProject(); +}); + diff --git a/src/views/out/ownerSettlement/index.vue b/src/views/out/ownerSettlement/index.vue new file mode 100644 index 0000000..84fd8c2 --- /dev/null +++ b/src/views/out/ownerSettlement/index.vue @@ -0,0 +1,130 @@ + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + + + + + + + + + + 联查分包结算 + + + + + + + + +