Merge remote-tracking branch 'origin/main'

main
hshansha 5 months ago
commit e89e08d312

@ -0,0 +1,92 @@
<template>
<div class="tree-node">
<div class="node-content">
<el-input v-model="nodeData.hz_name" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
<el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type===0"/>
<el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1" style="width: 250px;"
v-model="nodeData.pcTitle" @focus.stop="changeKaohe">
<i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i>
</el-input>
<!--评分占比-->
<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||nodeData.type===0"></el-input-number>
<el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(0)"
v-if="isRoot||nodeData.type===0">子级标题</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(1)"
v-if="isRoot||nodeData.type===0">子级引用</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click.stop="removeNode" v-if="!isRoot"></el-button>
</div>
<div class="children" v-if="nodeData.data && nodeData.data.length">
<recursive-tree
v-for="(child, index) in nodeData.data"
:key="index"
:node-data="child"
@add-child="onAddChild"
@remove-node="onRemoveNode"
@change-kaohe="onChangeKaohe"
></recursive-tree>
</div>
</div>
</template>
<script>
export default {
name: 'RecursiveTree',
props: {
nodeData: {
type: Object,
required: true
},
isRoot: {
type: Boolean,
default: false
}
},
methods: {
//
changeKaohe(){
this.$emit('change-kaohe', this.nodeData)
},
//
onChangeKaohe(parentNode){
this.$emit('change-kaohe', parentNode)
},
addChild(type) {
this.$emit('add-child', this.nodeData, type)
},
removeNode() {
this.$emit('remove-node', this.nodeData)
},
onAddChild(parentNode, type) {
this.$emit('add-child', parentNode, type)
},
onRemoveNode(nodeToRemove) {
this.$emit('remove-node', nodeToRemove)
},
}
}
</script>
<style scoped lang="scss">
.tree-node {
margin-left: 35px;
padding: 5px 0px 5px 5px;
border-left: 1px solid #ccc;
}
.node-content {
padding: 5px;
background: #f5f5f5;
margin-bottom: 5px;
}
button {
margin-left: 10px;
}
.el-radio{
margin-right: 10px;
}
</style>

@ -48,7 +48,7 @@
v-hasPermi="['kaohe:gather:remove']" v-hasPermi="['kaohe:gather:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
@ -57,7 +57,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['kaohe:gather:export']" v-hasPermi="['kaohe:gather:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -87,7 +87,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -97,34 +97,71 @@
/> />
<!-- 添加或修改生成汇总对话框 --> <!-- 添加或修改生成汇总对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="99%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <div style="min-height: 400px">
<el-form-item label="一级标题" prop="hzName"> <recursive-tree
<el-input v-model="form.hzName" placeholder="请输入一级标题" /> style="margin-left: 0px"
</el-form-item> :node-data="treeData"
<el-form-item label="表头" prop="tableHeader"> :is-root="true"
<el-input v-model="form.tableHeader" type="textarea" placeholder="请输入内容" /> @add-child="handleAddChild"
</el-form-item> @remove-node="handleRemoveNode"
<el-form-item label="表数据" prop="tableData"> @change-kaohe="changeKaoHe"
<el-input v-model="form.tableData" type="textarea" placeholder="请输入内容" /> ></recursive-tree>
</el-form-item> </div>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 选择引用考核任务信息 -->
<el-dialog title="引用考核任务选择" :visible.sync="khrw.open" width="900px">
<div>
<el-form :model="khrw.queryParams" :inline="true" label-width="100px">
<el-form-item label="考核任务名称" prop="pcTitle" style="margin-bottom: 10px">
<el-input
v-model="khrw.queryParams.pcTitle"
placeholder="请输入考核任务名称"
clearable
@keyup.enter.native="khrwQuery"
/>
</el-form-item>
<el-form-item style="margin-bottom: 10px">
<el-button type="primary" icon="el-icon-search" size="small" @click="khrwQuery"></el-button>
</el-form-item>
</el-form>
<el-table border v-loading="khrw.loading" :data="khrw.list" @row-dblclick="khrwRowChange">
<el-table-column label="主键" align="center" prop="id" width="60px"/>
<el-table-column label="考核任务名称" align="center" prop="pcTitle" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column label="考核任务描述" align="center" prop="pcDescription" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column label="模板名称" align="center" prop="templateName" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column label="考核任务备注" align="center" prop="remark" min-width="150" :show-overflow-tooltip="true"/>
</el-table>
<pagination
v-show="khrw.total>0"
:total="khrw.total"
:page.sync="khrw.queryParams.pageNum"
:limit.sync="khrw.queryParams.pageSize"
@pagination="khrwQuery"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="khrwCancel"> </el-button>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listGather, getGather, delGather, addGather, updateGather } from "@/api/kaohe/gather" import { listGather, getGather, delGather, addGather, updateGather } from "@/api/kaohe/gather"
import { listPingce } from "@/api/kaohe/pingce"
import TableColumn from '@/components/TableColumn'
import RecursiveTree from '@/components/RecursiveTree'
export default { export default {
name: "Gather", name: "Gather",
components: { TableColumn, RecursiveTree },
data() { data() {
return { return {
// //
@ -145,19 +182,34 @@ export default {
title: "", title: "",
// //
open: false, open: false,
treeData: {
hz_name: '',
data: []
},
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
hzName: null, hzName: null
tableHeader: null, },
tableData: null, /** 选择引用考核任务*/
khrw: {
parentNode: null,
//
open: false,
//
loading: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
pcTitle: null,
},
//
list: [],
//
total: 0,
}, },
//
form: {},
//
rules: {
}
} }
}, },
created() { created() {
@ -180,18 +232,10 @@ export default {
}, },
// //
reset() { reset() {
this.form = { this.treeData = {
id: null, hz_name: '',
hzName: null, data: []
tableHeader: null,
tableData: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
} }
this.resetForm("form")
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -211,7 +255,7 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.reset();
this.open = true this.open = true
this.title = "添加生成汇总" this.title = "添加生成汇总"
}, },
@ -227,7 +271,8 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { console.log(this.treeData);
/*this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateGather(this.form).then(response => { updateGather(this.form).then(response => {
@ -243,7 +288,7 @@ export default {
}) })
} }
} }
}) })*/
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
@ -260,7 +305,58 @@ export default {
this.download('kaohe/gather/export', { this.download('kaohe/gather/export', {
...this.queryParams ...this.queryParams
}, `gather_${new Date().getTime()}.xlsx`) }, `gather_${new Date().getTime()}.xlsx`)
} },
handleAddChild(parentNode,type) {
if (!parentNode.data) {
this.$set(parentNode, 'data', [])
}
parentNode.data.push({
type: type,
title: null,
id: null,
zb: null,
pcTitle: null,
data: []
})
},
handleRemoveNode(nodeToRemove) {
const removeNode = (parent, node) => {
if (parent.data) {
const index = parent.data.indexOf(node)
if (index !== -1) {
parent.data.splice(index, 1)
} else {
parent.data.forEach(child => removeNode(child, node))
}
}
}
removeNode(this.treeData, nodeToRemove)
},
changeKaoHe(parentNode){
this.khrw.parentNode = parentNode;
this.khrw.open = true;
this.khrw.queryParams.pageNum = 1;
this.khrwQuery();
},
/** 引用考核任务信息列表查询 */
khrwQuery() {
this.khrw.loading = true;
listPingce(this.khrw.queryParams).then(response => {
this.khrw.list = response.rows;
this.khrw.total = response.total;
this.khrw.loading = false;
});
},
/** 引用考核任务信息选择弹出框关闭*/
khrwCancel() {
this.khrw.open = false
},
//
khrwRowChange(row) {
this.khrw.parentNode.id = row.id;
this.khrw.parentNode.pcTitle = row.pcTitle;
this.khrw.open = false;
},
} }
} }
</script> </script>

@ -482,9 +482,9 @@
</el-dialog> </el-dialog>
<!--查看考核得分--> <!--查看考核得分-->
<el-dialog title="查看考核得分" :visible.sync="khdf.open" width="90%"> <el-dialog title="查看考核得分" :visible.sync="khdf.open" width="90%" top="20px !important">
<el-table border :data="khdf.list"> <el-table border :data="khdf.list" height="650px">
<template v-for="column in khdf.tableHeader"> <template v-for="column in khdf.tableHeader">
<table-column :key="column.label" :column="column" /> <table-column :key="column.label" :column="column" />
</template> </template>
@ -978,6 +978,7 @@ export default {
this.pcSetUp.pingceId = row.id; this.pcSetUp.pingceId = row.id;
this.pcSetUp.pingceName = row.pcTitle; this.pcSetUp.pingceName = row.pcTitle;
this.pcSetUp.templateId = row.templateId; this.pcSetUp.templateId = row.templateId;
this.pcSetUp.xzhIndex = null;
this.pcSetUp.open = true; this.pcSetUp.open = true;
this.getItemVote(); this.getItemVote();
}, },

File diff suppressed because it is too large Load Diff

@ -16,7 +16,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -25,7 +25,7 @@
@click="handleAdd" @click="handleAdd"
v-hasPermi="['kaohe:type:add']" v-hasPermi="['kaohe:type: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"
@ -85,7 +85,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
<el-form-item label="手机标识符" prop="uid"> <el-form-item label="手机标识符" prop="uid">
<el-input <el-input
v-model="queryParams.uid" v-model="queryParams.uid"
@ -24,7 +24,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -33,7 +33,7 @@
@click="handleAdd" @click="handleAdd"
v-hasPermi="['kaohe:uid:add']" v-hasPermi="['kaohe:uid: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"
@ -94,7 +94,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

@ -64,26 +64,11 @@
</el-table-column> </el-table-column>
<el-table-column label="评分主题" align="center" prop="voteTitle" min-width="200" :show-overflow-tooltip="true"> <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link> <div v-if="scope.$index=== xzhIndex">
</template> <el-input v-model.trim="scope.row.voteTitle" placeholder="请输入评分主题" :disabled="scope.row.id && !(new Date(scope.row.sTime) > (new Date()))"/>
</el-table-column>
<el-table-column label="评分选项" align="center" prop="options" min-width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.$index=== xzhIndex && scope.row.khitemTypeid===1">
<el-select :disabled="!(new Date(scope.row.sTime) > (new Date()))"
v-model="scope.row.voteItems" multiple placeholder="请选择评分选项">
<el-option
v-for="item in vote_options"
:key="item.id"
:label="item.vitemName"
:value="item.id">
</el-option>
</el-select>
</div> </div>
<div v-else> <div v-else>
<div v-if=" scope.row.voteItems"> <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
<div>{{ scope.row.voteItemsName }}</div>
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -109,11 +94,6 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="vote" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true"> <el-table-column label="开始时间" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.$index===xzhIndex"> <div v-if="scope.$index===xzhIndex">
@ -163,6 +143,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="vote" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
@ -257,18 +242,6 @@ export default {
listVote(this.queryParams).then(response => { listVote(this.queryParams).then(response => {
let pcSetUpList = []; let pcSetUpList = [];
response.rows.forEach(item=>{ response.rows.forEach(item=>{
if(item.voteItems){
item.voteItems = item.voteItems.split(',');
let VoteItemsName = []
item.voteItems.forEach(e => {
this.vote_options.forEach(e1 => {
if(e === e1.id){
VoteItemsName.push(e1.vitemName)
}
})
})
item['voteItemsName'] = VoteItemsName.join(',');
}
pcSetUpList.push(item); pcSetUpList.push(item);
}) })
this.voteList = pcSetUpList; this.voteList = pcSetUpList;
@ -341,12 +314,6 @@ export default {
type: 'Danger' type: 'Danger'
}) })
} }
if(row.khitemTypeid===1 && (!Vote.voteItems)){
flag = false;
this.$alert(`评分选项不能为空!`, `提示`, {
type: 'Danger'
})
}
if(row.khitemTypeid!==1 && (!Vote.maxNum)){ if(row.khitemTypeid!==1 && (!Vote.maxNum)){
flag = false; flag = false;
this.$alert(`最大值不能为空!`, `提示`, { this.$alert(`最大值不能为空!`, `提示`, {
@ -365,24 +332,16 @@ export default {
type: 'Danger' type: 'Danger'
}) })
} }
if(!Vote.vDescription){ if(row.khitemTypeid===1){
flag = false; Vote.voteItems = '1,2,3,4'
this.$alert(`评分详情描述不能为空!`, `提示`, {
type: 'Danger'
})
} }
if (Vote.id != null && flag ) { if (Vote.id != null && flag ) {
if(Vote.voteItems){
Vote.voteItems = Vote.voteItems.join(',')
}
updateVote(Vote).then(response => { updateVote(Vote).then(response => {
this.$modal.msgSuccess("修改成功") this.$modal.msgSuccess("修改成功")
this.cancelVote() this.cancelVote()
}) })
} else if(Vote.id === null && flag){ } else if(Vote.id === null && flag){
if(Vote.voteItems){ Vote.state = '0'
Vote.voteItems = Vote.voteItems.join(',')
}
addVote(Vote).then(response => { addVote(Vote).then(response => {
this.$modal.msgSuccess("新增成功") this.$modal.msgSuccess("新增成功")
this.cancelVote() this.cancelVote()

@ -108,10 +108,10 @@
<!-- <el-table-column label="投票id" align="center" prop="voteId" />--> <!-- <el-table-column label="投票id" align="center" prop="voteId" />-->
<el-table-column label="评分主题" align="center" prop="voteTitle" /> <el-table-column label="评分主题" align="center" prop="voteTitle" />
<!-- <el-table-column label="职工id" align="center" prop="empId" />--> <!-- <el-table-column label="职工id" align="center" prop="empId" />-->
<el-table-column label="被考核对象" align="center" prop="bumen" /> <el-table-column label="被考核对象" align="center" prop="bkhdxName" />
<el-table-column label="选项内容" align="center" prop="content" /> <!-- <el-table-column label="选项内容" align="center" prop="content" />-->
<el-table-column label="评分人数" align="center" prop="voteNum" /> <el-table-column label="评分人数" align="center" prop="voteNum" />
<el-table-column label="评分均值" align="center" prop="votezz" /> <el-table-column label="评分均值" align="center" prop="avgScore" />
<el-table-column label="评分总分" align="center" prop="voteScore" /> <el-table-column label="评分总分" align="center" prop="voteScore" />
<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"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -374,8 +374,8 @@ export default {
} }
}, },
created() { created() {
// this.queryParams.voteId=this.$route.query.id this.queryParams.voteId=this.$route.query.id
// this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询投票选项列表 */ /** 查询投票选项列表 */

Loading…
Cancel
Save