From 0c0fa2483fd431104f6498e40fffd983d913dce2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 25 四月 2023 17:11:09 +0800
Subject: [PATCH] 修改
---
src/views/analyse/identify/index.vue | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/src/views/analyse/identify/index.vue b/src/views/analyse/identify/index.vue
index 320da4a..d5f3e03 100644
--- a/src/views/analyse/identify/index.vue
+++ b/src/views/analyse/identify/index.vue
@@ -34,33 +34,44 @@
</template>
</el-table-column>
<el-table-column prop="identificationUser" label="计划负责人" />
+ <el-table-column prop="identificationUser" label="辨识专家" />
<el-table-column prop="evaluateUser" label="评价专家" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
- <el-table-column prop="planExecStatus" label="状态" show-overflow-tooltip>
+ <el-table-column prop="planExecStatus" label="执行状态" show-overflow-tooltip>
<template #default="scope">
<div>
+ <div v-if="scope.row.planExecStatus === 1">
+ <el-tag :type="'info'">
+ {{ '未开始' }}
+ </el-tag>
+ </div>
<div v-if="scope.row.planExecStatus === 2">
<el-tag :type="'info'">
- {{ '未辨识' }}
+ {{ '辨识阶段' }}
</el-tag>
</div>
<div v-if="scope.row.planExecStatus === 3">
- <el-tag :type="'success'">
- {{ '已辨识' }}
+ <el-tag :type="'primary'">
+ {{ '评价阶段' }}
</el-tag>
+ </div>
+ <div v-if="scope.row.planExecStatus === 4">
+ <el-tag :type="'success'">
+ {{ '完成阶段' }}
+ </el-tag>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="250">
<template #default="scope">
- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" @click="accessIdentify(scope.row)">提交</el-button>
- <el-button size="small" text type="primary" :icon="View" @click="openIdentifyQuery('查看', scope.row)">查看</el-button>
- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" :icon="Edit" @click="openIdentifyQuery('编辑', scope.row)">编辑</el-button>
- <el-button size="small" text type="danger" :icon="Delete" @click="onDelIdentify(scope.row)">删除</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2 && scope.row.identificationUserId == identifyState.user" @click="accessIdentify(scope.row)">提交</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 3 || scope.row.planExecStatus === 4" :icon="View" @click="openIdentifyQuery('查看', scope.row)">查看</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2 && scope.row.identificationUserId == identifyState.user" :icon="Edit" @click="openIdentifyQuery('辨识', scope.row)">辨识</el-button>
+<!-- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" :icon="Edit" @click="openIdentifyQuery('编辑', scope.row)">编辑</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -81,13 +92,17 @@
import { Edit, View, Plus, Delete } from '@element-plus/icons-vue';
import {planApi} from "/@/api/analyse/plan";
import {userApi} from "/@/api/systemManage/user";
+import {useUserInfo} from "/@/stores/userInfo";
+import {storeToRefs} from "pinia";
const IdentifyQueryDialog = defineAsyncComponent(() => import('./components/identifyQuery.vue'));
const identifyQueryDialogRef = ref();
-
+const userInfo = useUserInfo();
+const { userInfos } = storeToRefs(userInfo);
const identifyState = reactive<IdentifyStateType>({
identifyData: [],
+ user: null,
searchQuery: {
pageIndex: 1,
pageSize: 10,
@@ -146,12 +161,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
identifyState.personList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
@@ -192,29 +210,36 @@
};
const accessIdentify = (val: IdentifyType) => {
- ElMessageBox.confirm(`此操作将派发该计划：“${val.assessPlanName}”，是否继续?`, '提示', {
+ if(val.factorQueryDTOList?.length > 0){
+ ElMessageBox.confirm(`此操作将提交该计划：“${val.assessPlanName}”的辨识信息，是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
- })
- .then(async () => {
+ })
+ .then(async () => {
let res = await identifyApi().submitIdentify({ id: val.id});
if (res.data.code === 100) {
- ElMessage({
- type: 'success',
- duration: 2000,
- message: '提交成功'
- });
- await getIdentifyData();
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '提交成功'
+ });
+ await getIdentifyData();
} else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
- })
- .catch((error) => {
- });
+ })
+ .catch((error) => {
+ });
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: '请先添加辨识信息'
+ });
+ }
};
const onHandleSizeChange = (val: number) => {
@@ -241,6 +266,7 @@
getIdentifyData();
getAllPlanList();
getPersonList();
+ identifyState.user = Number(userInfos.value.uid)
});
</script>
--
Gitblit v1.9.2