ccsens_tall
/
TALL-MUI-4
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactor: 审核记录查看

deliver
Min5203 4 years ago
parent
749cb105d3
commit
121d43fe3b
6 changed files with 129 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 33
      common/styles/theme/default.scss
  3. 48
      pages/checkerList/checkerList.vue
  4. 11
      pages/submitlist/submitlist.vue
  5. 3
      plugins/p-deliver-checker/p-deliver-checker.vue
  6. 41
      plugins/p-deliver/p-deliver.vue

1
CHANGELOG.md
View File

@ -75,6 +75,7 @@
### 🔨 代码重构 ### 🔨 代码重构
范围|描述|commitId 范围|描述|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) - | 交付物插件代码审查 | [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) - | 审查接口核对完成 | [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) - | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f)

33
common/styles/theme/default.scss
View File

@ -13,11 +13,11 @@
height: 100%; height: 100%;
z-index: 100; z-index: 100;
} }
.box-modal-border{ .box-modal-border {
border-top:1px solid #D1D5DB; border-top: 1px solid #d1d5db;
} }
.delete-modal-border{ .delete-modal-border {
border-right:1px solid #D1D5DB ; border-right: 1px solid #d1d5db;
} }
} }
.warp { .warp {
@ -31,29 +31,36 @@
height: 375rpx; height: 375rpx;
background-color: #fff; background-color: #fff;
} }
.linkBox{ .linkBox {
::v-deep .input{ ::v-deep .input {
.u-input__input{ .u-input__input {
color: #60A5FA; color: #60a5fa;
} }
} }
} }
// 审核插件 // 审核插件
.common-list{ .common-list {
height: 12.5rem; height: 12.5rem;
overflow-y: scroll; overflow-y: scroll;
view{ view {
border-bottom: 1px solid #E5E7EB; border-bottom: 1px solid #e5e7eb;
} }
} }
.rect2{ .rect2 {
width: 80%; width: 80%;
height: 1000rpx; height: 1000rpx;
background-color: #fff; background-color: #fff;
} }
.rect3{ .rect3 {
width: 80%; width: 80%;
height: 895rpx; height: 895rpx;
background-color: #fff; background-color: #fff;
} }
.progressDot {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
line-height: 50rpx;
background-color: #fa8c16;
}
} }

48
pages/checkerList/checkerList.vue
View File

@ -1,20 +1,50 @@
<template> <template>
<view> </view> <theme class="pt-1 h-full">
<view class="h-full overflow-y-scroll bg-white mx-5 my-2 rounded-md p-3 text-gray-400">
<view v-for="item in checkerList" class="flex justify-between">
<view>
<view class="pb-2 text-gray-800">
{{ item.checkerName }}
</view>
<view class="pb-1">
{{ item.remark }}
</view>
<view class="pb-2" v-if="item.checkTime > 0">
{{ dayjs(+item.checkTime).format('MM-DD HH:mm') }}
</view>
</view>
<view>
<view>{{ item.status === 1 ? '已通过' : '已驳回' }}</view>
<view v-if="item.score > 0">
<u-circle-progress active-color="#FA8C16" :percent="item.score" width="90" border-width="7" class="mt-2">
<view class="u-progress-content">
<view class="progressDot text-white text-center">{{ item.score }}</view>
</view>
</u-circle-progress>
</view>
</view>
</view>
</view>
</theme>
</template> </template>
<script setup> <script setup>
import { ref } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
import dayjs from 'dayjs';
const checkerList = ref([]);
onLoad(options => { onLoad(options => {
// 根据交付物id获取上传记录 (async function getQueryCheckLog() {
(async function getHistory() {
try { try {
const param = { deliverId: options.deliverId }; const param = { deliverRecordId: options.deliverRecordId };
const data = await uni.$u.api.getDeliverHistory(param); const data = await uni.$u.api.queryCheckLog(param);
name.value = data.deliverName; checkerList.value = data;
listRef.value = data.deliverRecordList; console.log(checkerList.value);
console.log(data);
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
uni.$ui.showToast('获取交付物历史失败'); uni.$ui.showToast('获取检查交付物历史失败');
} }
}()); }());
}); });

11
pages/submitlist/submitlist.vue
View File

@ -94,7 +94,6 @@ onLoad(options => {
const data = await uni.$u.api.getDeliverHistory(param); const data = await uni.$u.api.getDeliverHistory(param);
name.value = data.deliverName; name.value = data.deliverName;
listRef.value = data.deliverRecordList; listRef.value = data.deliverRecordList;
console.log(data);
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
uni.$ui.showToast('获取交付物历史失败'); uni.$ui.showToast('获取交付物历史失败');
@ -103,12 +102,4 @@ onLoad(options => {
}); });
</script> </script>
<style lang="scss"> <style lang="scss"></style>
.progressDot {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
line-height: 50rpx;
background-color: #fa8c16;
}
</style>

3
plugins/p-deliver-checker/p-deliver-checker.vue
View File

@ -197,7 +197,8 @@ function confirmReject() {
// 跳转到审核记录页面 // 跳转到审核记录页面
function moreRecords() { function moreRecords() {
uni.navigateTo({ url: '/pages/checkerList/checkerList' }); const deliverRecordId = store.state.project.deliverRecordId
uni.navigateTo({ url: `/pages/checkerList/checkerList?deliverRecordId=${deliverRecordId}` });
} }
</script> </script>

41
plugins/p-deliver/p-deliver.vue
View File

@ -22,9 +22,7 @@
<!-- 插件上传方式 --> <!-- 插件上传方式 -->
<view> <view>
<view class="linkBox" <view class="linkBox"><u-input v-model="linkValue" type="text" :border="true" placeholder="请输入交付物地址/链接" class="input"></u-input></view>
><u-input v-model="linkValue" type="text" :border="true" placeholder="请输入交付物地址/链接" class="input"></u-input
></view>
<view class="mt-3"> <view class="mt-3">
<u-button size="mini" :plain="true" type="primary" class="mr-3" @click="paste">粘贴</u-button> <u-button size="mini" :plain="true" type="primary" class="mr-3" @click="paste">粘贴</u-button>
<u-button size="mini" :plain="true" type="primary" class="mr-3" @click="uploadFile">文件</u-button> <u-button size="mini" :plain="true" type="primary" class="mr-3" @click="uploadFile">文件</u-button>
@ -34,9 +32,7 @@
<!-- 编辑和删除的遮罩层 --> <!-- 编辑和删除的遮罩层 -->
<view class="mask flex items-center justify-center bg-grey" v-show="showMask" @click="showMask = false"> <view class="mask flex items-center justify-center bg-grey" v-show="showMask" @click="showMask = false">
<view class="bg-yellow-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click.stop="showEditModal = true" <view class="bg-yellow-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click.stop="showEditModal = true">修改</view>
>修改</view
>
<view class="bg-red-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click.stop="deleteDeliver">删除</view> <view class="bg-red-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click.stop="deleteDeliver">删除</view>
<!-- 删除的二次提示modal --> <!-- 删除的二次提示modal -->
<u-modal v-model="showDeleteModal" :content="content" :show-cancel-button="true" @confirm="confirmDelete"></u-modal> <u-modal v-model="showDeleteModal" :content="content" :show-cancel-button="true" @confirm="confirmDelete"></u-modal>
@ -86,7 +82,7 @@ const submitState = computed(() => !linkValue.value);
// 获取选中的审核人信息 // 获取选中的审核人信息
const delivers = computed(() => store.state.role.members); const delivers = computed(() => store.state.role.members);
const checkedDelivers = computed(() => delivers.value.filter(item => item.checked)); const checkedDelivers = computed(() => delivers.value.filter(item => item.checked));
getDeliverData() getDeliverData();
// 根据任务id获取交付物信息 // 根据任务id获取交付物信息
async function getDeliverData() { async function getDeliverData() {
try { try {
@ -95,12 +91,10 @@ async function getDeliverData() {
const param = { taskId: props.task.id }; const param = { taskId: props.task.id };
const data = await uni.$u.api.getDeliverByTaskId(param); const data = await uni.$u.api.getDeliverByTaskId(param);
deliver.value = data; deliver.value = data;
store.state.project.deliverRecordId = deliver.value.deliverRecordId
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
} }
}; }
// 验证提交的交付物信息格式 // 验证提交的交付物信息格式
function validateDeliverForm() { function validateDeliverForm() {
@ -124,18 +118,19 @@ function submit() {
if (!validateDeliverForm()) return; if (!validateDeliverForm()) return;
// 验证成功后进行请求 // 验证成功后进行请求
try { try {
const checkerList = [] const checkerList = [];
checkedDelivers.value.forEach(item=>{ checkedDelivers.value.forEach(item => {
checkerList.push(item.memberId) checkerList.push(item.memberId);
}) });
const param = { const param = {
projectId: store.state.project.project.id, projectId: store.state.project.project.id,
deliverId: deliver.value.deliverId, deliverId: deliver.value.deliverId,
fileList: [linkValue.value], fileList: [linkValue.value],
checkerList checkerList,
}; };
uni.$u.api.submitDeliverInfo(param); uni.$u.api.submitDeliverInfo(param);
uBadgeShow.value = true; uBadgeShow.value = true;
store.state.project.deliverRecordId = deliver.value.deliverRecordId;
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
uni.$ui.showToast('提交交付物信息失败'); uni.$ui.showToast('提交交付物信息失败');
@ -144,9 +139,9 @@ function submit() {
// 查看历史记录 // 查看历史记录
function openDeliverHistory() { function openDeliverHistory() {
const deliverIds = deliver.value.deliverId const deliverIds = deliver.value.deliverId;
// console.log(deliverId) // console.log(deliverId)
uni.navigateTo({ url:`/pages/submitList/submitList?deliverId=${deliverIds}`}); uni.navigateTo({ url: `/pages/submitList/submitList?deliverId=${deliverIds}` });
} }
// 粘贴上传 // 粘贴上传
@ -198,13 +193,13 @@ async function confirmEditDeliverName() {
} }
try { try {
const param = { const param = {
projectId:store.state.project.project.id, projectId: store.state.project.project.id,
taskId:props.task.id, taskId: props.task.id,
deliverName:newInputRef.value deliverName: newInputRef.value,
} };
await uni.$u.api.editDeliverName(param); await uni.$u.api.editDeliverName(param);
// uni.$ui.showToast('修改交付物名称成功'); // uni.$ui.showToast('修改交付物名称成功');
getDeliverData() getDeliverData();
// 请求成功 才会清空 请求失败保留 // 请求成功 才会清空 请求失败保留
showEditModal.value = false; showEditModal.value = false;
showMask.value = false; showMask.value = false;
@ -234,8 +229,6 @@ async function confirmDelete() {
console.error('error: ', error); console.error('error: ', error);
} }
} }
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

Write Preview
Loading…
Cancel
Save