From c380f2a463e387d864f46c9eaf3c54daf48b3192 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 18 四月 2023 09:59:55 +0800
Subject: [PATCH] 修改
---
src/views/analyse/plan/index.vue | 2 +-
src/layout/navBars/breadcrumb/user.vue | 26 +++++++++++++-------------
src/views/analyse/applyReview/components/reportDialog.vue | 2 +-
src/views/analyse/assessApply/components/reportDialog.vue | 19 +++++++++++++++++++
src/views/analyse/evaluate/components/evaluateDialog.vue | 4 +---
5 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 590ad2c..a3a4dc1 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -7,18 +7,18 @@
</div>
<div style="display: flex; align-items: center; padding-right: 5px">
<!-- <div @click="backToMenu()" class="backBtn">返回首页</div>-->
- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
- <div class="layout-navbars-breadcrumb-user-icon">
- <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
- </div>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">-->
+<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+<!-- <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>-->
+<!-- </div>-->
+<!-- <template #dropdown>-->
+<!-- <el-dropdown-menu>-->
+<!-- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>-->
+<!-- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>-->
+<!-- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </template>-->
+<!-- </el-dropdown>-->
<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
<!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
@@ -66,7 +66,7 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="/newMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+ <el-dropdown-item command="/project">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
<!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
<!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
diff --git a/src/views/analyse/applyReview/components/reportDialog.vue b/src/views/analyse/applyReview/components/reportDialog.vue
index 5724dfa..dbda8f2 100644
--- a/src/views/analyse/applyReview/components/reportDialog.vue
+++ b/src/views/analyse/applyReview/components/reportDialog.vue
@@ -178,7 +178,7 @@
<td class="w-25 m-color">{{item.approveStage}}</td>
<td class="w-25">{{item.approvePerson}}</td>
<td class="w-25 m-color">审批结果</td>
- <td class="w-25">{{item.approveStatus==1?'未审批':item.approveStatus==2?'通过':'未通过'}}</td>
+ <td class="w-25" :class="item.approveStatus==3?'redTit':''">{{item.approveStatus==1?'未审批':item.approveStatus==2?'通过':'未通过'}}</td>
</tr>
<tr>
<td class="w-25 m-color autoheight">审批意见</td>
diff --git a/src/views/analyse/assessApply/components/reportDialog.vue b/src/views/analyse/assessApply/components/reportDialog.vue
index 142e16d..edb56e2 100644
--- a/src/views/analyse/assessApply/components/reportDialog.vue
+++ b/src/views/analyse/assessApply/components/reportDialog.vue
@@ -172,6 +172,21 @@
<tr>
<el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.description" placeholder="评定依据（必填）" />
</tr>
+ <tr v-if="reportDialogState.reportForm.person?.length>0" class="m-color b-font" style="text-align: center">审批内容</tr>
+ <template v-if="reportDialogState.reportForm.person?.length>0" v-for="item in reportDialogState.reportForm.person">
+ <tr>
+ <td class="w-25 m-color">{{item.approveStage}}</td>
+ <td class="w-25">{{item.approvePerson}}</td>
+ <td class="w-25 m-color">审批结果</td>
+ <td class="w-25" :class="item.approveStatus==3?'redTit':''">{{item.approveStatus==1?'未审批':item.approveStatus==2?'通过':'未通过'}}</td>
+ </tr>
+ <tr>
+ <td class="w-25 m-color autoheight">审批意见</td>
+ <td class="w-75 autoheight l-border">
+ {{ item.approveDesc }}
+ </td>
+ </tr>
+ </template>
</table>
</el-form>
<template #footer>
@@ -514,6 +529,10 @@
width: 75%;
}
+&.redTit{
+ color: red;
+}
+
.ant-input {
height: 100%;
border: none;
diff --git a/src/views/analyse/evaluate/components/evaluateDialog.vue b/src/views/analyse/evaluate/components/evaluateDialog.vue
index 3844ef9..0962dd0 100644
--- a/src/views/analyse/evaluate/components/evaluateDialog.vue
+++ b/src/views/analyse/evaluate/components/evaluateDialog.vue
@@ -919,14 +919,13 @@
// evaluateDialogState.evaluateForm.riskValue = Number(numOriginValue.value)
if(evaluateDialogState.title === '评价'){
let { lecId, lsId, mesId, rsId, ...data} = evaluateDialogState.evaluateForm
- console.log(data,'要评价')
let res = await evaluateApi().addEvaluate(data);
if(res.data.code === 100){
emit('refresh')
evaluateDialogState.evaluateDialogVisible = false;
ElMessage({
type: 'success',
- message: '新增成功'
+ message: '评价成功'
})
}else{
ElMessage({
@@ -935,7 +934,6 @@
});
}
}else{
- console.log(evaluateDialogState.evaluateForm,'要编辑')
let res = await evaluateApi().modEvaluate(evaluateDialogState.evaluateForm)
if(res.data.code === 100){
emit('refresh')
diff --git a/src/views/analyse/plan/index.vue b/src/views/analyse/plan/index.vue
index 3aa9c99..41a1f9e 100644
--- a/src/views/analyse/plan/index.vue
+++ b/src/views/analyse/plan/index.vue
@@ -42,7 +42,7 @@
</el-table-column>
<el-table-column prop="identificationUser" label="辨识专家" />
<el-table-column prop="evaluateUser" label="评价专家" />
- <el-table-column prop="sceneUser" label="现场专家" />
+<!-- <el-table-column prop="sceneUser" 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>
--
Gitblit v1.9.2