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
Min5203 4 years ago
parent
fc4ef13207 7f9cf1f0f5
commit
d8a43286fb
8 changed files with 179 additions and 157 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. 1
      CHANGELOG.md
  2. 19
      components/Reviewer/Reviewer.vue
  3. 3
      pages/checkerList/checkerList.vue
  4. 3
      pages/submitlist/submitlist.vue
  5. 259
      plugins/p-deliver-checker/p-deliver-checker.vue
  6. 31
      plugins/p-deliver/p-deliver.vue
  7. 18
      store/deliver/index.js
  8. 2
      store/index.js

1
CHANGELOG.md
View File

@ -108,4 +108,3 @@
范围|描述|commitId
--|--|--
- | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)

19
components/Reviewer/Reviewer.vue
View File

@ -6,8 +6,8 @@
<!-- 展示选择的审核人 -->
<view class="flex item-center truncate justify-end flex-1 text-sm">
<view v-for="item in showCheckers" class="mx-1">
<!-- <u-badge :is-dot="true" is-center></u-badge> -->
{{ item.name }}
<!-- <u-badge :is-dot="true" is-center></u-badge> -->
{{ item.name }}
</view>
<view class="mx-1" v-show="checkedCheckers.length > 3">...</view>
</view>
@ -18,7 +18,13 @@
<!-- 隐藏的审核人选项 -->
<view v-show="!collapsed" class="foot mt-2 flex flex-wrap">
<u-button v-for="item in checkers" :type="item.checked ? 'primary' : 'default'" size="mini" class="my-1 mx-2" @click="item.checked = !item.checked">{{ item.name }}</u-button>
<u-button
v-for="item in checkers"
:type="item.checked ? 'primary' : 'default'"
size="mini"
class="my-1 mx-2"
@click="item.checked = !item.checked"
>{{ item.name }}</u-button>
</view>
</view>
</template>
@ -36,9 +42,8 @@ const collapsed = ref(true);
const checkers = computed(() => store.state.role.members);
// 所有选中的审核人
const checkedCheckers = computed(() => checkers.value.filter(item => item.checked));
const checkedCheckers = computed(() => checkers.value.filter(item => item.checked) || []);
// 折叠状态 显示的选中的检查人
const showCheckers = computed(() => {
return checkedCheckers.value.length > 3 ? checkedCheckers.value.slice(0, 3) : checkedCheckers.value;
})
const showCheckers = computed(() => (checkedCheckers.value.length > 3 ? checkedCheckers.value.slice(0, 3) : checkedCheckers.value));
</script>

3
pages/checkerList/checkerList.vue
View File

@ -18,7 +18,7 @@
<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 class="progress-dot text-white text-center">{{ item.score }}</view>
</view>
</u-circle-progress>
</view>
@ -41,7 +41,6 @@ onLoad(options => {
const param = { deliverRecordId: options.deliverRecordId };
const data = await uni.$u.api.queryCheckLog(param);
checkerList.value = data;
console.log(checkerList.value);
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('获取检查交付物历史失败');

3
pages/submitlist/submitlist.vue
View File

@ -35,7 +35,7 @@
<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 text-center">{{ items.score }}</view>
<view class="progress-dot text-white text-center">{{ items.score }}</view>
</view>
</u-circle-progress>
</view>
@ -94,6 +94,7 @@ onLoad(options => {
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('获取交付物历史失败');

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

@ -1,171 +1,166 @@
<template>
<theme>
<view class="bg-white rounded-md">
<view class="p-3 flex justify-between" @click="iconRef = !iconRef">
<span class="relative p-1">
<!-- <u-badge :is-dot="true" is-center></u-badge> -->
{{ nameRef }}
</span>
<u-icon :name="iconRef ? 'arrow-right' : 'arrow-down'"></u-icon>
<view class="bg-white rounded-md">
<view class="p-3 flex justify-between" @click="collapsed = !collapsed">
<span class="relative p-1">
<!-- <u-badge :is-dot="true" is-center></u-badge> -->
{{ checkData ? checkData.deliverName : '' }}
</span>
<!-- 展开折叠按钮 -->
<u-icon :name="collapsed ? 'arrow-up' : 'arrow-down'"></u-icon>
</view>
<view class="p-3 pt-0" v-show="collapsed">
<!-- 提交人和时间信息 -->
<view class="text-gray-400">
<!-- <span class="mr-2" v-if="checkData && checkData.submitter">{{ checkData.submitter }}</span> -->
<span v-if="checkData && checkData.submitTime"> {{ dayjs(+checkData.submitTime).format('MM-DD HH:mm') }}</span>
</view>
<view class="p-3 pt-0" v-show="iconRef">
<!-- 提交人和时间信息 -->
<view class="text-gray-400">
<span class="mr-2">{{ submitter }}</span> <span> {{ dayjs(+timeRef).format('MM-DD HH:mm') }}</span>
</view>
<!-- 提交的链接信息 -->
<view class="w-64 break-all text-blue-400 py-2"> {{ linkRef }} </view>
<!-- 审核人信息 -->
<view class="text-gray-400 flex justify-between">
<span>审核</span>
<span class="text-blue-400" @click="moreRecords">更多记录</span>
</view>
<view class="px-2">
<!-- 遍历审核人信息 -->
<view class="mt-3 text-sm flex justify-between" v-for="item in checkerList">
<!-- 提交的链接信息 -->
<view class="w-64 break-all text-blue-400 py-2" v-if="checkData && checkData.details && checkData.details[0]">
{{ checkData.details[0] }}
</view>
<!-- 审核人信息 -->
<view class="text-gray-400 flex justify-between">
<span>审核</span>
<span class="text-blue-400" @click="moreRecords">更多记录</span>
</view>
<view class="px-2" v-if="checkData && checkData.checkerList">
<!-- 遍历审核人信息 -->
<view class="mt-3 text-sm flex justify-between" v-for="item in checkData.checkerList">
<view>
<view>{{ item.checkerName }}</view>
<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">
<u-button size="mini" shape="circle" class="mr-4 h-1-4 leading-1-4" type="primary" @click="approvedModal = true">通过</u-button>
<u-button size="mini" shape="circle" class="h-1-4 leading-1-4" type="error" @click="rebutModal = true">驳回</u-button>
</view>
<!-- 自己是审核人 且审核过 当前审核人的审核状态并展示得分情况 -->
<view v-show="item.isMine === 1 && item.status !== null" class="text-sm">
<view>
<view>{{ item.checkerName }}</view>
<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>
{{ 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>
<u-button size="mini" shape="circle" class="h-1-4 leading-1-4" type="error" @click="rebut">驳回</u-button>
</view>
<!-- 当前审核人的审核状态并展示得分情况 -->
<view v-show="item.isMine === 1 && item.status !== null" class="text-sm">
<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 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="progress-dot text-white text-center">{{ item.score }}</view>
</view>
</u-circle-progress>
</view>
</view>
</view>
</view>
</view>
<!-- 审核通过的modal -->
<u-mask :show="approvedModal" @click="approvedModal = false">
<view class="warp">
<view class="rect2" @tap.stop>
<!-- 通过modal的标题 -->
<view class="text-center my-7 font-semibold"> 审核通过 </view>
<!-- 通过modal的进步器和滑动选择器 -->
<view class="flex justify-between mx-5">
<u-number-box v-model="score" size="30" input-width="50"></u-number-box>
<view class="w-32 pt-4">
<u-slider v-model="score" active-color="#34D399"></u-slider>
</view>
<!-- 审核通过的modal -->
<u-mask :show="approvedModal" @click="approvedModal = false">
<view class="warp">
<view class="rect2" @tap.stop>
<!-- 通过modal的标题 -->
<view class="text-center my-7 font-semibold"> 审核通过 </view>
<!-- 评分 -->
<view class="flex justify-between mx-5">
<u-number-box v-model="score" size="30" input-width="50" :max="100" :min="0" :step="1"></u-number-box>
<view class="w-32 pt-4">
<u-slider v-model="score" active-color="#34D399" :max="100" :min="0" :step="1"></u-slider>
</view>
<view>
<textarea
class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
placeholder="请输入通过建议"
maxlength="30"
v-model="adviceRef"
></textarea>
<view class="common-list">
<view v-for="item in commonWords" class="h-12 leading-12 w-62 mx-5" @click="adviceRef = item">
{{ item }}
</view>
</view>
<view>
<textarea
class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
placeholder="请输入通过建议"
maxlength="30"
v-model="adviceRef"
></textarea>
<view class="common-list">
<view v-for="item in commonWords" class="h-12 leading-12 w-62 mx-5" @click="adviceRef = item">
{{ item }}
</view>
</view>
<view class="flex justify-around h-12 mt-7 justify-self-stretch box-modal-border">
<view class="leading-12 flex-1 text-center delete-modal-border" @click="approvedModal = false"> 取消 </view>
<view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmAdvice"> 确定 </view>
</view>
</view>
<view class="flex justify-around h-12 mt-7 justify-self-stretch box-modal-border">
<view class="leading-12 flex-1 text-center delete-modal-border" @click="approvedModal = false"> 取消 </view>
<view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmAdvice"> 确定 </view>
</view>
</view>
</u-mask>
</view>
</u-mask>
<!-- 审批驳回的modal -->
<u-mask :show="rebutModal" @click="rebutModal = false">
<view class="warp">
<view class="rect3" @tap.stop>
<!-- 通过modal的标题 -->
<view class="text-center my-6 font-semibold"> 审核驳回 </view>
<view>
<textarea
class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
placeholder="请输入通过建议"
maxlength="30"
v-model="rebutRef"
></textarea>
<view class="common-list">
<view v-for="item in rebutWords" class="h-12 leading-12 w-62 mx-5" @click="rebutRef = item">
{{ item }}
</view>
<!-- 审批驳回的modal -->
<u-mask :show="rebutModal" @click="rebutModal = false">
<view class="warp">
<view class="rect3" @tap.stop>
<!-- 通过modal的标题 -->
<view class="text-center my-6 font-semibold"> 审核驳回 </view>
<view>
<textarea
class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
placeholder="请输入通过建议"
maxlength="30"
v-model="rebutRef"
></textarea>
<view class="common-list">
<view v-for="item in rebutWords" class="h-12 leading-12 w-62 mx-5" @click="rebutRef = item">
{{ item }}
</view>
</view>
<view class="flex justify-around h-12 mt-7 justify-self-stretch box-modal-border">
<view class="leading-12 flex-1 text-center delete-modal-border" @click="rebutModal = false"> 取消 </view>
<view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmReject"> 确定 </view>
</view>
</view>
<view class="flex justify-around h-12 mt-7 justify-self-stretch box-modal-border">
<view class="leading-12 flex-1 text-center delete-modal-border" @click="rebutModal = false"> 取消 </view>
<view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmReject"> 确定 </view>
</view>
</view>
</u-mask>
</view>
</theme>
</view>
</u-mask>
</view>
</template>
<script setup>
import { ref } from 'vue';
import { ref, computed } from 'vue';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
const props = defineProps({ task: { type: Object, default: () => {} } });
const store = useStore();
const nameRef = ref('');
const iconRef = ref(false);
const submitter = ref('黛西');
const timeRef = ref('');
const linkRef = ref('');
const projectId = computed(() => store.getters['project/projectId']);
const collapsed = ref(false);
const checkData = ref(null); // 获取到的审核信息
const approvedModal = ref(false); // 审核通过的modal
const rebutModal = ref(false); // 审核驳回的modal
const score = ref(1); // 分数
const score = ref(10); // 分数
const adviceRef = ref(''); // 审核通过的审批语
const rebutRef = ref(''); // 审核驳回的审批语
const commonWords = ['加油，再接再厉！', '很棒！', '不错，很详细！', '加油，再接再厉']; // 审核通过常用的审批语
const rebutWords = ['不详细', '还有需要改进的地方', '驳回审批1', '驳回审批2']; // 审核驳回常用的审批语
const checkerList = ref([]);
// 获取当前审核信息
(async function getDeliverList() {
const param = { taskId: props.task.id };
const data = await uni.$u.api.getDeliverByTaskId(param);
// console.log(data)
linkRef.value = data.details[0];
timeRef.value = data.submitTime;
nameRef.value = data.deliverName;
checkerList.value = data.checkerList;
try {
const param = { taskId: props.task.id };
checkData.value = await uni.$u.api.getDeliverByTaskId(param);
} catch (error) {
console.error('getDeliverList error: ', error);
}
}());
// 通过的按钮事件
async function approved() {
approvedModal.value = true;
}
// 驳回的按钮事件
function rebut() {
rebutModal.value = true;
}
// 审核通过发送相关请求
function confirmAdvice() {
// TODO:发送请求
// console.log('确定')
try {
const { deliverRecordId } = store.state.deliver;
const param = {
projectId: store.state.project.project.id,
deliverRecordId: store.state.project.deliverRecordId,
projectId: projectId.value,
deliverRecordId,
type: 1,
remark: adviceRef.value,
score: score.value,
@ -181,9 +176,10 @@ function confirmAdvice() {
function confirmReject() {
// TODO:发送请求
try {
const { deliverRecordId } = store.state.deliver;
const param = {
projectId: store.state.project.project.id,
deliverRecordId: store.state.project.deliverRecordId,
projectId: projectId.value,
deliverRecordId,
type: 2,
remark: rebutRef.value,
score: '',
@ -197,17 +193,8 @@ function confirmReject() {
// 跳转到审核记录页面
function moreRecords() {
const deliverRecordId = store.state.project.deliverRecordId
const { deliverRecordId } = store.state.deliver;
uni.navigateTo({ url: `/pages/checkerList/checkerList?deliverRecordId=${deliverRecordId}` });
}
</script>
<style scoped lang="scss">
.progressDot {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
line-height: 50rpx;
background-color: #fa8c16;
}
</style>
<style scoped lang="scss"></style>

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

@ -14,7 +14,17 @@
</span>
</view>
<u-button type="primary" size="mini" @click="submit" class="self-center" :disabled="submitState" v-show="!uBadgeShow">提交</u-button>
<!-- 提交 -->
<u-button
type="primary"
size="mini"
@click="submit"
class="self-center"
:disabled="submitState"
:ripple="true"
:loading="submitBtnLoading"
v-show="!uBadgeShow"
>提交</u-button>
<!-- 查看提交历史的按钮 -->
<u-icon name="arrow-right" class="ml-3" @click="openDeliverHistory"></u-icon>
@ -22,7 +32,9 @@
<!-- 插件上传方式 -->
<view>
<view class="linkBox"><u-input v-model="linkValue" type="text" :border="true" placeholder="请输入交付物地址/链接" class="input"></u-input></view>
<view class="link-box">
<u-input v-model="linkValue" type="text" :border="true" placeholder="请输入交付物地址/链接" class="input"></u-input>
</view>
<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="uploadFile">文件</u-button>
@ -80,8 +92,9 @@ const deliver = ref();
const submitState = computed(() => !linkValue.value);
// 获取选中的审核人信息
const projectId = computed(() => store.getters['project/projectId']);
const delivers = computed(() => store.state.role.members);
const checkedDelivers = computed(() => delivers.value.filter(item => item.checked));
const checkedCheckers = computed(() => delivers.value.filter(item => item.checked));
getDeliverData();
// 根据任务id获取交付物信息
async function getDeliverData() {
@ -95,7 +108,6 @@ async function getDeliverData() {
console.log('error: ', error);
}
}
// 验证提交的交付物信息格式
function validateDeliverForm() {
const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/;
@ -105,7 +117,7 @@ function validateDeliverForm() {
return false;
}
// 没有检查人 提示选择检查人
if (!checkedDelivers.value || !checkedDelivers.value.length) {
if (!checkedCheckers.value || !checkedCheckers.value.length) {
uni.$ui.showToast('请选择检查人');
return false;
}
@ -119,18 +131,19 @@ function submit() {
// 验证成功后进行请求
try {
const checkerList = [];
checkedDelivers.value.forEach(item => {
checkedCheckers.value.forEach(item => {
checkerList.push(item.memberId);
});
const param = {
projectId: store.state.project.project.id,
projectId: projectId.value,
deliverId: deliver.value.deliverId,
fileList: [linkValue.value],
checkerList,
};
console.log(param);
uni.$u.api.submitDeliverInfo(param);
store.commit('deliver/setDeliverRecordId', deliver.value.deliverRecordId);
uBadgeShow.value = true;
store.state.project.deliverRecordId = deliver.value.deliverRecordId;
} catch (error) {
console.log('error: ', error);
uni.$ui.showToast('提交交付物信息失败');
@ -193,7 +206,7 @@ async function confirmEditDeliverName() {
}
try {
const param = {
projectId: store.state.project.project.id,
projectId: projectId.value,
taskId: props.task.id,
deliverName: newInputRef.value,
};

18
store/deliver/index.js
View File

@ -0,0 +1,18 @@
export default {
namespaced: true,
state: {
deliverRecordId: '', // 交付物记录id
},
getters: {},
mutations: {
/**
* 设置交付物记录id
* @param {object} state
* @param {string} recordId
*/
setDeliverRecordId(state, recordId) {
state.deliverRecordId = recordId;
},
},
actions: {},
};

2
store/index.js
View File

@ -4,7 +4,7 @@ import role from './role/index.js';
import socket from './socket/index.js';
import task from './task/index.js';
import user from './user/index.js';
import deliver from './user/index.js';
import deliver from './deliver/index.js';
// 不属于具体模块的 应用级的 store内容
const state = {

Write Preview
Loading…
Cancel
Save