diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue index d40433d..c7730a1 100644 --- a/src/views/business/subpackage/check/edit.vue +++ b/src/views/business/subpackage/check/edit.vue @@ -1,11 +1,299 @@ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue index d40433d..c7730a1 100644 --- a/src/views/business/subpackage/check/edit.vue +++ b/src/views/business/subpackage/check/edit.vue @@ -1,11 +1,299 @@ diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue index 505af0c..a759976 100644 --- a/src/views/business/subpackage/check/list.vue +++ b/src/views/business/subpackage/check/list.vue @@ -13,6 +13,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import { getListPage } from '@/api/business/subpackage/check' + const $route = useRoute() const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -112,7 +113,15 @@ }) // 新建 const add = () => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'add', + }, + query: { + title: '新建', + }, + }) } // 导出 const exportAll = () => { @@ -132,12 +141,32 @@ } // 详情 const detail = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 编辑 const update = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'edit', + id: row.id, + }, + query: { + title: '编辑', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 提交 diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue index d40433d..c7730a1 100644 --- a/src/views/business/subpackage/check/edit.vue +++ b/src/views/business/subpackage/check/edit.vue @@ -1,11 +1,299 @@ diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue index 505af0c..a759976 100644 --- a/src/views/business/subpackage/check/list.vue +++ b/src/views/business/subpackage/check/list.vue @@ -13,6 +13,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import { getListPage } from '@/api/business/subpackage/check' + const $route = useRoute() const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -112,7 +113,15 @@ }) // 新建 const add = () => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'add', + }, + query: { + title: '新建', + }, + }) } // 导出 const exportAll = () => { @@ -132,12 +141,32 @@ } // 详情 const detail = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 编辑 const update = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'edit', + id: row.id, + }, + query: { + title: '编辑', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 提交 diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue index 8db29fe..be7703f 100644 --- a/src/views/business/subpackage/record/edit.vue +++ b/src/views/business/subpackage/record/edit.vue @@ -1,11 +1,347 @@ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue index d40433d..c7730a1 100644 --- a/src/views/business/subpackage/check/edit.vue +++ b/src/views/business/subpackage/check/edit.vue @@ -1,11 +1,299 @@ diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue index 505af0c..a759976 100644 --- a/src/views/business/subpackage/check/list.vue +++ b/src/views/business/subpackage/check/list.vue @@ -13,6 +13,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import { getListPage } from '@/api/business/subpackage/check' + const $route = useRoute() const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -112,7 +113,15 @@ }) // 新建 const add = () => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'add', + }, + query: { + title: '新建', + }, + }) } // 导出 const exportAll = () => { @@ -132,12 +141,32 @@ } // 详情 const detail = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 编辑 const update = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'edit', + id: row.id, + }, + query: { + title: '编辑', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 提交 diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue index 8db29fe..be7703f 100644 --- a/src/views/business/subpackage/record/edit.vue +++ b/src/views/business/subpackage/record/edit.vue @@ -1,11 +1,347 @@ diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue index 209a440..126ad4e 100644 --- a/src/views/business/subpackage/record/list.vue +++ b/src/views/business/subpackage/record/list.vue @@ -3,7 +3,7 @@ import type { Ref } from 'vue' import { ElLoading, ElMessage } from 'element-plus' import type { DateModelType } from 'element-plus' -import type { IListQueryRecord } from '../subpackage-interface' +import type { IListQueryRecord, IRecordList } from '../subpackage-interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' @@ -50,12 +50,12 @@ loadingTable.value = false getListPage(listQuery.value).then((response) => { list.value = response.data.rows - let interfaceStr = '' - for (const key in response.data.rows[0]) { - const item = response.data.rows[0][key] - interfaceStr += `${key}:${typeof (item)}\n` - } - console.log(interfaceStr) + // let interfaceStr = '' + // for (const key in response.data.rows[0]) { + // const item = response.data.rows[0][key] + // interfaceStr += `${key}:${typeof (item)}\n` + // } + // console.log(interfaceStr) total.value = parseInt(response.data.total) loadingTable.value = false }) @@ -70,7 +70,7 @@ listQuery.value = { businessSize: '', // evaluation: '', - formId: '', + formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id grade: '', outsourcerName: '', outsourcerNo: '', @@ -96,8 +96,17 @@ } // 详情 -const handleDetail = (row) => { - +const handleDetail = (row: IRecordList) => { + $router.push({ + name: 'subpackageArchivesDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + }, + }) } onMounted(async () => { diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 6b492f0..be78584 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -318,7 +318,7 @@ { path: 'subpackage/archives/detail/:id?', name: 'subpackageArchivesDetail', - component: () => import('@/views/business/subpackage/check/edit.vue'), + component: () => import('@/views/business/subpackage/record/edit.vue'), meta: { title: '分包方档案', icon: 'ep:key', diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue index 2465a3e..74990a4 100644 --- a/src/views/business/subpackage/apply/edit.vue +++ b/src/views/business/subpackage/apply/edit.vue @@ -6,8 +6,10 @@ import { filter } from 'lodash' import type { IApplyDetail, IDetailList } from '../subpackage-interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { detail } from '@/api/business/subpackage/check' +import { detail } from '@/api/business/subpackage/apply' import { fetchApproval, submitApproval } from '@/api/approval' +import showPhoto from '@/views/system/tool/showPhoto.vue' + const $route = useRoute() const $router = useRouter() const query = $route.query @@ -62,7 +64,7 @@ { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'orderCode', align: 'center' }, { text: '委托书编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托单位', value: 'usePersonName', align: 'center' }, + { text: '委托单位', value: 'customerName', align: 'center' }, ]) const getDetail = () => { @@ -106,7 +108,7 @@ // 创建formdata对象 const fd = new FormData() fd.append('multipartFile', event.target.files[0]) - detailForm.value.applyMinioFileName = event.target.files[0] + detailForm.value.applyMinioFileName = event.target.files[0].name // UploadFile(fd).then((res) => { // if (res.code === 200) { // sampleForm.value.minioFileName = res.data[0] @@ -278,15 +280,14 @@ - - - 上传 - -
- -
无 +
+ +
+ + {{ detailForm.applyMinioFileName ? '更换' : '上传' }} + diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 0f0e5be..9cca21e 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { detail, getListPage } from '@/api/business/subpackage/apply' +import { getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $route = useRoute() const $router = useRouter() @@ -132,7 +132,6 @@ } // 详情 -// eslint-disable-next-line @typescript-eslint/no-redeclare, no-import-assign const detail = (row: IApplyList) => { $router.push({ name: 'subpackageApplyDetail', diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue index d40433d..c7730a1 100644 --- a/src/views/business/subpackage/check/edit.vue +++ b/src/views/business/subpackage/check/edit.vue @@ -1,11 +1,299 @@ diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue index 505af0c..a759976 100644 --- a/src/views/business/subpackage/check/list.vue +++ b/src/views/business/subpackage/check/list.vue @@ -13,6 +13,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import { getListPage } from '@/api/business/subpackage/check' + const $route = useRoute() const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -112,7 +113,15 @@ }) // 新建 const add = () => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'add', + }, + query: { + title: '新建', + }, + }) } // 导出 const exportAll = () => { @@ -132,12 +141,32 @@ } // 详情 const detail = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 编辑 const update = (row: IApplyList) => { - + $router.push({ + name: 'subpackageCheckDetail', + params: { + type: 'edit', + id: row.id, + }, + query: { + title: '编辑', + approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string, + }, + }) } // 提交 diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue index 8db29fe..be7703f 100644 --- a/src/views/business/subpackage/record/edit.vue +++ b/src/views/business/subpackage/record/edit.vue @@ -1,11 +1,347 @@ diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue index 209a440..126ad4e 100644 --- a/src/views/business/subpackage/record/list.vue +++ b/src/views/business/subpackage/record/list.vue @@ -3,7 +3,7 @@ import type { Ref } from 'vue' import { ElLoading, ElMessage } from 'element-plus' import type { DateModelType } from 'element-plus' -import type { IListQueryRecord } from '../subpackage-interface' +import type { IListQueryRecord, IRecordList } from '../subpackage-interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' @@ -50,12 +50,12 @@ loadingTable.value = false getListPage(listQuery.value).then((response) => { list.value = response.data.rows - let interfaceStr = '' - for (const key in response.data.rows[0]) { - const item = response.data.rows[0][key] - interfaceStr += `${key}:${typeof (item)}\n` - } - console.log(interfaceStr) + // let interfaceStr = '' + // for (const key in response.data.rows[0]) { + // const item = response.data.rows[0][key] + // interfaceStr += `${key}:${typeof (item)}\n` + // } + // console.log(interfaceStr) total.value = parseInt(response.data.total) loadingTable.value = false }) @@ -70,7 +70,7 @@ listQuery.value = { businessSize: '', // evaluation: '', - formId: '', + formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id grade: '', outsourcerName: '', outsourcerNo: '', @@ -96,8 +96,17 @@ } // 详情 -const handleDetail = (row) => { - +const handleDetail = (row: IRecordList) => { + $router.push({ + name: 'subpackageArchivesDetail', + params: { + type: 'detail', + id: row.id, + }, + query: { + title: '详情', + }, + }) } onMounted(async () => { diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts index d330f41..5d8eb91 100644 --- a/src/views/business/subpackage/subpackage-interface.ts +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -132,3 +132,79 @@ offset: number limit: number } + +// 分包方档案row参数 +export interface IRecordList { + addressAreaName: string // 公司地址-区 + addressCityName: string // 公司地址-市 + addressCountryName: string // 公司地址-国家 + addressProvinceName: string // 公司地址-省 + approvalStatus: string // 审批状态类型-字典code + approvalStatusName: string // 审批状态类型-字典value + businessContent: string // 业务内容 + businessSize: string // 业务规模-字典code + businessSizeName: string // 业务规模-字典value + createTime: string // 创建时间 + decisionItem: string | number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示） + evaluation: string // 整体评价-字典code + evaluationName: string // 整体评价-字典value + fullAddress: string // 公司地址-详细地址 + grade: string // 履约评级-字典code + gradeName: string // 履约评级-字典value + id: string | number // 主键id + outsourcerName: string // 分包方公司名字 + outsourcerNo: string // 分包方编号 + outsourcerSize: string // 分包方公司规模 + processId: string // 流程实例id + taskId: string // 任务id（同意、驳回等操作使用） +} + +// 分包方档案详情参数 +export interface IRecordDetail { + addressArea: string // 公司地址-区编码 + addressAreaName: string // 公司地址-区 + addressCity: string // 公司地址-市编码 + addressCityName: string // 公司地址-市 + addressCountry: string // 公司地址-国家编码 + addressCountryName: string // 公司地址-国家 + addressProvince: string // 公司地址-省编码 + addressProvinceName: string // 公司地址-省 + bankAccount: string // 银行账户名 + bankAccountNumber: string // 银行账号 + bankName: string // 银行名称 + businessContent: string // 业务内容 + businessScope: string // 公司业务范围 + businessSize: string // 业务规模-字典code + businessSizeName: string // 业务规模-字典value + createTime: string // 创建时间（列表接口返回参数） + director: string // 负责人 + email: string // 邮箱 + evaluation: string // 整体评价-字典code + evaluationName: string // 整体评价-字典value + fullAddress: string // 公司地址-详细地址 + grade: string // 履约评级-字典code + gradeName: string // 履约评级-字典value + id: string | number // 主键id（列表、更新、详情接口参数） + invoiceArea: string // 开票地址-区编码 + invoiceAreaName: string // 开票地址-区 + invoiceCity: string // 开票地址-市编码 + invoiceCityName: string // 开票地址-市 + invoiceCountry: string // 开票地址-国家编码 + invoiceCountryName: string // 开票地址-国家 + invoiceFullAddress: string // 开票地址-详细地址 + invoiceProvince: string // 开票地址-省编码 + invoiceProvinceName: string // 开票地址-省 + minioFileName: string // minio存储文件名 + mobile: string // 手机 + outsourcerBriefName: string // 公司简称 + outsourcerName: string // 公司名称 + outsourcerNo: string // 分包方编号 + outsourcerSize: string // 公司规模-字典code + outsourcerSizeName: string // 公司规模-字典value + phone: string // 电话 + postalCode: string // 邮编 + processId: string // 流程实例id（未通过编辑接口必传参数） + remark: string // 备注 + taxNumber: string // 税号 + website: string // 网址 +}