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

Merge branch 'deliver' of ssh://101.201.226.163:50022/TALL/TALL-MUI-4 into deliver

deliver
wally 4 years ago
parent
4d901ac95d 749cb105d3
commit
85bb167efb
7 changed files with 297 additions and 252 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      CHANGELOG.md
  2. 12
      common/styles/tailwind.scss
  3. 10
      pages.json
  4. 23
      pages/checkerList/checkerList.vue
  5. 119
      pages/submitlist/submitlist.vue
  6. 12
      plugins/p-deliver-checker/p-deliver-checker.vue
  7. 3
      plugins/p-deliver/p-deliver.vue

172
CHANGELOG.md
View File

@ -1,109 +1,115 @@
# 1.0.0 (2022-01-20)
### 🌟 新功能
范围|描述|commitId
--|--|--
- | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
- | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f)
- | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35)
- | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
- | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
- | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
- | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
- | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
- | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
- | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
- | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2)
- | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
- | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
- | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
- | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
| 范围 | 描述 | commitId |
| ------- | ---------------------------- | ------------------------------------------------------------------------ |
| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |
| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) |
| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) |
| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) |
| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) |
| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) |
| - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f) |
| - | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35) |
| - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) |
| - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) |
| - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252) |
| - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) |
| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) |
| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) |
| - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) |
| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) |
| - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) |
| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
| - | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2) |
| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) |
| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) |
| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
| - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) |
| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) |
### 🎨 代码样式
范围|描述|commitId
--|--|--
- | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
- | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
| 范围 | 描述 | commitId |
| ---- | ----------------------- | ------------------------------------------------------------------------ |
| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) |
| - | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d) |
| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) |
### 🐛 Bug 修复
范围|描述|commitId
--|--|--
app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
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)
- | 修复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)
- | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
- | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
| 范围 | 描述 | commitId |
| ---------- | ------------------------------------ | ------------------------------------------------------------------------ |
| app.vue | 修复获取 token 报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) |
| 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) |
| - | 修复 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) |
| - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) |
| - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) |
| - | 解决 warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) |
### 📝 文档
范围|描述|commitId
--|--|--
- | deliver http 文件更新 | [568115c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/568115c)
- | 添加交付物http测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab)
| 范围 | 描述 | commitId |
| ---- | ------------------------ | ------------------------------------------------------------------------ |
| - | deliver http 文件更新 | [568115c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/568115c) |
| - | 添加交付物 http 测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab) |
### 📦 持续集成
范围|描述|commitId
--|--|--
- | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
- | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
- | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
- | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
- | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
- | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
- | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)
| 范围 | 描述 | commitId |
| ---- | -------------- | ------------------------------------------------------------------------ |
| - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e) |
| - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b) |
| - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) |
| - | 更新 drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) |
| - | 更新 drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) |
| - | 测试 ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8) |
| - | 测试 ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7) |
| - | 添加 drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) |
### 🔨 代码重构
范围|描述|commitId
--|--|--
- | deliver检查人重构；更新真实数据的检查人 | [ce808c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ce808c4)
- | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
- | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
- | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e)
- | 修改错误单词‘confirmDeleDte’ | [ddbb04c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ddbb04c)
- | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
- | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
- | 审查接口核对完成 | [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)
- | 提交交付物，修改交付物名称，查看交付物历史记录接口完成 | [f222bdf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f222bdf)
- | 提交交付物，查看提交记录，修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530)
- | 细节调整 | [3d1c463](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d1c463)
- | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
| 范围 | 描述 | commitId |
| ---- | ------------------------------------------------------ | ------------------------------------------------------------------------ |
| - | deliver 检查人重构；更新真实数据的检查人 | [ce808c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ce808c4) |
| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) |
| - | 交付物插件代码审查 | [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) |
| - | 提交交付物，查看提交记录，修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530) |
| - | 提交交付物，修改交付物名称，查看交付物历史记录接口完成 | [f222bdf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f222bdf) |
| - | 完善历史记录页面和修改插件的 TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15) |
| - | 细节调整 | [3d1c463](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d1c463) |
| - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) |
| - | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e) |
| - | 修改错误单词‘confirmDeleDte’ | [ddbb04c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ddbb04c) |
| - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) |
| - | 完善历史记录页面和修改插件的 TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15) |
| - | 审查接口核对完成 | [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) |
| - | 提交交付物，修改交付物名称，查看交付物历史记录接口完成 | [f222bdf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f222bdf) |
| - | 提交交付物，查看提交记录，修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530) |
| - | 细节调整 | [3d1c463](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d1c463) |
| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) |
| - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) |
### 🚀 性能优化
范围|描述|commitId
--|--|--
- | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b)
| 范围 | 描述 | commitId |
| ---- | -------- | ------------------------------------------------------------------------ |
| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) |
### chore
范围|描述|commitId
--|--|--
- | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089)
| 范围 | 描述 | commitId |
| ---- | ------------------- | ------------------------------------------------------------------------ |
| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) |
范围|描述|commitId
--|--|--
- | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)
| 范围 | 描述 | commitId |
| ---- | -------------- | ------------------------------------------------------------------------ |
| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |

12
common/styles/tailwind.scss
View File

@ -4363,7 +4363,6 @@
height: 2.5rem;
}
.h-full {
height: 100%;
}
@ -4415,10 +4414,6 @@
--tw-bg-opacity: 1;
background-color: rgba(59, 130, 246, var(--tw-bg-opacity));
}
.text-green-400 {
--tw-text-opacity: 1;
color: rgba(52, 211, 153, var(--tw-text-opacity));
}
.text-black {
--tw-text-opacity: 1;
color: rgba(0, 0, 0, var(--tw-text-opacity));
@ -4567,7 +4562,7 @@ border-radius: 0.375rem;
width: 16rem;
}
.w-32 {
width: 8rem
width: 8rem;
}
.w-58 {
width: 14.5rem;
@ -4584,5 +4579,6 @@ border-radius: 0.375rem;
.leading-1-4 {
line-height: 1.4rem;
}
.h-screen {
height: 100vh;
}

10
pages.json
View File

@ -29,6 +29,7 @@
"navigationBarTextStyle": "white"
}
}
// 提交的历史记录
,{
"path" : "pages/submitList/submitList",
"style" :
@ -36,6 +37,15 @@
"navigationStyle": "historty",
"navigationBarTitleText": "历史交付物"
}
}
// 审核的历史记录
,{
"path" : "pages/checkerList/checkerList",
"style" :
{
"navigationStyle": "kkkkk",
"navigationBarTitleText": "审核记录"
}
}
],

23
pages/checkerList/checkerList.vue
View File

@ -0,0 +1,23 @@
<template>
<view> </view>
</template>
<script setup>
onLoad(options => {
// 根据交付物id获取上传记录
(async function getHistory() {
try {
const param = { deliverId: options.deliverId };
const data = await uni.$u.api.getDeliverHistory(param);
name.value = data.deliverName;
listRef.value = data.deliverRecordList;
console.log(data);
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('获取交付物历史失败');
}
}());
});
</script>
<style lang="scss"></style>

119
pages/submitlist/submitlist.vue
View File

@ -1,101 +1,106 @@
<template>
<theme class="h-full w-full pt-1">
<theme class="pt-1">
<view class="h-full w-full overflow-y-scroll">
<view class="bg-white mx-5 my-2 rounded-md p-3 text-gray-400" v-for="item in listRef">
<!-- 插件名称和提交时间显示 -->
<view class="flex justify-between mb-2">
<view class="text-gray-800">{{item.plugname}}</view>
<view>{{item.subtime}}</view>
<view class="text-gray-800">{{ name }}</view>
<view>{{ dayjs(+item.submitTime).format('MM-DD HH:mm') }}</view>
</view>
<!-- 提交的链接 -->
<view class="text-blue-400 mb-2">
{{item.link}}
<view class="w-64 break-all text-blue-400 py-2">
{{ item.details[0] }}
</view>
<!-- 该插件物的审核人 -->
<view class="mb-2">审核人</view>
<view class="flex justify-between my-3" v-for="items in item.reviewer">
<view class="flex justify-between my-3" v-for="items in item.checkerList">
<view>
<view class="pb-2 text-gray-800">
{{items.name}}
{{ items.checkerName }}
</view>
<view class="pb-2">
{{items.advise}}
{{ items.remark }}
</view>
<view class="pb-2">
{{items.time}}
<view class="pb-2" v-if="items.checkTime > 0">
{{ dayjs(+items.checkTime).format('MM-DD HH:mm') }}
</view>
</view>
<view class="text-center">
<view :class="items.state === '已通过' ? 'text-green-500' : items.state === '已驳回' ? 'text-red-500' : '' ">
{{items.state}}
<view v-show="items.isMine !== 1">{{ item.status == null ? '待审核' : item.status === 1 ? '已通过' : '已驳回' }}</view>
<view v-show="items.isMine === 1 && items.status == null" class="text-sm">待审核</view>
<view v-show="items.isMine === 1 && items.status !== null" class="text-sm">
<view>
{{ items.status === 1 ? '已通过' : '已驳回' }}
</view>
<view v-if="items.state === '已通过'">
<u-circle-progress active-color="#FA8C16" :percent="items.grade" width="90" border-width="7" class="mt-2">
<view v-if="items.score > 0">
<u-circle-progress active-color="#FA8C16" :percent="items.score" width="90" border-width="7" class="mt-2">
<view class="u-progress-content">
<view class="progressDot text-white">{{items.grade}}</view>
<view class="progressDot text-white text-center">{{ items.score }}</view>
</view>
</u-circle-progress>
</view>
</view>
</view>
</view>
</view>
</view>
</theme>
</template>
<script setup>
import{ref} from 'vue'
import { ref } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
const listRef = ref([
{
plugname:'入职插件V0.8输出',
subtime:'12/25 13:01',
link:'https://www.baidu.com/',
reviewer:[
{
name:'冯老师',
time: '12/25 14:22',
advise:'加油！',
state:'已通过',
grade:80
},
{
name:'宋老师',
time: '12/28 8:22',
advise:'不详细！',
state:'已驳回',
grade:''
},
{
name:'张老师',
time: '',
advise:'',
state:'待审批',
grade:''
},
]
},
])
import dayjs from 'dayjs';
// const listRef = ref([
// {
// plugname:'入职插件V0.8输出',
// subtime:'12/25 13:01',
// link:'https://www.baidu.com/',
// reviewer:[
// {
// name:'冯老师',
// time: '12/25 14:22',
// advise:'加油！',
// state:'已通过',
// grade:80
// },
// {
// name:'宋老师',
// time: '12/28 8:22',
// advise:'不详细！',
// state:'已驳回',
// grade:''
// },
// {
// name:'张老师',
// time: '',
// advise:'',
// state:'待审批',
// grade:''
// },
// ]
// },
// ])
const listRef = ref([]);
const name = ref('');
onLoad(options => {
// 根据交付物id获取上传记录
(async function getHistory() {
try {
const param = { deliverId: options.deliverId };
const data = await uni.$u.api.getDeliverHistory(param)
// console.log(data.deliverRecordList[32].checkerList)
console.log(data)
const data = await uni.$u.api.getDeliverHistory(param);
name.value = data.deliverName;
listRef.value = data.deliverRecordList;
console.log(data);
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('获取交付物历史失败');
}
}());
});
</script>
<style lang="scss">
@ -104,6 +109,6 @@ onLoad(options => {
height: 50rpx;
border-radius: 50%;
line-height: 50rpx;
background-color: #FA8C16;
background-color: #fa8c16;
}
</style>

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

@ -18,7 +18,7 @@
<!-- 审核人信息 -->
<view class="text-gray-400 flex justify-between">
<span>审核</span>
<span class="text-blue-400">更多记录</span>
<span class="text-blue-400" @click="moreRecords">更多记录</span>
</view>
<view class="px-2">
<!-- 遍历审核人信息 -->
@ -28,7 +28,7 @@
<view class="my-1">{{ item.remark }}</view>
<view class="my-1" v-if="item.checkTime > 0">{{ dayjs(+item.checkTime).format('MM-DD HH:mm') }}</view>
</view>
<view v-show="item.isMine !== 1">{{ item.status == null ? '待审核' : item.status == '1' ? '已通过' : '已驳回' }}</view>
<view v-show="item.isMine !== 1">{{ item.status == null ? '待审核' : item.status === 1 ? '已通过' : '已驳回' }}</view>
<!-- 判断是否是当前审核人 -->
<view v-show="item.isMine === 1 && item.status == null">
<u-button size="mini" shape="circle" class="mr-4 h-1-4 leading-1-4" type="primary" @click="approved">通过</u-button>
@ -123,7 +123,7 @@ import dayjs from 'dayjs';
const props = defineProps({ task: { type: Object, default: () => {} } });
const store = useStore();
const nameRef = ref('入职插件V0.8原型输出');
const nameRef = ref('');
const iconRef = ref(false);
const submitter = ref('黛西');
const timeRef = ref('');
@ -150,7 +150,6 @@ const deliverRecordId = computed(() => store.state.deliver.deliverRecordId);
timeRef.value = data.submitTime;
nameRef.value = data.deliverName;
checkerList.value = data.checkerList;
console.log(checkerList.value);
}());
// 通过的按钮事件
@ -198,6 +197,11 @@ function confirmReject() {
}
rebutModal.value = false;
}
// 跳转到审核记录页面
function moreRecords() {
uni.navigateTo({ url: '/pages/checkerList/checkerList' });
}
</script>
<style scoped lang="scss">

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

@ -146,8 +146,9 @@ function submit() {
checkerList,
};
uni.$u.api.submitDeliverInfo(param);
submitBtnLoading.value = false; // 隐藏loading
uBadgeShow.value = true;
uni.$ui.showToast('提交交付物信息成功');
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('提交交付物信息失败');

Write Preview
Loading…
Cancel
Save