taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ljj' into lt

Browse Source
This commit is contained in:
taoge1020
2025-08-19 20:15:20 +08:00
parent 271f99fb16 da3a46189e
commit 001adefac7
10 changed files with 373 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
public/image/convert_tif.bat Normal file
View File

@ -0,0 +1,55 @@
@echo off
setlocal
REM 源文件
set SRC=odm_orthophoto.tif
REM 中间文件：去掩膜 + 保留 4 波段
set TMP1=tmp_nomask.tif
REM 中间文件：gdalwarp 处理透明通道
set TMP2=tmp_nomask_alpha.tif
REM 最终输出文件（性能优化：缩放 + 压缩）
set FINAL=clean_no_mask_optimized.tif
REM 配置参数
REM -tr 0.25x 分辨率控制（0.25 倍像素，或者每个像素大小扩大4倍），视你项目需要可调
REM -co 压缩参数：LZW 是无损压缩方式，TILED=YES 支持分块加载
REM -r average 使用平均值重采样可保持图像质量
echo [1/4] gdal_translate：去除掩膜并保留RGBA四波段...
gdal_translate -b 1 -b 2 -b 3 -b 4 -mask none -co PHOTOMETRIC=RGB -co ALPHA=YES %SRC% %TMP1%
if errorlevel 1 (
echo ❌ gdal_translate 失败
exit /b 1
)
echo [2/4] gdalwarp：强制生成 Alpha 通道...
gdalwarp -dstalpha %TMP1% %TMP2%
if errorlevel 1 (
echo ❌ gdalwarp 失败
exit /b 1
)
echo [3/4] gdalwarp：降采样并启用压缩优化...
gdalwarp ^
-r average ^
-tr 2 2 ^
-co COMPRESS=LZW ^
-co TILED=YES ^
-co PHOTOMETRIC=RGB ^
-co ALPHA=YES ^
%TMP2% %FINAL%
if errorlevel 1 (
echo ❌ gdalwarp 压缩优化失败
exit /b 1
)
echo [4/4] 清理临时文件...
del %TMP1%
del %TMP2%
echo ✅ 完成！优化后的 GeoTIFF 已生成：%FINAL%
endlocal
pause

7
src/api/materials/purchaseDoc/index.ts
View File

@ -121,3 +121,10 @@ export const logisticsDetial = (id) => {
method: 'get' method: 'get'
}); });
}; };
export const getDetailBASE = (id) => {
return request({
url: '/cailiaoshebei/purchaseDoc/pic/' + id,
method: 'get'
});
};

12
src/api/project/project/index.ts
View File

@ -174,3 +174,15 @@ export const getChildProject = (id: string | number): AxiosPromise<childProjectQ
method: 'get' method: 'get'
}); });
}; };
/**
* 上传项目文件
* @param data
*/
export const uploadProjectFile = (data: any) => {
return request({
url: '/project/project/save/tender/file',
method: 'put',
data: data
});
};

9
src/api/project/project/types.ts
View File

@ -8,6 +8,7 @@ export interface ProjectVO {
* 项目名称 * 项目名称
*/ */
projectName: string; projectName: string;
tenderFiles: string;
/** /**
* 项目简称 * 项目简称
@ -128,10 +129,10 @@ export interface locationType {
projectSite: string; projectSite: string;
} }
export interface childProjectQuery{ export interface childProjectQuery {
projectName:string; projectName: string;
pid:string; pid: string;
id?:string id?: string;
} }
export interface ProjectForm extends BaseEntity { export interface ProjectForm extends BaseEntity {

5
src/components/FileUpload/index.vue
View File

@ -315,6 +315,11 @@ const uploadedSuccessfully = (res: any) => {
fileList.value = []; fileList.value = [];
emit('update:modelValue', ''); // 同步到外部 v-model emit('update:modelValue', ''); // 同步到外部 v-model
} }
// if (props.autoUpload && props.limit === fileList.value.length) {
// fileUploadRef.value?.clearFiles();
// fileList.value = [];
// emit('update:modelValue', ''); // 同步到外部 v-model
// }
props.onUploadSuccess?.(fileList.value, res); props.onUploadSuccess?.(fileList.value, res);
}; };

1
src/components/Process/submitVerify.vue
View File

@ -304,7 +304,6 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']);
const handleCompleteTask = async () => { const handleCompleteTask = async () => {
form.value.taskId = taskId.value; form.value.taskId = taskId.value;
form.value.variables = props.taskVariables; form.value.variables = props.taskVariables;
let verify = false; let verify = false;
if (buttonObj.value.pop && nestNodeList.value && nestNodeList.value.length > 0) { if (buttonObj.value.pop && nestNodeList.value && nestNodeList.value.length > 0) {
nestNodeList.value.forEach((e) => { nestNodeList.value.forEach((e) => {

13
src/views/cory/template/index.vue
View File

@ -293,4 +293,17 @@ const handleAddApp = (row) => {
onMounted(() => { onMounted(() => {
getList(); getList();
}); });
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
getList();
}
);
onUnmounted(() => {
listeningProject();
});
</script> </script>

8
src/views/design/appointment/index.vue
View File

@ -510,6 +510,10 @@ const submitForm = async () => {
try { try {
// 1. 基础表单验证 // 1. 基础表单验证
await leaveFormRef.value.validate(); await leaveFormRef.value.validate();
<<<<<<< HEAD
=======
>>>>>>> origin/ljj
// 2. 提交前二次校验：「专业+人员」组合唯一性 // 2. 提交前二次校验：「专业+人员」组合唯一性
let hasDuplicate = false; let hasDuplicate = false;
const allKeys: string[] = []; const allKeys: string[] = [];
@ -567,6 +571,10 @@ const submitForm = async () => {
) )
] ]
}; };
<<<<<<< HEAD
=======
>>>>>>> origin/ljj
// 4. 数据处理（保持原有逻辑不变） // 4. 数据处理（保持原有逻辑不变）
const arr = []; const arr = [];
userList.value.forEach((item) => { userList.value.forEach((item) => {

475
src/views/materials/usageMaterials/material/indexSon.vue
View File

@ -113,22 +113,26 @@
<!-- </template> --> <!-- </template> -->
</el-table-column> </el-table-column>
<!-- 备注信息列（可展开） --> <!-- 备注信息列（可展开） -->
<el-table-column label="备注信息" min-width="120"> <el-table-column label="备注信息" min-width="120">
<template #default="scope"> <template #default="scope">
<el-popover placement="top" width="300" trigger="click"> <el-popover placement="top" width="300" trigger="click">
<template #reference> <template #reference>
<el-button size="small" type="text">查看详情</el-button> <el-button size="small" type="text">查看详情</el-button>
</template> </template>
<div class="space-y-2 text-sm"> <div class="space-y-2 text-sm">
<p><span class="font-medium">采购备注：</span>{{ scope.row.cgRemark || '-' }}</p> <p><span class="font-medium">采购备注：</span>{{ scope.row.cgRemark || '-' }}
<p><span class="font-medium">到货备注：</span>{{ scope.row.dhRemark || '-' }}</p> </p>
<p><span class="font-medium">供应商备注：</span>{{ scope.row.gysRemark || '-' }}</p> <p><span class="font-medium">到货备注：</span>{{ scope.row.dhRemark || '-' }}
<p><span class="font-medium">结算备注：</span>{{ scope.row.jsRemark || '-' }}</p> </p>
</div> <p><span class="font-medium">供应商备注：</span>{{ scope.row.gysRemark || '-'
</el-popover> }}</p>
</template> <p><span class="font-medium">结算备注：</span>{{ scope.row.jsRemark || '-' }}
</el-table-column> </p>
</div>
</el-popover>
</template>
</el-table-column>
<!-- 操作列 --> <!-- 操作列 -->
<el-table-column label="操作" min-width="120" align="center" fixed="right"> <el-table-column label="操作" min-width="120" align="center" fixed="right">
@ -153,244 +157,222 @@
<div class="text-gray-500 text-sm"> <div class="text-gray-500 text-sm">
共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条 共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
</div> </div>
<el-dialog <el-dialog v-model="dialogVisible2" :title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'" :width="dialogWidth"
v-model="dialogVisible2" :fullscreen="isFullscreen" :close-on-click-modal="false" :before-close="handleClose" destroy-on-close>
:title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'" <!-- 表单内容 -->
:width="dialogWidth" <el-form ref="formRef" :model="form" :rules="formRules" label-width="140px" class="space-y-4">
:fullscreen="isFullscreen" <!-- 第一行 -->
:close-on-click-modal="false" <el-row :gutter="20">
:before-close="handleClose" <el-col :span="12">
destroy-on-close <el-form-item label="批次" prop="batch">
> <el-input v-model="form.batch" placeholder="请输入批次信息"></el-input>
<!-- 表单内容 --> </el-form-item>
<el-form ref="formRef" :model="form" :rules="formRules" label-width="140px" class="space-y-4"> </el-col>
<!-- 第一行 --> <el-col :span="12">
<el-row :gutter="20"> <el-form-item label="联系单下达时间" prop="issuanceTime">
<el-col :span="12"> <el-date-picker v-model="form.issuanceTime" type="datetime" placeholder="选择联系单下达时间"
<el-form-item label="批次" prop="batch"> value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
<el-input v-model="form.batch" placeholder="请输入批次信息"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
<el-col :span="12">
<el-form-item label="联系单下达时间" prop="issuanceTime">
<el-date-picker
v-model="form.issuanceTime"
type="datetime"
placeholder="选择联系单下达时间"
value-format="YYYY-MM-DD HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!-- 第二行 --> <!-- 第二行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="要求到货数量" prop="requiredQuantity"> <el-form-item label="要求到货数量" prop="requiredQuantity">
<el-input v-model="form.requiredQuantity" placeholder="请输入要求到货数量"></el-input> <el-input v-model="form.requiredQuantity" placeholder="请输入要求到货数量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="要求到货时间" prop="requireDelivery"> <el-form-item label="要求到货时间" prop="requireDelivery">
<el-date-picker <el-date-picker v-model="form.requireDelivery" type="datetime" placeholder="选择要求到货时间"
v-model="form.requireDelivery" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
type="datetime" </el-form-item>
placeholder="选择要求到货时间" </el-col>
value-format="YYYY-MM-DD HH:mm:ss" </el-row>
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!-- 第三行 --> <!-- 第三行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="计划到货数量" prop="plannedQuantity"> <el-form-item label="计划到货数量" prop="plannedQuantity">
<el-input v-model="form.plannedQuantity" placeholder="请输入计划到货数量"></el-input> <el-input v-model="form.plannedQuantity" placeholder="请输入计划到货数量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="计划到货时间" prop="scheduledDelivery"> <el-form-item label="计划到货时间" prop="scheduledDelivery">
<el-date-picker <el-date-picker v-model="form.scheduledDelivery" type="datetime" placeholder="选择计划到货时间"
v-model="form.scheduledDelivery" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
type="datetime" </el-form-item>
placeholder="选择计划到货时间" </el-col>
value-format="YYYY-MM-DD HH:mm:ss" </el-row>
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!-- 第四行 --> <!-- 第四行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际到货验收数量" prop="actualAcceptance"> <el-form-item label="实际到货验收数量" prop="actualAcceptance">
<el-input v-model="form.actualAcceptance" placeholder="请输入实际到货验收数量"></el-input> <el-input v-model="form.actualAcceptance" placeholder="请输入实际到货验收数量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际到货时间" prop="actualDelivery"> <el-form-item label="实际到货时间" prop="actualDelivery">
<el-date-picker <el-date-picker v-model="form.actualDelivery" type="datetime" placeholder="选择实际到货时间"
v-model="form.actualDelivery" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
type="datetime" </el-form-item>
placeholder="选择实际到货时间" </el-col>
value-format="YYYY-MM-DD HH:mm:ss" </el-row>
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!-- 第五行 --> <!-- 第五行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="差异量" prop="differenceQuantity"> <el-form-item label="差异量" prop="differenceQuantity">
<el-input v-model="form.differenceQuantity" placeholder="请输入差异量"></el-input> <el-input v-model="form.differenceQuantity" placeholder="请输入差异量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="到货差异量" prop="dhDifferenceQuantity"> <el-form-item label="到货差异量" prop="dhDifferenceQuantity">
<el-input v-model="form.dhDifferenceQuantity" placeholder="请输入到货差异量"></el-input> <el-input v-model="form.dhDifferenceQuantity" placeholder="请输入到货差异量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第六行 --> <!-- 第六行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验收移交时间" prop="acceptanceCheck"> <el-form-item label="验收移交时间" prop="acceptanceCheck">
<el-date-picker <el-date-picker v-model="form.acceptanceCheck" type="datetime" placeholder="选择验收移交时间"
v-model="form.acceptanceCheck" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
type="datetime" </el-form-item>
placeholder="选择验收移交时间" </el-col>
value-format="YYYY-MM-DD HH:mm:ss" <el-col :span="12">
></el-date-picker> <el-form-item label="逾期状态" prop="expectedState">
</el-form-item> <el-select v-model="form.expectedState" placeholder="请选择逾期状态">
</el-col> <el-option label="未逾期" value="未逾期"></el-option>
<el-col :span="12"> <el-option label="已逾期" value="已逾期"></el-option>
<el-form-item label="逾期状态" prop="expectedState"> <el-option label="即将逾期" value="即将逾期"></el-option>
<el-select v-model="form.expectedState" placeholder="请选择逾期状态"> </el-select>
<el-option label="未逾期" value="未逾期"></el-option> </el-form-item>
<el-option label="已逾期" value="已逾期"></el-option> </el-col>
<el-option label="即将逾期" value="即将逾期"></el-option> </el-row>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- 第七行 - 金额信息 --> <!-- 第七行 - 金额信息 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="货物金额" prop="cargoAmount"> <el-form-item label="货物金额" prop="cargoAmount">
<el-input v-model="form.cargoAmount" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.cargoAmount" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="预付款" prop="advance"> <el-form-item label="预付款" prop="advance">
<el-input v-model="form.advance" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.advance" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="投料款" prop="feed"> <el-form-item label="投料款" prop="feed">
<el-input v-model="form.feed" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.feed" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="到货验收款" prop="acceptancePayment"> <el-form-item label="到货验收款" prop="acceptancePayment">
<el-input v-model="form.acceptancePayment" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.acceptancePayment" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第八行 - 金额信息 --> <!-- 第八行 - 金额信息 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="调试款" prop="debugging"> <el-form-item label="调试款" prop="debugging">
<el-input v-model="form.debugging" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.debugging" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="质保金" prop="qualityGuarantee"> <el-form-item label="质保金" prop="qualityGuarantee">
<el-input v-model="form.qualityGuarantee" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.qualityGuarantee" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结算金额" prop="settlementAmount"> <el-form-item label="结算金额" prop="settlementAmount">
<el-input v-model="form.settlementAmount" placeholder="0.00" prefix="¥"></el-input> <el-input v-model="form.settlementAmount" placeholder="0.00" prefix="¥"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第九行 --> <!-- 第九行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="交接方式" prop="associate"> <el-form-item label="交接方式" prop="associate">
<el-input v-model="form.associate" placeholder="请输入交接方式"></el-input> <el-input v-model="form.associate" placeholder="请输入交接方式"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="转换为合同" prop="transition"> <el-form-item label="转换为合同" prop="transition">
<el-select v-model="form.transition" placeholder="请选择是否转换为合同"> <el-select v-model="form.transition" placeholder="请选择是否转换为合同">
<el-option label="是" value="是"></el-option> <el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option> <el-option label="否" value="否"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第十行 --> <!-- 第十行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="到货要求" prop="deliveryRequirements"> <el-form-item label="到货要求" prop="deliveryRequirements">
<el-input v-model="form.deliveryRequirements" placeholder="请输入到货要求" type="textarea" rows="3"></el-input> <el-input v-model="form.deliveryRequirements" placeholder="请输入到货要求" type="textarea"
</el-form-item> rows="3"></el-input>
</el-col> </el-form-item>
</el-row> </el-col>
</el-row>
<!-- 第十一行 - 备注信息 --> <!-- 第十一行 - 备注信息 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="采购备注" prop="cgRemark"> <el-form-item label="采购备注" prop="cgRemark">
<el-input v-model="form.cgRemark" placeholder="请输入采购备注" type="textarea" rows="4"></el-input> <el-input v-model="form.cgRemark" placeholder="请输入采购备注" type="textarea" rows="4"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="到货备注" prop="dhRemark"> <el-form-item label="到货备注" prop="dhRemark">
<el-input v-model="form.dhRemark" placeholder="请输入到货备注" type="textarea" rows="4"></el-input> <el-input v-model="form.dhRemark" placeholder="请输入到货备注" type="textarea" rows="4"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商备注" prop="gysRemark"> <el-form-item label="供应商备注" prop="gysRemark">
<el-input v-model="form.gysRemark" placeholder="请输入供应商备注" type="textarea" rows="4"></el-input> <el-input v-model="form.gysRemark" placeholder="请输入供应商备注" type="textarea"
</el-form-item> rows="4"></el-input>
</el-col> </el-form-item>
</el-row> </el-col>
</el-row>
<!-- 第十二行 --> <!-- 第十二行 -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="结算备注" prop="jsRemark"> <el-form-item label="结算备注" prop="jsRemark">
<el-input v-model="form.jsRemark" placeholder="请输入结算备注" type="textarea" rows="3"></el-input> <el-input v-model="form.jsRemark" placeholder="请输入结算备注" type="textarea" rows="3"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<template #footer> <template #footer>
<div class="flex justify-end gap-3"> <div class="flex justify-end gap-3">
<el-button @click="handleCancel" class="transition-all duration-200"> 取消 </el-button> <el-button @click="handleCancel" class="transition-all duration-200">
<el-button type="primary" @click="handleSubmit" :loading="submitLoading" class="transition-all duration-200"> 取消
{{ dialogType2 === 'addSon' ? '新增' : '保存' }} </el-button>
</el-button> <el-button type="primary" @click="handleSubmit" :loading="submitLoading"
</div> class="transition-all duration-200">
</template> {{ dialogType2 === 'addSon' ? '新增' : '保存' }}
</el-button>
</div>
</template>
</el-dialog> </el-dialog>
</div>
</div> </div>
</div>
</template> </template>
<script setup> <script setup>
import { ref, reactive, onMounted, toRaw, getCurrentInstance } from 'vue'; import { ref, reactive, onMounted, toRaw, getCurrentInstance } from 'vue';
import { materialsUsageDetails, materialsSonAdd, materialsSonDel, materialsSonEdit } from '@/api/materials/usageMaterials/index'; import { materialsUsageDetails, materialsSonAdd, materialsSonDel, materialsSonEdit } from '@/api/materials/usageMaterials/index';
import { routerRename } from '@/api/air';
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const dialogVisible2 = ref(false); const dialogVisible2 = ref(false);
const dialogType2 = ref('addSon'); // add 或 edit const dialogType2 = ref('addSon'); // add 或 edit
@ -553,18 +535,15 @@ const handleSubmit = async () => {
} }
}; };
const materialsUsageDetails1 = () => { const materialsUsageDetails1 = () => {
loading.value = true; loading.value = true;
materialsUsageDetails({ physicalsupplyId: routeParams.value.id }) materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => {
.then((res) => { tableData.value = res.rows
tableData.value = res.rows; }).catch(() => {
loading.value = false;
}).finally(() => {
loading.value = false;
}) })
.catch(() => { }
loading.value = false;
})
.finally(() => {
loading.value = false;
});
};
// 格式化日期 // 格式化日期
const formatDate = (dateString) => { const formatDate = (dateString) => {
if (!dateString) return '-'; if (!dateString) return '-';

89
src/views/project/project/index.vue
View File

@ -149,6 +149,9 @@
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button> <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button> <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button>
<el-button link type="primary" icon="upload" @click="handleUpload(scope.row)" v-hasPermi="['project:project:saveTenderFile']"
>招标文件上传
</el-button>
</el-space> </el-space>
</template> </template>
</el-table-column> </el-table-column>
@ -190,9 +193,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="项目类别" prop="projectCategory" label-width="100px"> <el-form-item label="项目阶段" prop="projectStage" label-width="100px">
<el-select v-model="form.projectCategory" placeholder="请选择项目类别" clearable> <el-select v-model="form.projectStage" placeholder="请选择项目类别" clearable>
<el-option v-for="dict in project_category_type" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in project_stage" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -359,6 +362,15 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="上传文件" v-model="fileVisble" width="400">
<file-upload v-model="fileForm.tenderFiles" :limit="10" :file-type="['pdf']" :file-size="50" />
<template #footer>
<div class="dialog-footer">
<el-button v-loading="buttonLoading" type="primary" @click="uploadSubmit"> 提交</el-button>
<el-button @click="fileVisble = false">取消</el-button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
@ -370,7 +382,7 @@ import {
addProjectPilePoint, addProjectPilePoint,
addProjectSquare, addProjectSquare,
delProject, delProject,
getChildProject, uploadProjectFile,
getProject, getProject,
listProject, listProject,
updateProject updateProject
@ -378,8 +390,8 @@ import {
import { ProjectForm, ProjectQuery, ProjectVO, childProjectQuery, locationType } from '@/api/project/project/types'; import { ProjectForm, ProjectQuery, ProjectVO, childProjectQuery, locationType } from '@/api/project/project/types';
import amap from '@/components/amap/index.vue'; import amap from '@/components/amap/index.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable, project_category_type, project_type } = toRefs<any>( const { sys_normal_disable, project_category_type, project_type, project_stage } = toRefs<any>(
proxy?.useDict('sys_normal_disable', 'project_category_type', 'project_type') proxy?.useDict('sys_normal_disable', 'project_category_type', 'project_type', 'project_stage')
); );
const projectList = ref<ProjectVO[]>([]); const projectList = ref<ProjectVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -408,6 +420,11 @@ const dialog = reactive<DialogOption>({
visible: false, visible: false,
title: '' title: ''
}); });
const fileVisble = ref(false);
const fileForm = ref({
id: '',
tenderFiles: ''
});
const jsonData = ref(null); const jsonData = ref(null);
const fullscreenLoading = ref(false); const fullscreenLoading = ref(false);
@ -521,48 +538,6 @@ const setPoi = (location: locationType) => {
const setCheckedNodes = (nodeList: any) => { const setCheckedNodes = (nodeList: any) => {
nodes.value = nodeList; nodes.value = nodeList;
}; };
//上传节点
// const addFacilities = async () => {
// if (!layerType.value) {
// return proxy?.$modal.msgError('请选择图层类型');
// }
// if (!nodes.value.length) {
// return proxy?.$modal.msgError('请选择需要上传的图层');
// }
// const data = {
// projectId: projectId.value,
// nameGeoJson: null,
// locationGeoJson: null,
// pointGeoJson: null
// };
// loading.value = true;
// if (layerType.value == 1) {
// if (nodes.value[0].option == '名称') {
// data.nameGeoJson = jsonData.value[nodes.value[0].location.index];
// data.locationGeoJson = jsonData.value[nodes.value[1].location.index];
// } else {
// data.nameGeoJson = jsonData.value[nodes.value[1].location.index];
// data.locationGeoJson = jsonData.value[nodes.value[0].location.index];
// }
// await addProjectFacilities(data);
// await proxy?.$modal.msgSuccess('添加成功');
// } else if (layerType.value == 2) {
// data.pointGeoJson = jsonData.value[nodes.value[0].location.index];
// await addProjectPilePoint(data);
// await proxy?.$modal.msgSuccess('添加成功');
// } else if (layerType.value == 3) {
// if (nodes.value[0].option == '名称') {
// data.nameGeoJson = jsonData.value[nodes.value[0].location.index];
// data.locationGeoJson = jsonData.value[nodes.value[1].location.index];
// } else {
// data.nameGeoJson = jsonData.value[nodes.value[1].location.index];
// data.locationGeoJson = jsonData.value[nodes.value[0].location.index];
// }
// await addProjectSquare(data);
// await proxy?.$modal.msgSuccess('添加成功');
// }
// loading.value = false;
// };
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
@ -643,6 +618,24 @@ const submitForm = () => {
}); });
}; };
/** 上传文件 */
const handleUpload = async (row?: ProjectVO) => {
fileForm.value.id = row.id;
fileForm.value.tenderFiles = row.tenderFiles;
fileVisble.value = true;
};
const uploadSubmit = async () => {
if (!fileForm.value.tenderFiles) return proxy.$modal.msgError('请上传文件');
let res = await uploadProjectFile(fileForm.value);
if (res.code == 200) {
proxy.$modal.msgSuccess('上传成功');
fileVisble.value = false;
await getList();
}
};
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row?: ProjectVO) => { const handleDelete = async (row?: ProjectVO) => {
const _ids = row?.id || ids.value; const _ids = row?.id || ids.value;