Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sgaqgl-vue
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李苏
sgaqgl-vue
Commits
bac62f25
Commit
bac62f25
authored
2 years ago
by
dingyoujian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
三违
parent
9de23a92
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
192 additions
and
160 deletions
+192
-160
enterTV.js
src/api/threeViolations/enterTV.js
+9
-0
edit.vue
src/views/equipment/archives/edit.vue
+116
-81
index.vue
src/views/equipment/sbbymx/index.vue
+20
-19
edit.vue
src/views/threeViolations/correctTV/edit.vue
+1
-1
index.vue
src/views/threeViolations/correctTV/index.vue
+2
-2
edit.vue
src/views/threeViolations/enterTV/edit.vue
+30
-46
index.vue
src/views/threeViolations/enterTV/index.vue
+5
-2
edit.vue
src/views/threeViolations/punishmentRecord/edit.vue
+1
-1
index.vue
src/views/threeViolations/punishmentRecord/index.vue
+2
-2
edit.vue
src/views/threeViolations/queryRecords/edit.vue
+1
-1
index.vue
src/views/threeViolations/queryRecords/index.vue
+2
-2
edit.vue
src/views/threeViolations/tFPasses/edit.vue
+1
-1
index.vue
src/views/threeViolations/tFPasses/index.vue
+2
-2
No files found.
src/api/threeViolations/enterTV.js
View file @
bac62f25
...
...
@@ -104,3 +104,12 @@ export function queryBglxFile(query) {
data
:
query
||
{}
})
}
/* 查询 */
export
function
doQueryCfbz
(
query
)
{
return
request
({
url
:
'/aqgl/swgl/swcfbz/query'
,
method
:
'post'
,
data
:
query
||
{}
})
}
This diff is collapsed.
Click to expand it.
src/views/equipment/archives/edit.vue
View file @
bac62f25
This diff is collapsed.
Click to expand it.
src/views/equipment/sbbymx/index.vue
View file @
bac62f25
...
...
@@ -117,26 +117,27 @@
},
/* 表格标题对应参数*/
tableTitle
:
[
{
label
:
"档案编号"
,
prop
:
"dabh"
,
fieldType
:
"ftString"
,
width
:
100
},
{
label
:
"设备编号"
,
prop
:
"code"
,
fieldType
:
"ftString"
,
width
:
140
},
{
label
:
"公司"
,
prop
:
"gsName"
,
fieldType
:
"ftString"
,
width
:
96
},
//flid,下拉, aqgl/sbgl/sbfl/query
{
label
:
"设备分类"
,
prop
:
"sbflName"
,
fieldType
:
"ftString"
,
width
:
96
},
{
label
:
"设备编号"
,
prop
:
"dabh"
,
fieldType
:
"ftString"
,
width
:
100
},
{
label
:
"设备代码"
,
prop
:
"code"
,
fieldType
:
"ftString"
,
width
:
140
},
{
label
:
"设备名称"
,
prop
:
"name"
,
fieldType
:
"ftString"
,
width
:
160
},
// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{
label
:
"制造厂家"
,
prop
:
"productor"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"型号"
,
prop
:
"model"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"登记证编号"
,
prop
:
"serialno"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"计量单位"
,
prop
:
"jldw"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"启用日期"
,
prop
:
"qyrq"
,
fieldType
:
"ftDateTime"
},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
{
label
:
"使用状态"
,
prop
:
"tybzName"
,
fieldType
:
"ftString"
,
width
:
80
},
{
label
:
"使用地点"
,
prop
:
"sydd"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"用途"
,
prop
:
"yt"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"数量"
,
prop
:
"sl"
,
fieldType
:
"int"
},
{
label
:
"制造日期"
,
prop
:
"ccrq"
,
fieldType
:
"ftDateTime"
},
{
label
:
"备注"
,
prop
:
"bz"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"是否已入档"
,
prop
:
"doc"
,
fieldType
:
"ftString"
,
width
:
160
,
show
:
false
},
{
label
:
"是否已入档"
,
prop
:
"docName"
,
fieldType
:
"ftString"
,
width
:
160
}
{
label
:
"使用地点"
,
prop
:
"sydd"
,
fieldType
:
"ftString"
,
width
:
300
},
// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{
label
:
"型号"
,
prop
:
"model"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"制造厂家"
,
prop
:
"productor"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"登记证编号"
,
prop
:
"serialno"
,
fieldType
:
"ftString"
,
width
:
300
},
{
label
:
"制造日期"
,
prop
:
"ccrq"
,
fieldType
:
"ftDateTime"
},
// {label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{
label
:
"启用日期"
,
prop
:
"qyrq"
,
fieldType
:
"ftDateTime"
},
{
label
:
"检验日期"
,
prop
:
"scjyrq"
,
fieldType
:
"ftDateTime"
},
{
label
:
"下次检验日期"
,
prop
:
"xcjyrq"
,
fieldType
:
"ftDateTime"
},
{
label
:
"检验周期"
,
prop
:
"jyzq"
,
fieldType
:
"ftString"
},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
{
label
:
"使用状态"
,
prop
:
"syzt"
,
fieldType
:
"ftString"
,
width
:
80
},
{
label
:
"备注"
,
prop
:
"bz"
,
fieldType
:
"ftString"
,
width
:
300
}
],
/* 树的标题 */
treeTitle
:
'公司列表'
,
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/correctTV/edit.vue
View file @
bac62f25
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在
班组
"
ref=
"bzid"
prop=
"bzid"
>
<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>
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/correctTV/index.vue
View file @
bac62f25
...
...
@@ -103,8 +103,8 @@
tableTitle
:
[
{
label
:
"工号"
,
prop
:
"wzrcode"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"姓名"
,
prop
:
"wzr"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
班组"
,
prop
:
"bz
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
gs
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
部门"
,
prop
:
"bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"联系手机"
,
prop
:
"phone"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"违章日期"
,
prop
:
"wzrq"
,
fieldType
:
"ftDate"
},
{
label
:
"违章行为"
,
prop
:
"wzxw"
,
fieldType
:
"ftString"
,
width
:
280
},
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/enterTV/edit.vue
View file @
bac62f25
...
...
@@ -5,37 +5,23 @@
<el-row
:gutter=
"20"
>
<el-col
:span=
"12"
>
<!--
<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>
</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-row>
<el-row
:gutter=
"20"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在公司"
ref=
"gsid"
prop=
"gsid"
>
<RelSelect
style=
"width: 100%;"
:readonly=
"readonly"
src=
'jcsj/common/bm/queryGs'
:match=
"
{value:'id',label:'bmmc'}" v-model='form.gsid' >
</RelSelect>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在班组"
ref=
"bzid"
prop=
"bzid"
>
<RelSelect
linkage
:linkParams=
"
{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bzid' >
</RelSelect>
<el-col
:span=
"12"
>
<!--
<el-form-item
label=
"处罚标准"
ref=
"swbzid"
prop=
"swbzid"
>
-->
<!--
<RelSelect
style=
"width: 100%;"
:readonly=
"readonly"
src=
'aqgl/swgl/swcfbz/query'
:match=
"
{value:'id',label:'swdjName' + 'wglxName'}" v-model='form.swbzid' >
</RelSelect>
-->
<!--
</el-form-item>
-->
<el-form-item
label=
"处罚标准"
ref=
"swbzid"
prop=
"swbzid"
>
<el-select
style=
"width: 100%;"
v-model=
"form.swbzid"
placeholder=
""
>
<el-option
v-for=
"(item,index) in cfbzList"
:key=
"item.id"
:label=
"item.wglxName + '______' + item.swdjName"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"20"
>
<!--
<el-col
:span=
"12"
>
<el-form-item
label=
"所在部门"
ref=
"bmid"
prop=
"bmid"
>
<RelSelect
hasValue
:optionsData=
'optionsData'
style=
"width: 100%;"
:params=
"
{}" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' >
</RelSelect>
</el-form-item>
</el-col>
-->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"违章日期"
ref=
"wzrq"
prop=
"wzrq"
>
<el-date-picker
value-format=
"timestamp"
style=
"width: 100%;"
:readonly=
"readonly"
type=
"date"
...
...
@@ -43,17 +29,6 @@
</el-date-picker>
</el-form-item>
</el-col>
<!--
<el-col
:span=
"12"
>
<el-form-item
label=
"处罚金额"
ref=
"cfje"
prop=
"cfje"
>
<el-input
type=
'number'
:readonly=
"readonly"
v-model=
"form.cfje"
></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
:gutter=
"20"
>
<el-col
:span=
"24"
>
...
...
@@ -184,11 +159,14 @@
</
template
>
<
script
>
import
{
editMixin
}
from
'common'
import
{
doQueryCfbz
}
from
'@/api/threeViolations/enterTV.js'
;
export
default
{
mixins
:
[
editMixin
],
/* 存放index页面传递的额外参数*/
mounted
()
{
doQueryCfbz
({}).
then
(
e
=>
{
this
.
cfbzList
=
e
.
data
.
records
||
[]
})
},
/* 组件名称*/
name
:
"enterTVEdit"
,
...
...
@@ -200,7 +178,7 @@
/* 额外初始化,根据需求*/
systemType
:
[],
bm
List
:
[],
cfbz
List
:
[],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form
:
{
phone
:
''
,
...
...
@@ -213,7 +191,7 @@
//违规人ID
userid
:
''
,
//违章日期
wzrq
:
new
Date
().
getTime
(),
wzrq
:
new
Date
().
getTime
(),
//违章行为
wzxw
:
''
,
//备注
...
...
@@ -223,13 +201,12 @@
//维护人
whr
:
''
,
//维护时间
whsj
:
new
Date
().
getTime
(),
//创建人编码
cjrid
:
''
,
//创建人
cjr
:
''
,
//创建时间
cjsj
:
new
Date
().
getTime
(),
//系统版本
sysversion
:
''
,
//状态
...
...
@@ -257,7 +234,7 @@
//安全教育人
aqjyrid
:
''
,
//安全教育时间
aqjysj
:
new
Date
().
getTime
()
,
aqjysj
:
''
,
//安全教育内容
aqcont
:
''
,
//反思内容
...
...
@@ -269,13 +246,13 @@
//被教育人编码
ldbjyrid
:
''
,
//领导教育时间
ldjysj
:
new
Date
().
getTime
()
,
ldjysj
:
''
,
//领导教育内容
ldcont
:
''
,
//家属教育人
jsjyr
:
''
,
//家属教育时间
jsjysj
:
new
Date
().
getTime
()
,
jsjysj
:
''
,
//家属教育内容
jscont
:
''
,
//纠正措施
...
...
@@ -285,14 +262,21 @@
//纠正验证人编码
jzyzrid
:
''
,
//纠正验证时间
jzyzsj
:
new
Date
().
getTime
()
,
jzyzsj
:
''
,
//处罚标志
cfbz
:
''
,
//处罚金额
cfje
:
''
,
swbzid
:
''
},
/* form提交时的规则,具体规则参考官网*/
rules
:
{
userid
:
[{
required
:
true
},
],
swbzid
:
[{
required
:
true
},
],
wzrq
:
[{
required
:
true
},
]
/* bmid: [{
required: true,
trigger: 'blur'
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/enterTV/index.vue
View file @
bac62f25
...
...
@@ -43,7 +43,8 @@
doQuery
,
doAdd
,
doUpdate
,
doDelete
doDelete
,
doQueryCfbz
}
from
'@/api/threeViolations/enterTV.js'
;
/* edit页面*/
/* edit页面*/
...
...
@@ -81,10 +82,12 @@
{
label
:
"姓名"
,
prop
:
"wzr"
,
fieldType
:
"ftString"
,
width
:
140
},
//{label: "所在部门", prop: "bmName", fieldType: "ftString",width:160},
{
label
:
"所在公司"
,
prop
:
"gsName"
,
fieldType
:
"ftString"
,
width
:
140
},
{
label
:
"所在
班组"
,
prop
:
"bz
Name"
,
fieldType
:
"ftString"
,
width
:
140
},
{
label
:
"所在
部门"
,
prop
:
"bm
Name"
,
fieldType
:
"ftString"
,
width
:
140
},
{
label
:
"联系手机"
,
prop
:
"phone"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"违章日期"
,
prop
:
"wzrq"
,
fieldType
:
"ftDate"
},
{
label
:
"违章行为"
,
prop
:
"wzxw"
,
fieldType
:
"ftString"
,
width
:
280
},
{
label
:
"三违等级"
,
prop
:
"swdjName"
,
fieldType
:
"ftString"
,
width
:
280
},
{
label
:
"三违类型"
,
prop
:
"wglxName"
,
fieldType
:
"ftString"
,
width
:
280
},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/punishmentRecord/edit.vue
View file @
bac62f25
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在
班组
"
ref=
"bzid"
prop=
"bzid"
>
<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>
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/punishmentRecord/index.vue
View file @
bac62f25
...
...
@@ -108,8 +108,8 @@
tableTitle
:
[
{
label
:
"工号"
,
prop
:
"wzrcode"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"姓名"
,
prop
:
"wzr"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
班组"
,
prop
:
"bz
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
gs
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
部门"
,
prop
:
"bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"联系手机"
,
prop
:
"phone"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"违章日期"
,
prop
:
"wzrq"
,
fieldType
:
"ftDate"
},
{
label
:
"处罚金额"
,
prop
:
"cfje"
,
fieldType
:
"money"
},
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/queryRecords/edit.vue
View file @
bac62f25
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在
班组
"
ref=
"bzid"
prop=
"bzid"
>
<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>
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/queryRecords/index.vue
View file @
bac62f25
...
...
@@ -109,8 +109,8 @@
tableTitle
:
[
{
label
:
"工号"
,
prop
:
"wzrcode"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"姓名"
,
prop
:
"wzr"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
班组"
,
prop
:
"bz
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
gs
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
部门"
,
prop
:
"bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"联系手机"
,
prop
:
"phone"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"违章日期"
,
prop
:
"wzrq"
,
fieldType
:
"ftDate"
},
{
label
:
"违章行为"
,
prop
:
"wzxw"
,
fieldType
:
"ftString"
,
width
:
280
},
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/tFPasses/edit.vue
View file @
bac62f25
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"所在
班组
"
ref=
"bzid"
prop=
"bzid"
>
<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>
...
...
This diff is collapsed.
Click to expand it.
src/views/threeViolations/tFPasses/index.vue
View file @
bac62f25
...
...
@@ -121,8 +121,8 @@
tableTitle
:
[
{
label
:
"工号"
,
prop
:
"wzrcode"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"姓名"
,
prop
:
"wzr"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
班组"
,
prop
:
"bz
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在公司"
,
prop
:
"
gs
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"所在
部门"
,
prop
:
"bm
Name"
,
fieldType
:
"ftString"
,
width
:
160
},
{
label
:
"联系手机"
,
prop
:
"phone"
,
fieldType
:
"ftString"
,
width
:
120
},
{
label
:
"违章日期"
,
prop
:
"wzrq"
,
fieldType
:
"ftDate"
},
{
label
:
"违章行为"
,
prop
:
"wzxw"
,
fieldType
:
"ftString"
,
width
:
280
},
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment