Commit c0d08c6d authored by 李苏's avatar 李苏 💬

peix

parent 41f545dc
...@@ -4,13 +4,18 @@ ...@@ -4,13 +4,18 @@
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司编码" ref="gsid" prop="gsid"> <el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect> <RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="主办单位" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="培训项目" ref="name" prop="name"> <el-form-item label="培训项目" ref="name" prop="name">
<RelSelect :readonly="readonly" linkage :linkParams="{gsid:form.gsid}" style="width: 100%;" src='aqgl/pxgl/pxxm/query' filterable clearable :match="{value:'id',label:'name'}" v-model='form.name' ></RelSelect> <el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -20,29 +25,34 @@ ...@@ -20,29 +25,34 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="培训人数" ref="pxrs" prop="pxrs"> <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input :readonly="readonly" v-model="form.pxrs" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.pxrs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训方式" ref="pxfs" prop="pxfs">
<RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxfs' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="培训类型" ref="type" prop="type"> <el-form-item label="培训类型" ref="type" prop="type">
<el-input :readonly="readonly" v-model="form.type" ></el-input> <RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/type' filterable clearable :match="{value:'id',label:'name'}" v-model='form.type' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年度" ref="year" prop="year"> <el-form-item label="年度" ref="year" prop="year">
<el-input :readonly="readonly" v-model="form.year" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.year" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col v-show="form.type=='M'" :span="12">
<el-form-item label="月份" ref="month" prop="month"> <el-form-item label="月份" ref="month" prop="month">
<el-input :readonly="readonly" v-model="form.month" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col v-show="form.type=='Q'" :span="12">
<el-form-item label="季度" ref="quarter" prop="quarter"> <el-form-item label="季度" ref="quarter" prop="quarter">
<el-input :readonly="readonly" v-model="form.quarter" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.quarter" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -52,14 +62,11 @@ ...@@ -52,14 +62,11 @@
<el-input type='textarea' :readonly="readonly" v-model="form.pxmb" ></el-input> <el-input type='textarea' :readonly="readonly" v-model="form.pxmb" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="培训方式" ref="pxfs" prop="pxfs">
<el-input :readonly="readonly" v-model="form.pxfs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="授课人" ref="skrid" prop="skrid"> <el-form-item label="授课人" ref="skrid" prop="skrid">
<el-input :readonly="readonly" v-model="form.skrid" ></el-input> <personSelector :readonly="readonly" :label="form.skrName||'暂无'" @selected='skrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.skrid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -67,17 +74,12 @@ ...@@ -67,17 +74,12 @@
<el-input :readonly="readonly" v-model="form.pxsc" ></el-input> <el-input :readonly="readonly" v-model="form.pxsc" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="主办单位" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz"> <el-form-item label="备注" ref="bz" prop="bz">
<el-input type="textarea" :readonly="readonly" v-model="form.bz" ></el-input> <el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -141,13 +143,13 @@ ...@@ -141,13 +143,13 @@
//维护人 //维护人
whr:'', whr:'',
//维护时间 //维护时间
whsj:new Date().getTime(), whsj:'',
//创建人编码 //创建人编码
cjrid:'', cjrid:'',
//创建人 //创建人
cjr:'', cjr:'',
//创建时间 //创建时间
cjsj:new Date().getTime(), cjsj:'',
//系统版本 //系统版本
sysversion:'', sysversion:'',
//附件数 //附件数
...@@ -160,6 +162,9 @@ ...@@ -160,6 +162,9 @@
} }
}, },
methods: { methods: {
skrSelected(row){
this.form.skrid=row.id
},
} }
} }
......
...@@ -8,50 +8,42 @@ ...@@ -8,50 +8,42 @@
<div class="min_full" style="height: 40%;"> <div class="min_full" style="height: 40%;">
<!-- 查询条件--> <!-- 查询条件-->
<div class="search" v-condition> <div class="search" v-condition >
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1"> <el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">计划年份:</span> <span class="search-span">年份:</span>
<el-input style="width:60% ;"></el-input> <el-input v-model='queryParams.year' size="small" class="search-input"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">计划月份:</span>
<el-input></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">授课人:</span> <span class="search-span">授课人:</span>
<el-input></el-input> <el-input v-model='queryParams.skr' size="small" class="search-input"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">培训方式:</span> <span class="search-span">培训方式:</span>
<el-select></el-select> <RelSelect style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.pxfs' ></RelSelect>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<PrintButton :app='app'></PrintButton> <PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton> <ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton> <!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton> <CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton> <EditButton ref="edit" :app='app'></EditButton> -->
<AttachFileShow :app='app' ></AttachFileShow> <AttachFileShow :app='app' ></AttachFileShow>
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
...@@ -63,17 +55,17 @@ ...@@ -63,17 +55,17 @@
</div> </div>
<div class="min_full" style="height: 60%;padding: 10px;"> <div class="min_full" style="height: 60%;padding: 10px;">
<el-tabs v-model="activeName" v-show="tabData.length>0&&rowItem" > <el-tabs v-model="activeName" v-show="tabData.length>0&&rowItem" >
<el-tab-pane label="参与人员" name="first" > <el-tab-pane label="参与人员与得分" name="first" >
<Participants ref='participants' /> <Participants ref='participants' />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="考试程序" name="second"> <!-- <el-tab-pane label="考试程序" name="second">
<Cycle /> <Cycle />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="培训小结" name="third"> <el-tab-pane label="培训小结" name="third">
<Content /> <Content />
</el-tab-pane> </el-tab-pane> -->
<el-tab-pane label="培训内容及效果评估" name="fourth"> <el-tab-pane label="培训内容及效果评估" name="fourth">
<PersonLiable /> <PersonLiable ref='personLiable' />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -86,6 +78,7 @@ ...@@ -86,6 +78,7 @@
<script> <script>
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
doQuery,
doQueryPxjl, doQueryPxjl,
doAddPxjl, doAddPxjl,
doUpdatePxjl, doUpdatePxjl,
...@@ -119,9 +112,13 @@ ...@@ -119,9 +112,13 @@
type: '', type: '',
DialogTitle: '', DialogTitle: '',
/* 基础url*/ /* 基础url*/
baseUrl: '/aqgl/pxgl/pxjh', baseUrl: '/aqgl/pxgl/pxjl',
/* 查询参数*/
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
pxfs:'',
year:'',
skr:'',
bmid:'' bmid:''
}, },
/* 树的标题 */ /* 树的标题 */
...@@ -135,14 +132,18 @@ ...@@ -135,14 +132,18 @@
{label: "公司", prop: "gsName", fieldType: "ftString",width:192}, {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "培训项目", prop: "name", fieldType: "ftString",width:300}, {label: "培训项目", prop: "name", fieldType: "ftString",width:300},
{label: "培训对象", prop: "pxdx", fieldType: "ftString",width:300}, {label: "培训对象", prop: "pxdx", fieldType: "ftString",width:300},
{label: "培训人数", prop: "pxrs", fieldType: "int",width:100}, {label: "培训人数", prop: "pxrs", fieldType: "int"},
{label: "培训类型", prop: "type", fieldType: "ftString",width:160}, {label: "培训类型", prop: "type", fieldType: "ftString",width:100,transform:{
url:'aqgl/pxgl/pxjh/init/type',label:'name',value:'id'
}},
{label: "年度", prop: "year", fieldType: "int"}, {label: "年度", prop: "year", fieldType: "int"},
{label: "月份", prop: "month", fieldType: "int"}, {label: "月份", prop: "month", fieldType: "int"},
{label: "季度", prop: "quarter", fieldType: "int"}, {label: "季度", prop: "quarter", fieldType: "int"},
{label: "培训目标", prop: "pxmb", fieldType: "ftString",width:300}, {label: "培训目标", prop: "pxmb", fieldType: "ftString",width:300},
{label: "培训方式", prop: "pxfs", fieldType: "ftString",width:160}, {label: "培训方式", prop: "pxfs", fieldType: "ftString",width:130,transform:{
{label: "授课人", prop: "skrid", fieldType: "ftString",width:192}, url:'aqgl/pxgl/pxjh/init/pxfs',label:'name',value:'id'
}},
{label: "授课人", prop: "skrName", fieldType: "ftString",width:192},
{label: "课时", prop: "pxsc", fieldType: "float"}, {label: "课时", prop: "pxsc", fieldType: "float"},
{label: "主办单位", prop: "bmName", fieldType: "ftString",width:192}, {label: "主办单位", prop: "bmName", fieldType: "ftString",width:192},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "备注", prop: "bz", fieldType: "ftString",width:300},
...@@ -162,19 +163,15 @@ ...@@ -162,19 +163,15 @@
getRow: function(e) { getRow: function(e) {
this.rowItem = e this.rowItem = e
this.$nextTick(()=>{ this.$nextTick(()=>{
this.$refs.participants.queryParams.id=e.id this.$refs.participants.queryParams.pxid=e.id
this.$refs.participants.$refs['TablePager'].pageQuery() this.$refs.participants.$refs['TablePager'].pageQuery()
this.$refs.personLiable.queryParams.pxid=e.id
this.$refs.personLiable.$refs['TablePager'].pageQuery()
}) })
}, },
query: doQueryPxjl, query: doQuery,
/* 基础增*/
apiAdd: doAddPxjl,
/* 基础更新*/
apiUpdate: doUpdatePxjl,
/* 删除操作*/
apiDelete: doDeletePxjl,
/* treeQuery */ /* treeQuery */
apiTreeQuery: QueryBm, apiTreeQuery: QueryBm,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
......
<template> <template>
<div class="min_full" style="height: calc(84vh - 75px);"> <div class="min_full" style="height: calc(84vh - 75px);">
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <!-- <el-row class="tool-bar">
<ViewButton ref="view" :app='this'></ViewButton> <ViewButton ref="view" :app='this'></ViewButton>
<AddButton ref="add" :app='this'></AddButton> <AddButton ref="add" :app='this'></AddButton>
<CopyButton ref="copy" :app='this'></CopyButton> <CopyButton ref="copy" :app='this'></CopyButton>
<EditButton ref="edit" :app='this'></EditButton> <EditButton ref="edit" :app='this'></EditButton>
</el-row> </el-row> -->
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem' <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
<!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/--> <!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
</TablePager> </TablePager>
...@@ -44,14 +44,19 @@ ...@@ -44,14 +44,19 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [{ tableTitle: [{
prop: 'userid', prop: 'bmName',
label: '人员编号', label: '班组',
width: '120' width: '300'
}, },
{ {
prop: 'username', prop: 'bmName',
label: '人员姓名', label: '人员姓名',
width: '120' width: '300'
},
{
prop: 'df',
label: '得分',
width: '300'
} }
] ]
} }
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<PrintButton :app='app'></PrintButton> <PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton> <ViewButton ref="view" :app='this'></ViewButton>
<AddButton ref="add" :app='app'></AddButton> <AddButton ref="add" :app='this'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton> <CopyButton ref="copy" :app='this'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton> <EditButton ref="edit" :app='this'></EditButton>
<FieldButton :app='app'></FieldButton> <AttachFileShow :app='this' ></AttachFileShow>
<ExcelButton :app='app'></ExcelButton>
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
<!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/--> <!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
</TablePager> </TablePager>
...@@ -22,81 +22,57 @@ ...@@ -22,81 +22,57 @@
<script> <script>
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
QueryAppversion, doQueryPxjl,
QueryApptype, doAddPxjl,
AddAppversion, doUpdatePxjl,
DelAppversion, doDeletePxjl
UpdateAppversion } from '@/api/train/assessment.js';
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/ /* edit页面*/
import {tableMixin} from 'common' import {tableMixin_noapp} from 'common'
import Edit from './personLiableEdit.vue'
export default { export default {
mixins: [tableMixin], mixins: [tableMixin_noapp],
name: 'appVersion',
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() {
await this.$asRun(
[QueryApptype(),
res => {
var data = res['data']['records'];
let typeMap = []
for (var i in data) {
typeMap[data[i].id] = data[i].name
}
this.systemType = data
this.typeMap = typeMap
}
]
)
this.$refs['TablePager'].pageQuery()
},
data() { data() {
return { return {
/*需要的额外参数 */ /*需要的额外参数 */
typeMap: [], typeMap: [],
systemType: [], systemType: [],
baseUrl: 'kzzx/appversion', baseUrl: '/aqgl/pxgl/pxjh',
/* 查询参数*/ /* 查询参数*/
queryParams: {}, queryParams: {},
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [{ tableTitle: [
prop: 'appid', {label: "培训日期", prop: "pxrq", fieldType: "ftDateTime",width:200},
label: '提交日期', {label: "培训反馈", prop: "pxfk", fieldType: "ftString",width:300},
width: '120' {label: "培训内容", prop: "pxnr", fieldType: "ftString",width:300},
}, {label: "备注", prop: "bz", fieldType: "ftString",width:300},
{ {label: "维护人", prop: "whr", fieldType: "ftString"},
prop: 'name', {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
label: '培训内容', {label: "创建人", prop: "cjr", fieldType: "ftString"},
width: '120' {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
}, {label: "附件数", prop: "attachcount", fieldType: "int"},
{ {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
prop: 'type', {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
label: '效果评估', {label: "培训计划", prop: "jhid", fieldType: "ftString",width:192},
width: '120',
formatter: (row, column, cellValue, index) => {
var text = this.typeMap[cellValue]
return text;
}
}
] ]
} }
}, },
methods: { methods: {
/* 基础查询*/ /* 基础查询*/
query: QueryAppversion, query: doQueryPxjl,
/* 基础增*/ /* 基础增*/
apiAdd: AddAppversion, apiAdd: doAddPxjl,
/* 基础更新*/ /* 基础更新*/
apiUpdate: UpdateAppversion, apiUpdate: doUpdatePxjl,
/* 删除操作*/ /* 删除操作*/
apiDelete: DelAppversion, apiDelete: doDeletePxjl,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
}, },
/* 注册组件*/ /* 注册组件*/
components: { components: {
Edit
} }
} }
</script> </script>
......
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="培训日期" ref="pxrq" prop="pxrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.pxrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="培训反馈" ref="pxfk" prop="pxfk">
<el-input type='textarea' :readonly="readonly" v-model="form.pxfk" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="培训内容" ref="pxnr" prop="pxnr">
<el-input type='textarea' :readonly="readonly" v-model="form.pxnr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="24">
<el-form-item label="培训计划" ref="jhid" prop="jhid">
<el-input type='textarea' :readonly="readonly" v-model="form.jhid" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-form>
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
this.form.jhid=this.app.queryParams.pxid
this.form.pxid=this.app.queryParams.pxid
},
/* 组件名称*/
name: "aqglPxglPxjlEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化,根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
//ID
id:'',
//培训日期
pxrq:new Date().getTime(),
//培训反馈
pxfk:'',
//培训内容
pxnr:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:'',
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:'',
//系统版本
sysversion:'',
//附件数
attachcount:'',
//公司编码
gsid:'',
//部门编码
bmid:'',
//培训计划
jhid:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
}
}
},
methods: {
}
}
</script>
<style scoped lang="scss">
</style>
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="培训ID" ref="pxid" prop="pxid"> <el-form-item label="培训" ref="pxid" prop="pxid">
<el-input :readonly="readonly" v-model="form.pxid" ></el-input> <RelSelect :readonly="readonly" filterable style="width: 100%;" clearable src='aqgl/pxgl/pxjh/query'
:match="{value:'id',label:'name'}" v-model='form.pxid'></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
...@@ -86,7 +86,9 @@ ...@@ -86,7 +86,9 @@
tableTitle: [ tableTitle: [
{label: "考试主题", prop: "name", fieldType: "ftString",width:300}, {label: "考试主题", prop: "name", fieldType: "ftString",width:300},
{label: "公司", prop: "gsName", fieldType: "ftString",width:192}, {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "培训ID", prop: "pxid", fieldType: "ftString",width:192}, {label: "培训", prop: "pxid", fieldType: "ftString",width:192,transform:{
url:'aqgl/pxgl/pxjh/query',label:'name',value:'id'
}},
{label: "题库", prop: "xmid", fieldType: "ftString",width:192,transform:{ {label: "题库", prop: "xmid", fieldType: "ftString",width:192,transform:{
url:'aqgl/pxgl/pxxm/query',label:'name',value:'id' url:'aqgl/pxgl/pxxm/query',label:'name',value:'id'
}}, }},
......
...@@ -3,47 +3,83 @@ ...@@ -3,47 +3,83 @@
<!-- 填写表单内容,slot=form必写--> <!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="12">
<el-form-item label="培训日期" ref="pxrq" prop="pxrq"> <el-form-item label="公司" ref="gsid" prop="gsid">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
v-model="form.pxrq" placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="培训反馈" ref="pxfk" prop="pxfk"> <el-form-item label="主办单位" ref="bmid" prop="bmid">
<el-input type='textarea' :readonly="readonly" v-model="form.pxfk" ></el-input> <RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训项目" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训对象" ref="pxdx" prop="pxdx">
<el-input :readonly="readonly" v-model="form.pxdx" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input type="number" :readonly="readonly" v-model="form.pxrs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训方式" ref="pxfs" prop="pxfs">
<RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxfs' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="12">
<el-form-item label="培训内容" ref="pxnr" prop="pxnr"> <el-form-item label="培训类型" ref="type" prop="type">
<el-input type='textarea' :readonly="readonly" v-model="form.pxnr" ></el-input> <RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/type' filterable clearable :match="{value:'id',label:'name'}" v-model='form.type' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="备注" ref="bz" prop="bz"> <el-form-item label="年度" ref="year" prop="year">
<el-input :readonly="readonly" v-model="form.bz" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.year" ></el-input>
</el-form-item>
</el-col>
<el-col v-show="form.type=='M'" :span="12">
<el-form-item label="月份" ref="month" prop="month">
<el-input type="number" :readonly="readonly" v-model="form.month" ></el-input>
</el-form-item>
</el-col>
<el-col v-show="form.type=='Q'" :span="12">
<el-form-item label="季度" ref="quarter" prop="quarter">
<el-input type="number" :readonly="readonly" v-model="form.quarter" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24">
<el-form-item label="培训目标" ref="pxmb" prop="pxmb">
<el-input type='textarea' :readonly="readonly" v-model="form.pxmb" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid"> <el-form-item label="授课人" ref="skrid" prop="skrid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect> <personSelector :readonly="readonly" :label="form.skrName||'暂无'" @selected='skrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.skrid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid"> <el-form-item label="课时" ref="pxsc" prop="pxsc">
<RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <el-input :readonly="readonly" v-model="form.pxsc" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="培训计划" ref="jhid" prop="jhid"> <el-form-item label="备注" ref="bz" prop="bz">
<el-input type='textarea' :readonly="readonly" v-model="form.jhid" ></el-input> <el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -59,7 +95,7 @@ ...@@ -59,7 +95,7 @@
}, },
/* 组件名称*/ /* 组件名称*/
name: "aqglPxglPxjlEdit", name: "aqgl/pxglPxjhEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() { data() {
...@@ -74,12 +110,32 @@ ...@@ -74,12 +110,32 @@
form: { form: {
//ID //ID
id:'', id:'',
//培训日期 //公司编码
pxrq:new Date().getTime(), gsid:'',
//培训反馈 //培训项目
pxfk:'', name:'',
//培训内容 //培训对象
pxnr:'', pxdx:'',
//培训人数
pxrs:'',
//培训类型
type:'',
//年度
year:'',
//月份
month:'',
//季度
quarter:'',
//培训目标
pxmb:'',
//培训方式
pxfs:'',
//授课人
skrid:'',
//课时
pxsc:'',
//主办单位
bmid:'',
//备注 //备注
bz:'', bz:'',
//维护人编码 //维护人编码
...@@ -98,12 +154,6 @@ ...@@ -98,12 +154,6 @@
sysversion:'', sysversion:'',
//附件数 //附件数
attachcount:'', attachcount:'',
//公司编码
gsid:'',
//部门编码
bmid:'',
//培训计划
jhid:'',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
...@@ -112,6 +162,9 @@ ...@@ -112,6 +162,9 @@
} }
}, },
methods: { methods: {
skrSelected(row){
this.form.skrid=row.id
},
} }
} }
......
...@@ -11,19 +11,19 @@ ...@@ -11,19 +11,19 @@
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">年份:</span> <span class="search-span">年份:</span>
<el-input size="small" class="search-input"></el-input> <el-input v-model='queryParams.year' size="small" class="search-input"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">授课人:</span> <span class="search-span">授课人:</span>
<el-input size="small" class="search-input"></el-input> <el-input v-model='queryParams.skr' size="small" class="search-input"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">培训方式:</span> <span class="search-span">培训方式:</span>
<el-input size="small" class="search-input"></el-input> <RelSelect style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.pxfs' ></RelSelect>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -90,6 +90,10 @@ ...@@ -90,6 +90,10 @@
baseUrl: '/aqgl/pxgl/pxjl', baseUrl: '/aqgl/pxgl/pxjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
pxfs:'',
year:'',
skr:'',
bmid:''
}, },
/* 树的标题 */ /* 树的标题 */
...@@ -100,18 +104,29 @@ ...@@ -100,18 +104,29 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "培训日期", prop: "pxrq", fieldType: "ftDateTime",width:200}, {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "培训反馈", prop: "pxfk", fieldType: "ftString",width:300}, {label: "培训项目", prop: "name", fieldType: "ftString",width:300},
{label: "培训内容", prop: "pxnr", fieldType: "ftString",width:300}, {label: "培训对象", prop: "pxdx", fieldType: "ftString",width:300},
{label: "培训人数", prop: "pxrs", fieldType: "int"},
{label: "培训类型", prop: "type", fieldType: "ftString",width:100,transform:{
url:'aqgl/pxgl/pxjh/init/type',label:'name',value:'id'
}},
{label: "年度", prop: "year", fieldType: "int"},
{label: "月份", prop: "month", fieldType: "int"},
{label: "季度", prop: "quarter", fieldType: "int"},
{label: "培训目标", prop: "pxmb", fieldType: "ftString",width:300},
{label: "培训方式", prop: "pxfs", fieldType: "ftString",width:130,transform:{
url:'aqgl/pxgl/pxjh/init/pxfs',label:'name',value:'id'
}},
{label: "授课人", prop: "skrName", fieldType: "ftString",width:192},
{label: "课时", prop: "pxsc", fieldType: "float"},
{label: "主办单位", prop: "bmName", fieldType: "ftString",width:192},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"}, {label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"}, {label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "附件数", prop: "attachcount", fieldType: "int"}, {label: "附件数", prop: "attachcount", fieldType: "int"},
{label: "公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "培训计划", prop: "jhid", fieldType: "ftString",width:192},
] ]
} }
}, },
......
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