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

合并

Browse Source
This commit is contained in:
taoge1020
2025-08-14 16:41:39 +08:00
parent a305c5bc19 459396080b
commit a6c2df39e2
8 changed files with 259 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/cory/template/components/engineeringChangeApplicationForm.vue
View File

@ -71,8 +71,8 @@
{{ tableDetail.content }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="附件" :span="2" label-class-name="white">
<el-link type="primary" :underline="false" :href="tableDetail.attachmentsList.url" target="_blank">{{
tableDetail.attachmentsList.originalName
<el-link type="primary" :underline="false" :href="tableDetail.attachmentsList?.url" target="_blank">{{
tableDetail.attachmentsList?.originalName
}}</el-link>
</el-descriptions-item>
<el-descriptions-item label-align="center" label="变更费用估算" :span="2" class-name="zebra">
@ -175,7 +175,8 @@ const props = defineProps({
}
});
const tableDetail = ref<any>({});
const tableDetail = ref<any>({ attachmentsImgList: [], attachmentsList: [] });
const exportRef = ref<HTMLElement>();
const radioList = ref([
{ value: 0, label: '设计漏项' },

23
src/views/design/prelimScheme/index.vue
View File

@ -42,6 +42,15 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
link
type="primary"
v-if="scope.row.status !== 'draft'"
icon="Edit"
@click="handleView(scope.row)"
v-hasPermi="['design:PrelimScheme:edit']"
>查看流程</el-button
>
<el-button
link
type="primary"
@ -198,14 +207,12 @@ const handleDelete = async (row?: PrelimSchemeVO) => {
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'design/scheme/export',
{
...queryParams.value
},
`scheme_${new Date().getTime()}.xlsx`
);
const handleView = (row?: PrelimSchemeVO) => {
proxy.$tab.closePage(route);
proxy.$tab.openPage(`/design-management/prelimScheme/indexEdit`, '', {
id: row.id,
type: 'view'
});
};
onMounted(() => {

24
src/views/design/scheme/index.vue
View File

@ -42,6 +42,15 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
link
type="primary"
v-if="scope.row.status !== 'draft'"
icon="Edit"
@click="handleView(scope.row)"
v-hasPermi="['design:PrelimScheme:edit']"
>查看流程</el-button
>
<el-button
link
type="primary"
@ -196,15 +205,12 @@ const handleDelete = async (row?: SchemeVO) => {
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'design/scheme/export',
{
...queryParams.value
},
`scheme_${new Date().getTime()}.xlsx`
);
const handleView = (row?: SchemeVO) => {
proxy.$tab.closePage(route);
proxy.$tab.openPage(`/design-management/scheme/indexEdit`, '', {
id: row.id,
type: 'view'
});
};
onMounted(() => {

2
src/views/design/volumeCatalog/index.vue
View File

@ -106,7 +106,7 @@
link
type="primary"
icon="View"
v-if="scope.row.auditStatus != 'draft' && scope.row.auditStatus != 'finish'"
v-if="scope.row.auditStatus != 'draft'"
@click="handleAuditView(scope.row)"
v-hasPermi="['out:monthPlan:remove']"
>查看流程</el-button

3
src/views/materials/materialsInventory/index.vue
View File

@ -31,7 +31,8 @@
<el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="材料名称" align="center" prop="materialsName" />
<el-table-column label="物资名称" align="center" prop="materialsName" />
<el-table-column label="计划数量" align="center" prop="quantityCount" />
<el-table-column label="入库登记" align="center">
<el-table-column label="数量" align="center" prop="number">
<template #default="scope">

1
src/views/materials/orderMaterials/index.vue
View File

@ -441,6 +441,7 @@ const getSupplierList = async () => {
pageSize: 10000
});
supplierOptions.value = res.rows;
console.log('🚀 ~ getSupplierList ~ res.rows:', res.rows);
};
onMounted(() => {

16
src/views/materials/overallPlanMaterialSupply/index.vue
View File

@ -0,0 +1,16 @@
<template>
<div>init</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
export default defineComponent({
setup() {
// todo
return {};
}
});
</script>
<style lang="stylus" scoped></style>

307
src/views/materials/purchaseDoc/index.vue
View File

@ -4,9 +4,6 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="项目ID" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="采购单编号" prop="docCode">
<el-input v-model="queryParams.docCode" placeholder="请输入采购单编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -86,18 +83,13 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['cailiaoshebei:purchaseDoc:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="purchaseDocList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键ID" align="center" prop="id" v-if="true" />
<el-table-column label="项目ID" align="center" prop="projectId" />
<el-table-column label="采购单编号" align="center" prop="docCode" />
<el-table-column label="采购单编号" align="center" prop="docCode" width="90" />
<el-table-column label="供应商" align="center" prop="supplier" />
<el-table-column label="事由" align="center" prop="reason" />
<el-table-column label="设备统称" align="center" prop="name" />
@ -106,40 +98,50 @@
<span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="设计负责人联系方式" align="center" prop="designDirectorTel" />
<el-table-column label="现场技术负责人联系方式" align="center" prop="technicalDirectorTel" />
<el-table-column label="负责人联系方式" align="center" prop="designDirectorTel" width="130" />
<el-table-column label="现场联系方式" align="center" prop="technicalDirectorTel" width="130" />
<el-table-column label="收货地址" align="center" prop="receivingAddress" />
<el-table-column label="联系人" align="center" prop="contacts" />
<el-table-column label="项目负责人" align="center" prop="projectDirector" />
<el-table-column label="采购经办人" align="center" prop="purchasingAgent" />
<el-table-column label="项目负责人" align="center" prop="projectDirector" width="90" />
<el-table-column label="采购经办人" align="center" prop="purchasingAgent" width="90" />
<el-table-column label="日期" align="center" prop="preparedDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.preparedDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="反馈文件地址" align="center" prop="feedbackUrl" />
<el-table-column label="签收单位" align="center" prop="signingUnit" />
<el-table-column label="签收人" align="center" prop="signingPerson" />
<el-table-column label="签收日期" align="center" prop="signingDate" width="180">
<el-table-column label="文件地址" align="center" prop="feedbackUrl" width="130">
<template #default="scope">
<span>{{ parseTime(scope.row.signingDate, '{y}-{m}-{d}') }}</span>
<el-link :href="scope.row.feedbackUrl" target="_blank" type="primary" v-if="scope.row.feedbackUrl">回单</el-link>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="status" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="审核状态" align="center" prop="status">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
></el-button>
</el-tooltip>
<dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="160">
<template #default="scope">
<div class="flex flex-wrap">
<div class="flex">
<div class="w3"></div>
<el-button link type="primary" icon="Finished" @click="handleUpload(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:edit']">
审核</el-button
>
<el-button link type="primary" icon="Upload" @click="handleUpload(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
>上传</el-button
>
</div>
<br />
<div class="w3"></div>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
>修改</el-button
>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
>删除</el-button
>
</div>
</template>
</el-table-column>
</el-table>
@ -147,62 +149,71 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改物资-采购联系单对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="purchaseDocFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目ID" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目ID" />
</el-form-item>
<el-form-item label="采购单编号" prop="docCode">
<el-input v-model="form.docCode" placeholder="请输入采购单编号" />
</el-form-item>
<el-form-item label="供应商" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商" />
</el-form-item>
<el-form-item label="事由" prop="reason">
<el-input v-model="form.reason" placeholder="请输入事由" />
</el-form-item>
<el-form-item label="设备统称" prop="name">
<el-input v-model="form.name" placeholder="请输入设备统称" />
</el-form-item>
<el-form-item label="到货日期" prop="arrivalDate">
<el-date-picker clearable v-model="form.arrivalDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择到货日期">
</el-date-picker>
</el-form-item>
<el-form-item label="设计负责人联系方式" prop="designDirectorTel">
<el-input v-model="form.designDirectorTel" placeholder="请输入设计负责人联系方式" />
</el-form-item>
<el-form-item label="现场技术负责人联系方式" prop="technicalDirectorTel">
<el-input v-model="form.technicalDirectorTel" placeholder="请输入现场技术负责人联系方式" />
</el-form-item>
<el-form-item label="收货地址" prop="receivingAddress">
<el-input v-model="form.receivingAddress" placeholder="请输入收货地址" />
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="项目负责人" prop="projectDirector">
<el-input v-model="form.projectDirector" placeholder="请输入项目负责人" />
</el-form-item>
<el-form-item label="采购经办人" prop="purchasingAgent">
<el-input v-model="form.purchasingAgent" placeholder="请输入采购经办人" />
</el-form-item>
<el-form-item label="日期" prop="preparedDate">
<el-date-picker clearable v-model="form.preparedDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="反馈文件地址" prop="feedbackUrl">
<el-input v-model="form.feedbackUrl" placeholder="请输入反馈文件地址" />
</el-form-item>
<el-form-item label="签收单位" prop="signingUnit">
<el-input v-model="form.signingUnit" placeholder="请输入签收单位" />
</el-form-item>
<el-form-item label="签收人" prop="signingPerson">
<el-input v-model="form.signingPerson" placeholder="请输入签收人" />
</el-form-item>
<el-form-item label="签收日期" prop="signingDate">
<el-date-picker clearable v-model="form.signingDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择签收日期">
</el-date-picker>
</el-form-item>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
<el-form ref="purchaseDocFormRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12" :offset="0"
><el-form-item label="采购单编号" prop="docCode"> <el-input v-model="form.docCode" placeholder="请输入采购单编号" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="供应商" prop="supplier">
<!-- <el-input v-model="form.supplier" placeholder="请输入供应商" /> -->
<el-select v-model="form.supplier" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
<el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.name"> </el-option>
</el-select> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="需求批次号" prop="mrpBaseId">
<el-select v-model="form.mrpBaseId" value-key="id" placeholder="请选择需求批次号" filterable @change="getPlanList">
<el-option v-for="item in batchOptions" :key="item.id" :label="item.planCode" :value="item.id"> </el-option>
</el-select> </el-form-item
></el-col>
<el-col :span="12" :offset="0">
<el-form-item label="需求计划" prop="planId">
<el-select v-model="form.planId" value-key="id" placeholder="请选择需求计划" multiple filterable :disabled="!form.mrpBaseId">
<el-option v-for="item in planList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="事由" prop="reason"> <el-input v-model="form.reason" placeholder="请输入事由" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0">
<el-form-item label="设备统称" prop="name"> <el-input v-model="form.name" placeholder="请输入设备统称" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="到货日期" prop="arrivalDate">
<el-date-picker clearable v-model="form.arrivalDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择到货日期">
</el-date-picker> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="负责人联系方式" prop="designDirectorTel">
<el-input v-model="form.designDirectorTel" placeholder="请输入设计负责人联系方式" type="number" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="现场联系方式" prop="technicalDirectorTel">
<el-input v-model="form.technicalDirectorTel" placeholder="请输入现场技术负责人联系方式" type="number" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0">
<el-form-item label="收货地址" prop="receivingAddress">
<el-input v-model="form.receivingAddress" placeholder="请输入收货地址" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0">
<el-form-item label="联系人" prop="contacts"> <el-input v-model="form.contacts" placeholder="请输入联系人" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="项目负责人" prop="projectDirector">
<el-input v-model="form.projectDirector" placeholder="请输入项目负责人" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="采购经办人" prop="purchasingAgent">
<el-input v-model="form.purchasingAgent" placeholder="请输入采购经办人" /> </el-form-item
></el-col>
<el-col :span="12" :offset="0"
><el-form-item label="日期" prop="preparedDate">
<el-date-picker clearable v-model="form.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
</el-date-picker> </el-form-item
></el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -211,17 +222,34 @@
</div>
</template>
</el-dialog>
<el-dialog title="上传文件" v-model="uploadDialogVisible" width="30%">
<file-upload v-model="feedbackUrl" :file-type="['pdf']" :onUploadSuccess="handleSuccess" />
<template #footer>
<span>
<el-button @click="uploadDialogVisible = false">取消</el-button>
<el-button type="primary" @click="uploadFile">确定</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script setup name="PurchaseDoc" lang="ts">
import { getBatch, listBatch } from '@/api/materials/batchPlan';
import { listPurchaseDoc, getPurchaseDoc, delPurchaseDoc, addPurchaseDoc, updatePurchaseDoc } from '@/api/materials/purchaseDoc';
import { PurchaseDocVO, PurchaseDocQuery, PurchaseDocForm } from '@/api/materials/purchaseDoc/types';
import { listContractor } from '@/api/project/contractor';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const router = useRouter();
const { supply, wf_business_status } = toRefs<any>(proxy?.useDict('supply', 'wf_business_status'));
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const uploadDialogVisible = ref(false);
const purchaseDocList = ref<PurchaseDocVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -230,7 +258,7 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const feedbackUrl = ref('');
const queryFormRef = ref<ElFormInstance>();
const purchaseDocFormRef = ref<ElFormInstance>();
@ -238,10 +266,14 @@ const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const batchOptions = ref([]);
const supplierOptions = ref([]);
const initFormData: PurchaseDocForm = {
const planList = ref([]);
const initFormData: any = {
id: undefined,
projectId: undefined,
projectId: currentProject.value?.id,
docCode: undefined,
supplier: undefined,
reason: undefined,
@ -251,6 +283,8 @@ const initFormData: PurchaseDocForm = {
technicalDirectorTel: undefined,
receivingAddress: undefined,
contacts: undefined,
associationList: [],
projectDirector: undefined,
purchasingAgent: undefined,
preparedDate: undefined,
@ -260,12 +294,13 @@ const initFormData: PurchaseDocForm = {
signingDate: undefined,
status: undefined
};
const data = reactive<PageData<PurchaseDocForm, PurchaseDocQuery>>({
const data = reactive({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: undefined,
projectId: currentProject.value?.id,
docCode: undefined,
supplier: undefined,
reason: undefined,
@ -311,6 +346,7 @@ const cancel = () => {
const reset = () => {
form.value = { ...initFormData };
purchaseDocFormRef.value?.resetFields();
form.value.projectId = currentProject.value?.id;
};
/** 搜索按钮操作 */
@ -345,6 +381,9 @@ const handleUpdate = async (row?: PurchaseDocVO) => {
const _id = row?.id || ids.value[0];
const res = await getPurchaseDoc(_id);
Object.assign(form.value, res.data);
getPlanList();
form.value.planId = form.value.associationList?.map((item: any) => item.planId);
dialog.visible = true;
dialog.title = '修改物资-采购联系单';
};
@ -354,6 +393,10 @@ const submitForm = () => {
purchaseDocFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.associationList = form.value.planId?.map((item: any) => ({
planId: item
}));
if (form.value.id) {
await updatePurchaseDoc(form.value).finally(() => (buttonLoading.value = false));
} else {
@ -366,6 +409,38 @@ const submitForm = () => {
});
};
const getPlanList = async () => {
form.value.planId = '';
const res = await getBatch({
pageNum: 1,
pageSize: 10,
mrpBaseId: undefined,
projectId: currentProject.value?.id,
mrpBaseId: form.value.mrpBaseId
});
planList.value = res.rows;
};
const getBatchList = async () => {
const res = await listBatch({
pageNum: 1,
pageSize: 10,
planCode: undefined,
projectId: currentProject.value?.id
});
batchOptions.value = res.rows;
};
const getSupplierList = async () => {
const res = await listContractor({
projectId: currentProject.value?.id,
pageNum: 1,
contractorType: 4,
pageSize: 10000
});
supplierOptions.value = res.rows;
};
/** 删除按钮操作 */
const handleDelete = async (row?: PurchaseDocVO) => {
const _ids = row?.id || ids.value;
@ -376,17 +451,45 @@ const handleDelete = async (row?: PurchaseDocVO) => {
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'cailiaoshebei/purchaseDoc/export',
{
...queryParams.value
},
`purchaseDoc_${new Date().getTime()}.xlsx`
);
const handleUpload = (row?: PurchaseDocVO) => {
form.value.feedbackUrl = '';
form.value.id = row.id;
uploadDialogVisible.value = true;
};
const uploadFile = async () => {
if (!feedbackUrl.value) {
proxy?.$modal.msgError('请上传文件');
return;
}
await updatePurchaseDoc(form.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
uploadDialogVisible.value = false;
await getList();
};
const handleSuccess = (list, res: any) => {
form.value.feedbackUrl = res.data.url;
};
onMounted(() => {
getList();
getSupplierList();
getBatchList();
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
}
);
onUnmounted(() => {
listeningProject();
});
</script>