Merge remote-tracking branch 'origin/main'

main
hshansha 5 months ago
commit fbfb574376

@ -18,7 +18,7 @@ export function getGather(id) {
} }
// 新增生成汇总 // 新增生成汇总
export function addGather(data) { export function addGather1(data) {
return request({ return request({
url: '/kaohe/gather', url: '/kaohe/gather',
method: 'post', method: 'post',
@ -26,6 +26,15 @@ export function addGather(data) {
}) })
} }
// 新增生成汇总
export function addGather(data) {
return request({
url: '/kaohe/gather/generateSum',
method: 'post',
data: data
})
}
// 修改生成汇总 // 修改生成汇总
export function updateGather(data) { export function updateGather(data) {
return request({ return request({

@ -53,8 +53,6 @@ export function getItemVote(query) {
}) })
} }
// 批量添加账号接口 // 批量添加账号接口
export function addsUser(data) { export function addsUser(data) {
return request({ return request({

@ -2,23 +2,23 @@
<div class="tree-node"> <div class="tree-node">
<div class="node-content"> <div class="node-content">
<el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/> <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
<el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type===0"/> <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type1==='0'"/>
<el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1||nodeData.type===2" style="width: 250px;" <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type1==='1'||nodeData.type1==='2'" style="width: 250px;"
v-model="nodeData.pcTitle" @focus.stop="changeKaohe"> v-model="nodeData.pcTitle" @focus.stop="changeKaohe">
<i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i> <i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i>
</el-input> </el-input>
<!--评分占比--> <!--评分占比-->
<el-input-number style="margin-left: 5px;" v-model="nodeData.zb" :precision="2" :step="0.01" :min="0.01" <el-input-number style="margin-left: 5px;" v-model="nodeData.zb" :precision="2" :step="0.01" :min="0.01"
:max="1" v-if="nodeData.type===1||nodeData.type===0"></el-input-number> :max="1" v-if="nodeData.type1==='1'||nodeData.type1==='0'"></el-input-number>
<el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(0)" <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('0')"
v-if="isRoot||nodeData.type===0">标题</el-button> v-if="isRoot||nodeData.type1==='0'">标题</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(1)" <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('1')"
v-if="isRoot||nodeData.type===0">占比引用</el-button> v-if="isRoot||nodeData.type1==='0'">占比引用</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(2)" <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('2')"
v-if="isRoot||nodeData.type===0">不占比引用</el-button> v-if="isRoot||nodeData.type1==='0'">不占比引用</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click.stop="removeNode" v-if="!isRoot"></el-button> <el-button type="danger" icon="el-icon-delete" size="mini" @click.stop="removeNode" v-if="!isRoot"></el-button>
</div> </div>
<div class="children" v-if="nodeData.data && nodeData.data.length"> <div class="children" v-if="nodeData.data && nodeData.data.length">
@ -57,14 +57,14 @@ export default {
onChangeKaohe(parentNode){ onChangeKaohe(parentNode){
this.$emit('change-kaohe', parentNode) this.$emit('change-kaohe', parentNode)
}, },
addChild(type) { addChild(type1) {
this.$emit('add-child', this.nodeData, type) this.$emit('add-child', this.nodeData, type1)
}, },
removeNode() { removeNode() {
this.$emit('remove-node', this.nodeData) this.$emit('remove-node', this.nodeData)
}, },
onAddChild(parentNode, type) { onAddChild(parentNode, type1) {
this.$emit('add-child', parentNode, type) this.$emit('add-child', parentNode, type1)
}, },
onRemoveNode(nodeToRemove) { onRemoveNode(nodeToRemove) {
this.$emit('remove-node', nodeToRemove) this.$emit('remove-node', nodeToRemove)

@ -1,7 +1,7 @@
<template> <template>
<el-table-column v-if="!isLeaf" :label="column.label" header-align="center"> <el-table-column v-if="!isLeaf" :label="column.label" header-align="center">
<template v-for="child in column.children"> <template v-for="child in column.children">
<table-column :key="child.label" :column="child" /> <table-column :key="child.prop" :column="child" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-else :label="column.label" :prop="column.prop" header-align="center"/> <el-table-column v-else :label="column.label" :prop="column.prop" header-align="center"/>

@ -12,7 +12,7 @@
v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) > (new Date()))" v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) > (new Date()))"
@click="goVotepage(item)" @click="goVotepage(item)"
> >
<i class="el-icon-thumb"></i> 去评 <i class="el-icon-thumb" v-hasPermi="['kaohe:vote_emp:edit']"></i>
</el-tag> </el-tag>
<el-tag type="info" v-if="new Date(item.sTime) > (new Date())"></el-tag> <el-tag type="info" v-if="new Date(item.sTime) > (new Date())"></el-tag>
<el-tag type="info" v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) < (new Date()))"></el-tag> <el-tag type="info" v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) < (new Date()))"></el-tag>

@ -26,7 +26,7 @@
v-hasPermi="['kaohe:gather:add']" v-hasPermi="['kaohe:gather:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
@ -36,7 +36,7 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['kaohe:gather:edit']" v-hasPermi="['kaohe:gather:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -64,19 +64,27 @@
<el-table v-loading="loading" :data="gatherList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="gatherList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="一级标题" align="center" prop="hzName" /> <el-table-column label="一级标题" align="center" prop="hzName" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column label="表头" align="center" prop="tableHeader" /> <el-table-column label="表头" align="center" prop="tableHeader" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column label="表数据" align="center" prop="tableData" /> <el-table-column label="表数据" align="center" prop="tableData" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['kaohe:gather:edit']" v-hasPermi="['kaohe:gather:edit']"
>修改</el-button> >修改</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="viewKaoHeScore(scope.row)"
v-hasPermi="['kaohe:gather:query']"
>查看生成汇总
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -150,6 +158,20 @@
</div> </div>
</el-dialog> </el-dialog>
<!--查看生成汇总-->
<el-dialog title="查看生成汇总" :visible.sync="khdf.open" width="90%" top="20px !important">
<el-table border :data="khdf.list" height="650px">
<template v-for="column in khdf.tableHeader">
<table-column :key="column.label" :column="column" />
</template>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="khdf.open=false"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -164,6 +186,12 @@ export default {
components: { TableColumn, RecursiveTree }, components: { TableColumn, RecursiveTree },
data() { data() {
return { return {
//
khdf:{
open: false,
list: [],
tableHeader: []
},
// //
loading: true, loading: true,
// //
@ -271,7 +299,11 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.treeData); addGather(JSON.stringify(this.treeData)).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList();
})
/*this.$refs["form"].validate(valid => { /*this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
@ -306,18 +338,41 @@ export default {
...this.queryParams ...this.queryParams
}, `gather_${new Date().getTime()}.xlsx`) }, `gather_${new Date().getTime()}.xlsx`)
}, },
handleAddChild(parentNode,type) { handleAddChild(parentNode,type1) {
if (!parentNode.data) { if (!parentNode.data) {
this.$set(parentNode, 'data', []) this.$set(parentNode, 'data', [])
} }
parentNode.data.push({ if(type1==='0'){
type: type, parentNode.data.push({
title: null, type1: type1,
id: null, type: '0',
zb: null, title: null,
pcTitle: null, id: null,
data: [] zb: null,
}) pcTitle: null,
data: []
})
}
if(type1==='1'){
parentNode.data.push({
type1: type1,
type: '1',
title: null,
id: null,
zb: null,
pcTitle: null
})
}
if(type1==='2'){
parentNode.data.push({
type1: type1,
type: '1',
title: null,
id: null,
pcTitle: null
})
}
}, },
handleRemoveNode(nodeToRemove) { handleRemoveNode(nodeToRemove) {
const removeNode = (parent, node) => { const removeNode = (parent, node) => {
@ -354,9 +409,46 @@ export default {
// //
khrwRowChange(row) { khrwRowChange(row) {
this.khrw.parentNode.id = row.id; this.khrw.parentNode.id = row.id;
this.khrw.parentNode.title = row.pcTitle;
this.khrw.parentNode.pcTitle = row.pcTitle; this.khrw.parentNode.pcTitle = row.pcTitle;
this.khrw.open = false; this.khrw.open = false;
}, },
//
viewKaoHeScore(row){
this.khdf.list = [];
this.khdf.tableHeader = [];
this.khdf.open = true;
this.reset()
getGather(row.id).then(response => {
let khdfList = JSON.parse(response.data.tableData);
khdfList.forEach(item=> {
item.jxdwldbzkhzf['khdx'] = item.khdx;
})
this.khdf.list = khdfList;
let btTabelTree = JSON.parse(response.data.tableHeader);
btTabelTree.forEach(item => {
item.prop = item.name;
if(item.children && item.children.length>0){
this.setProp(item.children, item.prop)
}
})
this.khdf.tableHeader = btTabelTree;
})
},
// prop
setProp(list, prop){
list.forEach(item=>{
if(prop){
item.prop = prop+'.'+item.name;
}else {
item.prop = item.name;
}
if(item.children && item.children.length>0){
this.setProp(item.children, item.prop)
}
})
},
} }
} }
</script> </script>

@ -80,6 +80,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="pingceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="pingceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="考核任务名称" align="center" prop="pcTitle" /> <el-table-column label="考核任务名称" align="center" prop="pcTitle" />
<el-table-column label="考核任务描述" align="center" prop="pcDescription" /> <el-table-column label="考核任务描述" align="center" prop="pcDescription" />
@ -90,7 +91,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考核任务备注" align="center" prop="remark" /> <el-table-column label="考核任务备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="320px" > <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280px" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -99,13 +100,6 @@
@click="handleSetUp(scope.row, scope.$index)" @click="handleSetUp(scope.row, scope.$index)"
>发布考核 >发布考核
</el-button> </el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['kaohe:pingce:edit']"
>修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -119,7 +113,7 @@
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="viewKaoHeScore(scope.row)" @click="viewKaoHeScore(scope.row)"
v-hasPermi="['kaohe:kh_result:generate']" v-hasPermi="['kaohe:kh_result:list']"
>查看考核得分 >查看考核得分
</el-button> </el-button>
<el-button <el-button
@ -136,13 +130,6 @@
@click="viewUser(scope.row)" @click="viewUser(scope.row)"
>查看评分账号 >查看评分账号
</el-button> </el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['kaohe:pingce:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -447,12 +434,12 @@
<el-button v-if="!(scope.$index=== pcSetUp.xzhIndex)" <el-button v-if="!(scope.$index=== pcSetUp.xzhIndex)"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-s-tools" icon="el-icon-s-tools" v-hasPermi="['kaohe:vote:add', 'kaohe:vote:edit']"
@click="setUpTouPiao(scope.row,scope.$index)" @click="setUpTouPiao(scope.row,scope.$index)"
>编辑评分规则</el-button> >编辑评分规则</el-button>
<el-button v-if="scope.$index=== pcSetUp.xzhIndex" <el-button v-if="scope.$index=== pcSetUp.xzhIndex"
size="mini" size="mini" v-hasPermi="['kaohe:vote:add', 'kaohe:vote:edit']"
type="text" type="text"
@click="voteSubmitForm(scope.row)" @click="voteSubmitForm(scope.row)"
>确认</el-button> >确认</el-button>
@ -469,6 +456,7 @@
type="text" type="text"
icon="el-icon-thumb" icon="el-icon-thumb"
@click="goVotepage(scope.row)" @click="goVotepage(scope.row)"
v-hasPermi="['kaohe:vote_emp:edit']"
>去评分</el-button> >去评分</el-button>
</div> </div>

@ -184,6 +184,7 @@
type="text" type="text"
icon="el-icon-thumb" icon="el-icon-thumb"
@click="goVotepage(scope.row)" @click="goVotepage(scope.row)"
v-hasPermi="['kaohe:vote_emp:edit']"
>去评分</el-button> >去评分</el-button>
</div> </div>
</template> </template>

@ -39,7 +39,7 @@
</el-row> </el-row>
<div style="text-align: center; margin-top: 40px;"> <div style="text-align: center; margin-top: 40px;">
<el-button type="primary" icon="el-icon-s-promotion" @click="VoteSubmit"></el-button> <el-button type="primary" icon="el-icon-s-promotion" @click="VoteSubmit" v-hasPermi="['kaohe:vote_emp:edit']"></el-button>
</div> </div>
</div> </div>

Loading…
Cancel
Save