diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3ce9ee..cfa6cac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@
### 🔨 代码重构
范围|描述|commitId
--|--|--
+ - | 查看提交历史记录页面数据同步更新 | [749cb10](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/749cb10)
- | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
- | 审查接口核对完成 | [43ae604](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/43ae604)
- | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f)
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index bc7e4d8..f3fa893 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -4,7 +4,7 @@
.u-card {
font-size: 16px !important;
background-color: #f3f3f3 !important;
-
+
.mask {
position: absolute;
top: 0;
@@ -13,47 +13,54 @@
height: 100%;
z-index: 100;
}
- .box-modal-border{
- border-top:1px solid #D1D5DB;
- }
- .delete-modal-border{
- border-right:1px solid #D1D5DB ;
- }
- }
- .warp {
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
- }
- .rect {
- width: 80%;
- height: 375rpx;
- background-color: #fff;
- }
- .linkBox{
- ::v-deep .input{
- .u-input__input{
- color: #60A5FA;
- }
- }
- }
- // 审核插件
- .common-list{
- height: 12.5rem;
- overflow-y: scroll;
- view{
- border-bottom: 1px solid #E5E7EB;
- }
- }
- .rect2{
- width: 80%;
- height: 1000rpx;
- background-color: #fff;
- }
- .rect3{
- width: 80%;
- height: 895rpx;
- background-color: #fff;
- }
+ .box-modal-border {
+ border-top: 1px solid #d1d5db;
+ }
+ .delete-modal-border {
+ border-right: 1px solid #d1d5db;
+ }
+ }
+ .warp {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ }
+ .rect {
+ width: 80%;
+ height: 375rpx;
+ background-color: #fff;
+ }
+ .linkBox {
+ ::v-deep .input {
+ .u-input__input {
+ color: #60a5fa;
+ }
+ }
+ }
+ // 审核插件
+ .common-list {
+ height: 12.5rem;
+ overflow-y: scroll;
+ view {
+ border-bottom: 1px solid #e5e7eb;
+ }
+ }
+ .rect2 {
+ width: 80%;
+ height: 1000rpx;
+ background-color: #fff;
+ }
+ .rect3 {
+ width: 80%;
+ height: 895rpx;
+ background-color: #fff;
+ }
+ .progressDot {
+ width: 50rpx;
+ height: 50rpx;
+ border-radius: 50%;
+ line-height: 50rpx;
+ background-color: #fa8c16;
+ }
}
diff --git a/pages/checkerList/checkerList.vue b/pages/checkerList/checkerList.vue
index 6787716..2ff8f65 100644
--- a/pages/checkerList/checkerList.vue
+++ b/pages/checkerList/checkerList.vue
@@ -1,20 +1,50 @@
-
+
+
+
+
+
+ {{ item.checkerName }}
+
+
+ {{ item.remark }}
+
+
+ {{ dayjs(+item.checkTime).format('MM-DD HH:mm') }}
+
+
+
+ {{ item.status === 1 ? '已通过' : '已驳回' }}
+
+
+
+ {{ item.score }}
+
+
+
+
+
+
+
-
+
diff --git a/plugins/p-deliver-checker/p-deliver-checker.vue b/plugins/p-deliver-checker/p-deliver-checker.vue
index 9fd22df..5114ff1 100644
--- a/plugins/p-deliver-checker/p-deliver-checker.vue
+++ b/plugins/p-deliver-checker/p-deliver-checker.vue
@@ -197,7 +197,8 @@ function confirmReject() {
// 跳转到审核记录页面
function moreRecords() {
- uni.navigateTo({ url: '/pages/checkerList/checkerList' });
+ const deliverRecordId = store.state.project.deliverRecordId
+ uni.navigateTo({ url: `/pages/checkerList/checkerList?deliverRecordId=${deliverRecordId}` });
}
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 0d737d0..e76bf73 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -22,9 +22,7 @@
-
+
粘贴
文件
@@ -34,9 +32,7 @@
- 修改
+ 修改
删除
@@ -86,7 +82,7 @@ const submitState = computed(() => !linkValue.value);
// 获取选中的审核人信息
const delivers = computed(() => store.state.role.members);
const checkedDelivers = computed(() => delivers.value.filter(item => item.checked));
-getDeliverData()
+getDeliverData();
// 根据任务id获取交付物信息
async function getDeliverData() {
try {
@@ -95,12 +91,10 @@ async function getDeliverData() {
const param = { taskId: props.task.id };
const data = await uni.$u.api.getDeliverByTaskId(param);
deliver.value = data;
- store.state.project.deliverRecordId = deliver.value.deliverRecordId
} catch (error) {
console.log('error: ', error);
}
-};
-
+}
// 验证提交的交付物信息格式
function validateDeliverForm() {
@@ -124,18 +118,19 @@ function submit() {
if (!validateDeliverForm()) return;
// 验证成功后进行请求
try {
- const checkerList = []
- checkedDelivers.value.forEach(item=>{
- checkerList.push(item.memberId)
- })
+ const checkerList = [];
+ checkedDelivers.value.forEach(item => {
+ checkerList.push(item.memberId);
+ });
const param = {
- projectId: store.state.project.project.id,
- deliverId: deliver.value.deliverId,
- fileList: [linkValue.value],
- checkerList
- };
- uni.$u.api.submitDeliverInfo(param);
- uBadgeShow.value = true;
+ projectId: store.state.project.project.id,
+ deliverId: deliver.value.deliverId,
+ fileList: [linkValue.value],
+ checkerList,
+ };
+ uni.$u.api.submitDeliverInfo(param);
+ uBadgeShow.value = true;
+ store.state.project.deliverRecordId = deliver.value.deliverRecordId;
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('提交交付物信息失败');
@@ -144,9 +139,9 @@ function submit() {
// 查看历史记录
function openDeliverHistory() {
- const deliverIds = deliver.value.deliverId
+ const deliverIds = deliver.value.deliverId;
// console.log(deliverId)
- uni.navigateTo({ url:`/pages/submitList/submitList?deliverId=${deliverIds}`});
+ uni.navigateTo({ url: `/pages/submitList/submitList?deliverId=${deliverIds}` });
}
// 粘贴上传
@@ -196,24 +191,24 @@ async function confirmEditDeliverName() {
if (!newInputRef.value) {
uni.$ui.showToast('输入不能为空');
}
- try {
- const param = {
- projectId:store.state.project.project.id,
- taskId:props.task.id,
- deliverName:newInputRef.value
- }
- await uni.$u.api.editDeliverName(param);
- // uni.$ui.showToast('修改交付物名称成功');
- getDeliverData()
+ try {
+ const param = {
+ projectId: store.state.project.project.id,
+ taskId: props.task.id,
+ deliverName: newInputRef.value,
+ };
+ await uni.$u.api.editDeliverName(param);
+ // uni.$ui.showToast('修改交付物名称成功');
+ getDeliverData();
// 请求成功 才会清空 请求失败保留
- showEditModal.value = false;
- showMask.value = false;
- uBadgeShow.value = false;
- newInputRef.value = '';
- } catch (error) {
- console.error('error: ', error);
- uni.$ui.showToast('修改交付物名称失败');
- }
+ showEditModal.value = false;
+ showMask.value = false;
+ uBadgeShow.value = false;
+ newInputRef.value = '';
+ } catch (error) {
+ console.error('error: ', error);
+ uni.$ui.showToast('修改交付物名称失败');
+ }
}
// 删除交付物按钮
@@ -234,8 +229,6 @@ async function confirmDelete() {
console.error('error: ', error);
}
}
-
-