diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 694648f..c086cdf 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,53 +32,80 @@ }) } else { // 有发起人和审批流程 - const record = newValue[1] as any// 流程数据 - const initiator = newValue[0] as any// 发起人 + // const record = newValue[1] as any// 流程数据 + // const initiator = newValue[0] as any// 发起人 - approvalRecord.value.push({ // 发起人处理 - finishTime: initiator[0].createTime, // 创建时间--对应发起时间 - tableData: [ - { - name: initiator[0].taskName, - data: initiator[0].assigneeName, - }, - { - name: '部门名称', - data: initiator[0].deptName, - }, - ], - }) - // 流程数据处理 - record.forEach((item: any) => { - approvalRecord.value.push({ - finishTime: item.finishTime, - tableData: [ - { - name: item.taskName, - data: item.assigneeName, - }, - { - name: '部门名称', - data: item.deptName, - }, - { - name: '审批状态', - data: item.approvalStatus, - }, - { - name: '意见类别', - data: typeMap[item.comment.type], - }, - { - name: '意见内容', - data: item.comment.comment || '无', - }, - { - name: '任务耗时', - data: item.duration, - }, - ], - }) + newValue.forEach((item: any, index) => { + if (index !== 0) { + // 流程数据处理 + item.forEach((itemIn: any) => { + if (itemIn.approvalStatus !== '发起人') { + approvalRecord.value.push({ + finishTime: itemIn.finishTime, + tableData: [ + { + name: itemIn.taskName, + data: itemIn.assigneeName, + }, + { + name: '部门名称', + data: itemIn.deptName, + }, + { + name: '审批状态', + data: itemIn.approvalStatus, + }, + { + name: '意见类别', + data: typeMap[itemIn.comment.type], + }, + { + name: '意见内容', + data: itemIn.comment.comment || '无', + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + ], + }) + } }) } }, diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 694648f..c086cdf 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,53 +32,80 @@ }) } else { // 有发起人和审批流程 - const record = newValue[1] as any// 流程数据 - const initiator = newValue[0] as any// 发起人 + // const record = newValue[1] as any// 流程数据 + // const initiator = newValue[0] as any// 发起人 - approvalRecord.value.push({ // 发起人处理 - finishTime: initiator[0].createTime, // 创建时间--对应发起时间 - tableData: [ - { - name: initiator[0].taskName, - data: initiator[0].assigneeName, - }, - { - name: '部门名称', - data: initiator[0].deptName, - }, - ], - }) - // 流程数据处理 - record.forEach((item: any) => { - approvalRecord.value.push({ - finishTime: item.finishTime, - tableData: [ - { - name: item.taskName, - data: item.assigneeName, - }, - { - name: '部门名称', - data: item.deptName, - }, - { - name: '审批状态', - data: item.approvalStatus, - }, - { - name: '意见类别', - data: typeMap[item.comment.type], - }, - { - name: '意见内容', - data: item.comment.comment || '无', - }, - { - name: '任务耗时', - data: item.duration, - }, - ], - }) + newValue.forEach((item: any, index) => { + if (index !== 0) { + // 流程数据处理 + item.forEach((itemIn: any) => { + if (itemIn.approvalStatus !== '发起人') { + approvalRecord.value.push({ + finishTime: itemIn.finishTime, + tableData: [ + { + name: itemIn.taskName, + data: itemIn.assigneeName, + }, + { + name: '部门名称', + data: itemIn.deptName, + }, + { + name: '审批状态', + data: itemIn.approvalStatus, + }, + { + name: '意见类别', + data: typeMap[itemIn.comment.type], + }, + { + name: '意见内容', + data: itemIn.comment.comment || '无', + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + ], + }) + } }) } }, diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index 218268c..4d2905d 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -124,6 +124,7 @@ type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别 }) }) + console.log('[[[[[[[list]]]]]]]', list.value) } }) total.value = parseInt(response.data.total) diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 694648f..c086cdf 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,53 +32,80 @@ }) } else { // 有发起人和审批流程 - const record = newValue[1] as any// 流程数据 - const initiator = newValue[0] as any// 发起人 + // const record = newValue[1] as any// 流程数据 + // const initiator = newValue[0] as any// 发起人 - approvalRecord.value.push({ // 发起人处理 - finishTime: initiator[0].createTime, // 创建时间--对应发起时间 - tableData: [ - { - name: initiator[0].taskName, - data: initiator[0].assigneeName, - }, - { - name: '部门名称', - data: initiator[0].deptName, - }, - ], - }) - // 流程数据处理 - record.forEach((item: any) => { - approvalRecord.value.push({ - finishTime: item.finishTime, - tableData: [ - { - name: item.taskName, - data: item.assigneeName, - }, - { - name: '部门名称', - data: item.deptName, - }, - { - name: '审批状态', - data: item.approvalStatus, - }, - { - name: '意见类别', - data: typeMap[item.comment.type], - }, - { - name: '意见内容', - data: item.comment.comment || '无', - }, - { - name: '任务耗时', - data: item.duration, - }, - ], - }) + newValue.forEach((item: any, index) => { + if (index !== 0) { + // 流程数据处理 + item.forEach((itemIn: any) => { + if (itemIn.approvalStatus !== '发起人') { + approvalRecord.value.push({ + finishTime: itemIn.finishTime, + tableData: [ + { + name: itemIn.taskName, + data: itemIn.assigneeName, + }, + { + name: '部门名称', + data: itemIn.deptName, + }, + { + name: '审批状态', + data: itemIn.approvalStatus, + }, + { + name: '意见类别', + data: typeMap[itemIn.comment.type], + }, + { + name: '意见内容', + data: itemIn.comment.comment || '无', + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + ], + }) + } }) } }, diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index 218268c..4d2905d 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -124,6 +124,7 @@ type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别 }) }) + console.log('[[[[[[[list]]]]]]]', list.value) } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index 2c32210..5f0c979 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -152,30 +152,6 @@ const selectMeasueDataConfirm = (val: any) => { getDetail(val.id, val.certificateReportCode) } -// ------------------------------------委托单------------------------------------------ -// 点击选择委托单编号 -const handleClickOrder = () => { - orderVisible.value = true -} -// 修改委托单对话框显隐 -const changeOrderVisible = (val: boolean) => { - orderVisible.value = val -} -// 选好委托单 -const confirmCheckoutOrder = (val: any) => { - if (val && val.length) { - form.value.orderId = val[0].id // 委托单id - form.value.orderCode = val[0].orderCode // 委托单 - form.value.customerId = val[0].customerId// 委托方id - form.value.customerName = val[0].customerName// 委托方名称 - form.value.customerAddress = val[0].customerAddress// 委托方地址 - form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.busPersonId = val[0].busPersonId// 业务员id - form.value.busPersonName = val[0].busPersonName// 业务员名字 - } -} // -------------------------------选择环境记录单---------------------------------------- const businessEnvironmentRecord = ref({}) as any // 环境记录单信息 @@ -385,7 +361,31 @@ }) }) } - +// ------------------------------------委托单------------------------------------------ +// 点击选择委托单编号 +const handleClickOrder = () => { + orderVisible.value = true +} +// 修改委托单对话框显隐 +const changeOrderVisible = (val: boolean) => { + orderVisible.value = val +} +// 选好委托单 +const confirmCheckoutOrder = (val: any) => { + if (val && val.length) { + sampleList.value = [] + form.value.orderId = val[0].id // 委托单id + form.value.orderCode = val[0].orderCode // 委托单 + form.value.customerId = val[0].customerId// 委托方id + form.value.customerName = val[0].customerName// 委托方名称 + form.value.customerAddress = val[0].customerAddress// 委托方地址 + form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.busPersonId = val[0].busPersonId// 业务员id + form.value.busPersonName = val[0].busPersonName// 业务员名字 + } +} // --------------------------------------证书模板------------------------------------------ // 选择证书模板Ref const templateDialogRef = ref() diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 694648f..c086cdf 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,53 +32,80 @@ }) } else { // 有发起人和审批流程 - const record = newValue[1] as any// 流程数据 - const initiator = newValue[0] as any// 发起人 + // const record = newValue[1] as any// 流程数据 + // const initiator = newValue[0] as any// 发起人 - approvalRecord.value.push({ // 发起人处理 - finishTime: initiator[0].createTime, // 创建时间--对应发起时间 - tableData: [ - { - name: initiator[0].taskName, - data: initiator[0].assigneeName, - }, - { - name: '部门名称', - data: initiator[0].deptName, - }, - ], - }) - // 流程数据处理 - record.forEach((item: any) => { - approvalRecord.value.push({ - finishTime: item.finishTime, - tableData: [ - { - name: item.taskName, - data: item.assigneeName, - }, - { - name: '部门名称', - data: item.deptName, - }, - { - name: '审批状态', - data: item.approvalStatus, - }, - { - name: '意见类别', - data: typeMap[item.comment.type], - }, - { - name: '意见内容', - data: item.comment.comment || '无', - }, - { - name: '任务耗时', - data: item.duration, - }, - ], - }) + newValue.forEach((item: any, index) => { + if (index !== 0) { + // 流程数据处理 + item.forEach((itemIn: any) => { + if (itemIn.approvalStatus !== '发起人') { + approvalRecord.value.push({ + finishTime: itemIn.finishTime, + tableData: [ + { + name: itemIn.taskName, + data: itemIn.assigneeName, + }, + { + name: '部门名称', + data: itemIn.deptName, + }, + { + name: '审批状态', + data: itemIn.approvalStatus, + }, + { + name: '意见类别', + data: typeMap[itemIn.comment.type], + }, + { + name: '意见内容', + data: itemIn.comment.comment || '无', + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + ], + }) + } }) } }, diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index 218268c..4d2905d 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -124,6 +124,7 @@ type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别 }) }) + console.log('[[[[[[[list]]]]]]]', list.value) } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index 2c32210..5f0c979 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -152,30 +152,6 @@ const selectMeasueDataConfirm = (val: any) => { getDetail(val.id, val.certificateReportCode) } -// ------------------------------------委托单------------------------------------------ -// 点击选择委托单编号 -const handleClickOrder = () => { - orderVisible.value = true -} -// 修改委托单对话框显隐 -const changeOrderVisible = (val: boolean) => { - orderVisible.value = val -} -// 选好委托单 -const confirmCheckoutOrder = (val: any) => { - if (val && val.length) { - form.value.orderId = val[0].id // 委托单id - form.value.orderCode = val[0].orderCode // 委托单 - form.value.customerId = val[0].customerId// 委托方id - form.value.customerName = val[0].customerName// 委托方名称 - form.value.customerAddress = val[0].customerAddress// 委托方地址 - form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.busPersonId = val[0].busPersonId// 业务员id - form.value.busPersonName = val[0].busPersonName// 业务员名字 - } -} // -------------------------------选择环境记录单---------------------------------------- const businessEnvironmentRecord = ref({}) as any // 环境记录单信息 @@ -385,7 +361,31 @@ }) }) } - +// ------------------------------------委托单------------------------------------------ +// 点击选择委托单编号 +const handleClickOrder = () => { + orderVisible.value = true +} +// 修改委托单对话框显隐 +const changeOrderVisible = (val: boolean) => { + orderVisible.value = val +} +// 选好委托单 +const confirmCheckoutOrder = (val: any) => { + if (val && val.length) { + sampleList.value = [] + form.value.orderId = val[0].id // 委托单id + form.value.orderCode = val[0].orderCode // 委托单 + form.value.customerId = val[0].customerId// 委托方id + form.value.customerName = val[0].customerName// 委托方名称 + form.value.customerAddress = val[0].customerAddress// 委托方地址 + form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.busPersonId = val[0].busPersonId// 业务员id + form.value.busPersonName = val[0].busPersonName// 业务员名字 + } +} // --------------------------------------证书模板------------------------------------------ // 选择证书模板Ref const templateDialogRef = ref() diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index ce44d4c..47634e8 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -509,13 +509,12 @@ 退回 - + + --> + 完成 diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 694648f..c086cdf 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,53 +32,80 @@ }) } else { // 有发起人和审批流程 - const record = newValue[1] as any// 流程数据 - const initiator = newValue[0] as any// 发起人 + // const record = newValue[1] as any// 流程数据 + // const initiator = newValue[0] as any// 发起人 - approvalRecord.value.push({ // 发起人处理 - finishTime: initiator[0].createTime, // 创建时间--对应发起时间 - tableData: [ - { - name: initiator[0].taskName, - data: initiator[0].assigneeName, - }, - { - name: '部门名称', - data: initiator[0].deptName, - }, - ], - }) - // 流程数据处理 - record.forEach((item: any) => { - approvalRecord.value.push({ - finishTime: item.finishTime, - tableData: [ - { - name: item.taskName, - data: item.assigneeName, - }, - { - name: '部门名称', - data: item.deptName, - }, - { - name: '审批状态', - data: item.approvalStatus, - }, - { - name: '意见类别', - data: typeMap[item.comment.type], - }, - { - name: '意见内容', - data: item.comment.comment || '无', - }, - { - name: '任务耗时', - data: item.duration, - }, - ], - }) + newValue.forEach((item: any, index) => { + if (index !== 0) { + // 流程数据处理 + item.forEach((itemIn: any) => { + if (itemIn.approvalStatus !== '发起人') { + approvalRecord.value.push({ + finishTime: itemIn.finishTime, + tableData: [ + { + name: itemIn.taskName, + data: itemIn.assigneeName, + }, + { + name: '部门名称', + data: itemIn.deptName, + }, + { + name: '审批状态', + data: itemIn.approvalStatus, + }, + { + name: '意见类别', + data: typeMap[itemIn.comment.type], + }, + { + name: '意见内容', + data: itemIn.comment.comment || '无', + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + { + name: '任务耗时', + data: itemIn.duration, + }, + ], + }) + } + }) + } + else { + approvalRecord.value.push({ // 发起人处理 + finishTime: item[0].createTime, // 创建时间--对应发起时间 + tableData: [ + { + name: item[0].taskName, + data: item[0].assigneeName, + }, + { + name: '部门名称', + data: item[0].deptName, + }, + ], + }) + } }) } }, diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index 218268c..4d2905d 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -124,6 +124,7 @@ type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别 }) }) + console.log('[[[[[[[list]]]]]]]', list.value) } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index 2c32210..5f0c979 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -152,30 +152,6 @@ const selectMeasueDataConfirm = (val: any) => { getDetail(val.id, val.certificateReportCode) } -// ------------------------------------委托单------------------------------------------ -// 点击选择委托单编号 -const handleClickOrder = () => { - orderVisible.value = true -} -// 修改委托单对话框显隐 -const changeOrderVisible = (val: boolean) => { - orderVisible.value = val -} -// 选好委托单 -const confirmCheckoutOrder = (val: any) => { - if (val && val.length) { - form.value.orderId = val[0].id // 委托单id - form.value.orderCode = val[0].orderCode // 委托单 - form.value.customerId = val[0].customerId// 委托方id - form.value.customerName = val[0].customerName// 委托方名称 - form.value.customerAddress = val[0].customerAddress// 委托方地址 - form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 - form.value.busPersonId = val[0].busPersonId// 业务员id - form.value.busPersonName = val[0].busPersonName// 业务员名字 - } -} // -------------------------------选择环境记录单---------------------------------------- const businessEnvironmentRecord = ref({}) as any // 环境记录单信息 @@ -385,7 +361,31 @@ }) }) } - +// ------------------------------------委托单------------------------------------------ +// 点击选择委托单编号 +const handleClickOrder = () => { + orderVisible.value = true +} +// 修改委托单对话框显隐 +const changeOrderVisible = (val: boolean) => { + orderVisible.value = val +} +// 选好委托单 +const confirmCheckoutOrder = (val: any) => { + if (val && val.length) { + sampleList.value = [] + form.value.orderId = val[0].id // 委托单id + form.value.orderCode = val[0].orderCode // 委托单 + form.value.customerId = val[0].customerId// 委托方id + form.value.customerName = val[0].customerName// 委托方名称 + form.value.customerAddress = val[0].customerAddress// 委托方地址 + form.value.certificationCompany = val[0].certificationCompany// 证书单位名称 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址 + form.value.busPersonId = val[0].busPersonId// 业务员id + form.value.busPersonName = val[0].busPersonName// 业务员名字 + } +} // --------------------------------------证书模板------------------------------------------ // 选择证书模板Ref const templateDialogRef = ref() diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index ce44d4c..47634e8 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -509,13 +509,12 @@ 退回 - + + --> + 完成 diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue index 877ea57..a61a435 100644 --- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue +++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue @@ -21,6 +21,7 @@ import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt' import { getOrderDetail, updateOrder } from '@/api/business/schedule/order' import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue' +import useCheckList from '@/utils/useCheckList' import { exportFile } from '@/utils/exportUtils' const user = userStore() const pageType = ref('add') // 页面类型: add, edit, detail @@ -174,7 +175,7 @@ { text: '样品名称', value: 'sampleName', align: 'center', required: true }, { text: '型号规格', value: 'sampleModel', align: 'center', required: true }, { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true }, - { text: '外观状态', value: 'appearanceStatus', align: 'center' }, + { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true }, { text: '备注', value: 'interchangeRemark', align: 'center' }, ]) @@ -274,6 +275,9 @@ }) return } + if (!useCheckList(sampleList.value, columns.value)) { + return + } if (!formEl) { return } formEl.validate((valid) => { if (valid) { @@ -317,7 +321,7 @@ const changeSelectReceiver = (userId: string) => { // 在用户列表里找到选择的接收人的名字 const name = usePersonList.value.find(item => item.id === userId)!.name - dataForm.value.reciever = name + // dataForm.value.reciever = name searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名 getAutographList() // 调对应接收人的签名 } @@ -378,7 +382,7 @@ await getDict() // 获取字典 nextTick(() => { if (pageType.value === 'add') { - dataForm.value.reciever = user.id // 收发员 + dataForm.value.reciever = user.name // 收发员 createUser.value = user.id // 创建人 } else { @@ -523,7 +527,7 @@ :loading="applyPersonLoading" @change="changeSelectReceiver" > - + @@ -568,6 +572,9 @@ show-overflow-tooltip align="center" > +