diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts new file mode 100644 index 0000000..2ace8d1 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts @@ -0,0 +1,17 @@ +// 筛选数据 +export interface IListQuery { + deptId: string // 部门id + staffId: string // 人员id + startTime: string // 开始时间 + endTime: string // 结束时间 +} + +// 表格 +export interface IList { + id: string // 主键 + deptName: string // 部门 + staffName: string // 人员 + samples: string // 检完样品数量 + certificates: string // 出具证书数量 + outPut: string // 产值统计(单位分) +} diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts new file mode 100644 index 0000000..2ace8d1 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts @@ -0,0 +1,17 @@ +// 筛选数据 +export interface IListQuery { + deptId: string // 部门id + staffId: string // 人员id + startTime: string // 开始时间 + endTime: string // 结束时间 +} + +// 表格 +export interface IList { + id: string // 主键 + deptName: string // 部门 + staffName: string // 人员 + samples: string // 检完样品数量 + certificates: string // 出具证书数量 + outPut: string // 产值统计(单位分) +} diff --git a/src/views/business/board/depOutputAnalysis/list.vue b/src/views/business/board/depOutputAnalysis/list.vue new file mode 100644 index 0000000..1b15465 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/list.vue @@ -0,0 +1,278 @@ + + + + + + diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts new file mode 100644 index 0000000..2ace8d1 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts @@ -0,0 +1,17 @@ +// 筛选数据 +export interface IListQuery { + deptId: string // 部门id + staffId: string // 人员id + startTime: string // 开始时间 + endTime: string // 结束时间 +} + +// 表格 +export interface IList { + id: string // 主键 + deptName: string // 部门 + staffName: string // 人员 + samples: string // 检完样品数量 + certificates: string // 出具证书数量 + outPut: string // 产值统计(单位分) +} diff --git a/src/views/business/board/depOutputAnalysis/list.vue b/src/views/business/board/depOutputAnalysis/list.vue new file mode 100644 index 0000000..1b15465 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/list.vue @@ -0,0 +1,278 @@ + + + + + + diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts index 7c33972..461c825 100644 --- a/src/views/business/board/jobAccount/jobAccount-interface.ts +++ b/src/views/business/board/jobAccount/jobAccount-interface.ts @@ -1,6 +1,14 @@ // 表格 export interface IList { - + organizeName: string // 检测实验室 + organizeNo: string// 实验室代码 + samplesCompletedToday: string// 当日检测完样品 + certificatesToday: string// 当日检定员出具证书数 + expireSamplesToday: string// 当日到期样品数 + samplesYear: string// 今年样品数 + expireSamplesYear: string// 今年超期样品总数 + inMeasureExpireSamplesYear: string// 今年超期样品总数-检测中 + expireRate: string// 超期率 } export interface IListQuery { diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts new file mode 100644 index 0000000..2ace8d1 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts @@ -0,0 +1,17 @@ +// 筛选数据 +export interface IListQuery { + deptId: string // 部门id + staffId: string // 人员id + startTime: string // 开始时间 + endTime: string // 结束时间 +} + +// 表格 +export interface IList { + id: string // 主键 + deptName: string // 部门 + staffName: string // 人员 + samples: string // 检完样品数量 + certificates: string // 出具证书数量 + outPut: string // 产值统计(单位分) +} diff --git a/src/views/business/board/depOutputAnalysis/list.vue b/src/views/business/board/depOutputAnalysis/list.vue new file mode 100644 index 0000000..1b15465 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/list.vue @@ -0,0 +1,278 @@ + + + + + + diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts index 7c33972..461c825 100644 --- a/src/views/business/board/jobAccount/jobAccount-interface.ts +++ b/src/views/business/board/jobAccount/jobAccount-interface.ts @@ -1,6 +1,14 @@ // 表格 export interface IList { - + organizeName: string // 检测实验室 + organizeNo: string// 实验室代码 + samplesCompletedToday: string// 当日检测完样品 + certificatesToday: string// 当日检定员出具证书数 + expireSamplesToday: string// 当日到期样品数 + samplesYear: string// 今年样品数 + expireSamplesYear: string// 今年超期样品总数 + inMeasureExpireSamplesYear: string// 今年超期样品总数-检测中 + expireRate: string// 超期率 } export interface IListQuery { diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue index 200d601..5a329bc 100644 --- a/src/views/business/board/standardReminder/list.vue +++ b/src/views/business/board/standardReminder/list.vue @@ -1,4 +1,4 @@ - + diff --git a/src/api/business/board/depOutputAnalysis.ts b/src/api/business/board/depOutputAnalysis.ts new file mode 100644 index 0000000..7be89b6 --- /dev/null +++ b/src/api/business/board/depOutputAnalysis.ts @@ -0,0 +1,23 @@ +// 部门产值分析 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/depOutputAnalysis/depOutputAnalysis-interface' + +// 部门产值分析列表 +export function getDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput', + method: 'post', + data, + }) +} + +// 部门产值分析导出 +export function exportDepOutputAnalysisList(data: IListQuery) { + return request({ + url: '/business/board/deptOutput/export', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index cf4a5b9..c58c57b 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -103,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - // { - // path: 'departmentalOutputAnalysis', - // name: 'JobAccountList', - // component: () => import('@/views/business/board/jobAccount/list.vue'), - // meta: { - // title: '部门产值分析', - // icon: 'ep:key', - // auth: '/business/board/departmentalOutputAnalysis', - // }, - // }, + { + path: 'departmentalOutputAnalysis', + name: 'DepartmentalOutputAnalysis', + component: () => import('@/views/business/board/depOutputAnalysis/list.vue'), + meta: { + title: '部门产值分析', + icon: 'ep:key', + auth: '/business/board/departmentalOutputAnalysis', + }, + }, ], }, { diff --git a/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts new file mode 100644 index 0000000..2ace8d1 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/depOutputAnalysis-interface.ts @@ -0,0 +1,17 @@ +// 筛选数据 +export interface IListQuery { + deptId: string // 部门id + staffId: string // 人员id + startTime: string // 开始时间 + endTime: string // 结束时间 +} + +// 表格 +export interface IList { + id: string // 主键 + deptName: string // 部门 + staffName: string // 人员 + samples: string // 检完样品数量 + certificates: string // 出具证书数量 + outPut: string // 产值统计(单位分) +} diff --git a/src/views/business/board/depOutputAnalysis/list.vue b/src/views/business/board/depOutputAnalysis/list.vue new file mode 100644 index 0000000..1b15465 --- /dev/null +++ b/src/views/business/board/depOutputAnalysis/list.vue @@ -0,0 +1,278 @@ + + + + + + diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts index 7c33972..461c825 100644 --- a/src/views/business/board/jobAccount/jobAccount-interface.ts +++ b/src/views/business/board/jobAccount/jobAccount-interface.ts @@ -1,6 +1,14 @@ // 表格 export interface IList { - + organizeName: string // 检测实验室 + organizeNo: string// 实验室代码 + samplesCompletedToday: string// 当日检测完样品 + certificatesToday: string// 当日检定员出具证书数 + expireSamplesToday: string// 当日到期样品数 + samplesYear: string// 今年样品数 + expireSamplesYear: string// 今年超期样品总数 + inMeasureExpireSamplesYear: string// 今年超期样品总数-检测中 + expireRate: string// 超期率 } export interface IListQuery { diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue index 200d601..5a329bc 100644 --- a/src/views/business/board/standardReminder/list.vue +++ b/src/views/business/board/standardReminder/list.vue @@ -1,4 +1,4 @@ - + diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 142db45..34f15a0 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -43,6 +43,7 @@ const certificationsMap = ref([]) // 证书类别 const powerVoltageMap = ref([]) // 电源电压 const isUrgentMap = ref([]) // 是否加急 +const sampleStatusMap = ref([]) as any// 样品状态 const customerInfoMap = ref([]) // 系统字典--航天计量检测技术(江苏)有限公司基本信息 const list = ref([])// 表格数据 @@ -55,6 +56,7 @@ { text: '型号', value: 'sampleModel', align: 'center', required: true }, { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true }, { text: '电源电压', value: 'powerVoltage', align: 'center', required: true }, + { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true }, { text: '附件说明', value: 'appendixDescn', align: 'center' }, { text: '备注', value: 'remark', align: 'center' }, { text: '检定项目', value: 'measureContent', align: 'center' }, @@ -117,6 +119,12 @@ } }) }) + // 样品状态 + getDictByCode('sampleStatus').then((response) => { + response.data.forEach((item: dictType) => { + sampleStatusMap.value[`${item.value}`] = item.name + }) + }) // 系统字典 getDictByCode('systemDict').then((response) => { const tempMap = response.data.map((item: dictType) => { @@ -143,7 +151,6 @@ customerInfoMap.value = tempMap }) } -getDict() // 点击选择 const customerNoFocus = () => { @@ -373,14 +380,22 @@ getOrderDetail({ id: infoId.value }).then((res) => { dataForm.value = res.data dataForm.value.phone = res.data.customerPhone - list.value = res.data.customerSampleInfoList + list.value = res.data.customerSampleInfoList.map((item: any) => { + return { + ...item, + sampleStatusName: item.sampleStatus ? sampleStatusMap.value[item.sampleStatus] : '', + } + }) }) } -// 非添加页面获取详情 -if (pageType.value !== 'add') { - getInfo() -} +onMounted(async () => { + await getDict() + // 非添加页面获取详情 + if (pageType.value !== 'add') { + getInfo() + } +})