diff --git a/src/api/finance/purchasingrequisition.ts b/src/api/finance/purchasingrequisition.ts index 64c1ea1..84b49f4 100644 --- a/src/api/finance/purchasingrequisition.ts +++ b/src/api/finance/purchasingrequisition.ts @@ -188,6 +188,20 @@ export function getDeptMembers() { }); } +/** + * 保存采购代表(指定单人或部门多人) + * @param id 采购申请ID + * @param representorTeacherNo 指定采购代表人(单人,用户ID或工号) + * @param representors 部门多人由系统抽取(多人,用户ID或工号逗号分隔) + */ +export function saveRepresentor(id: number, representorTeacherNo?: string, representors?: string) { + return request({ + url: '/purchase/purchasingapply/saveRepresentor', + method: 'post', + data: { id, representorTeacherNo, representors } + }); +} + /** * 文件归档:按文件类型打包下载该申请单下所有附件的下载地址(GET 请求,浏览器直接下载 zip) * @param purchaseId 采购申请ID diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index c778943..8b2f3e0 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -169,6 +169,7 @@ interface FileItem { url?: string; uid?: number; id?: string; // 文件ID + fileTitle?: string; // 文件标题(用于显示) } interface UploadFileItem { diff --git a/src/views/finance/purchaseagent/form.vue b/src/views/finance/purchaseagent/form.vue index 9b1208c..03242b5 100644 --- a/src/views/finance/purchaseagent/form.vue +++ b/src/views/finance/purchaseagent/form.vue @@ -1,28 +1,48 @@ - - - + + + + + + + + + 新增时自动创建系统用户,默认密码:Aa123456,角色:招标代理 + - @@ -48,6 +68,9 @@ const formRef = ref(); const dataForm = reactive({ id: '', agentName: '', + contactPerson: '', + contactPhone: '', + username: '', remark: '', }); const visible = ref(false); @@ -64,6 +87,9 @@ const openDialog = async (type: string, rowData?: any) => { visible.value = true; dataForm.id = ''; dataForm.agentName = ''; + dataForm.contactPerson = ''; + dataForm.contactPhone = ''; + dataForm.username = ''; dataForm.remark = ''; nextTick(() => { @@ -76,6 +102,9 @@ const openDialog = async (type: string, rowData?: any) => { Object.assign(dataForm, { id: res.data.id || '', agentName: res.data.agentName || '', + contactPerson: res.data.contactPerson || '', + contactPhone: res.data.contactPhone || '', + username: res.data.username || '', remark: res.data.remark || '', }); } @@ -124,5 +153,10 @@ defineExpose({ diff --git a/src/views/finance/purchaseagent/index.vue b/src/views/finance/purchaseagent/index.vue index ec6ba98..38223bc 100644 --- a/src/views/finance/purchaseagent/index.vue +++ b/src/views/finance/purchaseagent/index.vue @@ -75,7 +75,25 @@ 代理名称 - + + + + 联系人 + + + + + + 联系电话 + + + + + + 登录用户名 + + + 备注 @@ -206,7 +224,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { getPage, delObj, getAgentSummary } from "/@/api/finance/purchaseagent"; import { deptTree } from '/@/api/admin/dept'; import { useMessage, useMessageBox } from "/@/hooks/message"; -import { List, Document, EditPen, Clock, Search } from '@element-plus/icons-vue' +import { List, Document, EditPen, Clock, Search, User, Phone, UserFilled } from '@element-plus/icons-vue' // 引入组件 const FormDialog = defineAsyncComponent(() => import('./form.vue')); diff --git a/src/views/finance/purchasingrequisition/accept/AcceptBatchForm.vue b/src/views/finance/purchasingrequisition/accept/AcceptBatchForm.vue index 2fa55a2..2a5487b 100644 --- a/src/views/finance/purchasingrequisition/accept/AcceptBatchForm.vue +++ b/src/views/finance/purchasingrequisition/accept/AcceptBatchForm.vue @@ -1,15 +1,6 @@ - - - - 填写履约验收评价表 - 上传履约验收评价表 - - 金额≥30万,仅支持上传模版 - - - - - - - - - - - {{row.itemName}} - - - - - - - - - - 合格 - 不合格 - - - - - - - - - - - - - - - - {{ lyysTemplateLabel }} - - - - - - - - - - - + - - - - - - - - - - - - - - - - onRoleChange(idx, val as string)" - > - - - - - - - onTeamUserChange(idx, list)" - /> - - - - - - 删除 - - + 增加成员 - - - 至少3人,且为单数 - - ; - - 从往期带入 - - - - - - + + + + + 下载{{ lyysTemplateLabel }} + @@ -171,37 +36,32 @@ diff --git a/src/views/finance/purchasingrequisition/accept/PurchasingAcceptModal.vue b/src/views/finance/purchasingrequisition/accept/PurchasingAcceptModal.vue index 34a0777..f5baa16 100644 --- a/src/views/finance/purchasingrequisition/accept/PurchasingAcceptModal.vue +++ b/src/views/finance/purchasingrequisition/accept/PurchasingAcceptModal.vue @@ -59,14 +59,11 @@ v-show="String(b.batch) === activeTab" :key="b.id" :ref="(el) => setBatchFormRef(b.batch, el)" - v-model="batchForms[b.batch]" - :can-fill="canFillForm" + :model-value="batchForms[b.batch]" :readonly="false" :purchase-id="String(purchaseId)" :project-type="acceptProjectType" - :acceptance-items="acceptanceItems" :batch-num="b.batch" - :previous-batches-teams="getPreviousBatchesTeams(b.batch)" /> @@ -83,26 +80,6 @@ 关 闭 - - - 导出履约验收评价表 - - - - 下载当前期({{ activeTab }}期) - - - 下载全部期数(zip) - - - - diff --git a/src/views/finance/purchasingrequisition/index.vue b/src/views/finance/purchasingrequisition/index.vue index bae92f1..4d4625f 100644 --- a/src/views/finance/purchasingrequisition/index.vue +++ b/src/views/finance/purchasingrequisition/index.vue @@ -292,77 +292,72 @@ - + + + + - - - - 指定 - 随机 + + + + 指定采购代表人 + 部门多人系统抽取 - + - + - - {{ assignAgentCurrentRow.agentName }} + + + + - - 取消 - - 随机分配 - - - 确定 - - + 取消 + 确定 - - -