diff --git a/src/api/calibration/applicationForSealApproval/index.ts b/src/api/calibration/applicationForSealApproval/index.ts new file mode 100644 index 0000000..43049f5 --- /dev/null +++ b/src/api/calibration/applicationForSealApproval/index.ts @@ -0,0 +1,46 @@ +import request from '@/utils/request' +const AUTH_BASE_URL = '/api2' + +/* + * 申请用印 + * */ + +// 新增申请用印 +export const BusinessApplication = (data: any) => { + const formData = new FormData() + 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) + formData.append('file', data.file) + formData.append('personincharge', data.personincharge) + return request({ + url: `${AUTH_BASE_URL}/business/application`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + +// 申请用印展示 +export const BusinessApplicationdetail = (data: any) => { + const formData = new FormData() + formData.append('page', data.pageNum) + formData.append('per_page', data.pageSize) + if (data.times && data.times.length) { + formData.append('times', data.times[0]) + formData.append('end_time', data.times[1]) + } + formData.append('seal_type', data.seal_type) + return request({ + url: `${AUTH_BASE_URL}/business/applicationdetail`, + 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 new file mode 100644 index 0000000..3a021f3 --- /dev/null +++ b/src/api/calibration/inventoryRegistration/index.ts @@ -0,0 +1,44 @@ +import request from '@/utils/request' +const AUTH_BASE_URL = '/api2' + +/* + * 入库登记 + * */ + +// 新增入库登记 +export const BusinessWarehousing = (data: any) => { + const formData = new FormData() + formData.append('unit', data.unit) + formData.append('mark', data.mark) + formData.append('lawyer', data.lawyer) + formData.append('deadline', data.deadline) + formData.append('contract', data.contract) + return request({ + url: `${AUTH_BASE_URL}/business/warehousing`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} + +// 入库登记 展示 +export const BusinessWarehousingdetail = (data: any) => { + const formData = new FormData() + formData.append('page', data.pageNum) + formData.append('per_page', data.pageSize) + if (data.times && data.times.length) { + formData.append('times', data.times[0]) + formData.append('end_time', data.times[1]) + } + formData.append('unit', data.unit) + return request({ + url: `${AUTH_BASE_URL}/business/warehousingdetail`, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/src/router/index.ts b/src/router/index.ts index 942237d..c8c7dd5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -224,12 +224,11 @@ export const constantRoutes: RouteRecordRaw[] = [ title: '申请用印', icon: 'setting' }, - redirect: '/stamp/index', children: [ { - path: 'index', - name: 'StampApplicationIndex', - component: () => import('@/views/stamp-application/index.vue'), + path: 'applicationForSealApproval', + name: 'ApplicationForSealApproval', + component: () => import('@/views/calibration/applicationForSealApproval/index.vue'), meta: { title: '申请用印' } @@ -266,12 +265,11 @@ export const constantRoutes: RouteRecordRaw[] = [ title: '入库登记', icon: 'setting' }, - redirect: '/registration/index', children: [ { - path: 'index', - name: 'RegistrationIndex', - component: () => import('@/views/registration/index.vue'), + path: 'inventoryRegistration', + name: 'InventoryRegistration', + component: () => import('@/views/calibration/inventoryRegistration/index.vue'), meta: { title: '入库登记' } diff --git a/src/views/calibration/applicationForSealApproval/components/StampingForm.vue b/src/views/calibration/applicationForSealApproval/components/StampingForm.vue new file mode 100644 index 0000000..534ba69 --- /dev/null +++ b/src/views/calibration/applicationForSealApproval/components/StampingForm.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/calibration/applicationForSealApproval/index.vue b/src/views/calibration/applicationForSealApproval/index.vue new file mode 100644 index 0000000..fd5a156 --- /dev/null +++ b/src/views/calibration/applicationForSealApproval/index.vue @@ -0,0 +1,294 @@ + + + diff --git a/src/views/calibration/businessSystem/conflictOfInterestSearch/components/BusinessProjectForm.vue b/src/views/calibration/businessSystem/conflictOfInterestSearch/components/BusinessProjectForm.vue index 9621e1b..cbc3598 100644 --- a/src/views/calibration/businessSystem/conflictOfInterestSearch/components/BusinessProjectForm.vue +++ b/src/views/calibration/businessSystem/conflictOfInterestSearch/components/BusinessProjectForm.vue @@ -84,11 +84,6 @@ 点击选择文件 - - - - - @@ -99,6 +94,13 @@ import { ElMessage } from 'element-plus' import { BusinessProjectquerytype } from '@/api/calibration/conflictOfInterestSearch' import { BusinessRegistrationlist } from '@/api/calibration/preRegistration' +const props = defineProps({ + data: { + type: Object, + default: () => ({}) + } +}) + const typeList = [ { name: '法律顾问', value: '顾' }, { name: '专项服务', value: '专' }, @@ -140,7 +142,6 @@ const formRules = reactive({ function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) formRef.value.clearValidate(field) ElMessage.success('文件选择成功') } @@ -187,11 +188,39 @@ const onBusinessRegistrationlist = () => { }) } +const setFormData = (data: any) => { + if (data) { + Object.keys(formData).forEach((key) => { + if (Object.prototype.hasOwnProperty.call(data, key)) { + formData[key as keyof typeof formData] = data[key] + } + }) + } +} + onMounted(() => { onBusinessRegistrationlist() DepartmentList() + console.log(props.data) + setFormData(props.data) }) +// watch( +// () => props.data, +// (newValue) => { +// // type: '', +// // ContractNo: '', +// // times: '', +// // responsiblefor: '', +// // charge: '', +// // contract: undefined, +// // personincharge: '', +// // user_id: '' +// console.log(newValue) +// }, +// { immediate: true } +// ) + const getForm = () => { return formData } diff --git a/src/views/calibration/businessSystem/conflictOfInterestSearch/index.vue b/src/views/calibration/businessSystem/conflictOfInterestSearch/index.vue index 942af2f..742b2cc 100644 --- a/src/views/calibration/businessSystem/conflictOfInterestSearch/index.vue +++ b/src/views/calibration/businessSystem/conflictOfInterestSearch/index.vue @@ -3,7 +3,7 @@
- + - + {{ JSON.parse(row.client_username) @@ -57,7 +57,7 @@ }} - + {{ JSON.parse(row.party_username) @@ -97,7 +97,7 @@ icon="edit" size="small" link - @click="handleResetPassword(scope.row)" + @click="handleOpenDialog(scope.row)" > 编辑 @@ -127,7 +127,7 @@ row-key="id" @selection-change="handleSelectionChange" > - + {{ JSON.parse(row.client_username) @@ -143,7 +143,7 @@ }} - + {{ JSON.parse(row.party_username) @@ -338,68 +338,36 @@ function handleResetPassword(row: UserPageVO): void { }) } // ==================== 弹窗操作 ==================== -async function handleOpenDialog(): Promise { - // dialog.visible = true - // dialog.title = titleString - // - // // 并行加载下拉选项数据 - // try { - // ;[roleOptions.value, deptOptions.value] = await Promise.all([ - // RoleAPI.getOptions(), - // DeptAPI.getOptions() - // ]) - // } catch (error) { - // ElMessage.error('加载选项数据失败') - // console.error('加载选项数据失败:', error) - // } - // - // // 编辑:加载用户数据 - // if (id) { - // try { - // const data = await UserAPI.getFormData(id) - // Object.assign(formData, data) - // } catch (error) { - // ElMessage.error('加载用户数据失败') - // console.error('加载用户数据失败:', error) - // } - // } - functionDialogBox( - BusinessProjectForm, - {}, - { - title: '新增立案登记', - width: '900', - ok(value: any) { - handleSubmit(value) +function handleOpenDialog(data: any = null) { + if (data) { + functionDialogBox( + BusinessProjectForm, + { + data + }, + { + title: '编辑立案登记', + width: '900', + ok(value: any) { + handleSubmit(value) + } } - } - ) + ) + } else { + functionDialogBox( + BusinessProjectForm, + {}, + { + title: '新增立案登记', + width: '900', + ok(value: any) { + handleSubmit(value) + } + } + ) + } } async function handleOpenDialog2(): Promise { - // dialog.visible = true - // dialog.title = titleString - // - // // 并行加载下拉选项数据 - // try { - // ;[roleOptions.value, deptOptions.value] = await Promise.all([ - // RoleAPI.getOptions(), - // DeptAPI.getOptions() - // ]) - // } catch (error) { - // ElMessage.error('加载选项数据失败') - // console.error('加载选项数据失败:', error) - // } - // - // // 编辑:加载用户数据 - // if (id) { - // try { - // const data = await UserAPI.getFormData(id) - // Object.assign(formData, data) - // } catch (error) { - // ElMessage.error('加载用户数据失败') - // console.error('加载用户数据失败:', error) - // } - // } functionDialogBox( BidRegistrationForm, {}, diff --git a/src/views/calibration/businessSystem/preRegistration/index.vue b/src/views/calibration/businessSystem/preRegistration/index.vue index 6fb6905..9b5d92b 100644 --- a/src/views/calibration/businessSystem/preRegistration/index.vue +++ b/src/views/calibration/businessSystem/preRegistration/index.vue @@ -52,7 +52,7 @@ @selection-change="handleSelectionChange" > - + {{ JSON.parse(row.client_username) @@ -68,7 +68,7 @@ }} - + {{ JSON.parse(row.party_username) diff --git a/src/views/calibration/caseManagement/components/CaseInvoiceComponent/components/CaseInvoiceForm.vue b/src/views/calibration/caseManagement/components/CaseInvoiceComponent/components/CaseInvoiceForm.vue index e637eb5..f594a7b 100644 --- a/src/views/calibration/caseManagement/components/CaseInvoiceComponent/components/CaseInvoiceForm.vue +++ b/src/views/calibration/caseManagement/components/CaseInvoiceComponent/components/CaseInvoiceForm.vue @@ -48,7 +48,6 @@ const formRules = reactive({ function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) formRef.value.clearValidate(field) ElMessage.success('文件选择成功') } diff --git a/src/views/calibration/caseManagement/components/CaseLogComponent/components/CaseLogForm.vue b/src/views/calibration/caseManagement/components/CaseLogComponent/components/CaseLogForm.vue index fcee50d..b3eb17d 100644 --- a/src/views/calibration/caseManagement/components/CaseLogComponent/components/CaseLogForm.vue +++ b/src/views/calibration/caseManagement/components/CaseLogComponent/components/CaseLogForm.vue @@ -48,7 +48,6 @@ const formRules = reactive({ function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) formRef.value.clearValidate(field) ElMessage.success('文件选择成功') } diff --git a/src/views/calibration/caseManagement/components/CaseManagementForm.vue b/src/views/calibration/caseManagement/components/CaseManagementForm.vue index f749a80..5abbecd 100644 --- a/src/views/calibration/caseManagement/components/CaseManagementForm.vue +++ b/src/views/calibration/caseManagement/components/CaseManagementForm.vue @@ -146,7 +146,6 @@ const formRules = reactive({ function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) formRef.value.clearValidate(field) ElMessage.success('文件选择成功') } diff --git a/src/views/calibration/caseManagement/index.vue b/src/views/calibration/caseManagement/index.vue index 21d2db1..edee15e 100644 --- a/src/views/calibration/caseManagement/index.vue +++ b/src/views/calibration/caseManagement/index.vue @@ -91,7 +91,7 @@ - + {{ JSON.parse(row.client_username) @@ -107,7 +107,7 @@ }} - + {{ JSON.parse(row.party_username) diff --git a/src/views/calibration/departureFinancialRegistration/index.vue b/src/views/calibration/departureFinancialRegistration/index.vue index f1e500e..78fc01d 100644 --- a/src/views/calibration/departureFinancialRegistration/index.vue +++ b/src/views/calibration/departureFinancialRegistration/index.vue @@ -823,7 +823,6 @@ function handleDelete(id?: string | number): void { function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) userFormRef.value.clearValidate(field) ElMessage.success('文件选择成功') } diff --git a/src/views/calibration/inventoryRegistration/components/StampingForm.vue b/src/views/calibration/inventoryRegistration/components/StampingForm.vue new file mode 100644 index 0000000..cee8b82 --- /dev/null +++ b/src/views/calibration/inventoryRegistration/components/StampingForm.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/calibration/inventoryRegistration/index.vue b/src/views/calibration/inventoryRegistration/index.vue new file mode 100644 index 0000000..b10cb7c --- /dev/null +++ b/src/views/calibration/inventoryRegistration/index.vue @@ -0,0 +1,292 @@ + + + diff --git a/src/views/calibration/personnelManagement/index.vue b/src/views/calibration/personnelManagement/index.vue index 47780ba..27e45d0 100644 --- a/src/views/calibration/personnelManagement/index.vue +++ b/src/views/calibration/personnelManagement/index.vue @@ -877,7 +877,6 @@ function handleDelete(id?: string | number): void { function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) userFormRef.value.clearValidate(field) ElMessage.success('文件选择成功') } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index f1e500e..78fc01d 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -823,7 +823,6 @@ function handleDelete(id?: string | number): void { function handleFileSelect(file: any, field: string): void { // 将文件对象保存到表单数据中 formData[field] = file.raw // file.raw 是实际的 File 对象 - console.log(formData[field]) userFormRef.value.clearValidate(field) ElMessage.success('文件选择成功') }