diff --git a/CHANGELOG.md b/CHANGELOG.md index be57eb4..ec48e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc) 交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd) + 交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889) - | 修复p-deliver报错taskRef的问题 | [880cf7c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/880cf7c) - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) diff --git a/components/FinancialClause/FinancialClause.vue b/components/FinancialClause/FinancialClause.vue index a5ce538..0751d55 100644 --- a/components/FinancialClause/FinancialClause.vue +++ b/components/FinancialClause/FinancialClause.vue @@ -1,7 +1,7 @@ + + diff --git a/pages/checkerList/checkerList.vue b/pages/checkerList/checkerList.vue deleted file mode 100644 index a5fa664..0000000 --- a/pages/checkerList/checkerList.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/pages/submitLog/submitLog.vue b/pages/submitLog/submitLog.vue new file mode 100644 index 0000000..e20a7cf --- /dev/null +++ b/pages/submitLog/submitLog.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue deleted file mode 100644 index 5c7d985..0000000 --- a/pages/submitlist/submitlist.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - diff --git a/plugins/p-deliver-check/check-form-modal.vue b/plugins/p-deliver-check/check-form-modal.vue index 6fed1d4..5adc968 100644 --- a/plugins/p-deliver-check/check-form-modal.vue +++ b/plugins/p-deliver-check/check-form-modal.vue @@ -54,7 +54,6 @@ const score = ref(100); // 评分 * @param {string} mode 'RESOLVE'|'REJECT' */ async function handleSubmit(mode) { - console.log('mode: ', mode); try { const deliverRecordId = props.data.deliverRecordId(); const param = { @@ -68,7 +67,7 @@ async function handleSubmit(mode) { handleHide(); // 隐藏 + 重置 uni.$ui.showToast('审核信息提交成功'); // 通知父组件评审成功 更新信息 - emits('submit-end', mode); + emits('submit-end', param); } catch (error) { console.error('error: ', error); uni.$ui.showToast('审核信息提交失败, 请稍后重试'); diff --git a/plugins/p-deliver-check/p-deliver-check.vue b/plugins/p-deliver-check/p-deliver-check.vue index c273b59..9a0cdc6 100644 --- a/plugins/p-deliver-check/p-deliver-check.vue +++ b/plugins/p-deliver-check/p-deliver-check.vue @@ -1,10 +1,10 @@ diff --git a/plugins/p-deliver-upload/p-deliver-upload.vue b/plugins/p-deliver-upload/p-deliver-upload.vue new file mode 100644 index 0000000..578a16d --- /dev/null +++ b/plugins/p-deliver-upload/p-deliver-upload.vue @@ -0,0 +1,225 @@ + + + diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index 56abf77..fefe63b 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -1,244 +1,35 @@ diff --git a/plugins/p-task-title/p-task-title.vue b/plugins/p-task-title/p-task-title.vue index 4a7efc4..8655b90 100644 --- a/plugins/p-task-title/p-task-title.vue +++ b/plugins/p-task-title/p-task-title.vue @@ -1,7 +1,7 @@ @@ -10,10 +10,10 @@ defineProps({ task: { type: Object, default: () => {} } });