Skip to content

Y
yn-science-front
Commit 27e03303 authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

parents 980cefa4 23bc5837
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 36 deletions
src/views/audit/project/Index.vue
View file @ 27e03303
...@@ -117,6 +117,19 @@ export default { ...@@ -117,6 +117,19 @@ export default {
{ title: '审核状态', dataIndex: 'auditResultName', align: 'center' }, { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
{ title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, }, { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
], ],
excelCol: [
{ title: "项目名称", dataIndex: 'projName' },
{ title: '申请编号', dataIndex: 'appNo' },
{ title: "开始时间", dataIndex: "startDate" },
{ title: "结束时间", dataIndex: "endDate" },
{ title: "申报年度", dataIndex: "reportYear" },
{ title: "项目类别", dataIndex: 'projClassName' },
{ title: "项目资金(万元)", dataIndex: "govFunding" },
{ title: '申报单位', dataIndex: 'appUnitName' },
{ title: '申报学科', dataIndex: 'knowledgeName' },
{ title: '申报人', dataIndex: 'appPersonName' },
{ title: '审核状态', dataIndex: 'auditResultName' },
],
pagination: { pagination: {
pageIndex: 1, pageIndex: 1,
pageSize: this.$defaultPageSize, pageSize: this.$defaultPageSize,
...@@ -193,7 +206,7 @@ export default { ...@@ -193,7 +206,7 @@ export default {
this.tableData = dataList.map(item => { this.tableData = dataList.map(item => {
return { return {
...item, ...item,
projClassName: item.projClass === 1 ? "一般项目" : "重点项目", projClassName: item.projClass === "1" ? "一般项目" : "重点项目",
} }
}) })
this.tableData.forEach(e => { this.tableData.forEach(e => {
...@@ -265,21 +278,23 @@ export default { ...@@ -265,21 +278,23 @@ export default {
this.disabledSubmit = value this.disabledSubmit = value
}, },
exportData () { exportData () {
let column = [ this.loading = true;
{ title: "项目名称", dataIndex: 'projName' }, let pars = isEmptyParams(this.searchForm);
//{ title: "项目编号", dataIndex: "projNo", align: 'center' }, let par = { ...pars, pageIndex: -1, pageSize: -1, }
{ title: '申请编号', dataIndex: 'appNo' }, this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
{ title: "开始时间", dataIndex: "startDate" }, if (data) {
{ title: "结束时间", dataIndex: "endDate" }, const { dataList = [], total = 0 } = data;
{ title: "申报年度", dataIndex: "reportYear" }, this.pagination.total = total;
{ title: "项目类别", dataIndex: 'projClassName' }, this.tableData = dataList
{ title: "项目资金(万元)", dataIndex: "govFunding" }, this.tableData.forEach(e => {
{ title: '申报单位', dataIndex: 'appUnitName' }, e.projClassName = e.projClass === "1" ? "一般项目" : "重点项目"
{ title: '申报学科', dataIndex: 'knowledgeName' }, e.startDate = moment(e.startDate).format('YYYY-MM-DD')
{ title: '申报人', dataIndex: 'appPersonName' }, e.endDate = moment(e.endDate).format('YYYY-MM-DD')
{ title: '审核状态', dataIndex: 'auditResultName' }, })
] this.$ToDoExcel(`项目审核列表`, tableColumnsName(this.excelCol), filterExportExcelData(this.excelCol, dataList))
this.$ToDoExcel(`项目审核列表`, tableColumnsName(column), filterExportExcelData(column, this.tableData)) this.loading = false
}
}).catch(() => { this.loading = false })
} }
}, },
}; };
......
src/views/audit/project/final.vue
View file @ 27e03303
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<a-form-item> <a-form-item>
<a-input placeholder="项目编号" v-model="searchForm.projNo" :maxLength="100" style="width: 150px" /> <a-input placeholder="项目编号" v-model="searchForm.projNo" :maxLength="100" style="width: 150px" />
</a-form-item> </a-form-item>
<a-form-item>
<base-select v-model="searchForm.projClass" :title="'项目类别'" :type="17" :isAll="true" :width="150" />
</a-form-item>
<a-form-item label="评分刷选"> <a-form-item label="评分刷选">
<a-input-number v-model="searchForm.scoreStart" :min="0" :step="0.01" style="width: 60px" /> <a-input-number v-model="searchForm.scoreStart" :min="0" :step="0.01" style="width: 60px" />
~ ~
...@@ -121,21 +124,21 @@ const EditableCell = { ...@@ -121,21 +124,21 @@ const EditableCell = {
props: { props: {
text: Number, text: Number,
}, },
data() { data () {
return { return {
value: this.text, value: this.text,
editable: false, editable: false,
}; };
}, },
methods: { methods: {
handleChange(value) { handleChange (value) {
this.value = value; this.value = value;
}, },
check() { check () {
this.editable = false; this.editable = false;
this.$emit('change', this.value); this.$emit('change', this.value);
}, },
edit() { edit () {
this.editable = true; this.editable = true;
}, },
}, },
...@@ -178,17 +181,17 @@ export default { ...@@ -178,17 +181,17 @@ export default {
columns: [ columns: [
{ title: "项目编号", dataIndex: "projNo", align: 'center' }, { title: "项目编号", dataIndex: "projNo", align: 'center' },
{ title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300 }, { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300 },
{ title: "答辩技术专家评分", scopedSlots: { customRender: 'defenseTechnologyInfo' }, align: 'center', width: 150 }, { title: "项目编号", dataIndex: "projNo", align: 'center' },
{ title: "答辩账务专家评分", scopedSlots: { customRender: 'defenseEconomyInfo' }, align: 'center', width: 150 }, { title: "答辩分数", scopedSlots: { customRender: 'defenseInfo' }, align: 'center', width: 150 },
{ title: "答辩分数", dataIndex: "defenseScore", align: 'center', width: 150 },
{ title: "项目类别", dataIndex: 'projClassName' , align: 'center' }, { title: "项目类别", dataIndex: 'projClassName' , align: 'center' },
{ title: '申报单位', dataIndex: 'appUnitName', align: 'center' }, { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
{ title: '申报人', dataIndex: 'appPersonName', align: 'center' }, { title: '申报人', dataIndex: 'appPersonName', align: 'center' },
{ title: '年龄', dataIndex: 'age', align: 'center' },
{ title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' }, { title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' },
{ title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' }, { title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' },
{ title: '最终得分', dataIndex: 'gradeScore', align: 'center' }, { title: '最终得分', dataIndex: 'gradeScore', align: 'center' },
{ title: '审核状态', dataIndex: 'auditResultName', align: 'center' }, { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
{ title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', width: 120, }, { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 180, },
], ],
tableData: [], tableData: [],
innerColumns: [ innerColumns: [
...@@ -206,8 +209,12 @@ export default { ...@@ -206,8 +209,12 @@ export default {
{ title: "答辩账务专家评分", dataIndex: 'defenseEconomyScore', align: 'center' }, { title: "答辩账务专家评分", dataIndex: 'defenseEconomyScore', align: 'center' },
{ title: "答辩分数", dataIndex: "defenseScore", align: 'center' }, { title: "答辩分数", dataIndex: "defenseScore", align: 'center' },
{ title: "项目类别", dataIndex: 'projClassName', align: 'center' }, { title: "项目类别", dataIndex: 'projClassName', align: 'center' },
{ title: "总预算数", dataIndex: 'totalFunding', align: 'center' },
{ title: "省级财政资金", dataIndex: 'govFunding', align: 'center' },
{ title: "自筹资金", dataIndex: 'selfFunding', align: 'center' },
{ title: '申报单位', dataIndex: 'appUnitName', align: 'center' }, { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
{ title: '申报人', dataIndex: 'appPersonName', align: 'center' }, { title: '申报人', dataIndex: 'appPersonName', align: 'center' },
{ title: '年龄', dataIndex: 'age', align: 'center' },
{ title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' }, { title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' },
{ title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' }, { title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' },
{ title: '最终得分', dataIndex: 'gradeScore', align: 'center' }, { title: '最终得分', dataIndex: 'gradeScore', align: 'center' },
...@@ -292,14 +299,10 @@ export default { ...@@ -292,14 +299,10 @@ export default {
this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => { this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => {
if (data) { if (data) {
const { dataList = [], total = 0 } = data; const { dataList = [], total = 0 } = data;
this.tableData = dataList.map(item => { this.tableData = dataList
return {
...item,
projClassName: item.projClass === "1" ? "一般项目" : "重点项目",
}
})
this.pagination.total = total; this.pagination.total = total;
this.tableData.forEach(e => { this.tableData.forEach(e => {
e.projClassName = e.projClass === "1" ? "一般项目" : "重点项目"
e.startDate = moment(e.startDate).format('YYYY-MM-DD') e.startDate = moment(e.startDate).format('YYYY-MM-DD')
e.endDate = moment(e.endDate).format('YYYY-MM-DD') e.endDate = moment(e.endDate).format('YYYY-MM-DD')
// 技术专家 // 技术专家
...@@ -412,7 +415,7 @@ export default { ...@@ -412,7 +415,7 @@ export default {
} }
}).catch(() => { this.loading = false }) }).catch(() => { this.loading = false })
}, },
onCellChange(key, dataIndex, value) { onCellChange (key, dataIndex, value) {
const target = this.tableData.find(item => item.id === key); const target = this.tableData.find(item => item.id === key);
if (target) { if (target) {
target[dataIndex] = value target[dataIndex] = value
......
src/views/components/common/baseSelect.vue
View file @ 27e03303
...@@ -106,8 +106,18 @@ export default { ...@@ -106,8 +106,18 @@ export default {
case 16: case 16:
this.getSexSelect() this.getSexSelect()
break; break;
case 17:
this.geProjClassSelect()
break;
} }
}, },
geProjClassSelect () {
let arr = []
arr.push({ title: '一般项目', key: '1' })
arr.push({ title: '重点项目', key: '2' })
this.selectArray = arr
this.loadValue()
},
getIsSelect () { getIsSelect () {
let arr = [] let arr = []
arr.push({ title: '是', key: '1' }) arr.push({ title: '是', key: '1' })
......
src/views/report/project/Index.vue
View file @ 27e03303
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</template> </template>
<template slot="option" slot-scope="record"> <template slot="option" slot-scope="record">
<a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button> <a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button>
<a-button type="link" size="small" v-if="((record.projState == -10 || record.projState == 10 || record.projState == 30))" @click="recordClick(record, 'edit')">修改</a-button> <a-button type="link" size="small" v-if="((record.projState == -10 || record.projState == 10 || record.projState == 30 || record.projState == 35))" @click="recordClick(record, 'edit')">修改</a-button>
<a-popconfirm title="确定要上报吗？" v-if="((record.projState == 10 || record.projState == 30))" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'report')"> <a-popconfirm title="确定要上报吗？" v-if="((record.projState == 10 || record.projState == 30 || record.projState == 35))" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'report')">
<a-button type="link" size="small">上报</a-button> <a-button type="link" size="small">上报</a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" size="small" v-if="record.projState <= 10" @click="recordClick(record,'delete')">删除</a-button> <a-button type="link" size="small" v-if="record.projState <= 10" @click="recordClick(record,'delete')">删除</a-button>
...@@ -73,7 +73,7 @@ import axios from 'axios' ...@@ -73,7 +73,7 @@ import axios from 'axios'
export default { export default {
name: 'reportProject', name: 'reportProject',
components: { components: {
projectView, projectCreate,previewFile, knowledgeSelect, personInfoEdit projectView, projectCreate, previewFile, knowledgeSelect, personInfoEdit
}, },
data () { data () {
return { return {
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
this.visibleEdit = true this.visibleEdit = true
}, },
getYear () { getYear () {
this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => { this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
if (data) { if (data) {
this.isButten = data.disabled this.isButten = data.disabled
this.description = data.description this.description = data.description
......
src/views/report/project/components/projectEdit.vue
View file @ 27e03303
...@@ -796,7 +796,7 @@ export default { ...@@ -796,7 +796,7 @@ export default {
var obj = this.getObj(step) var obj = this.getObj(step)
obj.step = step obj.step = step
let state = obj.projState let state = obj.projState
if (state != 30 && step == 5) if ((state != 30 || state != 30) && step == 5)
obj.projState = 10 obj.projState = 10
let pars = isEmptyParams(obj) let pars = isEmptyParams(obj)
let par = { ...pars } let par = { ...pars }
......
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