diff --git a/src/api/calibration/accountAdjustmentApplication/index.ts b/src/api/calibration/accountAdjustmentApplication/index.ts index f512a77..84a623d 100644 --- a/src/api/calibration/accountAdjustmentApplication/index.ts +++ b/src/api/calibration/accountAdjustmentApplication/index.ts @@ -24,6 +24,25 @@ export const FinanceLoan = (data: any) => { }) } +// 编辑调账申请 +export const FinanceEditAccounts = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('times', data.times) + formData.append('ContractNo', data.ContractNo) + formData.append('CustomerID', data.CustomerID) + formData.append('amount', data.amount) + formData.append('situation', data.situation) + return request({ + url: `${AUTH_BASE_URL}/finance/editAccounts`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 调账申请展示 export const FinanceLoandisplay = (data: any) => { const formData = new FormData() @@ -43,3 +62,17 @@ export const FinanceLoandisplay = (data: any) => { } }) } + +// 删除调账申请 +export const FinanceDeleteAccounts = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deleteAccounts`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/applicationForSealApproval/index.ts b/src/api/calibration/applicationForSealApproval/index.ts index 43049f5..5e2a2ec 100644 --- a/src/api/calibration/applicationForSealApproval/index.ts +++ b/src/api/calibration/applicationForSealApproval/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { isFile } from '@/utils/auxiliaryFunction' const AUTH_BASE_URL = '/api2' /* @@ -25,6 +26,26 @@ export const BusinessApplication = (data: any) => { }) } +// 编辑申请用印 +export const BusinessEditApplication = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('Printingpurpose', data.Printingpurpose) + formData.append('CaseNumber', data.CaseNumber) + formData.append('Reason', data.Reason) + formData.append('seal_number', data.seal_number) + formData.append('seal_type', data.seal_type) + if (isFile(data.file)) formData.append('file', data.file) + return request({ + url: `${AUTH_BASE_URL}/business/editApplication`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 申请用印展示 export const BusinessApplicationdetail = (data: any) => { const formData = new FormData() @@ -44,3 +65,17 @@ export const BusinessApplicationdetail = (data: any) => { } }) } + +// 删除申请用印 +export const BusinessDeleteApplication = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteApplication`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/bidRegistration/index.ts b/src/api/calibration/bidRegistration/index.ts index 1b18ac2..751de40 100644 --- a/src/api/calibration/bidRegistration/index.ts +++ b/src/api/calibration/bidRegistration/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { isFile } from '@/utils/auxiliaryFunction' const AUTH_BASE_URL = '/api2' /* @@ -24,6 +25,25 @@ export const BusinessBid = (data: any) => { }) } +// 编辑投标登记 +export const BusinessEditBid = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('BiddingUnit', data.BiddingUnit) + formData.append('ProjectName', data.ProjectName) + formData.append('times', data.times) + if (isFile(data.BiddingAnnouncement)) + formData.append('BiddingAnnouncement', data.BiddingAnnouncement) + return request({ + url: `${AUTH_BASE_URL}/business/editBid`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 投标登记展示 export const BusinessBiddetail = (data: any) => { const formData = new FormData() @@ -44,3 +64,17 @@ export const BusinessBiddetail = (data: any) => { } }) } + +// 删除投标登记 +export const BusinessDeleteBid = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteBid`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/caseManagement/index.ts b/src/api/calibration/caseManagement/index.ts index 620ff19..4e6a2f2 100644 --- a/src/api/calibration/caseManagement/index.ts +++ b/src/api/calibration/caseManagement/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { isFile } from '@/utils/auxiliaryFunction' const AUTH_BASE_URL = '/api2' /* @@ -26,6 +27,27 @@ export const BusinessCasemanagement = (data: any) => { }) } +// 编辑案件管理信息 +export const BusinessEditCase = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('times', data.times) + if (isFile(data.AgencyContract)) formData.append('AgencyContract', data.AgencyContract) + if (isFile(data.Contractreturn)) formData.append('Contractreturn', data.Contractreturn) + if (isFile(data.Closingapplication)) + formData.append('Closingapplication', data.Closingapplication) + formData.append('ChangeRequest', data.ChangeRequest) + formData.append('paymentcollection', data.paymentcollection) + return request({ + url: `${AUTH_BASE_URL}/business/editCase`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 案件分页查询 export const BusinessCasemanagementdetail = (data: any) => { const formData = new FormData() @@ -46,6 +68,20 @@ export const BusinessCasemanagementdetail = (data: any) => { }) } +// 删除案件管理 +export const BusinessDeleteCase = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteCase`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 案件已收款(累加) export const BusinessAccumulate = (data: any) => { const formData = new FormData() diff --git a/src/api/calibration/conflictOfInterestSearch/index.ts b/src/api/calibration/conflictOfInterestSearch/index.ts index d822bec..aecf745 100644 --- a/src/api/calibration/conflictOfInterestSearch/index.ts +++ b/src/api/calibration/conflictOfInterestSearch/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { isFile } from '@/utils/auxiliaryFunction' const AUTH_BASE_URL = '/api2' /* @@ -26,6 +27,24 @@ export const BusinessProject = (data: any) => { }) } +// 编辑立案登记 +export const BusinessEditproject = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('times', data.times) + formData.append('responsiblefor', data.responsiblefor) + formData.append('charge', data.charge) + if (isFile(data.contract)) formData.append('contract', data.contract) + return request({ + url: `${AUTH_BASE_URL}/business/editproject`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 立案登记类型查询 export const BusinessProjectquerytype = (type: string) => { const formData = new FormData() @@ -60,3 +79,17 @@ export const BusinessProjectdetail = (data: any) => { } }) } + +// 删除立项接口 +export const BusinessDeleteProject = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteProject`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/inventoryRegistration/index.ts b/src/api/calibration/inventoryRegistration/index.ts index 3a021f3..212ac5d 100644 --- a/src/api/calibration/inventoryRegistration/index.ts +++ b/src/api/calibration/inventoryRegistration/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { isFile } from "@/utils/auxiliaryFunction"; const AUTH_BASE_URL = '/api2' /* @@ -23,6 +24,25 @@ export const BusinessWarehousing = (data: any) => { }) } +// 编辑入库登记 +export const BusinessEditWarehousing = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('unit', data.unit) + formData.append('mark', data.mark) + formData.append('lawyer', data.lawyer) + formData.append('deadline', data.deadline) + if (isFile(data.contract)) formData.append('contract', data.contract) + return request({ + url: `${AUTH_BASE_URL}/business/editWarehousing`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 入库登记 展示 export const BusinessWarehousingdetail = (data: any) => { const formData = new FormData() @@ -42,3 +62,17 @@ export const BusinessWarehousingdetail = (data: any) => { } }) } + +// 删除入库登记 +export const BusinessDeleteWarehousing = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteWarehousing`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/invoiceApplication/index.ts b/src/api/calibration/invoiceApplication/index.ts index 9947350..e287081 100644 --- a/src/api/calibration/invoiceApplication/index.ts +++ b/src/api/calibration/invoiceApplication/index.ts @@ -27,6 +27,29 @@ export const FinanceIssueInvoice = (data: any) => { }) } +// 编辑开票申请 +export const FinanceEditInvoice = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('ContractNo', data.ContractNo) + formData.append('personincharge', data.personincharge) + formData.append('amount', data.amount) + formData.append('type', data.type) + formData.append('unit', data.unit) + formData.append('number', data.number) + formData.append('address_telephone', data.address_telephone) + formData.append('bank', data.bank) + formData.append('username', data.username) + return request({ + url: `${AUTH_BASE_URL}/finance/editInvoice`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 开票分页查询 export const FinanceIssueDetail = (data: any) => { const formData = new FormData() @@ -46,3 +69,17 @@ export const FinanceIssueDetail = (data: any) => { } }) } + +// 删除开票申请 +export const FinanceDeleteInvoice = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deleteInvoice`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/lmportantScheduleManagement/index.ts b/src/api/calibration/lmportantScheduleManagement/index.ts index ddaaa14..84deede 100644 --- a/src/api/calibration/lmportantScheduleManagement/index.ts +++ b/src/api/calibration/lmportantScheduleManagement/index.ts @@ -24,6 +24,26 @@ export const BusinessSchedule = (data: any) => { }) } +// 编辑日程 +export const BusinessEditSchedule = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('title', data.title) + if (data.tiems && data.tiems.length) { + formData.append('tiems', data.tiems[0]) + formData.append('end_time', data.tiems[1]) + } + formData.append('remark', data.remark) + return request({ + url: `${AUTH_BASE_URL}/business/editSchedule`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 日程展示 export const BusinessScheduleDetail = (data: any) => { const formData = new FormData() diff --git a/src/api/calibration/paymentApplicationForm/index.ts b/src/api/calibration/paymentApplicationForm/index.ts index 77330a3..b339f96 100644 --- a/src/api/calibration/paymentApplicationForm/index.ts +++ b/src/api/calibration/paymentApplicationForm/index.ts @@ -26,6 +26,27 @@ export const FinancePaymentRequest = (data: any) => { }) } +// 编辑付款申请 +export const FinanceEditPayment = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('reason', data.reason) + formData.append('amount', data.amount) + formData.append('times', data.times) + formData.append('payee', data.payee) + formData.append('bankcard', data.bankcard) + formData.append('BankName', data.BankName) + formData.append('applicant', data.applicant) + return request({ + url: `${AUTH_BASE_URL}/finance/editPayment`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 付款申请展示 export const FinancePaymentDisplay = (data: any) => { const formData = new FormData() @@ -45,3 +66,17 @@ export const FinancePaymentDisplay = (data: any) => { } }) } + +// 删除付款申请 +export const FinanceDeletePayment = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deletePayment`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/personnelManagement/index.ts b/src/api/calibration/personnelManagement/index.ts index ebf54f5..7dc95be 100644 --- a/src/api/calibration/personnelManagement/index.ts +++ b/src/api/calibration/personnelManagement/index.ts @@ -31,7 +31,8 @@ export const UserCreateUser = (data: any) => { formData.append('password', data.password) formData.append('nation', data.nation) formData.append('IdCard', data.IdCard) - formData.append('department', data.department) + formData.append('department', JSON.stringify(data.department)) + formData.append('role', JSON.stringify(data.role)) formData.append('mobilePhone', data.mobilePhone) formData.append('position', data.position) formData.append('team', data.team) diff --git a/src/api/calibration/preRegistration/index.ts b/src/api/calibration/preRegistration/index.ts index 5713a2b..32d5f04 100644 --- a/src/api/calibration/preRegistration/index.ts +++ b/src/api/calibration/preRegistration/index.ts @@ -25,7 +25,28 @@ export const BusinessRegister = (data: any) => { }) } -// 审批分页接口 +// 编辑预立案 +export const BusinessEditRegistration = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('times', data.times) + formData.append('client_username', data.client_username) + formData.append('client_card', data.client_card) + formData.append('party_username', data.party_username) + formData.append('party_card', data.party_card) + formData.append('description', data.description) + formData.append('Undertaker', data.Undertaker) + return request({ + url: `${AUTH_BASE_URL}/business/editRegistration`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + +// 预立案登记展示 export const BusinessRegisterdetail = (data: any) => { const formData = new FormData() formData.append('page', data.pageNum) @@ -60,3 +81,17 @@ export const BusinessPreFilingLinkedCases = () => { method: 'post' }) } + +// 删除预立案登记接口 +export const BusinessDeleteRegistration = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/business/deleteRegistration`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/reimbursement/index.ts b/src/api/calibration/reimbursement/index.ts index 515df62..7c0a268 100644 --- a/src/api/calibration/reimbursement/index.ts +++ b/src/api/calibration/reimbursement/index.ts @@ -24,6 +24,25 @@ export const FinanceReimbursement = (data: any) => { }) } +// 编辑报销申请 +export const FinanceEditReimbursement = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('person', data.person) + formData.append('times', data.times) + formData.append('reason', data.reason) + formData.append('amount', data.amount) + formData.append('FeeDescription', data.FeeDescription) + return request({ + url: `${AUTH_BASE_URL}/finance/editReimbursement`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 报销展示 export const FinanceReidetail = (data: any) => { const formData = new FormData() @@ -43,3 +62,17 @@ export const FinanceReidetail = (data: any) => { } }) } + +// 删除报销申请 +export const FinanceDeleteReimbursement = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deleteReimbursement`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/revenueRecognition/index.ts b/src/api/calibration/revenueRecognition/index.ts index 42b97f1..ea7e4ee 100644 --- a/src/api/calibration/revenueRecognition/index.ts +++ b/src/api/calibration/revenueRecognition/index.ts @@ -24,6 +24,25 @@ export const FinanceConfirm = (data: any) => { }) } +// 编辑收入确认 +export const FinanceEditIncome = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('times', data.times) + formData.append('ContractNo', data.ContractNo) + formData.append('CustomerID', data.CustomerID) + formData.append('amount', data.amount) + formData.append('allocate', data.allocate) + return request({ + url: `${AUTH_BASE_URL}/finance/editIncome`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 收入确认展示 export const FinanceConfirmdisplay = (data: any) => { const formData = new FormData() @@ -43,3 +62,17 @@ export const FinanceConfirmdisplay = (data: any) => { } }) } + +// 删除收入确认 +export const FinanceDeleteIncome = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deleteIncome`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/roleManagement/index.ts b/src/api/calibration/roleManagement/index.ts index 0401af9..56ba4e9 100644 --- a/src/api/calibration/roleManagement/index.ts +++ b/src/api/calibration/roleManagement/index.ts @@ -69,7 +69,7 @@ export const BusinessDeleteRole = (id: string) => { export const BusinessModifypermissions = (data: any) => { const formData = new FormData() formData.append('id', data.id) - formData.append('permissionId', data.permissionId) + formData.append('permissionId', JSON.stringify(data.permissionId)) return request({ url: `${AUTH_BASE_URL}/business/modifypermissions`, method: 'post', @@ -79,3 +79,17 @@ export const BusinessModifypermissions = (data: any) => { } }) } + +// 根据角色查询权限 +export const BusinessGetRolePermissions = (roleId: string) => { + const formData = new FormData() + formData.append('roleId', roleId) + return request({ + url: `${AUTH_BASE_URL}/business/getRolePermissions`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/api/calibration/salaryBonusAdjustment/index.ts b/src/api/calibration/salaryBonusAdjustment/index.ts index be42fb0..d430ace 100644 --- a/src/api/calibration/salaryBonusAdjustment/index.ts +++ b/src/api/calibration/salaryBonusAdjustment/index.ts @@ -22,6 +22,23 @@ export const FinanceChange = (data: any) => { }) } +// 编辑工资/奖金变更 +export const FinanceEditBonusChange = (data: any) => { + const formData = new FormData() + formData.append('id', data.id) + formData.append('username', data.username) + formData.append('type', data.type) + formData.append('Instructions', data.Instructions) + return request({ + url: `${AUTH_BASE_URL}/finance/editBonusChange`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + // 工资/奖金变更展示 export const FinanceChangeDetail = (data: any) => { const formData = new FormData() @@ -41,3 +58,17 @@ export const FinanceChangeDetail = (data: any) => { } }) } + +// 删除工资/奖金变更 +export const FinanceDeleteBonusChange = (id: string) => { + const formData = new FormData() + formData.append('id', id) + return request({ + url: `${AUTH_BASE_URL}/finance/deleteBonusChange`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/utils/auxiliaryFunction/index.ts b/src/utils/auxiliaryFunction/index.ts index 3749d22..cb9e241 100644 --- a/src/utils/auxiliaryFunction/index.ts +++ b/src/utils/auxiliaryFunction/index.ts @@ -127,15 +127,36 @@ export function convertFilePathsToObject(filePaths: string | string[]): Array<{ // 安全的文件信息提取函数 export function getFileInfo(fileStr: string): { url: string; name: string } | null { try { - if (!fileStr || !isValidJson(fileStr)) return null - const files = convertFilePathsToObject(JSON.parse(fileStr)) - return files && files.length > 0 ? files[0] : null + if (!fileStr) return null + + // 如果是有效的JSON字符串,按原有逻辑处理 + if (isValidJson(fileStr)) { + const parsed = JSON.parse(fileStr) + const files = convertFilePathsToObject(parsed) + return files && files.length > 0 ? { url: files[0].url, name: files[0].name } : null + } + // 如果是URL字符串,直接使用 convertFilePathsToObject 处理 + else if (typeof fileStr === 'string') { + const files = convertFilePathsToObject(fileStr) + return files && files.length > 0 ? { url: files[0].url, name: files[0].name } : null + } + + return null } catch (e) { console.error('解析文件信息失败:', e) return null } } +export function deepCloneByJSON(obj: any) { + try { + return JSON.parse(JSON.stringify(obj)) + } catch (error) { + console.error('深拷贝失败:', error) + return obj + } +} + export function isString(value: any): boolean { return typeof value === 'string' } @@ -151,3 +172,36 @@ export function isValidJson(str: string): boolean { return false } } + +export function isValidFormat(data: any): boolean { + let parsedData = data + + // 如果输入是字符串,尝试解析为 JSON + if (typeof data === 'string') { + try { + parsedData = JSON.parse(data) + } catch (e) { + return false // JSON 解析失败,直接返回 false + } + } + + // 检查是否为数组 + if (!Array.isArray(parsedData)) { + return false + } + + // 检查数组中的每个元素 + return parsedData.every((item) => { + // 检查是否为对象且不为 null + if (typeof item !== 'object' || item === null) { + return false + } + + // 检查必需的属性是否存在,且类型是否正确 + const hasIndex = typeof item.index === 'number' + const hasName = typeof item.name === 'string' + const hasIdNumber = typeof item.idNumber === 'string' + + return hasIndex && hasName && hasIdNumber + }) +} diff --git a/src/utils/request.ts b/src/utils/request.ts index b0d6ef8..3b9ec30 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -80,7 +80,7 @@ httpRequest.interceptors.response.use( return Promise.reject(error) } - const { code, msg } = response.data as ApiResponse + const { code, message } = response.data as any switch (code) { case ApiCodeEnum.ACCESS_TOKEN_INVALID: @@ -91,17 +91,17 @@ httpRequest.interceptors.response.use( } else { // 未启用token刷新,直接跳转登录页 await redirectToLogin('登录已过期,请重新登录') - return Promise.reject(new Error(msg || 'Access Token Invalid')) + return Promise.reject(new Error(message || 'Access Token Invalid')) } case ApiCodeEnum.REFRESH_TOKEN_INVALID: // Refresh Token 过期,跳转登录页 await redirectToLogin('登录已过期,请重新登录') - return Promise.reject(new Error(msg || 'Refresh Token Invalid')) + return Promise.reject(new Error(message || 'Refresh Token Invalid')) default: - ElMessage.error(msg || '请求失败') - return Promise.reject(new Error(msg || 'Request Error')) + ElMessage.error(message || '请求失败') + return Promise.reject(new Error(message || 'Request Error')) } } ) diff --git a/src/views/calibration/accountAdjustmentApplication/index.vue b/src/views/calibration/accountAdjustmentApplication/index.vue index 3e17298..ada99c7 100644 --- a/src/views/calibration/accountAdjustmentApplication/index.vue +++ b/src/views/calibration/accountAdjustmentApplication/index.vue @@ -32,14 +32,6 @@
新增 - - 删除 -
编辑 @@ -118,7 +110,7 @@ - + (appStore.device === DeviceEnum.DESKTOP ? '600 // 角色表单 const formData = reactive({ + id: '', times: '', ContractNo: '', CustomerID: '', @@ -310,15 +308,17 @@ function handleSelectionChange(selection: any) { } // 打开角色弹窗 -function handleOpenDialog(roleId?: string) { +function handleOpenDialog(data: any = null) { dialog.visible = true - if (roleId) { - dialog.title = '修改角色' - RoleAPI.getFormData(roleId).then((data) => { - Object.assign(formData, data) - }) + if (data) { + dialog.title = '修改调帐申请' + if (data && Object.keys(data).length > 0) { + const data1 = deepCloneByJSON(data) + + Object.assign(formData, data1) + } } else { - dialog.title = '新增角色' + dialog.title = '新增调帐申请' } } @@ -329,7 +329,7 @@ function handleSubmit() { loading.value = true const roleId = formData.id if (roleId) { - RoleAPI.update(roleId, formData) + FinanceEditAccounts(formData) .then(() => { ElMessage.success('修改成功') handleCloseDialog() @@ -369,7 +369,7 @@ const onUserDeleteDepartment = (id: string) => { }).then( () => { loading.value = true - UserDeleteDepartment(id) + FinanceDeleteAccounts(id) .then(() => { ElMessage.success('删除成功') handleResetQuery() @@ -381,58 +381,6 @@ const onUserDeleteDepartment = (id: string) => { } ) } -// 删除角色 -function handleDelete(roleId?: number) { - const roleIds = [roleId || ids.value].join(',') - if (!roleIds) { - ElMessage.warning('请勾选删除项') - return - } - - ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then( - () => { - loading.value = true - RoleAPI.deleteByIds(roleIds) - .then(() => { - ElMessage.success('删除成功') - handleResetQuery() - }) - .finally(() => (loading.value = false)) - }, - () => { - ElMessage.info('已取消删除') - } - ) -} - -// 打开分配菜单权限弹窗 -// async function handleOpenAssignPermDialog(row: RolePageVO) { -// const roleId = row.id; -// if (roleId) { -// assignPermDialogVisible.value = true; -// loading.value = true; -// -// checkedRole.value.id = roleId; -// checkedRole.value.name = row.name; -// -// // 获取所有的菜单 -// menuPermOptions.value = await MenuAPI.getOptions(); -// -// // 回显角色已拥有的菜单 -// RoleAPI.getRoleMenuIds(roleId) -// .then((data) => { -// const checkedMenuIds = data; -// checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false)); -// }) -// .finally(() => { -// loading.value = false; -// }); -// } -// } // 分配菜单权限提交 function handleAssignPermSubmit() { diff --git a/src/views/calibration/applicationForSealApproval/components/StampingForm.vue b/src/views/calibration/applicationForSealApproval/components/StampingForm.vue index 534ba69..c4b6fd4 100644 --- a/src/views/calibration/applicationForSealApproval/components/StampingForm.vue +++ b/src/views/calibration/applicationForSealApproval/components/StampingForm.vue @@ -52,7 +52,7 @@ 点击选择文件 - + import { UserPersonneldisplay } from '@/api/calibration/personnelManagement' import { ElMessage } from 'element-plus' +import { deepCloneByJSON, getFileInfo } from '@/utils/auxiliaryFunction' + +const props = defineProps({ + newData: { + type: Object, + default: () => ({}) + } +}) const formRef = ref() // 表单数据 @@ -144,12 +152,22 @@ const DepartmentList = () => { onMounted(() => { DepartmentList() + setFormData(props.newData) }) const getForm = () => { return formData } +const setFormData = (data: any) => { + if (data && Object.keys(data).length > 0) { + const data1 = deepCloneByJSON(data) + data1.file = getFileInfo(data1.file) + + Object.assign(formData, data1) + } +} + const submit = (): Promise => { return new Promise((resolve, reject) => { formRef.value?.validate((valid: boolean) => { diff --git a/src/views/calibration/applicationForSealApproval/index.vue b/src/views/calibration/applicationForSealApproval/index.vue index fd5a156..d5f7f06 100644 --- a/src/views/calibration/applicationForSealApproval/index.vue +++ b/src/views/calibration/applicationForSealApproval/index.vue @@ -59,11 +59,7 @@