Skip to content

I
intelligent_station_web
Commit 7835b394 authored by liangjingpeng's avatar liangjingpeng
Browse files
Options

评审专家-申报信息3.改1

parent ea6e30d0
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 300 deletions
src/views/reviewExperts/topicList/index.vue
View file @ 7835b394
......@@ -52,34 +52,34 @@
@click="resetQuery"
>重置
</el-button>
<!-- <el-button-->
<!-- :class="commonField.addClass"-->
<!-- :type="commonField.typePrimary"-->
<!-- :icon="commonField.addIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.addClass"-->
<!-- :type="commonField.typePrimary"-->
<!-- :icon="commonField.addIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- //导入按钮-->
<!-- TODO 标签管理去掉： v-hasPermi="hasImportPerm" -->
<!-- <el-button-->
<!-- :class="commonField.importClass"-->
<!-- :type="commonField.typeWarning"-->
<!-- :icon="commonField.importIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleImport"-->
<!-- >{{-->
<!-- commonField.importName-->
<!-- }}-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.exportClass"-->
<!-- :type="commonField.typePrimary"-->
<!-- :icon="commonField.exportIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleExport"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.importClass"-->
<!-- :type="commonField.typeWarning"-->
<!-- :icon="commonField.importIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleImport"-->
<!-- >{{-->
<!-- commonField.importName-->
<!-- }}-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.exportClass"-->
<!-- :type="commonField.typePrimary"-->
<!-- :icon="commonField.exportIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleExport"-->
<!-- >导出-->
<!-- </el-button>-->
</el-form-item>
</div>
</el-form>
......@@ -125,13 +125,13 @@
</el-table-column>
<el-table-column label="状态" prop="state">
<template slot-scope="scope">
<!-- <el-switch-->
<!-- v-model="scope.row.state"-->
<!-- class="switchDisabledStyle"-->
<!-- inactive-value="0"-->
<!-- active-value="1"-->
<!-- @click.native="handleStatusChange(scope.row)"-->
<!-- />-->
<!-- <el-switch-->
<!-- v-model="scope.row.state"-->
<!-- class="switchDisabledStyle"-->
<!-- inactive-value="0"-->
<!-- active-value="1"-->
<!-- @click.native="handleStatusChange(scope.row)"-->
<!-- />-->
{{ scope.row.state || '-' }}
</template>
</el-table-column>
......@@ -147,23 +147,23 @@
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
<template slot-scope="scope">
<!-- <el-button-->
<!-- :class="commonField.updateClass"-->
<!-- :type="commonField.typeParent"-->
<!-- :size="commonField.size"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.updateClass"-->
<!-- :type="commonField.typeParent"-->
<!-- :size="commonField.size"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<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 === '立项评审中'" icon="el-icon-edit-outline" @click="handleProject(scope.row)" />
<el-button v-else icon="el-icon-search" />
<!-- <el-button-->
<!-- :class="commonField.delClass"-->
<!-- :type="commonField.typeParent"-->
<!-- :size="commonField.size"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- :class="commonField.delClass"-->
<!-- :type="commonField.typeParent"-->
<!-- :size="commonField.size"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
......@@ -176,75 +176,75 @@
@pagination="getList"
/>
<!-- 添加或修改标签信息配置对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">-->
<!-- <el-form-item label="标签名称" prop="labelName">-->
<!-- <el-input v-model.trim="form.labelName" show-word-limit :maxlength="50" placeholder="请输入标签名称" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标签分类" prop="labelType">-->
<!-- <el-radio-group v-model="form.labelType">-->
<!-- <el-radio label="1" :checked="form.labelType === '1'">模板</el-radio>-->
<!-- <el-radio label="2">镜像</el-radio>-->
<!-- <el-radio label="3">数据集</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="权重" prop="weight">-->
<!-- <el-input-number v-model="form.weight" style="width: 100%" controls-position="right" :min="0" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态">-->
<!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio label="1">启用</el-radio>-->
<!-- <el-radio label="0">停用</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remarks">-->
<!-- <el-input-->
<!-- v-model.trim="form.remarks"-->
<!-- maxlength="200"-->
<!-- show-word-limit-->
<!-- type="textarea"-->
<!-- placeholder="请输入内容"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button class="cancelBtn" @click="cancel">取 消</el-button>-->
<!-- <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">-->
<!-- <el-form-item label="标签名称" prop="labelName">-->
<!-- <el-input v-model.trim="form.labelName" show-word-limit :maxlength="50" placeholder="请输入标签名称" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标签分类" prop="labelType">-->
<!-- <el-radio-group v-model="form.labelType">-->
<!-- <el-radio label="1" :checked="form.labelType === '1'">模板</el-radio>-->
<!-- <el-radio label="2">镜像</el-radio>-->
<!-- <el-radio label="3">数据集</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="权重" prop="weight">-->
<!-- <el-input-number v-model="form.weight" style="width: 100%" controls-position="right" :min="0" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态">-->
<!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio label="1">启用</el-radio>-->
<!-- <el-radio label="0">停用</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remarks">-->
<!-- <el-input-->
<!-- v-model.trim="form.remarks"-->
<!-- maxlength="200"-->
<!-- show-word-limit-->
<!-- type="textarea"-->
<!-- placeholder="请输入内容"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button class="cancelBtn" @click="cancel">取 消</el-button>-->
<!-- <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!-- 标签导入对话框 -->
<!-- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>-->
<!-- <el-upload-->
<!-- accept=".xlsx, .xls"-->
<!-- :headers="upload.headers"-->
<!-- :action="upload.url + '?updateSupport=' + upload.updateSupport"-->
<!-- :disabled="upload.isUploading"-->
<!-- :on-progress="handleFileUploadProgress"-->
<!-- :on-success="handleFileSuccess"-->
<!-- :auto-upload="false"-->
<!-- :on-change="employeeUpload"-->
<!-- :on-remove="handleRemove"-->
<!-- :before-remove="beforeRemove"-->
<!-- :on-preview="handlePreview"-->
<!-- :before-upload="beforeAvatarUpload"-->
<!-- :file-list="fileList"-->
<!-- drag-->
<!-- >-->
<!-- <i class="el-icon-upload" />-->
<!-- <div class="el-upload__text">-->
<!-- 将文件拖到此处，或-->
<!-- <em>点击上传</em>-->
<!-- </div>-->
<!-- <div slot="tip" class="el-upload__tip">-->
<!-- <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>-->
<!-- </div>-->
<!-- <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>-->
<!-- </el-upload>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button class="cancelBtn" @click="upload.open = false">取 消</el-button>-->
<!-- <el-button class="submitBtn" :loading="importLoading" type="primary" @click="submitFileForm">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!-- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>-->
<!-- <el-upload-->
<!-- accept=".xlsx, .xls"-->
<!-- :headers="upload.headers"-->
<!-- :action="upload.url + '?updateSupport=' + upload.updateSupport"-->
<!-- :disabled="upload.isUploading"-->
<!-- :on-progress="handleFileUploadProgress"-->
<!-- :on-success="handleFileSuccess"-->
<!-- :auto-upload="false"-->
<!-- :on-change="employeeUpload"-->
<!-- :on-remove="handleRemove"-->
<!-- :before-remove="beforeRemove"-->
<!-- :on-preview="handlePreview"-->
<!-- :before-upload="beforeAvatarUpload"-->
<!-- :file-list="fileList"-->
<!-- drag-->
<!-- >-->
<!-- <i class="el-icon-upload" />-->
<!-- <div class="el-upload__text">-->
<!-- 将文件拖到此处，或-->
<!-- <em>点击上传</em>-->
<!-- </div>-->
<!-- <div slot="tip" class="el-upload__tip">-->
<!-- <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>-->
<!-- </div>-->
<!-- <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>-->
<!-- </el-upload>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button class="cancelBtn" @click="upload.open = false">取 消</el-button>-->
<!-- <el-button class="submitBtn" :loading="importLoading" type="primary" @click="submitFileForm">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
......@@ -260,11 +260,10 @@ import {
uploadFalseFile,
importTemplate
} from '@/api/resLabelInfo'
import { listResLabelInfo } from './reviewExperts'
import { getDataCache, setDataCache } from '@/assets/js/filterData'
import commonField from '@/utils/commonField'
import { getToken } from '@/utils/auth'
import {tableColumn} from './reviewExperts.data'
import { tableColumn } from './reviewExperts.data'
export default {
name: 'ResLabelInfo',
......@@ -420,29 +419,29 @@ export default {
}
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '新增标签信息'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.businessId
getResLabelInfo(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改标签信息'
})
},
// /** 新增按钮操作 */
// handleAdd() {
// this.reset()
// this.open = true
// this.title = '新增标签信息'
// },
// /** 修改按钮操作 */
// handleUpdate(row) {
// this.reset()
// const id = row.businessId
// getResLabelInfo(id).then(response => {
// this.form = response.data
// this.open = true
// this.title = '修改标签信息'
// })
// },
/** 评审中操作按钮*/
handleProject(row) {
console.log('row', row)
this.$router.push({
path: '/reviewExperts/topicList/reviewPage',
query: {
state: row.state,
state: row.state
}
})
},
......@@ -557,56 +556,56 @@ export default {
// this.getList()
// },
// 提交上传文件
submitFileForm() {
// this.$refs.upload.submit()
this.importLoading = true
const that = this
if (this.fileList.length === 0) {
this.$message.warning('请上传文件')
// 导入成功后关闭弹出框
this.importLoading = false
this.upload.open = true
} else { // 根据后台需求数据格式
var formData = new FormData() // 当前为空
formData.append('file', this.fileList)
importExcel(formData).then(res => {
if (res.code === 200) {
if (res.data.filename === null) {
this.$message.success('导入成功')
this.fileList = []
// 导入成功后关闭弹出框
this.importLoading = false
this.upload.open = false
// 导入成功后刷新页面
this.getList()
} else {
uploadFalseFile({ fileName: res.data.filename }).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob) // 创建下载的链接
downloadElement.href = href
downloadElement.download = '模板错误提示' + '.txt' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click() // 点击下载
document.body.removeChild(downloadElement) // 下载完成移除元素
window.URL.revokeObjectURL(href) // 释放掉blob对象
this.importLoading = false
})
}
this.importLoading = false
} else if (res.code === 41020) {
this.$message.info('上传超时,请重新上传')
this.importLoading = false
} else {
this.$message.error(res.message)
this.importLoading = false
}
}).catch(() => {
// this.$message.error(err.message)
that.importLoading = false
})
}
},
// submitFileForm() {
// // this.$refs.upload.submit()
// this.importLoading = true
// const that = this
// if (this.fileList.length === 0) {
// this.$message.warning('请上传文件')
// // 导入成功后关闭弹出框
// this.importLoading = false
// this.upload.open = true
// } else { // 根据后台需求数据格式
// var formData = new FormData() // 当前为空
// formData.append('file', this.fileList)
// importExcel(formData).then(res => {
// if (res.code === 200) {
// if (res.data.filename === null) {
// this.$message.success('导入成功')
// this.fileList = []
// // 导入成功后关闭弹出框
// this.importLoading = false
// this.upload.open = false
// // 导入成功后刷新页面
// this.getList()
// } else {
// uploadFalseFile({ fileName: res.data.filename }).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob) // 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '模板错误提示' + '.txt' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click() // 点击下载
// document.body.removeChild(downloadElement) // 下载完成移除元素
// window.URL.revokeObjectURL(href) // 释放掉blob对象
// this.importLoading = false
// })
// }
// this.importLoading = false
// } else if (res.code === 41020) {
// this.$message.info('上传超时,请重新上传')
// this.importLoading = false
// } else {
// this.$message.error(res.message)
// this.importLoading = false
// }
// }).catch(() => {
// // this.$message.error(err.message)
// that.importLoading = false
// })
// }
// },
beforeAvatarUpload(file) {
console.log('file', file)
},
......
src/views/reviewExperts/topicList/reviewExperts.js deleted 100644 → 0
View file @ ea6e30d0
import request from '@/utils/request'
import Qs from 'qs'
/**
* 1. 列表查询
* 2. 查询详细信息
* 3. 新增
* 4. 修改
* 5. 逻辑删除
* 6. 导出
* 7、导入标签信息
* 8.下载错误文件
* -------------------------
* 9.下载用户导入模板
*/
// 1. 查询标签信息列表
export function listResLabelInfo(query) {
return request({
url: '/reslabelinfo/list',
method: 'get',
params: query
})
}
//
// export function listResLabelInfoAll(query) {
// return request({
// url: '/reslabelinfo/listAll',
// method: 'get',
// params: query
// })
// }
//
// // 2. 查询标签信息详细信息
// export function getResLabelInfo(businessId) {
// return request({
// url: '/reslabelinfo/detail/' + businessId,
// method: 'get'
// })
// }
//
// // 3. 新增标签信息
// export function addResLabelInfo(data) {
// data = Qs.stringify(data)
// return request({
// url: '/reslabelinfo/add',
// method: 'post',
// data: data
// })
// }
//
// // 4. 修改标签信息
// export function updateResLabelInfo(data) {
// const businessId = data.businessId
// data = Qs.stringify(data)
// return request({
// url: '/reslabelinfo/update/' + businessId,
// method: 'put',
// data
// })
// }
//
// // 5. 逻辑删除标签信息
// export function delResLabelInfo(businessId) {
// return request({
// url: '/reslabelinfo/deleteLogical/' + businessId,
// method: 'delete'
// })
// }
//
// // 6. 导出标签信息
// export function exportResLabelInfo(query) {
// return request({
// url: '/reslabelinfo/export',
// method: 'get',
// params: query,
// responseType: 'blob'
// })
// }
//
// // 7、导入标签信息
// export function importExcel(data) {
// return request({
// url: '/reslabelinfo/importExcel',
// method: 'post',
// headers: {
// 'Content-Type': 'multipart/form-data'
// },
// transformRequest: [(data) => {
// return data
// }],
// data
// })
// }
// // 8.下载错误文件
// export function uploadFalseFile(params) {
// params = Qs.stringify(params)
// return request({
// url: '/reslabelinfo/downFalseFile',
// method: 'post',
// data: params,
// responseType: 'blob'
// })
// }
// // 9.下载用户导入模板
// export function importTemplate(params) {
// return request({
// url: '/reslabelinfo/importTemplate',
// method: 'get',
// responseType: 'blob',
// params
// })
// }
src/views/reviewExperts/topicList/reviewPage.vue
View file @ 7835b394
......@@ -11,8 +11,8 @@
<el-step title="步骤 2" />
<el-step title="步骤 3">
<div slot="title">
<span v-if="active === 2" class="step-title">立项评审中<a style="color: deeppink">(待本人评审)</a></span>
<span v-else class="step-title">立项评审完成</span>
<span v-if="active === 2" class="step-title">验收评审中<a style="color: deeppink">(待本人评审)</a></span>
<span v-else class="step-title">验收评审完成</span>
</div>
</el-step>
</el-steps>
......
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