Commit 33370ba4 authored by zhoumaotao's avatar zhoumaotao

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents a14cb3b7 6e135c84
...@@ -808,7 +808,7 @@ export const constantRoutes = [ ...@@ -808,7 +808,7 @@ export const constantRoutes = [
component:() => import( "@/views/train/onlinExamination/index"), component:() => import( "@/views/train/onlinExamination/index"),
hidden:false, hidden:false,
meta:{ meta:{
"title": "onlinExamination", "title": "在线考试管理",
"icon": "", "icon": "",
"noCache": false, "noCache": false,
"link": null, "link": null,
......
...@@ -4,68 +4,163 @@ ...@@ -4,68 +4,163 @@
<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="roleid" prop="roleid"> <el-form-item label="部门" ref="bmid" prop="bmid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
<RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" ref="roleid" prop="roleid"> <!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-form-item label="违规人" ref="ryid" prop="ryid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected='wgrSelected' ></personSelector>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在支部" ref="roleid" prop="roleid"> <el-form-item label="电话" >
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="true" v-model="form.phone" ></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="roleid" prop="roleid"> <el-form-item label="违章日期" ref="wzrq" prop="wzrq">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.wzrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="违章行为" ref="wzxw" prop="wzxw">
<el-input type='textarea' :readonly="readonly" v-model="form.wzxw" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<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-col :span="12">
<el-form-item label="手机号" ref="roleid" prop="roleid"> <el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="readonly" v-model="form.sysversion" ></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="roleid" prop="roleid"> <el-form-item label="工作流状态" ref="wfpname" prop="wfpname">
<el-date-picker :readonly="readonly" v-model="form.roleid"></el-date-picker> <el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="违章行为" ref="roleid" prop="roleid"> <el-form-item label="曝光内容" ref="bgcont" prop="bgcont">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="readonly" v-model="form.bgcont" ></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="roleid" prop="roleid"> <el-form-item label="安全教育人" ref="aqjyrid" prop="aqjyrid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="readonly" v-model="form.aqjyrid" ></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="roleid" prop="roleid"> <el-form-item label="安全教育时间" ref="aqjysj" prop="aqjysj">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.aqjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验证人" ref="roleid" prop="roleid"> <el-form-item label="安全教育内容" ref="aqcont" prop="aqcont">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="readonly" v-model="form.aqcont" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验证时间" ref="roleid" prop="roleid"> <el-form-item label="反思内容" ref="fscont" prop="fscont">
<el-date-picker :readonly="readonly" v-model="form.roleid"></el-date-picker> <el-input :readonly="readonly" v-model="form.fscont" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-form-item label="谈话层级" ref="ldglcj" prop="ldglcj">
<el-input :readonly="readonly" v-model="form.ldglcj" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="教育人编码" ref="ldjyrid" prop="ldjyrid">
<el-input :readonly="readonly" v-model="form.ldjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被教育人编码" ref="ldbjyrid" prop="ldbjyrid">
<el-input :readonly="readonly" v-model="form.ldbjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育时间" ref="ldjysj" prop="ldjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ldjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育内容" ref="ldcont" prop="ldcont">
<el-input :readonly="readonly" v-model="form.ldcont" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="家属教育人" ref="jsjyr" prop="jsjyr">
<el-input :readonly="readonly" v-model="form.jsjyr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育时间" ref="jsjysj" prop="jsjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jsjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育内容" ref="jscont" prop="jscont">
<el-input :readonly="readonly" v-model="form.jscont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正措施" ref="jzcs" prop="jzcs">
<el-input :readonly="readonly" v-model="form.jzcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正结果" ref="jzjg" prop="jzjg">
<el-input :readonly="readonly" v-model="form.jzjg" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正验证人编码" ref="jzyzrid" prop="jzyzrid">
<el-input :readonly="readonly" v-model="form.jzyzrid" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="纠正验证时间" ref="jzyzsj" prop="jzyzsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jzyzsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚标志" ref="cfbz" prop="cfbz">
<el-input :readonly="readonly" v-model="form.cfbz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚金额" ref="cfje" prop="cfje">
<el-input :readonly="readonly" v-model="form.cfje" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-form> </el-form>
<!-- 按钮重写, -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里,根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
...@@ -74,9 +169,10 @@ ...@@ -74,9 +169,10 @@
mixins: [editMixin], mixins: [editMixin],
/* 存放index页面传递的额外参数*/ /* 存放index页面传递的额外参数*/
mounted() { mounted() {
}, },
/* 组件名称*/ /* 组件名称*/
name: 'roleManagementEdit', name: "enterTVEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() { data() {
...@@ -85,27 +181,108 @@ ...@@ -85,27 +181,108 @@
/* 额外初始化,根据需求*/ /* 额外初始化,根据需求*/
systemType: [], systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {phone:'',
roleid: '', //ID
rolename: '', id:'',
bz: "", //部门ID
bmid:'',
//班组ID
bzid:'',
//违规人ID
userid:'',
//违章日期
wzrq:new Date().getTime(),
//违章行为
wzxw:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
//状态
zt:'',
//工作流ID
wfid:'',
//工作流实例号
wfinstid:'',
//工作流状态ID
wfpid:'',
//工作流状态
wfpname:'',
//待处理人id
wfwuserid:'',
//待处理人
wfwusername:'',
//已处理人id
wfhuserid:'',
//已处理人
wfhusername:'',
//状态
zt:'',
//曝光内容
bgcont:'',
//安全教育人
aqjyrid:'',
//安全教育时间
aqjysj:new Date().getTime(),
//安全教育内容
aqcont:'',
//反思内容
fscont:'',
//谈话层级
ldglcj:'',
//教育人编码
ldjyrid:'',
//被教育人编码
ldbjyrid:'',
//领导教育时间
ldjysj:new Date().getTime(),
//领导教育内容
ldcont:'',
//家属教育人
jsjyr:'',
//家属教育时间
jsjysj:new Date().getTime(),
//家属教育内容
jscont:'',
//纠正措施
jzcs:'',
//纠正结果
jzjg:'',
//纠正验证人编码
jzyzrid:'',
//纠正验证时间
jzyzsj:new Date().getTime(),
//处罚标志
cfbz:'',
//处罚金额
cfje:'',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
} }
} }
}, },
methods: { methods: {
wgrSelected(row){
this.form.userid=row.id
this.form.phone=row.phone
}
} }
} }
</script> </script>
......
<template> <template>
<div class="form-detail"> <div class="form-detail">
<el-form ref="form" label-width='80px' :model="form" > <el-row class="tool-bar">
<!-- <AttachFileButton :params="{childPath:'BGLX'}" :app='vMain'></AttachFileButton> -->
<el-button size='mini' @click.native="readonly=false;$success('开启编辑')" type="primary">编辑</el-button>
<el-button size='mini' @click.native="save()" type="primary">保存</el-button>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row>
<br>
<el-form ref="form" label-width='80px' >
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="通报内容"> <el-form-item label="纠正措施">
<el-input type="textarea" rows="5" > <el-input v-model='vMain.rowItem.jzcs' :readonly="readonly" type="textarea" rows="5" >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="纠正结果"> <el-form-item label="纠正结果">
<el-input type="textarea" rows="5" > <el-input v-model='vMain.rowItem.jzjg' :readonly="readonly" type="textarea" rows="5" >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验证人"> <el-form-item label="验证人">
<el-input > <personSelector :readonly="readonly" :label="vMain.rowItem.jzyzrName||vMain.rowItem.jzyzrid||'暂无'" @selected='yzrSelected' ></personSelector>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验证时间"> <el-form-item label="验证时间">
<el-date-picker></el-date-picker> <el-date-picker style='width:100%' v-model='vMain.rowItem.jzyzsj' :readonly="readonly" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -36,17 +46,37 @@ ...@@ -36,17 +46,37 @@
export default { export default {
data() { data() {
return { return {
readonly:true,
} }
}, },
props:['vMain'],
methods: { methods: {
handleRemove(file, fileList) { yzrSelected(row){
console.log(file, fileList); this.vMain.rowItem.id=row.id
}, },
handlePictureCardPreview(file) { save(){
this.dialogImageUrl = file.url; let params=this.vMain.rowItem
this.dialogVisible = true; this.vMain.apiUpdate(params).then(res => {
if (res.success) {
this.$success('更新成功')
this.readonly=true
this.vMain.$refs['TablePager'].reLoad()
let tableData=this.vMain.$refs['TablePager'].tableData
let nowIndex=false
tableData.forEach((data,index)=>{
if(data.id==params.master.id){
nowIndex=index
}
})
if(nowIndex!==false){
this.vMain.$refs['TablePager'].tableData.splice(nowIndex,1,params.master)
this.vMain.$refs['TablePager'].setCurrent(params.master)
}
} else {
this.$error(res.message || '更新失败')
}
})
} }
} }
} }
...@@ -54,7 +84,7 @@ ...@@ -54,7 +84,7 @@
<style scoped> <style scoped>
.form-detail{ .form-detail{
height: 300px; height: 500px;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
......
...@@ -26,10 +26,9 @@ ...@@ -26,10 +26,9 @@
<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> -->
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -47,7 +46,7 @@ ...@@ -47,7 +46,7 @@
</div> </div>
<div class="min_full" style="height: 60%;padding: 10px;"> <div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs --> <!-- tabs -->
<Exposure /> <Exposure :vMain='this' />
</div> </div>
</div> </div>
...@@ -56,13 +55,11 @@ ...@@ -56,13 +55,11 @@
<script> <script>
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
QueryKzzxRole, doQuery,
QueryApptype, doAdd,
AddKzzxRole, doUpdate,
DeleteKzzxRole, doDelete
UpdateKzzxRole, } from '@/api/threeViolations/enterTV.js';
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/ /* edit页面*/
import Edit from './edit' import Edit from './edit'
import Exposure from './exposure.vue' import Exposure from './exposure.vue'
...@@ -76,8 +73,7 @@ ...@@ -76,8 +73,7 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery() this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
console.log(_)
}, },
data() { data() {
return { return {
...@@ -88,7 +84,7 @@ ...@@ -88,7 +84,7 @@
type: '', type: '',
DialogTitle: '', DialogTitle: '',
/* 基础url*/ /* 基础url*/
baseUrl: 'kzzx/role', baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: '', ksrq: '',
...@@ -96,86 +92,40 @@ ...@@ -96,86 +92,40 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{ {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
prop: 'whsj', // {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
label: '时间', // {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
show:false, {label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
fieldType:'ftDateTime', {label: "手机", prop: "phone", fieldType: "ftString",width:192},
width: '100', {label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
align:'left' {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
}, // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
{ // {label: "维护人", prop: "whr", fieldType: "ftString"},
prop: 'whsj', // {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
label: '车间', // {label: "创建人", prop: "cjr", fieldType: "ftString"},
...this.$common('ftDateTime') // {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
}, // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
{ // {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
prop: 'whr', // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
label: '岗位', // {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
width: '100' // {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
}, // {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
{ // {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
prop: 'whr', // {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
label: '地点', // {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
width: '100' // {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
}, // {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
{ // {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
prop: 'whr', // {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
label: '作业活动设施风险点', // {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
width: '100' // {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
}, // {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
{ // {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
prop: 'whr', // {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
label: '事故类型', // {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
width: '100' // {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
}, // {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
{ // {label: "处罚金额", prop: "cfje", fieldType: "float"},
prop: 'whr',
label: '危险等级',
width: '100'
},
{
prop: 'whr',
label: '危险分值',
width: '100'
},
{
prop: 'whr',
label: '风险类型',
width: '100'
},
{
prop: 'whr',
label: '管控措施落实后等级',
width: '100'
},
{
prop: 'whr',
label: '管理层级',
width: '100'
},
{
prop: 'whr',
label: '拍照选项',
width: '100'
},
{
prop: 'whr',
label: '序号',
width: '100'
},
{
prop: 'whr',
label: '图形编号',
width: '100'
},
{
prop: 'whr',
label: '措施类型',
width: '100'
}
] ]
} }
}, },
...@@ -184,38 +134,18 @@ ...@@ -184,38 +134,18 @@
console.log(val,'val') console.log(val,'val')
}, },
/* 基础查询*/ /* 基础查询*/
query: QueryKzzxRole, query: doQuery,
/* 基础增*/ /* 基础增*/
apiAdd: AddKzzxRole, apiAdd: doAdd,
/* 基础更新*/ /* 基础更新*/
apiUpdate: UpdateKzzxRole, apiUpdate: doUpdate,
/* 删除操作*/ /* 删除操作*/
apiDelete: DeleteKzzxRole, apiDelete: doDelete,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
init() { init() {
}, },
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
}, },
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery() this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
}, },
data() { data() {
return { return {
......
...@@ -4,57 +4,166 @@ ...@@ -4,57 +4,166 @@
<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="roleid" prop="roleid"> <el-form-item label="部门" ref="bmid" prop="bmid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
<RelSelect style="width: 100%;" :params="{flid:form.flid}" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" ref="roleid" prop="roleid"> <!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-form-item label="违规人" ref="ryid" prop="ryid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected='wgrSelected' ></personSelector>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在支部" ref="roleid" prop="roleid"> <el-form-item label="电话" >
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="true" v-model="form.phone" ></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="roleid" prop="roleid"> <el-form-item label="违章日期" ref="wzrq" prop="wzrq">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.wzrq" placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系手机"> <el-form-item label="处罚金额" ref="cfje" prop="cfje">
<el-input></el-input> <el-input type='number' :readonly="readonly" v-model="form.cfje" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="违章行为" ref="wzxw" prop="wzxw">
<el-input type='textarea' :readonly="readonly" v-model="form.wzxw" ></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="违章日期"> <el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-date-picker style="width: 100%;"></el-date-picker> <el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="处罚金额"> <el-form-item label="工作流状态" ref="wfpname" prop="wfpname">
<el-input></el-input> <el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="违章行为"> <el-form-item label="曝光内容" ref="bgcont" prop="bgcont">
<el-input></el-input> <el-input :readonly="readonly" v-model="form.bgcont" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-form-item label="安全教育人" ref="aqjyrid" prop="aqjyrid">
<el-input :readonly="readonly" v-model="form.aqjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全教育时间" ref="aqjysj" prop="aqjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.aqjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全教育内容" ref="aqcont" prop="aqcont">
<el-input :readonly="readonly" v-model="form.aqcont" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="反思内容" ref="fscont" prop="fscont">
<el-input :readonly="readonly" v-model="form.fscont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="谈话层级" ref="ldglcj" prop="ldglcj">
<el-input :readonly="readonly" v-model="form.ldglcj" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="教育人编码" ref="ldjyrid" prop="ldjyrid">
<el-input :readonly="readonly" v-model="form.ldjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被教育人编码" ref="ldbjyrid" prop="ldbjyrid">
<el-input :readonly="readonly" v-model="form.ldbjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育时间" ref="ldjysj" prop="ldjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ldjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育内容" ref="ldcont" prop="ldcont">
<el-input :readonly="readonly" v-model="form.ldcont" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="家属教育人" ref="jsjyr" prop="jsjyr">
<el-input :readonly="readonly" v-model="form.jsjyr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育时间" ref="jsjysj" prop="jsjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jsjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育内容" ref="jscont" prop="jscont">
<el-input :readonly="readonly" v-model="form.jscont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正措施" ref="jzcs" prop="jzcs">
<el-input :readonly="readonly" v-model="form.jzcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正结果" ref="jzjg" prop="jzjg">
<el-input :readonly="readonly" v-model="form.jzjg" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正验证人编码" ref="jzyzrid" prop="jzyzrid">
<el-input :readonly="readonly" v-model="form.jzyzrid" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="纠正验证时间" ref="jzyzsj" prop="jzyzsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jzyzsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚标志" ref="cfbz" prop="cfbz">
<el-input :readonly="readonly" v-model="form.cfbz" ></el-input>
</el-form-item>
</el-col>
-->
</el-form> </el-form>
<!-- 按钮重写, -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里,根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
...@@ -63,9 +172,10 @@ ...@@ -63,9 +172,10 @@
mixins: [editMixin], mixins: [editMixin],
/* 存放index页面传递的额外参数*/ /* 存放index页面传递的额外参数*/
mounted() { mounted() {
}, },
/* 组件名称*/ /* 组件名称*/
name: 'roleManagementEdit', name: "enterTVEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() { data() {
...@@ -74,27 +184,108 @@ ...@@ -74,27 +184,108 @@
/* 额外初始化,根据需求*/ /* 额外初始化,根据需求*/
systemType: [], systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {phone:'',
roleid: '', //ID
rolename: '', id:'',
bz: "", //部门ID
bmid:'',
//班组ID
bzid:'',
//违规人ID
userid:'',
//违章日期
wzrq:new Date().getTime(),
//违章行为
wzxw:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
//状态
zt:'',
//工作流ID
wfid:'',
//工作流实例号
wfinstid:'',
//工作流状态ID
wfpid:'',
//工作流状态
wfpname:'',
//待处理人id
wfwuserid:'',
//待处理人
wfwusername:'',
//已处理人id
wfhuserid:'',
//已处理人
wfhusername:'',
//状态
zt:'',
//曝光内容
bgcont:'',
//安全教育人
aqjyrid:'',
//安全教育时间
aqjysj:new Date().getTime(),
//安全教育内容
aqcont:'',
//反思内容
fscont:'',
//谈话层级
ldglcj:'',
//教育人编码
ldjyrid:'',
//被教育人编码
ldbjyrid:'',
//领导教育时间
ldjysj:new Date().getTime(),
//领导教育内容
ldcont:'',
//家属教育人
jsjyr:'',
//家属教育时间
jsjysj:new Date().getTime(),
//家属教育内容
jscont:'',
//纠正措施
jzcs:'',
//纠正结果
jzjg:'',
//纠正验证人编码
jzyzrid:'',
//纠正验证时间
jzyzsj:new Date().getTime(),
//处罚标志
cfbz:'',
//处罚金额
cfje:'',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
} }
} }
}, },
methods: { methods: {
wgrSelected(row){
this.form.userid=row.id
this.form.phone=row.phone
}
} }
} }
</script> </script>
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</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> <RelSelect hasValue style="width: 100%;" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div> </div>
</el-col> </el-col>
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
<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> -->
<AttachFileButton :app='app' ></AttachFileButton> <!-- <AttachFileButton :app='app' ></AttachFileButton> -->
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -69,13 +69,11 @@ ...@@ -69,13 +69,11 @@
<script> <script>
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
QueryKzzxRole, doQuery,
QueryApptype, doAdd,
AddKzzxRole, doUpdate,
DeleteKzzxRole, doDelete
UpdateKzzxRole, } from '@/api/threeViolations/enterTV.js';
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/ /* edit页面*/
import Edit from './edit' import Edit from './edit'
import { import {
...@@ -83,7 +81,6 @@ ...@@ -83,7 +81,6 @@
} from 'common' } from 'common'
export default { export default {
mixins: [tableMixin], mixins: [tableMixin],
name: 'appVersion',
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
...@@ -98,62 +95,61 @@ ...@@ -98,62 +95,61 @@
type: '', type: '',
DialogTitle: '', DialogTitle: '',
/* 基础url*/ /* 基础url*/
baseUrl: 'kzzx/role', baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: '', ksrq: '',
jsrq: '' jsrq: '',
bmid:''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{ {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
prop: 'whsj', // {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
label: '人员工号', // {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
...this.$common('ftDateTime') {label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
}, {label: "手机", prop: "phone", fieldType: "ftString",width:192},
{ {label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
prop: 'whsj', {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
label: '姓名', // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
...this.$common('ftDateTime') // {label: "维护人", prop: "whr", fieldType: "ftString"},
}, // {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{ // {label: "创建人", prop: "cjr", fieldType: "ftString"},
prop: 'whr', // {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
label: '所在支部', // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
width: '100' // {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
}, // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
{ // {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
prop: 'whr', // {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
label: '所在班组', // {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
width: '100' // {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
}, // {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
{ // {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
prop: 'whr', // {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
label: '联系手机', // {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
width: '100' // {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
}, // {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
{ // {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
prop: 'whr', // {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
label: '违章日期', // {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
width: '100' // {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
}, // {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
{ // {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
prop: 'whr', // {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
label: '违章行为', // {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
width: '100' // {label: "处罚金额", prop: "cfje", fieldType: "float"},
}
] ]
} }
}, },
methods: { methods: {
/* 基础查询*/ /* 基础查询*/
query: QueryKzzxRole, query: doQuery,
/* 基础增*/ /* 基础增*/
apiAdd: AddKzzxRole, apiAdd: doAdd,
/* 基础更新*/ /* 基础更新*/
apiUpdate: UpdateKzzxRole, apiUpdate: doUpdate,
/* 删除操作*/ /* 删除操作*/
apiDelete: DeleteKzzxRole, apiDelete: doDelete,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
init() { init() {
......
...@@ -4,52 +4,163 @@ ...@@ -4,52 +4,163 @@
<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="roleid" prop="roleid"> <el-form-item label="部门" ref="bmid" prop="bmid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
<RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" ref="roleid" prop="roleid"> <!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-form-item label="违规人" ref="ryid" prop="ryid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected='wgrSelected' ></personSelector>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在支部" ref="roleid" prop="roleid"> <el-form-item label="电话" >
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-input :readonly="true" v-model="form.phone" ></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="roleid" prop="roleid"> <el-form-item label="违章日期" ref="wzrq" prop="wzrq">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.wzrq" placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="违章行为" ref="wzxw" prop="wzxw">
<el-input type='textarea' :readonly="readonly" v-model="form.wzxw" ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<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>
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系手机"> <el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input></el-input> <el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="违章日期"> <el-form-item label="工作流状态" ref="wfpname" prop="wfpname">
<el-date-picker style="width: 100%;"></el-date-picker> <el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="违章行为"> <el-form-item label="曝光内容" ref="bgcont" prop="bgcont">
<el-input></el-input> <el-input :readonly="readonly" v-model="form.bgcont" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-form-item label="安全教育人" ref="aqjyrid" prop="aqjyrid">
<el-input :readonly="readonly" v-model="form.aqjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全教育时间" ref="aqjysj" prop="aqjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.aqjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全教育内容" ref="aqcont" prop="aqcont">
<el-input :readonly="readonly" v-model="form.aqcont" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="反思内容" ref="fscont" prop="fscont">
<el-input :readonly="readonly" v-model="form.fscont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="谈话层级" ref="ldglcj" prop="ldglcj">
<el-input :readonly="readonly" v-model="form.ldglcj" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="教育人编码" ref="ldjyrid" prop="ldjyrid">
<el-input :readonly="readonly" v-model="form.ldjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被教育人编码" ref="ldbjyrid" prop="ldbjyrid">
<el-input :readonly="readonly" v-model="form.ldbjyrid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育时间" ref="ldjysj" prop="ldjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ldjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领导教育内容" ref="ldcont" prop="ldcont">
<el-input :readonly="readonly" v-model="form.ldcont" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="家属教育人" ref="jsjyr" prop="jsjyr">
<el-input :readonly="readonly" v-model="form.jsjyr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育时间" ref="jsjysj" prop="jsjysj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jsjysj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家属教育内容" ref="jscont" prop="jscont">
<el-input :readonly="readonly" v-model="form.jscont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正措施" ref="jzcs" prop="jzcs">
<el-input :readonly="readonly" v-model="form.jzcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正结果" ref="jzjg" prop="jzjg">
<el-input :readonly="readonly" v-model="form.jzjg" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纠正验证人编码" ref="jzyzrid" prop="jzyzrid">
<el-input :readonly="readonly" v-model="form.jzyzrid" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="纠正验证时间" ref="jzyzsj" prop="jzyzsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jzyzsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚标志" ref="cfbz" prop="cfbz">
<el-input :readonly="readonly" v-model="form.cfbz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚金额" ref="cfje" prop="cfje">
<el-input :readonly="readonly" v-model="form.cfje" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-form> </el-form>
<!-- 按钮重写, -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里,根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
...@@ -58,9 +169,10 @@ ...@@ -58,9 +169,10 @@
mixins: [editMixin], mixins: [editMixin],
/* 存放index页面传递的额外参数*/ /* 存放index页面传递的额外参数*/
mounted() { mounted() {
}, },
/* 组件名称*/ /* 组件名称*/
name: 'roleManagementEdit', name: "enterTVEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() { data() {
...@@ -69,27 +181,108 @@ ...@@ -69,27 +181,108 @@
/* 额外初始化,根据需求*/ /* 额外初始化,根据需求*/
systemType: [], systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {phone:'',
roleid: '', //ID
rolename: '', id:'',
bz: "", //部门ID
bmid:'',
//班组ID
bzid:'',
//违规人ID
userid:'',
//违章日期
wzrq:new Date().getTime(),
//违章行为
wzxw:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
//状态
zt:'',
//工作流ID
wfid:'',
//工作流实例号
wfinstid:'',
//工作流状态ID
wfpid:'',
//工作流状态
wfpname:'',
//待处理人id
wfwuserid:'',
//待处理人
wfwusername:'',
//已处理人id
wfhuserid:'',
//已处理人
wfhusername:'',
//状态
zt:'',
//曝光内容
bgcont:'',
//安全教育人
aqjyrid:'',
//安全教育时间
aqjysj:new Date().getTime(),
//安全教育内容
aqcont:'',
//反思内容
fscont:'',
//谈话层级
ldglcj:'',
//教育人编码
ldjyrid:'',
//被教育人编码
ldbjyrid:'',
//领导教育时间
ldjysj:new Date().getTime(),
//领导教育内容
ldcont:'',
//家属教育人
jsjyr:'',
//家属教育时间
jsjysj:new Date().getTime(),
//家属教育内容
jscont:'',
//纠正措施
jzcs:'',
//纠正结果
jzjg:'',
//纠正验证人编码
jzyzrid:'',
//纠正验证时间
jzyzsj:new Date().getTime(),
//处罚标志
cfbz:'',
//处罚金额
cfje:'',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
} }
} }
}, },
methods: { methods: {
wgrSelected(row){
this.form.userid=row.id
this.form.phone=row.phone
}
} }
} }
</script> </script>
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</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> <RelSelect hasValue :optionsData='optionsData' style="width: 100%;" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div> </div>
</el-col> </el-col>
...@@ -67,15 +67,14 @@ ...@@ -67,15 +67,14 @@
</template> </template>
<script> <script>
/* 引入需要的接口*/
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
QueryKzzxRole, doQuery,
QueryApptype, doAdd,
AddKzzxRole, doUpdate,
DeleteKzzxRole, doDelete
UpdateKzzxRole, } from '@/api/threeViolations/enterTV.js';
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/ /* edit页面*/
import Edit from './edit' import Edit from './edit'
import { import {
...@@ -98,92 +97,68 @@ ...@@ -98,92 +97,68 @@
type: '', type: '',
DialogTitle: '', DialogTitle: '',
/* 基础url*/ /* 基础url*/
baseUrl: 'kzzx/role', baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: '', ksrq: '',
jsrq: '' jsrq: '',
bmid:''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{ {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
prop: 'whsj', // {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
label: '人员工号', // {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
...this.$common('ftDateTime') {label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
}, {label: "手机", prop: "phone", fieldType: "ftString",width:192},
{ {label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
prop: 'whsj', {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
label: '姓名', // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
...this.$common('ftDateTime') // {label: "维护人", prop: "whr", fieldType: "ftString"},
}, // {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{ // {label: "创建人", prop: "cjr", fieldType: "ftString"},
prop: 'whr', // {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
label: '所在支部', // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
width: '100' // {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
}, // {label: "状态", prop: "zt", fieldType: "ftString",width:6},
{ // {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
prop: 'whr', // {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
label: '所在班组', // {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
width: '100' // {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
}, // {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
{ // {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
prop: 'whr', // {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
label: '联系手机', // {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
width: '100' // {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
}, // {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
{ // {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
prop: 'whr', // {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
label: '违章日期', // {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
width: '100' // {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
}, // {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
{ // {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
prop: 'whr', // {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
label: '违章行为', // {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
width: '100' // {label: "处罚金额", prop: "cfje", fieldType: "float"},
},
{
prop: 'whr',
label: '处罚金额',
width: '100'
}
] ]
} }
}, },
methods: { methods: {
/* 基础查询*/ /* 基础查询*/
query: QueryKzzxRole, query: doQuery,
/* 基础增*/ /* 基础增*/
apiAdd: AddKzzxRole, apiAdd: doAdd,
/* 基础更新*/ /* 基础更新*/
apiUpdate: UpdateKzzxRole, apiUpdate: doUpdate,
/* 删除操作*/ /* 删除操作*/
apiDelete: DeleteKzzxRole, apiDelete: doDelete,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
init() { init() {
}, },
/* 启用停用*/ /* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
}, },
......
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