diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278b335..a268d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
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)
diff --git a/apis/plugin.js b/apis/plugin.js
index a3616b5..9be2729 100644
--- a/apis/plugin.js
+++ b/apis/plugin.js
@@ -1,13 +1,12 @@
import Config from '@/common/js/config.js';
-const apiUrl = Config.apiUrl;
+const { apiUrl } = Config;
const defaultwbs = `${apiUrl}/defaultwbs`;
export function setupPlugin(app) {
uni.$u.api = { ...uni.$u.api } || {};
// 获取插件信息
- uni.$u.api.getOtherPlugin = param =>
- uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`);
+ uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`);
// 查询子任务
uni.$u.api.findSonTask = param => uni.$u.post(`${defaultwbs}/task/findSonTask`, param);
@@ -19,6 +18,7 @@ export function setupPlugin(app) {
uni.$u.api.queryDeliverOfTask = param => uni.$u.post(`${defaultwbs}/deliver/queryDeliverOfTask`, param);
// 检查交付物
uni.$u.api.checkDeliver = param => uni.$u.post(`${defaultwbs}/deliver/checkDeliver`, param);
+ // v4.0
// 根据任务id获取任务的交付物信息
uni.$u.api.getDeliverByTaskId = param => uni.$u.post(`${defaultwbs}/deliver/getDeliver`, param);
}
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index cbdf29e..d2f401e 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -4,13 +4,7 @@
.u-card {
font-size: 16px !important;
background-color: #f3f3f3 !important;
- .btns{
- color: #007aff;
- }
- .active {
- background-color: #2979ff;
- color: #ffffff;
- }
+
.mask {
position: absolute;
top: 0;
diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue
index 135b903..55a2024 100644
--- a/components/Reviewer/Reviewer.vue
+++ b/components/Reviewer/Reviewer.vue
@@ -1,110 +1,44 @@
-
+
+
+ 审核人
+
+
+
+
+
+ {{ item.name }}
+
+ ...
+
+
+
+
+
+
+
+
+
-
-
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index d28c05b..700a712 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -22,21 +22,17 @@
-
-
-
+
- 粘贴
- 文件
- 拍照
+ 粘贴
+ 文件
+ 拍照
- 修改
+ 修改
删除
@@ -46,14 +42,12 @@
- 交付物标题名称
-
-
-
+ 交付物标题名称
+
- 取消
- 确定
+ 取消
+ 确定
@@ -62,7 +56,7 @@
-
+
@@ -98,7 +92,7 @@ const submitState = computed(() => !linkValue.value);
console.log('error: ', error);
uni.$ui.showToast('获取交付物信息失败');
}
-}());
+})();
// (async function getDeliverData(){
// try{
@@ -112,16 +106,31 @@ const submitState = computed(() => !linkValue.value);
// uni.$ui.showToast('获取交付物信息失败')
// }
// })
-
-// 提交后验证链接并修改状态
-function submit() {
+// 验证提交的交付物信息格式
+function validateDeliverForm() {
const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/;
if (!reg.test(linkValue.value)) {
// 显示toast信息
uni.$ui.showToast('请输入正确的链接');
- } else {
- uBadgeShow.value = true;
+ return false;
+ }
+ // 没有检查人 提示选择检查人
+ if (!checkedDelivers.value || !checkedDelivers.value.length) {
+ uni.$ui.showToast('请选择检查人');
+ return false;
}
+ return true;
+}
+
+// 提交后验证链接并修改状态
+function submit() {
+ if (!validateDeliverForm()) return;
+
+
+ // else {
+ // //
+ // uBadgeShow.value = true;
+ // }
}
// 查看历史记录
@@ -134,7 +143,7 @@ function paste() {
uni.getClipboardData({
success(res) {
linkValue.value = res.data;
- },
+ }
});
}
@@ -145,7 +154,7 @@ async function uploadFile() {
'https://test.tall.wiki/filedeal/file/upload/multiple',
{},
['.xls', '.xlsx', '.zip', '.exe', '.pdf', '.doc', '.docx', '.ppt', '.pptx'],
- 'files',
+ 'files'
);
// console.log(data[0])
linkValue.value = data[0].visitUrl;
@@ -161,7 +170,7 @@ async function uploadPhoto() {
'https://test.tall.wiki/filedeal/file/upload/multiple',
{},
['.xls', '.xlsx', '.zip', '.exe', '.pdf', '.doc', '.docx', '.ppt', '.pptx'],
- 'files',
+ 'files'
);
// console.log(data[0])
linkValue.value = data[0].visitUrl;
@@ -205,5 +214,4 @@ async function confirmDelete() {
}
-
+