diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index 465b2e7..fbe670d 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -10,7 +10,7 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import { SCHEDULE } from '@/utils/scheduleDict' import TemplateTable from '@/views/customer/customerInfo/templateTable.vue' -import { getSapmleDetail, updateSample } from '@/api/customer/sampleList' +import { getSampleDetail, updateSample } from '@/api/customer/sampleList' import countries from '@/components/AddressSelect/country-code.json' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' @@ -198,7 +198,7 @@ // 获取样品详情 const getInfo = () => { - // getSapmleDetail({ id: infoId.value }).then((res) => { + // getSampleDetail({ id: infoId.value }).then((res) => { dataForm.value = { orderId: '123', ABC: 'A', diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index 465b2e7..fbe670d 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -10,7 +10,7 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import { SCHEDULE } from '@/utils/scheduleDict' import TemplateTable from '@/views/customer/customerInfo/templateTable.vue' -import { getSapmleDetail, updateSample } from '@/api/customer/sampleList' +import { getSampleDetail, updateSample } from '@/api/customer/sampleList' import countries from '@/components/AddressSelect/country-code.json' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' @@ -198,7 +198,7 @@ // 获取样品详情 const getInfo = () => { - // getSapmleDetail({ id: infoId.value }).then((res) => { + // getSampleDetail({ id: infoId.value }).then((res) => { dataForm.value = { orderId: '123', ABC: 'A', diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue index 43cedde..51dfb04 100644 --- a/src/views/device/receive/createOrCheck.vue +++ b/src/views/device/receive/createOrCheck.vue @@ -208,12 +208,12 @@ // 保存 const save = () => { - const loading = ElLoading.service({ - lock: true, - background: 'rgba(255, 255, 255, 0.8)', - }) ruleFormRef.value.validate((valid: boolean) => { if (valid) { + const loading = ElLoading.service({ + lock: true, + background: 'rgba(255, 255, 255, 0.8)', + }) const params = { applyUnit: form.value.applyUnit, // 申请单位 applyPerson: form.value.applyPerson, // 申请人 diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index 465b2e7..fbe670d 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -10,7 +10,7 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import { SCHEDULE } from '@/utils/scheduleDict' import TemplateTable from '@/views/customer/customerInfo/templateTable.vue' -import { getSapmleDetail, updateSample } from '@/api/customer/sampleList' +import { getSampleDetail, updateSample } from '@/api/customer/sampleList' import countries from '@/components/AddressSelect/country-code.json' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' @@ -198,7 +198,7 @@ // 获取样品详情 const getInfo = () => { - // getSapmleDetail({ id: infoId.value }).then((res) => { + // getSampleDetail({ id: infoId.value }).then((res) => { dataForm.value = { orderId: '123', ABC: 'A', diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue index 43cedde..51dfb04 100644 --- a/src/views/device/receive/createOrCheck.vue +++ b/src/views/device/receive/createOrCheck.vue @@ -208,12 +208,12 @@ // 保存 const save = () => { - const loading = ElLoading.service({ - lock: true, - background: 'rgba(255, 255, 255, 0.8)', - }) ruleFormRef.value.validate((valid: boolean) => { if (valid) { + const loading = ElLoading.service({ + lock: true, + background: 'rgba(255, 255, 255, 0.8)', + }) const params = { applyUnit: form.value.applyUnit, // 申请单位 applyPerson: form.value.applyPerson, // 申请人 diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue deleted file mode 100644 index 4a4de71..0000000 --- a/src/views/device/receive/solveComponent/buttonBox.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - {{ item.name }} - - - - - - - - - diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index 465b2e7..fbe670d 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -10,7 +10,7 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import { SCHEDULE } from '@/utils/scheduleDict' import TemplateTable from '@/views/customer/customerInfo/templateTable.vue' -import { getSapmleDetail, updateSample } from '@/api/customer/sampleList' +import { getSampleDetail, updateSample } from '@/api/customer/sampleList' import countries from '@/components/AddressSelect/country-code.json' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' @@ -198,7 +198,7 @@ // 获取样品详情 const getInfo = () => { - // getSapmleDetail({ id: infoId.value }).then((res) => { + // getSampleDetail({ id: infoId.value }).then((res) => { dataForm.value = { orderId: '123', ABC: 'A', diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue index 43cedde..51dfb04 100644 --- a/src/views/device/receive/createOrCheck.vue +++ b/src/views/device/receive/createOrCheck.vue @@ -208,12 +208,12 @@ // 保存 const save = () => { - const loading = ElLoading.service({ - lock: true, - background: 'rgba(255, 255, 255, 0.8)', - }) ruleFormRef.value.validate((valid: boolean) => { if (valid) { + const loading = ElLoading.service({ + lock: true, + background: 'rgba(255, 255, 255, 0.8)', + }) const params = { applyUnit: form.value.applyUnit, // 申请单位 applyPerson: form.value.applyPerson, // 申请人 diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue deleted file mode 100644 index 4a4de71..0000000 --- a/src/views/device/receive/solveComponent/buttonBox.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - {{ item.name }} - - - - - - - - - diff --git a/src/views/device/receive/solveComponent/solveBox.vue b/src/views/device/receive/solveComponent/solveBox.vue new file mode 100644 index 0000000..4a4de71 --- /dev/null +++ b/src/views/device/receive/solveComponent/solveBox.vue @@ -0,0 +1,41 @@ + + + + + + + + + {{ item.name }} + + + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 08409b5..cfca65f 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -151,7 +151,7 @@ }, { path: 'cert/detail/:id?', - name: 'taskDetail', + name: 'certPrintDetail', component: () => import('@/views/business/schedule/certPrint/certDetail.vue'), meta: { title: '证书详情', diff --git a/src/utils/getUid.ts b/src/utils/getUid.ts new file mode 100644 index 0000000..6ba284f --- /dev/null +++ b/src/utils/getUid.ts @@ -0,0 +1,18 @@ +/** + * 生成 n - m 之间的随机数 + */ +export function getRandom(n: number, m: number) { + return Math.floor(Math.random() * (m - n + 1) + n) +} + +/** + * 生成一个唯一的字符串ID,每次执行结果必定不一样 + */ +export function getUid() { + const random = '0123456789abcdefghijklmnopqrstuvwxyz' + let str = '' + for (let i = 0; i < 4; i++) { + str += random[getRandom(0, 35)] + } + return new Date().valueOf() + str +} diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue new file mode 100644 index 0000000..628f3ca --- /dev/null +++ b/src/views/business/lab/components/distributeDialog.vue @@ -0,0 +1,149 @@ + + + + + + + 样品名称: + + + + 证书类别: + + + {{ item.name }} + + + + + 检定项目: + + + + 备注: + + + + 检定人员: + + + + + + + + 应出具证书: + 份 + + + + + 确定 + + + 取消 + + + + + + + diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue index 8f13ac5..7ff92d4 100644 --- a/src/views/business/schedule/order/orderListEdit.vue +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -9,6 +9,7 @@ import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue' import type { ICustomer } from '@/views/customer/customerInfo/customer_interface' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getUid } from '@/utils/getUid' const pageType = ref('add') // 页面类型: add, edit, detail const infoId = ref('') // id @@ -29,7 +30,33 @@ companyAddress: '', // 委托方地址 remark: '', // 备注 minioFileName: '', // 附件 + isUrgent: '', // 是否加急 + certifications: '', // 证书类别 }) + +// 是否加急 +const isUrgentMap = [ + { + label: '是', + value: '1', + }, + { + label: '否', + value: '2', + }, +] + +// 证书类别 +const certificationsMap = [ + { + label: '检测报告', + value: '1', + }, + { + label: '校准报告', + value: '2', + }, +] const list = ref([])// 表格数据 // 电源电压 const powerVoltageMap = [ @@ -66,6 +93,8 @@ orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }], + certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }], + isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -137,6 +166,7 @@ mesureContent: '', // 检定项目 remark: '', // 备注 isEdit: true, // 是否可编辑 + delId: getUid(), }) } @@ -149,11 +179,17 @@ }) } else { - // --------------------------删除有问题---------------------------- checkoutList.value.forEach((item: ISampleList) => { list.value.forEach((element, index) => { - if (element.sampleNo === item.sampleNo || !item.sampleNo) { - list.value.splice(index, 1) + if (!item.sampleNo) { // 点击增加行--手动增加的项目需要判断前端添加的delID + if (element.delId === item.delId) { + list.value.splice(index, 1) + } + } + else { // 从样品库中选择的项目 + if (element.sampleNo === item.sampleNo) { + list.value.splice(index, 1) + } } }) }) @@ -163,7 +199,6 @@ const fileRef = ref() // 文件上传input const onFileChange = (event: any) => { // 原生上传 - console.log(event.target.files) if (event.target.files?.length !== 0) { // 创建formdata对象 const fd = new FormData() @@ -334,6 +369,30 @@ /> + + + + + + + + + + + + + + @@ -396,18 +455,16 @@ show-overflow-tooltip align="center" > - + - {{ scope.row[item.value] }} - - + {{ scope.row[item.value] }} + diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts index 8749da7..4330569 100644 --- a/src/views/business/schedule/order/orderList_interface.ts +++ b/src/views/business/schedule/order/orderList_interface.ts @@ -41,6 +41,8 @@ companyAddress: string // 委托方地址 remark: string // 备注 minioFileName: string // 附件 + isUrgent: string // 是否加急 + certifications: string // 证书类别 } // 样品清单 @@ -55,5 +57,6 @@ mesureContent: string // 检定项目 remark: string // 备注 isEdit?: boolean // 是否可编辑 + delId?: string // 删除id } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index 465b2e7..fbe670d 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -10,7 +10,7 @@ import showPhoto from '@/views/system/tool/showPhoto.vue' import { SCHEDULE } from '@/utils/scheduleDict' import TemplateTable from '@/views/customer/customerInfo/templateTable.vue' -import { getSapmleDetail, updateSample } from '@/api/customer/sampleList' +import { getSampleDetail, updateSample } from '@/api/customer/sampleList' import countries from '@/components/AddressSelect/country-code.json' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' @@ -198,7 +198,7 @@ // 获取样品详情 const getInfo = () => { - // getSapmleDetail({ id: infoId.value }).then((res) => { + // getSampleDetail({ id: infoId.value }).then((res) => { dataForm.value = { orderId: '123', ABC: 'A', diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue index 43cedde..51dfb04 100644 --- a/src/views/device/receive/createOrCheck.vue +++ b/src/views/device/receive/createOrCheck.vue @@ -208,12 +208,12 @@ // 保存 const save = () => { - const loading = ElLoading.service({ - lock: true, - background: 'rgba(255, 255, 255, 0.8)', - }) ruleFormRef.value.validate((valid: boolean) => { if (valid) { + const loading = ElLoading.service({ + lock: true, + background: 'rgba(255, 255, 255, 0.8)', + }) const params = { applyUnit: form.value.applyUnit, // 申请单位 applyPerson: form.value.applyPerson, // 申请人 diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue deleted file mode 100644 index 4a4de71..0000000 --- a/src/views/device/receive/solveComponent/buttonBox.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - {{ item.name }} - - - - - - - - - diff --git a/src/views/device/receive/solveComponent/solveBox.vue b/src/views/device/receive/solveComponent/solveBox.vue new file mode 100644 index 0000000..4a4de71 --- /dev/null +++ b/src/views/device/receive/solveComponent/solveBox.vue @@ -0,0 +1,41 @@ + + + + + + + + + {{ item.name }} + + + + + + + + + diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue index adf5fa0..bb1d704 100644 --- a/src/views/device/receive/solveList.vue +++ b/src/views/device/receive/solveList.vue @@ -5,7 +5,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import { useRouter } from 'vue-router' import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive' -import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue' +import ButtonBox from '@/views/device/receive/solveComponent/solveBox.vue' import { exportFile } from '@/utils/exportUtils' import { printJSON } from '@/utils/printUtils' import { SCHEDULE } from '@/utils/scheduleDict'