Commit 2890c4f9 authored by liangjingpeng's avatar liangjingpeng

细节修改3

parent 0de51f8b
This diff is collapsed.
......@@ -88,7 +88,7 @@
<div style="padding:5px 10px">
<div v-if="themeType !== '8'" class="tableTitle">标签管理列表</div>
<el-table v-loading="loading" border :data="resLabelInfoList">
<el-table-column type="index" label="序号" min-width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column min-width="120" label="课题号" prop="problemNumber" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.problemNumber || '-' }}
......@@ -132,7 +132,7 @@
<!-- >{{ scope.row.stage }}</el-tag>-->
</el-table-column>
<el-table-column min-width="100" label="状态" prop="state">
<el-table-column min-width="120" label="状态" prop="state">
<template slot-scope="scope">
<!-- <el-switch-->
<!-- v-model="scope.row.state"-->
......@@ -158,7 +158,7 @@
<template slot-scope="scope">
<!-- <el-button v-if="scope.row.state === '验收评审中' ||scope.row.state === '立项评审中'" icon="el-icon-edit-outline" @click="handleProject(scope.row)" />-->
<el-button
v-if="scope.row.state === '验收评审中' ||scope.row.state === '立项评审中'"
v-if="(scope.row.state === '验收评审中' && scope.row.acceptanceState === '待本人评审') ||(scope.row.state === '立项评审中' && scope.row.projectState === '待本人评审')"
:class="commonField.delClass"
:type="commonField.typeParent"
:size="commonField.size"
......@@ -171,7 +171,7 @@
:class="commonField.updateClass"
:type="commonField.typeParent"
:size="commonField.size"
@click=""
@click="handleView(scope.row)"
>查看
</el-button>
</template>
......@@ -298,37 +298,37 @@ export default {
statusOptions: [
{
dictLabel: '立项评审中',
dictValue: '0'
dictValue: '立项评审中'
},
{
dictLabel: '项目申报中',
dictValue: '1'
dictValue: '项目申报中'
},
{
dictLabel: '验收评审中',
dictValue: '2'
dictValue: '验收评审中'
},
{
dictLabel: '验收申请中',
dictValue: '3'
dictValue: '验收申请中'
},
{
dictLabel: '验收完成',
dictValue: '4'
dictValue: '验收完成'
}
],
sortOptions: [
{
dictLabel: '模板',
dictValue: '1'
dictLabel: '一般课题',
dictValue: '一般课题'
},
{
dictLabel: '镜像',
dictValue: '2'
dictLabel: '专题课题',
dictValue: '专题课题'
},
{
dictLabel: '数据集',
dictValue: '3'
dictLabel: '重要课题',
dictValue: '重要课题'
}
],
// 用户导入参数
......@@ -470,7 +470,7 @@ export default {
// this.title = '修改标签信息'
// })
// },
/** 评审中操作按钮*/
/** 操作-编辑按钮*/
handleProject(row) {
console.log('row', row)
this.$router.push({
......@@ -480,6 +480,16 @@ export default {
}
})
},
/** 操作-查看按钮*/
handleView(row) {
console.log('row', row)
this.$router.push({
path: '/reviewExperts/topicList/reviewPage',
query: {
state: row.state
}
})
},
// 改变状态
// handleStatusChange(row) {
// const text = row.flag === '1' ? '启用' : '停用'
......
......@@ -35,40 +35,40 @@ export const tableColumn = [
createDate: '2018-12-23',
stage: '立项',
state: '申报完成',
projectState: '待本人评审',
projectState: '本人已评审',
acceptanceState: ''
},
{
businessId: '4',
problemNumber: '2024kk1304',
problemName: '母猪的繁育',
declareType: '一般课题',
declareType: '重要课题',
headName: '白眉鹰王',
phoneNumber: '12345678901',
createDate: '2020-01-01',
stage: '立项',
state: '项目申报中',
projectState: '本人已评审',
acceptanceState: '本人已评审'
projectState: '待本人评审',
acceptanceState: ''
},
{
businessId: '5',
problemNumber: '2024kk1305',
problemName: '母猪的繁育',
declareType: '一般课题',
declareType: '重要课题',
headName: '金毛狮王',
phoneNumber: '12345678901',
createDate: '2020-01-01',
stage: '验收',
state: '验收申请中',
projectState: '待本人评审',
projectState: '本人已评审',
acceptanceState: ''
},
{
businessId: '6',
problemNumber: '2024kk1306',
problemName: '母猪的繁育',
declareType: '一般课题',
declareType: '专题课题',
headName: '白骨精',
phoneNumber: '12345678901',
createDate: '2020-01-01',
......@@ -81,7 +81,7 @@ export const tableColumn = [
businessId: '7',
problemNumber: '2024kk1307',
problemName: '母猪的繁育',
declareType: '一般课题',
declareType: '专题课题',
headName: '白骨精',
phoneNumber: '12345678901',
createDate: '2020-01-01',
......
......@@ -4,7 +4,9 @@
<el-steps :active="active" align-center finish-status="success">
<el-step>
<div slot="title">
<span v-if="active === 0" class="step-title">立项评审中<a style="color: #bc14ff;font-weight: normal;">(待本人评审)</a></span>
<span v-if="oneStep === '项目申报中'" class="step-title">项目申报中</span>
<span v-else-if="oneStep === '申报完成'" class="step-title">申报完成</span>
<span v-else-if="active === 0" class="step-title">立项评审中<a style="color: #bc14ff;font-weight: normal;">(待本人评审)</a></span>
<span v-else class="step-title">立项评审完成</span>
</div>
</el-step>
......@@ -13,9 +15,10 @@
<span class="step-title">中期评审完成</span>
</div>
</el-step>
<el-step title="步骤 3">
<el-step>
<div slot="title">
<span v-if="active === 2" class="step-title">验收评审中<a style="color: #bc14ff;font-weight: normal;">(待本人评审)</a></span>
<span v-if="threeStep === '验收申请中'" class="step-title">验收申请中</span>
<span v-else-if="active === 2" class="step-title">验收评审中<a style="color: #bc14ff;font-weight: normal;">(待本人评审)</a></span>
<span v-else-if="active ===3" class="step-title">验收评审完成<a style="color: #bc14ff">(本人已评审)</a></span>
<span v-else class="step-title">验收完成</span>
</div>
......@@ -218,7 +221,9 @@ export default {
data() {
return {
active: 0,
state: 1,
oneStep: '',
threeStep: '',
state: 0,
showBtn: true,
showBtn1: true,
activeName: 'first',
......@@ -259,16 +264,42 @@ export default {
},
created() {
if (this.$route.query.state === '立项评审中') {
this.state = 0
this.active = 0
this.activeName = 'first'
}
if (this.$route.query.state === '项目申报中' || this.$route.query.state === '申报完成') {
this.showBtn = false
if (this.$route.query.state === '申报完成') {
this.oneStep = '申报完成'
this.active = 0.1
} else {
this.oneStep = '项目申报中'
this.active = -1
}
this.activeName = 'first'
}
if (this.$route.query.state === '验收评审中') {
this.state = 1
this.active = 2
this.activeName = 'second'
this.showBtn = false
}
if (this.$route.query.state === '验收申请中') {
this.state = 1
this.active = 1.9
this.threeStep = '验收申请中'
this.activeName = 'second'
this.showBtn = false
this.showBtn1 = false
}
if (this.$route.query.state === '验收完成') {
this.state = 1
this.active = 4
this.activeName = 'second'
this.showBtn = false
this.showBtn1 = false
}
},
methods: {
goBack() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment