hansha
/
kaohe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
hshansha 6 months ago
parent d7921b8841 aa3f18017e
commit 829ae71bc0
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File

29
ruoyi-ui/src/views/kaohe/items/index.vue
Unescape View File

@ -1,22 +1,22 @@
<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="90px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="考核名称" prop="itemName"> <el-form-item label="考核项名称" prop="itemName">
<el-input <el-input
v-model="queryParams.itemName" v-model="queryParams.itemName"
placeholder="请输入考核名称" placeholder="请输入考核项名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="考核类型Id" prop="typeId"> <!-- <el-form-item label="考核类型Id" prop="typeId">
<el-input <el-input
v-model="queryParams.typeId" v-model="queryParams.typeId"
placeholder="请输入考核类型Id" placeholder="请输入考核类型Id"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</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 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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -72,8 +72,8 @@
<el-table v-loading="loading" :data="itemsList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="itemsList" @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="itemName" /> <el-table-column label="考核项名称" align="center" prop="itemName" />
<el-table-column label="考核类型Id" align="center" prop="typeId" /> <!-- <el-table-column label="考核类型Id" align="center" prop="typeId" />-->
<el-table-column label="考核类型" align="center" prop="type" /> <el-table-column label="考核类型" align="center" prop="type" />
<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">
@ -105,10 +105,10 @@
/> />
<!-- 添加或修改考核项对话框 --> <!-- 添加或修改考核项对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="考核名称" prop="itemName"> <el-form-item label="考核项名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入考核名称" /> <el-input v-model="form.itemName" placeholder="请输入考核项名称" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="考核类型Id" prop="typeId"> <!-- <el-form-item label="考核类型Id" prop="typeId">
<el-input v-model="form.typeId" placeholder="请输入考核类型Id" /> <el-input v-model="form.typeId" placeholder="请输入考核类型Id" />
@ -130,7 +130,7 @@
<!-- 选择考核类型 --> <!-- 选择考核类型 -->
<el-dialog title="双击选择考核类型" :visible.sync="type.open" width="900px" append-to-body> <el-dialog title="双击选择考核类型" :visible.sync="type.open" width="600px" append-to-body>
<div> <div>
<el-form :model="type.queryParams" :inline="true" label-width="70px"> <el-form :model="type.queryParams" :inline="true" label-width="70px">
<el-form-item label="类型名称" prop="name" style="margin-bottom: 10px"> <el-form-item label="类型名称" prop="name" style="margin-bottom: 10px">
@ -147,7 +147,7 @@
</el-form> </el-form>
<el-table border v-loading="type.loading" :data="type.list" @row-dblclick="typeRowChange"> <el-table border v-loading="type.loading" :data="type.list" @row-dblclick="typeRowChange">
<el-table-column label="主键ID" align="center" prop="id" /> <!-- <el-table-column label="主键ID" align="center" prop="id" />-->
<el-table-column label="类型名称" align="center" prop="name" /> <el-table-column label="类型名称" align="center" prop="name" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
</el-table> </el-table>
@ -209,7 +209,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
itemName: [ itemName: [
{ required: true, message: "考核名称不能为空", trigger: "blur" } { required: true, message: "考核项名称不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "考核类型不能为空", trigger: "blur" }
], ],
}, },
/** 选择考核类型*/ /** 选择考核类型*/

16
ruoyi-ui/src/views/kaohe/template/index.vue
Unescape View File

@ -108,7 +108,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="考核名称" align="center" prop="itemName" /> <el-table-column label="考核项名称" align="center" prop="itemName" />
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -132,7 +132,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="考核名称" align="center" prop="itemName" /> <el-table-column label="考核项名称" align="center" prop="itemName" />
</el-table> </el-table>
</div> </div>
<div style="width: 59%;"> <div style="width: 59%;">
@ -152,10 +152,17 @@
<el-table border ref="khitemTable" v-loading="khitem.loading" :data="khitem.list" @select="khitemSelect" @select-all="khitemSelectAll"> <el-table border ref="khitemTable" v-loading="khitem.loading" :data="khitem.list" @select="khitemSelect" @select-all="khitemSelectAll">
<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="itemName" /> <el-table-column label="考核项名称" align="center" prop="itemName" />
<el-table-column label="考核类型" align="center" prop="type" /> <el-table-column label="考核类型" align="center" prop="type" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
</el-table> </el-table>
<pagination
v-show="khitem.total>0"
:total="khitem.total"
:page.sync="khitem.queryParams.pageNum"
:limit.sync="khitem.queryParams.pageSize"
@pagination="khitemQuery"
/>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -215,7 +222,7 @@ export default {
// 列表查询参数 // 列表查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10000000000000, pageSize: 10,
itemName: undefined itemName: undefined
}, },
// 表格数据 // 表格数据
@ -334,6 +341,7 @@ export default {
this.khitem.loading = true; this.khitem.loading = true;
listItems(this.khitem.queryParams).then(response => { listItems(this.khitem.queryParams).then(response => {
this.khitem.list = response.rows; this.khitem.list = response.rows;
this.khitem.total = response.total;
this.khitem.loading = false; this.khitem.loading = false;
this.$nextTick(()=> { this.$nextTick(()=> {
this.khitem.selectList.forEach(item =>{ this.khitem.selectList.forEach(item =>{

Write Preview
Loading…
Cancel
Save