diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 7402e46..8666957 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -61,17 +61,17 @@ // 表头 const columns = ref([ - { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' }, + { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, - { text: '型号', value: 'sampleModel', align: 'center' }, - { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, - { text: '委托方代码', value: 'customerNo', align: 'center' }, - { text: '委托方名称', value: 'customerName', align: 'center' }, - { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, - { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, - { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '型号', value: 'sampleModel', align: 'center', width: '100' }, + { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' }, + { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' }, + { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' }, + { text: '委托方名称', value: 'customerName', align: 'center', width: '100' }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, + { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' }, + { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 7402e46..8666957 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -61,17 +61,17 @@ // 表头 const columns = ref([ - { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' }, + { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, - { text: '型号', value: 'sampleModel', align: 'center' }, - { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, - { text: '委托方代码', value: 'customerNo', align: 'center' }, - { text: '委托方名称', value: 'customerName', align: 'center' }, - { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, - { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, - { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '型号', value: 'sampleModel', align: 'center', width: '100' }, + { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' }, + { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' }, + { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' }, + { text: '委托方名称', value: 'customerName', align: 'center', width: '100' }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, + { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' }, + { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index b302245..caeeae4 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -138,6 +138,9 @@ requireOverTime: string // 预计检完时间 mesureContent: string // 检定项目 remark: string // 备注 + measureType?: string // 校验类别专业 + certificateReportCode?: string // 证书编号 + certificateReportName?: string // 证书名称 } // 证书导出 diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 7402e46..8666957 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -61,17 +61,17 @@ // 表头 const columns = ref([ - { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' }, + { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, - { text: '型号', value: 'sampleModel', align: 'center' }, - { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, - { text: '委托方代码', value: 'customerNo', align: 'center' }, - { text: '委托方名称', value: 'customerName', align: 'center' }, - { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, - { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, - { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '型号', value: 'sampleModel', align: 'center', width: '100' }, + { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' }, + { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' }, + { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' }, + { text: '委托方名称', value: 'customerName', align: 'center', width: '100' }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, + { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' }, + { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index b302245..caeeae4 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -138,6 +138,9 @@ requireOverTime: string // 预计检完时间 mesureContent: string // 检定项目 remark: string // 备注 + measureType?: string // 校验类别专业 + certificateReportCode?: string // 证书编号 + certificateReportName?: string // 证书名称 } // 证书导出 diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue index 2a9e394..00c899e 100644 --- a/src/views/business/schedule/certPrint/certDetail.vue +++ b/src/views/business/schedule/certPrint/certDetail.vue @@ -106,7 +106,6 @@ getSelectList('standardLevel') // 获取标准等级下拉框 getSelectList('transmitRange') // 获取传递范围下拉框 getSelectList('standardCategory') // 获取类别下拉框 -const approvalDialog = ref() const params = ref({ director: '', meterMajor: '', @@ -120,81 +119,8 @@ limit: 999999, }) -// 数据 -const list = ref([]) -// 标准配套设备更换表格总数 -const total = ref(0) - -// 所用设备列表 -const deviceList = ref([]) -// 标准装置列表 -const standardDeviceList = ref([]) -// 文件列表 -const fileList = ref([]) - -// 标准配套设备表头类型 -interface columnsType { - text: string - value: string - align: string - required: Boolean - choose: Boolean - time: Boolean -} - -// 标准配套设备更换表头 -const columns = ref([ - { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false }, - { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false }, - { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false }, - { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false }, - { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false }, -]) -// 标准配套设备更换查询条件 -const listQuery = ref({ - limit: 10, - offset: 1, -}) -// 标准配套设备更换表格loding -const loadingTable = ref(false) -// 申请文档表头 -const columnsFiles = ref([ - { - text: '文件编号', - value: 'fileName', - align: 'center', - required: true, - choose: true, - time: false, - }, - { - text: '文件名称', - value: 'createTime', - align: 'center', - required: true, - choose: false, - time: true, - }, - { - text: '文件代号', - value: 'remark', - align: 'center', - required: true, - time: false, - choose: false, - }, -]) -// 添加表格数据对象 -const addList = ref({}) // 添加表格弹窗开关 const dialogVisible = ref(false) -// 选择标准装置数据列表下拉框类型 -interface standardListType { - id: string - standardName: string -} -// 选择标准装置数据列表下拉框 -const standardList = ref([]) // 初始化路由 const $router = useRouter() // 关闭 @@ -210,52 +136,51 @@ // 获取详情信息 const getInfo = (id: string | number) => { -// dataForm.value = { -// "approvalStatus": "2", -// "certificateReportCategory": "1,2", -// "certificateReportCode": "RIM202303002", -// "certificateReportFile": "", -// "certificateReportName": "证书报告名称03", -// "certificateReportType": "1", -// "createTime": "2023-03-14T18:28:41", -// "createUser": "1", -// "customerAddress": "ewfewfe ", -// "customerEmail": "", -// "customerName": "京东集团", -// "customerNo": "wtsc202302080001", -// "customerPhone": "950618", -// "deliverer": "张三", -// "delivererId": "1", -// "delivererTel": "113652204", -// "id": "154524246245210210", -// "isDel": false, -// "measureContent": "项目4", -// "measureDeptId": "", -// "measurePersonId": "1", -// "measureType": "2", -// "orderId": "1623234926190817282", -// "originalRecordId": "1625802150301368321", -// "originalRecordName": "", -// "planDeliverTime": "2022-11-29T21:14:50", -// "printNum": 0, -// "printStatus": "1", -// "processId": "", -// "remark": "", -// "requireOverTime": "2023-01-29T21:14:50", -// "sampleId": "1625742343335677953", -// "sampleName": "测试4", -// "sampleNo": "", -// "signId": "", -// "templateId": "" -// } - // certificatePrintDetail({ id }).then(res => { - // dataForm.value = res.data; - // }) + // 详情页面待确认 TODO + // dataForm.value = { + // approvalStatus: '2', + // certificateReportCategory: '1,2', + // certificateReportCode: 'RIM202303002', + // certificateReportFile: '', + // certificateReportName: '证书报告名称03', + // certificateReportType: '1', + // createTime: '2023-03-14T18:28:41', + // createUser: '1', + // customerAddress: 'ewfewfe ', + // customerEmail: '', + // customerName: '京东集团', + // customerNo: 'wtsc202302080001', + // customerPhone: '950618', + // deliverer: '张三', + // delivererId: '1', + // delivererTel: '113652204', + // id: '154524246245210210', + // isDel: false, + // measureContent: '项目4', + // measureDeptId: '', + // measurePersonId: '1', + // measureType: '2', + // orderId: '1623234926190817282', + // originalRecordId: '1625802150301368321', + // originalRecordName: '', + // planDeliverTime: '2022-11-29T21:14:50', + // printNum: 0, + // printStatus: '1', + // processId: '', + // remark: '', + // requireOverTime: '2023-01-29T21:14:50', + // sampleId: '1625742343335677953', + // sampleName: '测试4', + // sampleNo: '', + // signId: '', + // templateId: '', + // } + certificatePrintDetail({ id }).then((res) => { + dataForm.value = res.data + dataForm.value.createTime = res.data.createTime.split('T')[0] + }) } -// 保存后的id -const addId = ref('') - // 打印证书 const printCert = () => { @@ -285,11 +210,6 @@ fileRef.value.click() } -// 点击关闭 -const handleClose = () => { - dialogVisible.value = false -} - onMounted(() => { if ($route.params && $route.params.id) { infoId.value = $route.query.id as string @@ -324,7 +244,7 @@ @@ -333,13 +253,13 @@ - + @@ -347,7 +267,7 @@ @@ -355,6 +275,7 @@ + @@ -509,21 +430,6 @@ - - - - - - - - - - - - diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 7402e46..8666957 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -61,17 +61,17 @@ // 表头 const columns = ref([ - { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' }, + { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, - { text: '型号', value: 'sampleModel', align: 'center' }, - { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, - { text: '委托方代码', value: 'customerNo', align: 'center' }, - { text: '委托方名称', value: 'customerName', align: 'center' }, - { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, - { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, - { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '型号', value: 'sampleModel', align: 'center', width: '100' }, + { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' }, + { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' }, + { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' }, + { text: '委托方名称', value: 'customerName', align: 'center', width: '100' }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, + { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' }, + { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index b302245..caeeae4 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -138,6 +138,9 @@ requireOverTime: string // 预计检完时间 mesureContent: string // 检定项目 remark: string // 备注 + measureType?: string // 校验类别专业 + certificateReportCode?: string // 证书编号 + certificateReportName?: string // 证书名称 } // 证书导出 diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue index 2a9e394..00c899e 100644 --- a/src/views/business/schedule/certPrint/certDetail.vue +++ b/src/views/business/schedule/certPrint/certDetail.vue @@ -106,7 +106,6 @@ getSelectList('standardLevel') // 获取标准等级下拉框 getSelectList('transmitRange') // 获取传递范围下拉框 getSelectList('standardCategory') // 获取类别下拉框 -const approvalDialog = ref() const params = ref({ director: '', meterMajor: '', @@ -120,81 +119,8 @@ limit: 999999, }) -// 数据 -const list = ref([]) -// 标准配套设备更换表格总数 -const total = ref(0) - -// 所用设备列表 -const deviceList = ref([]) -// 标准装置列表 -const standardDeviceList = ref([]) -// 文件列表 -const fileList = ref([]) - -// 标准配套设备表头类型 -interface columnsType { - text: string - value: string - align: string - required: Boolean - choose: Boolean - time: Boolean -} - -// 标准配套设备更换表头 -const columns = ref([ - { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false }, - { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false }, - { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false }, - { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false }, - { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false }, -]) -// 标准配套设备更换查询条件 -const listQuery = ref({ - limit: 10, - offset: 1, -}) -// 标准配套设备更换表格loding -const loadingTable = ref(false) -// 申请文档表头 -const columnsFiles = ref([ - { - text: '文件编号', - value: 'fileName', - align: 'center', - required: true, - choose: true, - time: false, - }, - { - text: '文件名称', - value: 'createTime', - align: 'center', - required: true, - choose: false, - time: true, - }, - { - text: '文件代号', - value: 'remark', - align: 'center', - required: true, - time: false, - choose: false, - }, -]) -// 添加表格数据对象 -const addList = ref({}) // 添加表格弹窗开关 const dialogVisible = ref(false) -// 选择标准装置数据列表下拉框类型 -interface standardListType { - id: string - standardName: string -} -// 选择标准装置数据列表下拉框 -const standardList = ref([]) // 初始化路由 const $router = useRouter() // 关闭 @@ -210,52 +136,51 @@ // 获取详情信息 const getInfo = (id: string | number) => { -// dataForm.value = { -// "approvalStatus": "2", -// "certificateReportCategory": "1,2", -// "certificateReportCode": "RIM202303002", -// "certificateReportFile": "", -// "certificateReportName": "证书报告名称03", -// "certificateReportType": "1", -// "createTime": "2023-03-14T18:28:41", -// "createUser": "1", -// "customerAddress": "ewfewfe ", -// "customerEmail": "", -// "customerName": "京东集团", -// "customerNo": "wtsc202302080001", -// "customerPhone": "950618", -// "deliverer": "张三", -// "delivererId": "1", -// "delivererTel": "113652204", -// "id": "154524246245210210", -// "isDel": false, -// "measureContent": "项目4", -// "measureDeptId": "", -// "measurePersonId": "1", -// "measureType": "2", -// "orderId": "1623234926190817282", -// "originalRecordId": "1625802150301368321", -// "originalRecordName": "", -// "planDeliverTime": "2022-11-29T21:14:50", -// "printNum": 0, -// "printStatus": "1", -// "processId": "", -// "remark": "", -// "requireOverTime": "2023-01-29T21:14:50", -// "sampleId": "1625742343335677953", -// "sampleName": "测试4", -// "sampleNo": "", -// "signId": "", -// "templateId": "" -// } - // certificatePrintDetail({ id }).then(res => { - // dataForm.value = res.data; - // }) + // 详情页面待确认 TODO + // dataForm.value = { + // approvalStatus: '2', + // certificateReportCategory: '1,2', + // certificateReportCode: 'RIM202303002', + // certificateReportFile: '', + // certificateReportName: '证书报告名称03', + // certificateReportType: '1', + // createTime: '2023-03-14T18:28:41', + // createUser: '1', + // customerAddress: 'ewfewfe ', + // customerEmail: '', + // customerName: '京东集团', + // customerNo: 'wtsc202302080001', + // customerPhone: '950618', + // deliverer: '张三', + // delivererId: '1', + // delivererTel: '113652204', + // id: '154524246245210210', + // isDel: false, + // measureContent: '项目4', + // measureDeptId: '', + // measurePersonId: '1', + // measureType: '2', + // orderId: '1623234926190817282', + // originalRecordId: '1625802150301368321', + // originalRecordName: '', + // planDeliverTime: '2022-11-29T21:14:50', + // printNum: 0, + // printStatus: '1', + // processId: '', + // remark: '', + // requireOverTime: '2023-01-29T21:14:50', + // sampleId: '1625742343335677953', + // sampleName: '测试4', + // sampleNo: '', + // signId: '', + // templateId: '', + // } + certificatePrintDetail({ id }).then((res) => { + dataForm.value = res.data + dataForm.value.createTime = res.data.createTime.split('T')[0] + }) } -// 保存后的id -const addId = ref('') - // 打印证书 const printCert = () => { @@ -285,11 +210,6 @@ fileRef.value.click() } -// 点击关闭 -const handleClose = () => { - dialogVisible.value = false -} - onMounted(() => { if ($route.params && $route.params.id) { infoId.value = $route.query.id as string @@ -324,7 +244,7 @@ @@ -333,13 +253,13 @@ - + @@ -347,7 +267,7 @@ @@ -355,6 +275,7 @@ + @@ -509,21 +430,6 @@ - - - - - - - - - - - - diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..adc67e0 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -3,8 +3,8 @@ import { getCurrentInstance, ref } from 'vue' import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' // import { Row } from 'element-plus/es/components/table-v2/src/components' -import VuePdfEmbed from 'vue-pdf-embed' -import * as pdfjsLib from 'pdfjs-dist' +// import VuePdfEmbed from 'vue-pdf-embed' +// import * as pdfjsLib from 'pdfjs-dist' import type { ICerPrintList, ICertPrintSearch } from './cert-interface' import ApprovalDialogPart from './components/ApprovalDialogPart.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts index 3a258c8..c7bf1be 100644 --- a/src/api/customer/customer.ts +++ b/src/api/customer/customer.ts @@ -68,18 +68,18 @@ } // 根据客户查样品id -export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) { +export function getSampleByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/sampleRecords', method: 'post', data, }) } // 根据客户查合同记录 -export function getContractByCustomer(data: { id: string; offset: number; limit: number }) { +export function getContractByCustomer(data: { id: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/customer/contractRecords', method: 'post', data, }) @@ -88,15 +88,15 @@ // 根据客户查检定记录 export function getOrderByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: '/customer/fake/interface', + url: '/customer/sample/measureRecordsById', method: 'post', data, }) } -// -export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) { +// 检定证书 +export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) { return request({ - url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`, + url: '/business/certificateReport/certificateRecordsById', method: 'post', data, }) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 7402e46..8666957 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -61,17 +61,17 @@ // 表头 const columns = ref([ - { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' }, + { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, - { text: '型号', value: 'sampleModel', align: 'center' }, - { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, - { text: '委托方代码', value: 'customerNo', align: 'center' }, - { text: '委托方名称', value: 'customerName', align: 'center' }, - { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, - { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' }, - { text: '样品属性', value: 'sampleBelongName', align: 'center' }, - { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' }, + { text: '型号', value: 'sampleModel', align: 'center', width: '100' }, + { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' }, + { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' }, + { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' }, + { text: '委托方名称', value: 'customerName', align: 'center', width: '100' }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } }, + { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' }, + { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' }, + { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' }, // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } }, ]) // 表格数据 diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index b302245..caeeae4 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -138,6 +138,9 @@ requireOverTime: string // 预计检完时间 mesureContent: string // 检定项目 remark: string // 备注 + measureType?: string // 校验类别专业 + certificateReportCode?: string // 证书编号 + certificateReportName?: string // 证书名称 } // 证书导出 diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue index 2a9e394..00c899e 100644 --- a/src/views/business/schedule/certPrint/certDetail.vue +++ b/src/views/business/schedule/certPrint/certDetail.vue @@ -106,7 +106,6 @@ getSelectList('standardLevel') // 获取标准等级下拉框 getSelectList('transmitRange') // 获取传递范围下拉框 getSelectList('standardCategory') // 获取类别下拉框 -const approvalDialog = ref() const params = ref({ director: '', meterMajor: '', @@ -120,81 +119,8 @@ limit: 999999, }) -// 数据 -const list = ref([]) -// 标准配套设备更换表格总数 -const total = ref(0) - -// 所用设备列表 -const deviceList = ref([]) -// 标准装置列表 -const standardDeviceList = ref([]) -// 文件列表 -const fileList = ref([]) - -// 标准配套设备表头类型 -interface columnsType { - text: string - value: string - align: string - required: Boolean - choose: Boolean - time: Boolean -} - -// 标准配套设备更换表头 -const columns = ref([ - { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false }, - { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false }, - { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false }, - { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false }, - { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false }, -]) -// 标准配套设备更换查询条件 -const listQuery = ref({ - limit: 10, - offset: 1, -}) -// 标准配套设备更换表格loding -const loadingTable = ref(false) -// 申请文档表头 -const columnsFiles = ref([ - { - text: '文件编号', - value: 'fileName', - align: 'center', - required: true, - choose: true, - time: false, - }, - { - text: '文件名称', - value: 'createTime', - align: 'center', - required: true, - choose: false, - time: true, - }, - { - text: '文件代号', - value: 'remark', - align: 'center', - required: true, - time: false, - choose: false, - }, -]) -// 添加表格数据对象 -const addList = ref({}) // 添加表格弹窗开关 const dialogVisible = ref(false) -// 选择标准装置数据列表下拉框类型 -interface standardListType { - id: string - standardName: string -} -// 选择标准装置数据列表下拉框 -const standardList = ref([]) // 初始化路由 const $router = useRouter() // 关闭 @@ -210,52 +136,51 @@ // 获取详情信息 const getInfo = (id: string | number) => { -// dataForm.value = { -// "approvalStatus": "2", -// "certificateReportCategory": "1,2", -// "certificateReportCode": "RIM202303002", -// "certificateReportFile": "", -// "certificateReportName": "证书报告名称03", -// "certificateReportType": "1", -// "createTime": "2023-03-14T18:28:41", -// "createUser": "1", -// "customerAddress": "ewfewfe ", -// "customerEmail": "", -// "customerName": "京东集团", -// "customerNo": "wtsc202302080001", -// "customerPhone": "950618", -// "deliverer": "张三", -// "delivererId": "1", -// "delivererTel": "113652204", -// "id": "154524246245210210", -// "isDel": false, -// "measureContent": "项目4", -// "measureDeptId": "", -// "measurePersonId": "1", -// "measureType": "2", -// "orderId": "1623234926190817282", -// "originalRecordId": "1625802150301368321", -// "originalRecordName": "", -// "planDeliverTime": "2022-11-29T21:14:50", -// "printNum": 0, -// "printStatus": "1", -// "processId": "", -// "remark": "", -// "requireOverTime": "2023-01-29T21:14:50", -// "sampleId": "1625742343335677953", -// "sampleName": "测试4", -// "sampleNo": "", -// "signId": "", -// "templateId": "" -// } - // certificatePrintDetail({ id }).then(res => { - // dataForm.value = res.data; - // }) + // 详情页面待确认 TODO + // dataForm.value = { + // approvalStatus: '2', + // certificateReportCategory: '1,2', + // certificateReportCode: 'RIM202303002', + // certificateReportFile: '', + // certificateReportName: '证书报告名称03', + // certificateReportType: '1', + // createTime: '2023-03-14T18:28:41', + // createUser: '1', + // customerAddress: 'ewfewfe ', + // customerEmail: '', + // customerName: '京东集团', + // customerNo: 'wtsc202302080001', + // customerPhone: '950618', + // deliverer: '张三', + // delivererId: '1', + // delivererTel: '113652204', + // id: '154524246245210210', + // isDel: false, + // measureContent: '项目4', + // measureDeptId: '', + // measurePersonId: '1', + // measureType: '2', + // orderId: '1623234926190817282', + // originalRecordId: '1625802150301368321', + // originalRecordName: '', + // planDeliverTime: '2022-11-29T21:14:50', + // printNum: 0, + // printStatus: '1', + // processId: '', + // remark: '', + // requireOverTime: '2023-01-29T21:14:50', + // sampleId: '1625742343335677953', + // sampleName: '测试4', + // sampleNo: '', + // signId: '', + // templateId: '', + // } + certificatePrintDetail({ id }).then((res) => { + dataForm.value = res.data + dataForm.value.createTime = res.data.createTime.split('T')[0] + }) } -// 保存后的id -const addId = ref('') - // 打印证书 const printCert = () => { @@ -285,11 +210,6 @@ fileRef.value.click() } -// 点击关闭 -const handleClose = () => { - dialogVisible.value = false -} - onMounted(() => { if ($route.params && $route.params.id) { infoId.value = $route.query.id as string @@ -324,7 +244,7 @@ @@ -333,13 +253,13 @@ - + @@ -347,7 +267,7 @@ @@ -355,6 +275,7 @@ + @@ -509,21 +430,6 @@ - - - - - - - - - - - - diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..adc67e0 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -3,8 +3,8 @@ import { getCurrentInstance, ref } from 'vue' import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' // import { Row } from 'element-plus/es/components/table-v2/src/components' -import VuePdfEmbed from 'vue-pdf-embed' -import * as pdfjsLib from 'pdfjs-dist' +// import VuePdfEmbed from 'vue-pdf-embed' +// import * as pdfjsLib from 'pdfjs-dist' import type { ICerPrintList, ICertPrintSearch } from './cert-interface' import ApprovalDialogPart from './components/ApprovalDialogPart.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue index 6c46aa2..8ca3ed4 100644 --- a/src/views/business/subpackage/record/edit.vue +++ b/src/views/business/subpackage/record/edit.vue @@ -12,36 +12,38 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' +import type { IAddress } from '@/components/AddressSelect/address-interface' + const $route = useRoute() const $router = useRouter() const query = $route.query const menu = ref([ { - name: '基本信息', + name: '分包方人员', id: '0', }, { - name: '分包方人员', + name: '业务能力', id: '1', }, { - name: '业务能力', + name: '项目记录', id: '2', }, { - name: '项目记录', + name: '合同记录', id: '3', }, { - name: '合同记录', + name: '检定证书', id: '4', }, - { - name: '检定证书', - id: '5', - }, -]) // 详情按钮组合 +]) +// 详情按钮组合 +// 当前点击 const active = ref('') +// 当前点击名称 +const currentMenuTitle = ref('') const detailForm = ref({ addressArea: '', // 公司地址-区编码 addressAreaName: '', // 公司地址-区 @@ -144,10 +146,38 @@ fileRef.value.click() } +// 公司地址变化后给对象赋值 +function fullAddressChange(addressObj: IAddress) { + // dataForm.value.addressCountry = addressObj.country + // dataForm.value.addressProvince = addressObj.province + // dataForm.value.addressCity = addressObj.city + // dataForm.value.addressArea = addressObj.area + // dataForm.value.fullAddress = addressObj.address + // dataForm.value.addressCountryName = addressObj.countryName + // dataForm.value.addressProvinceName = addressObj.provinceName + // dataForm.value.addressCityName = addressObj.cityName + // dataForm.value.addressAreaName = addressObj.areaName +} +// 开票地址发生变化 +function invoiceFullAddressChange(addressObj: IAddress) { + // dataForm.value.invoiceCountry = addressObj.country + // dataForm.value.invoiceProvince = addressObj.province + // dataForm.value.invoiceCity = addressObj.city + // dataForm.value.invoiceArea = addressObj.area + // dataForm.value.invoiceFullAddress = addressObj.address + // dataForm.value.invoiceCountryName = addressObj.countryName + // dataForm.value.invoiceProvinceName = addressObj.provinceName + // dataForm.value.invoiceCityName = addressObj.cityName + // dataForm.value.invoiceAreaName = addressObj.areaName +} + // 切换tab状态 const changeCurrentButton = (val: string) => { console.log(val) active.value = val + currentMenuTitle.value = menu.value.filter((item) => { + return item.id === val + })[0].name } onMounted(() => { @@ -161,7 +191,6 @@