diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index 03b2a51..7005697 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -126,7 +126,7 @@ item.sampleFileStatus = String(item.sampleFileStatus) return item }) - total.value = res.total + total.value = res.data.total loadingTable.value = false }) } diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index 03b2a51..7005697 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -126,7 +126,7 @@ item.sampleFileStatus = String(item.sampleFileStatus) return item }) - total.value = res.total + total.value = res.data.total loadingTable.value = false }) } diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue index 27135c0..eebe730 100644 --- a/src/views/business/schedule/task/components/processConfig.vue +++ b/src/views/business/schedule/task/components/processConfig.vue @@ -136,6 +136,10 @@ // 只能操作此用户自己的实验室 const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { + if (!processList.value[index].measurePersonId) { + ElMessage.warning('检定人员不能为空') + return false + } const params = { id: processList.value[index].id, measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择） diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index 03b2a51..7005697 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -126,7 +126,7 @@ item.sampleFileStatus = String(item.sampleFileStatus) return item }) - total.value = res.total + total.value = res.data.total loadingTable.value = false }) } diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue index 27135c0..eebe730 100644 --- a/src/views/business/schedule/task/components/processConfig.vue +++ b/src/views/business/schedule/task/components/processConfig.vue @@ -136,6 +136,10 @@ // 只能操作此用户自己的实验室 const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { + if (!processList.value[index].measurePersonId) { + ElMessage.warning('检定人员不能为空') + return false + } const params = { id: processList.value[index].id, measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择） diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue index 7f892e5..3aa04f3 100644 --- a/src/views/business/schedule/task/components/processNode.vue +++ b/src/views/business/schedule/task/components/processNode.vue @@ -161,6 +161,7 @@ v-model="processNodeData.requireCertifications" class="process-input" size="small" + :min="0" :disabled="(props.isDept && user.deptId !== processNodeData.measureSegmentId) || !certificationEdit || props.detail" /> 份 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index 03b2a51..7005697 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -126,7 +126,7 @@ item.sampleFileStatus = String(item.sampleFileStatus) return item }) - total.value = res.total + total.value = res.data.total loadingTable.value = false }) } diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue index 27135c0..eebe730 100644 --- a/src/views/business/schedule/task/components/processConfig.vue +++ b/src/views/business/schedule/task/components/processConfig.vue @@ -136,6 +136,10 @@ // 只能操作此用户自己的实验室 const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { + if (!processList.value[index].measurePersonId) { + ElMessage.warning('检定人员不能为空') + return false + } const params = { id: processList.value[index].id, measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择） diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue index 7f892e5..3aa04f3 100644 --- a/src/views/business/schedule/task/components/processNode.vue +++ b/src/views/business/schedule/task/components/processNode.vue @@ -161,6 +161,7 @@ v-model="processNodeData.requireCertifications" class="process-input" size="small" + :min="0" :disabled="(props.isDept && user.deptId !== processNodeData.measureSegmentId) || !certificationEdit || props.detail" /> 份 diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue index 77c97d8..f6601ca 100644 --- a/src/views/business/schedule/task/components/selectStaff.vue +++ b/src/views/business/schedule/task/components/selectStaff.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 6b6b4b8..d9e8479 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -106,81 +106,87 @@ - diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue index 53cea4e..694648f 100644 --- a/src/components/ApprovalRecord/ApprovalRecord.vue +++ b/src/components/ApprovalRecord/ApprovalRecord.vue @@ -32,8 +32,8 @@ }) } else { // 有发起人和审批流程 - const record = newValue[0] as any// 流程数据 - const initiator = newValue[1] as any// 发起人 + const record = newValue[1] as any// 流程数据 + const initiator = newValue[0] as any// 发起人 approvalRecord.value.push({ // 发起人处理 finishTime: initiator[0].createTime, // 创建时间--对应发起时间 diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index e150747..37385db 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -87,8 +87,8 @@ console.log('或签数据处理', item) let name = ''// 姓名 - let approvalStatus = ''// 审批类型 - let finishTime = ''// 审批类型 + let approvalStatus = ''// 审批状态 + let finishTime = ''// 完成时间 let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue index 7f578d7..9bd76af 100644 --- a/src/components/dialog/selectStaffDialog.vue +++ b/src/components/dialog/selectStaffDialog.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index 0a7022a..8e82c30 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -110,6 +110,7 @@ :rows="4" show-word-limit type="textarea" + :maxlength="50" /> diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index d4c911b..52b2d2a 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -73,6 +73,19 @@ }) } }) + // menu.value = menu.value.map(item => { + // if(item.name === '待检测') { + // return { + // ...item, + // name: '待分配', + // id: '1' + // } + // } else { + // return item + // } + // }) + console.log('-------', menu.value) + resolve(menu.value) }) }) diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue index fad76ab..881de2b 100644 --- a/src/views/business/lab/myMeasure/components/processNode.vue +++ b/src/views/business/lab/myMeasure/components/processNode.vue @@ -137,7 +137,7 @@
- 应出具证书 份 + 应出具证书 份
当前状态{{ processNodeData.measureStatusName }} diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue index 03b2a51..7005697 100644 --- a/src/views/business/lab/myMeasure/myMeasureList.vue +++ b/src/views/business/lab/myMeasure/myMeasureList.vue @@ -126,7 +126,7 @@ item.sampleFileStatus = String(item.sampleFileStatus) return item }) - total.value = res.total + total.value = res.data.total loadingTable.value = false }) } diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue index 27135c0..eebe730 100644 --- a/src/views/business/schedule/task/components/processConfig.vue +++ b/src/views/business/schedule/task/components/processConfig.vue @@ -136,6 +136,10 @@ // 只能操作此用户自己的实验室 const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { + if (!processList.value[index].measurePersonId) { + ElMessage.warning('检定人员不能为空') + return false + } const params = { id: processList.value[index].id, measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择） diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue index 7f892e5..3aa04f3 100644 --- a/src/views/business/schedule/task/components/processNode.vue +++ b/src/views/business/schedule/task/components/processNode.vue @@ -161,6 +161,7 @@ v-model="processNodeData.requireCertifications" class="process-input" size="small" + :min="0" :disabled="(props.isDept && user.deptId !== processNodeData.measureSegmentId) || !certificationEdit || props.detail" /> 份 diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue index 77c97d8..f6601ca 100644 --- a/src/views/business/schedule/task/components/selectStaff.vue +++ b/src/views/business/schedule/task/components/selectStaff.vue @@ -43,7 +43,7 @@ const columns = ref([ { text: '姓名', value: 'name', align: 'center' }, { text: '人员编号', value: 'staffNo', align: 'center' }, - { text: '所在部门', value: 'deptId', align: 'center' }, + { text: '所在部门', value: 'deptName', align: 'center' }, { text: '行政职务', value: 'administrationJob', align: 'center' }, ]) diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue index 3aafb62..eed0441 100644 --- a/src/views/system/user/userAdd.vue +++ b/src/views/system/user/userAdd.vue @@ -259,7 +259,7 @@ - +