Skip to content

S
sgaqgl-vue
Commit 440c7c93 authored by zhoumaotao's avatar zhoumaotao
Browse files
Options

代码调整

parent 942b45b0
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 121 deletions
src/api/threeViolations/tFPasses.js deleted 100644 → 0
View file @ 942b45b0
import request from 'common/src/utils/request'
/* 查询 */
export function doQuery(query) {
return request({
url: '/aqgl/swgl/swjlsp/query',
method: 'post',
data: query||{}
})
}
/* 更新 */
export function doUpdate(query) {
return request({
url: '/aqgl/swgl/swjlsp/update',
method: 'post',
data: query||{}
})
}
export function doAdd(query) {
return request({
url: '/aqgl/swgl/swjlsp/add',
method: 'post',
data: query||{}
})
}
export function doDelete(query) {
return request({
url: '/aqgl/swgl/swjlsp/delete',
method: 'post',
data: query||{}
})
}
src/views/threeViolations/enterTV/edit.vue
View file @ 440c7c93
...@@ -3,24 +3,34 @@ ...@@ -3,24 +3,34 @@
<!-- 填写表单内容，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="12">
<el-form-item label="部门" ref="bmid" prop="bmid">
<!-- <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-col :span="12">
<!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> --> <!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<el-form-item label="违规人" ref="userid" prop="userid"> <el-form-item label="姓名" ref="userid" prop="userid">
<personSelector :label="form.wzr||form.userid||'暂无'" @selected='wgrSelected' ></personSelector> <personSelector :label="form.wzr||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="电话" > <el-form-item label="联系手机" >
<el-input :readonly="true" v-model="form.phone" ></el-input> <el-input :readonly="true" v-model="form.phone" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="所在公司" ref="bmid" prop="bmid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所在班组" ref="bzid" prop="bzid">
<RelSelect linkage :linkParams="{pid:form.bmid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bzid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="违章日期" ref="wzrq" prop="wzrq"> <el-form-item label="违章日期" ref="wzrq" prop="wzrq">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date" <el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
...@@ -28,21 +38,24 @@ ...@@ -28,21 +38,24 @@
</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="处罚金额" ref="cfje" prop="cfje"> <el-form-item label="处罚金额" ref="cfje" prop="cfje">
<el-input type='number' :readonly="readonly" v-model="form.cfje" ></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="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="24"> <el-col :span="24">
<el-form-item label="违章行为" ref="wzxw" prop="wzxw"> <el-form-item label="违章行为" ref="wzxw" prop="wzxw">
<el-input type='textarea' :readonly="readonly" v-model="form.wzxw" ></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-col :span="12">
...@@ -275,15 +288,29 @@ ...@@ -275,15 +288,29 @@
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
bmid: [{
required: true,
trigger: 'blur'
}, ],
bzid: [{
required: true,
trigger: 'blur'
}, ],
userid: [{
required: true,
trigger: 'blur'
}, ],
wzrq: [{
required: true,
trigger: 'blur'
}, ]
} }
} }
}, },
methods: { methods: {
wgrSelected(row){ wgrSelected(row){
this.form.userid=row.id this.form.userid=row.id
this.form.phone=row.phone this.form.phone=row.phone||''
this.form.bmid=row.bmid
} }
} }
} }
......
src/views/threeViolations/enterTV/index.vue
View file @ 440c7c93
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<el-input v-model='queryParams.ryxx' ></el-input> <el-input v-model='queryParams.ryxx' ></el-input>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<!-- 按钮操作--> <!-- 按钮操作-->
...@@ -22,10 +20,8 @@ ...@@ -22,10 +20,8 @@
<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>
<WorkFlowButton :app='app'></WorkFlowButton>
<!-- 额外按钮--> <!-- 额外按钮-->
<!-- 表头设置 --> <!-- 表头设置 -->
...@@ -75,18 +71,19 @@ ...@@ -75,18 +71,19 @@
baseUrl: '/aqgl/swgl/swjl', baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ryxx: '' ryxx: '',
zt:'I'
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "部门", prop: "bmName", fieldType: "ftString",width:192}, //{label: "状态", prop: "ztName", fieldType: "ftString",width:90},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192}, {label: "工号", prop: "wzrcode", fieldType: "ftString",width:120},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192}, {label: "姓名", prop: "wzr", fieldType: "ftString",width:160},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192}, {label: "所在公司", prop: "bmName", fieldType: "ftString",width:160},
{label: "手机", prop: "phone", fieldType: "ftString",width:192}, {label: "所在班组", prop: "bzName", fieldType: "ftString",width:160},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"}, {label: "联系手机", prop: "phone", fieldType: "ftString",width:120},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300}, {label: "违章日期", prop: "wzrq", fieldType: "ftDate"},
{label: "状态", prop: "wfpname", fieldType: "ftString",width:100}, {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:280},
// {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"},
...@@ -113,7 +110,7 @@ ...@@ -113,7 +110,7 @@
// {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192}, // {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
// {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"}, // {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
// {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60}, // {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
{label: "处罚金额", prop: "cfje", fieldType: "float"}, //{label: "处罚金额", prop: "cfje", fieldType: "float"},
] ]
} }
}, },
......
src/views/threeViolations/punishmentRecord/index.vue
View file @ 440c7c93
...@@ -106,13 +106,13 @@ ...@@ -106,13 +106,13 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "部门", prop: "bmName", fieldType: "ftString",width:192}, {label: "工号", prop: "wzrcode", fieldType: "ftString",width:120},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192}, {label: "姓名", prop: "wzr", fieldType: "ftString",width:160},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192}, {label: "所在公司", prop: "bmName", fieldType: "ftString",width:160},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192}, {label: "所在班组", prop: "bzName", fieldType: "ftString",width:160},
{label: "手机", prop: "phone", fieldType: "ftString",width:192}, {label: "联系手机", prop: "phone", fieldType: "ftString",width:120},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"}, {label: "违章日期", prop: "wzrq", fieldType: "ftDate"},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300}, {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:260},
// {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"},
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
// {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192}, // {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
// {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"}, // {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
// {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60}, // {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
{label: "处罚金额", prop: "cfje", fieldType: "float"}, {label: "处罚金额", prop: "cfje", fieldType: "money"},
] ]
} }
}, },
......
src/views/threeViolations/queryRecords/index.vue
View file @ 440c7c93
...@@ -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>
<RelSelect style="width: 100%;" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect> <RelSelect style="width: 100%;" src='/jcsj/common/bm/queryGs' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-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>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -107,13 +107,13 @@ ...@@ -107,13 +107,13 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "部门", prop: "bmName", fieldType: "ftString",width:192}, {label: "工号", prop: "wzrcode", fieldType: "ftString",width:120},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192}, {label: "姓名", prop: "wzr", fieldType: "ftString",width:160},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192}, {label: "所在公司", prop: "bmName", fieldType: "ftString",width:160},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192}, {label: "所在班组", prop: "bzName", fieldType: "ftString",width:160},
{label: "手机", prop: "phone", fieldType: "ftString",width:192}, {label: "联系手机", prop: "phone", fieldType: "ftString",width:120},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"}, {label: "违章日期", prop: "wzrq", fieldType: "ftDate"},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300}, {label: "违章行为", prop: "wzxw", fieldType: "ftString",width:280},
// {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"},
......
src/views/threeViolations/tFPasses/index.vue
View file @ 440c7c93
<template> <template>
<div class="min_full" style="height: 140vh;"> <div class="min_full" style="height: 140vh;">
<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="12" class="search-col">
<div class="search-item">
<span class="search-span">事务类型:</span>
<RelSelect src='wf/common/wfstate' :match="{value:'id',label:'name'}" v-model='queryParams.operatype' ></RelSelect>
</div>
</el-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 v-model='queryParams.ryxx' ></el-input> <el-input v-model='queryParams.ryxx' ></el-input>
...@@ -43,8 +35,6 @@ ...@@ -43,8 +35,6 @@
<!--<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>
<WorkFlowButton :app='this'></WorkFlowButton>
<!-- 额外按钮--> <!-- 额外按钮-->
<!-- 表头设置 --> <!-- 表头设置 -->
...@@ -72,9 +62,9 @@ ...@@ -72,9 +62,9 @@
<el-tab-pane label="领导谈话关" name="fourth"> <el-tab-pane label="领导谈话关" name="fourth">
<Leadership :vMain='this' /> <Leadership :vMain='this' />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="家属协管关" name="fifth"> <!-- <el-tab-pane label="家属协管关" name="fifth">
<Family :vMain='this' /> <Family :vMain='this' />
</el-tab-pane> </el-tab-pane>-->
</el-tabs> </el-tabs>
</div> </div>
...@@ -88,7 +78,7 @@ ...@@ -88,7 +78,7 @@
doAdd, doAdd,
doUpdate, doUpdate,
doDelete doDelete
} from '@/api/threeViolations/tFPasses.js'; } from '@/api/threeViolations/enterTV.js';
/* edit页面*/ /* edit页面*/
import Edit from './edit' import Edit from './edit'
import Exposure from './exposure.vue' import Exposure from './exposure.vue'
...@@ -122,7 +112,6 @@ ...@@ -122,7 +112,6 @@
baseUrl: '/aqgl/swgl/swjl', baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
operatype:'W',
ryxx:'', ryxx:'',
beginDate: new Date().getTime()-1000*60*60*24*30, beginDate: new Date().getTime()-1000*60*60*24*30,
endDate: new Date().getTime() endDate: new Date().getTime()
......
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