Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

评估内容优化

Browse Source
This commit is contained in:
paidaxing444 2020-10-19 09:57:02 +08:00
parent 47369fc805
commit 9cfb1a4b61
3 changed files with 81 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
View File

@ -1,7 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form
<el-form-item label="名称" prop="name"> :model="queryParams"
ref="queryForm"
:inline="true"
label-width="68px"
>
<el-form-item label="评估名称" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
placeholder="请输入名称" placeholder="请输入名称"
@ -11,8 +16,16 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -24,7 +37,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['benyi:assessmentcontent:add']" v-hasPermi="['benyi:assessmentcontent:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -34,7 +48,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:assessmentcontent:edit']" v-hasPermi="['benyi:assessmentcontent:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -44,7 +59,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['benyi:assessmentcontent:remove']" v-hasPermi="['benyi:assessmentcontent:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
</el-row> </el-row>
@ -52,12 +68,29 @@
v-loading="loading" v-loading="loading"
:data="assessmentcontentList" :data="assessmentcontentList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
row-key="id"
default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<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="name" /> <el-table-column label="评估名称" align="center" prop="name" />
<el-table-column label="是否元素" align="center" prop="iselement" :formatter="iselementFormat" /> <el-table-column
<el-table-column label="适用范围" align="center" prop="scope" :formatter="scopeFormat" /> label="是否元素"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> align="center"
prop="iselement"
:formatter="iselementFormat"
/>
<el-table-column
label="适用范围"
align="center"
prop="scope"
:formatter="scopeFormat"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -65,14 +98,16 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:assessmentcontent:edit']" v-hasPermi="['benyi:assessmentcontent:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:assessmentcontent:remove']" v-hasPermi="['benyi:assessmentcontent:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -97,7 +132,11 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.name"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="是否元素" prop="iselement"> <el-form-item label="是否元素" prop="iselement">
<el-select v-model="form.iselement" placeholder="请选择是否元素"> <el-select v-model="form.iselement" placeholder="请选择是否元素">
@ -134,7 +173,7 @@ import {
getAssessmentcontent, getAssessmentcontent,
delAssessmentcontent, delAssessmentcontent,
addAssessmentcontent, addAssessmentcontent,
updateAssessmentcontent updateAssessmentcontent,
} from "@/api/benyi/assessmentcontent"; } from "@/api/benyi/assessmentcontent";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -173,29 +212,29 @@ export default {
parentId: undefined, parentId: undefined,
name: undefined, name: undefined,
iselement: undefined, iselement: undefined,
scope: undefined scope: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
parentId: [ parentId: [
{ required: true, message: "所属模块不能为空", trigger: "blur" } { required: true, message: "所属模块不能为空", trigger: "blur" },
], ],
name: [{ required: true, message: "名称不能为空", trigger: "blur" }], name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
iselement: [ iselement: [
{ required: true, message: "是否元素不能为空", trigger: "blur" } { required: true, message: "是否元素不能为空", trigger: "blur" },
], ],
scope: [{ required: true, message: "范围不能为空", trigger: "blur" }] scope: [{ required: true, message: "范围不能为空", trigger: "blur" }],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_dm_pgyssyfw").then(response => { this.getDicts("sys_dm_pgyssyfw").then((response) => {
this.scopeOptions = response.data; this.scopeOptions = response.data;
}); });
this.getDicts("sys_yes_no").then(response => { this.getDicts("sys_yes_no").then((response) => {
this.iselementOptions = response.data; this.iselementOptions = response.data;
}); });
}, },
@ -211,8 +250,9 @@ export default {
/** 查询评估内容列表 */ /** 查询评估内容列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listAssessmentcontent(this.queryParams).then(response => { listAssessmentcontent(this.queryParams).then((response) => {
this.assessmentcontentList = response.rows; // this.assessmentcontentList = response.rows;
this.assessmentcontentList = this.handleTree(response.rows, "id");
//console.log(this.assessmentcontentList); //console.log(this.assessmentcontentList);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -221,7 +261,7 @@ export default {
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
getTreeselect() { getTreeselect() {
listAssessmentcontent(null).then(response => { listAssessmentcontent(null).then((response) => {
this.parentidOptions = this.handleTree(response.rows, "id"); this.parentidOptions = this.handleTree(response.rows, "id");
console.log(this.parentidOptions); console.log(this.parentidOptions);
}); });
@ -235,7 +275,7 @@ export default {
return { return {
id: node.id, id: node.id,
label: node.name, label: node.name,
children: node.children children: node.children,
}; };
}, },
@ -252,7 +292,7 @@ export default {
name: undefined, name: undefined,
iselement: undefined, iselement: undefined,
scope: undefined, scope: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -268,7 +308,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -287,7 +327,7 @@ export default {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
const id = row.id || this.ids; const id = row.id || this.ids;
getAssessmentcontent(id).then(response => { getAssessmentcontent(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改评估内容"; this.title = "修改评估内容";
@ -295,10 +335,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateAssessmentcontent(this.form).then(response => { updateAssessmentcontent(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -306,7 +346,7 @@ export default {
} }
}); });
} else { } else {
addAssessmentcontent(this.form).then(response => { addAssessmentcontent(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -321,12 +361,12 @@ export default {
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm(
'是否确认删除评估内容编号为"' + ids + '"的数据项?', '是否确认删除评估内容的数据项?',
"警告", "警告",
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -337,7 +377,7 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>

2
ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
View File

@ -72,7 +72,7 @@
<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="title" /> <el-table-column label="标题" align="center" prop="title" />
<el-table-column label="内容" align="center" show-overflow-tooltip="true" prop="content" /> <el-table-column label="内容" align="center" :show-overflow-tooltip="true" prop="content" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"

2
ruoyi-ui/src/views/benyi/child/index.vue
View File

@ -1105,7 +1105,7 @@ export default {
}); });
} else { } else {
addChild(this.form).then((response) => { addChild(this.form).then((response) => {
console.log(response); // console.log(response);
if (response.code === 200) { if (response.code === 200) {
this.form_jhr.childid = response.data; this.form_jhr.childid = response.data;
addContactpeople(this.form_jhr).then((res) => { addContactpeople(this.form_jhr).then((res) => {