Skip to content

A
attendance-performance-platform
Commit 8de405f9 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents e016b340 459179d8
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 109 deletions
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
View file @ 8de405f9
<template>
<div class="page">
<LayoutTable :data="tableData" noDel :config="tableConfig">
<LayoutTable :data="tableData" notDel :config="tableConfig">
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
</div>
......@@ -87,28 +87,28 @@ export default {
{ label: "反馈人数", prop: "feedbackNum", formatter: this.formatter },
{ label: "创建用户", prop: "createUserId", formatter: this.formatter },
{
label: "绩效反馈问题",
width: 120,
prop: "subColumns",
formatter: (row) => {
let widthsize = this.columnSet.reduce((pre, cur) => {
return pre + Number(cur.width);
}, 50);
return (
<el-popover placement="right" width={widthsize} trigger="click">
{this.renderTable(row.feedbackQuestionList)}
<el-button type="text" slot="reference">详细</el-button>
</el-popover>
);
},
},
// {
// label: "绩效反馈问题",
// width: 120,
// prop: "subColumns",
// formatter: (row) => {
// let widthsize = this.columnSet.reduce((pre, cur) => {
// return pre + Number(cur.width);
// }, 50);
// return (
// <el-popover placement="right" width={widthsize} trigger="click">
// {this.renderTable(row.feedbackQuestionList)}
// <el-button type="text" slot="reference">详细</el-button>
// </el-popover>
// );
// },
// },
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
);
}
}
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ 8de405f9
......@@ -188,97 +188,6 @@ export default {
mounted() {
let id = localStorage.getItem('checkFeedbackId')
this.getInfo(id)
// this.Frule = [
// {
// "type": "span",
// "title": "问卷名称",
// "native": false,
// "children": [
// "这是一段文字"
// ],
// "_fc_drag_tag": "span",
// "hidden": false,
// "display": true
// },
// {
// "type": "input",
// "field": "Fupb1nuyh5txf1",
// "title": "输入框",
// "info": "",
// "$required": false,
// "_fc_drag_tag": "input",
// "hidden": false,
// "display": true
// },
// {
// "type": "inputNumber",
// "field": "Flo91nuyh5vjag",
// "title": "计数器",
// "info": "",
// "$required": false,
// "_fc_drag_tag": "inputNumber",
// "hidden": false,
// "display": true
// },
// {
// "type": "radio",
// "field": "Fz3d1nuyh5xpor",
// "title": "单选框",
// "info": "",
// "effect": {
// "fetch": ""
// },
// "$required": false,
// "options": [
// {
// "value": "1",
// "label": "选项1"
// },
// {
// "value": "2",
// "label": "选项2"
// }
// ],
// "_fc_drag_tag": "radio",
// "hidden": false,
// "display": true
// },
// {
// "type": "checkbox",
// "field": "Fwzb1nuyh61906",
// "title": "多选框",
// "info": "",
// "effect": {
// "fetch": ""
// },
// "$required": false,
// "options": [
// {
// "value": "1",
// "label": "选项1"
// },
// {
// "value": "2",
// "label": "选项2"
// }
// ],
// "_fc_drag_tag": "checkbox",
// "hidden": false,
// "display": true
// }
// ]
// this.Fopthion = {
// "form": {
// "labelPosition": "top",
// "size": "mini",
// "labelWidth": "20%",
// "hideRequiredAsterisk": false,
// "showMessage": true,
// "inlineMessage": false
// },
// "submitBtn": true,
// "resetBtn": false
// }
},
methods: {
......@@ -295,6 +204,9 @@ export default {
this.Frule = formCreate.parseJson(this.feedbackData.formContent)
this.Fopthion = formCreate.parseJson(this.feedbackData.ruleContent)
})
this.$get('/feedback/getOptionSummaryList', { feedbackId: id }).then(res => {
console.log(res)
})
}
}
}
......
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