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

过五关

parent 69abc167
...@@ -17,7 +17,7 @@ const service = axios.create({ ...@@ -17,7 +17,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分 // axios中请求配置有baseURL选项,表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API, baseURL: process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 10000 timeout: 6000000
}) })
// request拦截器 // request拦截器
......
...@@ -3,48 +3,164 @@ ...@@ -3,48 +3,164 @@
<!-- 填写表单内容,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="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-col>
<el-col :span="12">
<!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<el-form-item label="违规人" ref="ryid" prop="ryid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected='wgrSelected' ></personSelector>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电话" >
<el-input :readonly="true" v-model="form.phone" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="违章日期" ref="wzrq" prop="wzrq">
<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-row>
<el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="内容" ref="roleid" prop="roleid"> <el-form-item label="违章行为" ref="wzxw" prop="wzxw">
<el-input :readonly="readonly" type="textarea" v-model="form.roleid"></el-input> <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>
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作流状态" ref="wfpname" prop="wfpname">
<el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="曝光内容" ref="bgcont" prop="bgcont">
<el-input :readonly="readonly" v-model="form.bgcont" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="有效期至"> <el-form-item label="安全教育人" ref="aqjyrid" prop="aqjyrid">
<el-date-picker style="width: 100%;" <el-input :readonly="readonly" v-model="form.aqjyrid" ></el-input>
type="date" </el-form-item>
placeholder="选择日期"> </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-date-picker>
</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="aqcont" prop="aqcont">
<el-select placeholder="请选择" style="width: 100%;" > <el-input :readonly="readonly" v-model="form.aqcont" ></el-input>
<!-- <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> -->
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </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>
...@@ -53,9 +169,10 @@ ...@@ -53,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() {
...@@ -64,27 +181,108 @@ ...@@ -64,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>
......
...@@ -11,17 +11,18 @@ ...@@ -11,17 +11,18 @@
<!-- 权限--> <!-- 权限-->
</el-row> </el-row>
<br> <br>
<el-form ref="form" label-width='80px' :model="form" > <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 v-model="vMain.rowItem.jsjyr" :readonly="readonly" rows="5" > <!-- <el-input v-model="vMain.rowItem.jsjyr" :readonly="readonly" rows="5" >
</el-input> </el-input> -->
<personSelector :readonly="readonly" :label="vMain.rowItem.jsjyrName||vMain.rowItem.jsjyr||'暂无'" @selected='jsjyrSelected' ></personSelector>
</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 style="width: 100%;" label="教育时间">
<el-date-picker v-model="vMain.rowItem.jsjysj" :readonly="readonly" ></el-date-picker> <el-date-picker type="datetime" v-model="vMain.rowItem.jsjysj" :readonly="readonly" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -48,6 +49,9 @@ ...@@ -48,6 +49,9 @@
}, },
props:['vMain'], props:['vMain'],
methods: { methods: {
jsjyrSelected(row){
this.vMain.rowItem.jsjyr=row.id
},
save(){ save(){
let params=this.vMain.rowItem let params=this.vMain.rowItem
this.vMain.apiUpdate(params).then(res => { this.vMain.apiUpdate(params).then(res => {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="教育时间"> <el-form-item label="教育时间">
<el-date-picker :readonly="readonly" v-model="vMain.rowItem.ldjysj" style="width: 100%;"></el-date-picker> <el-date-picker type="datetime" :readonly="readonly" v-model="vMain.rowItem.ldjysj" style="width: 100%;"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="form-detail"> <div class="form-detail">
<el-row class="tool-bar"> <el-row class="tool-bar">
<AttachFileButton :params="{childPath:'FSJC'}" :app='this'></AttachFileButton> <AttachFileButton :params="{childPath:'FSJC'}" :app='vMain'></AttachFileButton>
<el-button size='mini' @click.native="readonly=false;$success('开启编辑')" type="primary">编辑</el-button> <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-button size='mini' @click.native="save()" type="primary">保存</el-button>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="教育时间"> <el-form-item label="教育时间">
<el-date-picker v-model="vMain.rowItem.fsjysj" :readonly="readonly" ></el-date-picker> <el-date-picker type="datetime" v-model="vMain.rowItem.fsjysj" :readonly="readonly" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="form-detail"> <div class="form-detail">
<el-row class="tool-bar"> <el-row class="tool-bar">
<AttachFileButton :params="{childPath:'AQBK'}" :app='this'></AttachFileButton> <AttachFileButton :params="{childPath:'AQBK'}" :app='vMain'></AttachFileButton>
<el-button size='mini' @click.native="readonly=false;$success('开启编辑')" type="primary">编辑</el-button> <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-button size='mini' @click.native="save()" type="primary">保存</el-button>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="教育时间"> <el-form-item label="教育时间">
<el-date-picker v-model="vMain.rowItem.aqjysj" :readonly="readonly" ></el-date-picker> <el-date-picker type="datetime" v-model="vMain.rowItem.aqjysj" :readonly="readonly" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
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