Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
template_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
杨硕
template_vue
Commits
aa4027d9
Commit
aa4027d9
authored
Jul 31, 2023
by
CenXinYi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'project1' of
http://gitlab.91isoft.com:90/yangshuo/template_vue
into project1
parents
3d3c555e
6b7c2147
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
232 additions
and
343 deletions
+232
-343
draw.js
src/api/equipment/draw.js
+3
-82
application.vue
src/views/equipment/application.vue
+18
-12
basicInfo.vue
src/views/equipment/basicInfo.vue
+7
-69
boundManagement.vue
src/views/equipment/boundManagement.vue
+5
-1
check.vue
src/views/equipment/check.vue
+51
-27
checkProcess.vue
src/views/equipment/checkProcess.vue
+49
-25
draw.vue
src/views/equipment/draw.vue
+25
-41
equipmentAbandonment.vue
src/views/equipment/equipmentAbandonment.vue
+11
-10
income.vue
src/views/equipment/income.vue
+33
-30
draw.vue
src/views/processManagement/draw.vue
+29
-45
index.vue
src/views/sample/sampleType/index.vue
+1
-1
No files found.
src/api/equipment/draw.js
View file @
aa4027d9
import
request
from
'@/utils/request'
import
Qs
from
'qs'
// 查询基础信息列表
export
function
listWbApply
(
query
)
{
return
request
({
...
...
@@ -8,88 +7,10 @@ export function listWbApply(query) {
params
:
query
})
}
export
function
getlistRole
()
{
// 逻辑删除基础信息接口
export
function
deleteLogical
(
id
)
{
return
request
({
url
:
'system/role/listAll'
,
method
:
'get'
})
}
// 查询角色详细
export
function
getRole
(
businessId
)
{
return
request
({
url
:
'/system/role/detail/'
+
businessId
,
method
:
'get'
})
}
// 新增角色
export
function
addRole
(
data
)
{
data
=
Qs
.
stringify
(
data
)
return
request
({
url
:
'/system/role/add'
,
method
:
'post'
,
data
:
data
,
headers
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export
function
updateRole
(
data
)
{
const
businessId
=
data
.
businessId
data
=
Qs
.
stringify
(
data
)
return
request
({
url
:
'/system/role/update/'
+
businessId
,
method
:
'put'
,
data
,
headers
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
}
})
}
// 角色数据权限
export
function
dataScope
(
data
)
{
data
=
Qs
.
stringify
(
data
)
return
request
({
url
:
'/system/role/dataScope'
,
method
:
'put'
,
data
,
headers
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
}
})
}
// 角色状态修改
export
function
changeRoleStatus
(
businessId
,
flag
)
{
const
data
=
{
businessId
,
flag
}
return
request
({
url
:
'/system/role/changeStatus'
,
method
:
'put'
,
params
:
data
})
}
// 删除角色
export
function
delRole
(
roleId
)
{
return
request
({
url
:
'/system/role/deleteLogical/'
+
roleId
,
url
:
'/wbapply/deleteLogical/'
+
id
,
method
:
'delete'
})
}
// 导出角色
export
function
exportRole
(
query
)
{
return
request
({
url
:
'/system/role/export'
,
method
:
'get'
,
params
:
query
,
responseType
:
'blob'
})
}
src/views/equipment/application.vue
View file @
aa4027d9
...
...
@@ -117,18 +117,24 @@ export default {
},
// 提价时要调的接口
submitForm
()
{
this
.
$refs
.
form
.
validate
((
valid
)
=>
{
if
(
valid
)
{
addApplication
(
this
.
form
).
then
(
res
=>
{
console
.
log
(
'res'
,
res
)
if
(
res
.
code
===
200
)
{
this
.
$message
.
success
(
'操作成功'
)
this
.
resetFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
success
(
res
.
message
)
}
})
}
this
.
$confirm
(
'是否确认提交?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(
res
=>
{
this
.
$refs
.
form
.
validate
((
valid
)
=>
{
if
(
valid
)
{
addApplication
(
this
.
form
).
then
(
res
=>
{
console
.
log
(
'res'
,
res
)
if
(
res
.
code
===
200
)
{
this
.
$message
.
success
(
'操作成功'
)
this
.
resetFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
success
(
res
.
message
)
}
})
}
})
})
},
// 调数据字典查询
...
...
src/views/equipment/basicInfo.vue
View file @
aa4027d9
...
...
@@ -127,24 +127,21 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
@
close=
"cancel"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
size=
"small"
label-width=
"80px"
>
<el-form-item
label=
"pn"
prop=
"pn"
>
<el-input
v-model
.
trim=
"form.pn"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入pn"
/>
</el-form-item>
<el-form-item
label=
"ptype"
prop=
"ptype"
>
<el-input
v-model
.
trim=
"form.ptype"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入ptype"
/>
<el-input
v-model
.
trim=
"form.pn"
:maxlength=
"30"
placeholder=
"请输入pn"
/>
</el-form-item>
<el-form-item
label=
"pgx"
prop=
"pgx"
>
<el-input
v-model
.
trim=
"form.pgx"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入pgx"
/>
<el-input
v-model
.
trim=
"form.pgx"
:maxlength=
"30"
placeholder=
"请输入pgx"
/>
</el-form-item>
<el-form-item
label=
"prank"
prop=
"prank"
>
<el-input
v-model
.
trim=
"form.prank"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入prank"
/>
<el-input
v-model
.
trim=
"form.prank"
:maxlength=
"30"
placeholder=
"请输入prank"
/>
</el-form-item>
<el-form-item
label=
"pissb"
prop=
"pissb"
>
<el-form-item
label=
"pissb"
prop=
"pissb"
>
<el-select
v-model=
"form.pissb"
placeholder=
"请选择pissb"
clearable
size=
"small"
style=
"width:
150
px"
style=
"width:
341
px"
>
<el-option
v-for=
"dict in statusOptions"
...
...
@@ -155,10 +152,10 @@
</el-select>
</el-form-item>
<el-form-item
label=
"psm"
prop=
"psm"
>
<el-input
v-model
.
trim=
"form.psm"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入psm"
/>
<el-input
v-model
.
trim=
"form.psm"
:maxlength=
"30"
placeholder=
"请输入psm"
/>
</el-form-item>
<el-form-item
label=
"psy"
prop=
"psy"
>
<el-input
v-model
.
trim=
"form.psy"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入psy"
/>
<el-input
v-model
.
trim=
"form.psy"
:maxlength=
"30"
placeholder=
"请输入psy"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -213,31 +210,6 @@ export default {
dictValue
:
'0'
}
],
// 数据范围选项
dataScopeOptions
:
[
{
value
:
'1'
,
label
:
'全部数据权限'
},
{
value
:
'2'
,
label
:
'自定数据权限'
},
{
value
:
'3'
,
label
:
'本部门数据权限'
},
{
value
:
'4'
,
label
:
'本部门及以下数据权限'
},
{
value
:
'5'
,
label
:
'仅本人数据权限'
}
],
// 部门列表
tOptions
:
[],
// 查询参数
queryParams
:
{
page
:
1
,
...
...
@@ -308,40 +280,6 @@ export default {
this
.
loading
=
false
})
},
// 所有菜单节点数据
getMenuAllCheckedKeys
()
{
// 目前被选中的菜单节点
const
checkedKeys
=
this
.
$refs
.
menu
.
getHalfCheckedKeys
()
// 半选中的菜单节点
const
halfCheckedKeys
=
this
.
$refs
.
menu
.
getCheckedKeys
()
checkedKeys
.
unshift
.
apply
(
checkedKeys
,
halfCheckedKeys
)
return
checkedKeys
},
// 所有部门节点数据
getDeptAllCheckedKeys
()
{
// 目前被选中的部门节点
const
checkedKeys
=
this
.
$refs
.
dept
.
getHalfCheckedKeys
()
// // 半选中的部门节点
const
halfCheckedKeys
=
this
.
$refs
.
dept
.
getCheckedKeys
()
checkedKeys
.
unshift
.
apply
(
checkedKeys
,
halfCheckedKeys
)
return
this
.
$refs
.
dept
.
getCheckedKeys
()
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect
(
roleId
)
{
return
roleMenuTreeselect
(
roleId
).
then
(
response
=>
{
this
.
menuOptions
=
response
.
data
.
menus
return
response
})
},
/** 根据角色ID和菜单ID查询部门树结构 */
getRoleDeptTreeselect
(
roleId
,
menuId
)
{
return
roleDeptTreeselect
(
roleId
,
menuId
).
then
(
response
=>
{
this
.
form
.
deptCheckStrictly
=
response
.
data
.
deptCheckStrictly
this
.
deptOptions
=
response
.
data
.
depts
this
.
form
.
dataScope
=
this
.
dataScopeOptions
[
response
.
data
.
dataScope
-
1
].
value
return
response
})
},
// 取消按钮
cancel
()
{
this
.
open
=
false
...
...
src/views/equipment/boundManagement.vue
View file @
aa4027d9
...
...
@@ -303,7 +303,11 @@ export default {
form
:
{
pn
:
''
,
lot
:
''
,
plocation
:
''
plocation
:
''
,
phd
:
''
,
psm
:
''
,
pzl
:
''
,
prank
:
''
},
defaultProps
:
{
children
:
'children'
,
...
...
src/views/equipment/check.vue
View file @
aa4027d9
...
...
@@ -33,8 +33,8 @@
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
size=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
type=
"primary
"
icon=
"el-icon-refresh"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"primary"
style=
"padding: 8px 7px;"
size=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
style=
"padding: 8px 7px;
"
icon=
"el-icon-refresh"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
<div
style=
"float: right"
>
<el-form-item>
...
...
@@ -401,36 +401,60 @@ export default {
this
.
title
=
'详情信息'
this
.
openDetails
=
!
this
.
openDetails
},
deleteByType
(){
deleteByType
()
{
// 添加二次确认对话框
this
.
$confirm
(
"确认要结束盘点吗?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
.
then
(()
=>
{
// 用户点击确定按钮时执行的回调函数
deleteByType
(
1
).
then
(
flag
=>
{
if
(
flag
.
data
>
0
&&
flag
.
code
===
200
)
{
this
.
$message
.
success
(
"结束盘点成功"
)
}
else
{
this
.
$message
.
error
(
"结束盘点失败"
)
if
(
flag
.
data
>
0
&&
flag
.
code
===
200
)
{
this
.
$message
.
success
(
"结束盘点成功"
)
;
}
else
{
this
.
$message
.
error
(
"结束盘点失败"
);
}
});
})
.
catch
(()
=>
{
// 用户点击取消按钮时执行的回调函数,可以忽略这里的实现
});
},
checkType
()
{
checkType
(
1
).
then
(
total
=>
{
if
(
total
.
data
!==
0
)
{
this
.
$message
.
error
(
"请先结束盘点"
);
}
else
{
let
data
=
[];
if
(
this
.
selectList
.
length
===
0
)
{
data
=
this
.
equipmentList
;
}
else
{
data
=
this
.
selectList
;
}
// 添加二次确认对话框
this
.
$confirm
(
"确认要进行盘点吗?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
},
checkType
(){
checkType
(
1
).
then
(
total
=>
{
if
(
total
.
data
!==
0
){
this
.
$message
.
error
(
"请先结束盘点"
)
}
else
{
let
data
=
[]
if
(
this
.
selectList
.
length
===
0
){
data
=
this
.
equipmentList
}
else
{
data
=
this
.
selectList
}
.
then
(()
=>
{
// 用户点击确定按钮时执行的回调函数
addList
(
data
).
then
(
flag
=>
{
if
(
flag
.
data
.
influence
>
0
)
{
this
.
$message
.
success
(
"盘点成功"
)
}
else
{
this
.
$message
.
error
(
"盘点失败"
)
if
(
flag
.
data
.
influence
>
0
)
{
this
.
$message
.
success
(
"盘点成功"
)
;
}
else
{
this
.
$message
.
error
(
"盘点失败"
)
;
}
})
}
})
},
});
})
.
catch
(()
=>
{
// 用户点击取消按钮时执行的回调函数,可以忽略这里的实现
});
}
});
},
handelTab
(
i
,
e
)
{
const
that
=
this
...
...
src/views/equipment/checkProcess.vue
View file @
aa4027d9
...
...
@@ -33,8 +33,8 @@
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
size=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
type=
"primary
"
icon=
"el-icon-refresh"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"primary"
style=
"padding: 8px 7px;"
size=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
style=
"padding: 8px 7px;
"
icon=
"el-icon-refresh"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
<div
style=
"float: right"
>
<el-form-item>
...
...
@@ -392,36 +392,60 @@ export default {
this
.
title
=
'详情信息'
this
.
openDetails
=
!
this
.
openDetails
},
deleteByType
(){
deleteByType
()
{
// 添加二次确认对话框
this
.
$confirm
(
"确认要结束盘点吗?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
.
then
(()
=>
{
// 用户点击确定按钮时执行的回调函数
deleteByType
(
2
).
then
(
flag
=>
{
if
(
flag
.
data
>
0
)
{
this
.
$message
.
success
(
"结束盘点成功"
)
}
else
{
this
.
$message
.
error
(
"结束盘点失败"
)
if
(
flag
.
data
>
0
)
{
this
.
$message
.
success
(
"结束盘点成功"
)
;
}
else
{
this
.
$message
.
error
(
"结束盘点失败"
);
}
})
},
checkType
(){
});
})
.
catch
(()
=>
{
// 用户点击取消按钮时执行的回调函数,可以忽略这里的实现
});
},
checkType
()
{
// 添加二次确认对话框
this
.
$confirm
(
"确认要盘点吗?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
.
then
(()
=>
{
// 用户点击确定按钮时执行的回调函数
checkType
(
2
).
then
(
total
=>
{
if
(
total
.
data
!==
0
)
{
this
.
$message
.
error
(
"请先结束盘点"
)
}
else
{
let
data
=
[]
if
(
this
.
selectList
.
length
===
0
)
{
data
=
this
.
equipmentList
}
else
{
data
=
this
.
selectList
if
(
total
.
data
!==
0
)
{
this
.
$message
.
error
(
"请先结束盘点"
)
;
}
else
{
let
data
=
[]
;
if
(
this
.
selectList
.
length
===
0
)
{
data
=
this
.
equipmentList
;
}
else
{
data
=
this
.
selectList
;
}
addList
(
data
).
then
(
flag
=>
{
if
(
flag
.
data
.
influence
>
0
)
{
this
.
$message
.
success
(
"盘点成功"
)
}
else
{
this
.
$message
.
error
(
"盘点失败"
)
if
(
flag
.
data
.
influence
>
0
)
{
this
.
$message
.
success
(
"盘点成功"
)
;
}
else
{
this
.
$message
.
error
(
"盘点失败"
)
;
}
})
})
;
}
})
},
});
})
.
catch
(()
=>
{
// 用户点击取消按钮时执行的回调函数,可以忽略这里的实现
});
},
handelTab
(
i
,
e
)
{
const
that
=
this
if
(
!
that
.
$refs
[
'input'
+
i
])
{
...
...
src/views/equipment/draw.vue
View file @
aa4027d9
...
...
@@ -157,21 +157,7 @@
</template>
<
script
>
// import {
// addRole,
// changeRoleStatus,
// dataScope,
// delRole,
// exportRole,
// getRole,
// listBasicInfo,
// updateRole
// } from '@/api/equipment/basicInfo'
import
{
roleMenuTreeselect
,
roleMenuTreeselectMC
,
treeselect
as
menuTreeselect
}
from
'@/api/system/menu'
import
{
roleDeptTreeselect
,
treeselect
as
deptTreeselect
}
from
'@/api/system/dept'
import
{
listBasicInfo
}
from
'@/api/equipment/basicInfo'
import
{
listWbApply
}
from
'@/api/equipment/draw'
// import { getRolesByInsId } from '../../../api/businessManage/template'
import
{
listWbApply
,
deleteLogical
}
from
'@/api/equipment/draw'
export
default
{
name
:
'Role'
,
data
()
{
...
...
@@ -486,22 +472,22 @@ export default {
this
.
title
=
'添加角色'
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
()
const
roleId
=
row
.
businessId
||
this
.
ids
const
roleMenu
=
this
.
getRoleMenuTreeselect
(
roleId
)
getRole
(
roleId
).
then
(
response
=>
{
this
.
form
=
response
.
data
this
.
open
=
true
this
.
getMenuTreeselect
(
roleId
)
this
.
$nextTick
(()
=>
{
roleMenu
.
then
(
res
=>
{
this
.
$refs
.
menu
.
setCheckedKeys
(
res
.
data
.
checkedKeys
)
})
})
this
.
title
=
'修改角色'
})
},
//
handleUpdate(row) {
//
this.reset()
//
const roleId = row.businessId || this.ids
//
const roleMenu = this.getRoleMenuTreeselect(roleId)
//
getRole(roleId).then(response => {
//
this.form = response.data
//
this.open = true
//
this.getMenuTreeselect(roleId)
//
this.$nextTick(() => {
//
roleMenu.then(res => {
//
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
//
})
//
})
//
this.title = '修改角色'
//
})
//
},
/** 提交按钮 */
submitForm
:
function
()
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
...
...
@@ -528,20 +514,18 @@ export default {
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
roleIds
=
row
.
businessId
||
this
.
ids
this
.
$confirm
(
'
所选择数据被删除后不可再恢复,是否继续?
'
,
'提示'
,
{
const
id
=
row
.
businessId
this
.
$confirm
(
'
是否确认操作?
'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(
function
()
{
return
delRole
(
roleIds
)
}).
then
(()
=>
{
this
.
getList
()
this
.
$message
({
message
:
'删除成功'
,
type
:
'success'
}).
then
(
res
=>
{
deleteLogical
(
id
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
$message
.
success
(
'操作成功'
)
this
.
getList
()
}
})
}).
catch
(
function
()
{
})
}
}
...
...
src/views/equipment/equipmentAbandonment.vue
View file @
aa4027d9
...
...
@@ -33,8 +33,8 @@
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
size=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-refresh
"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"primary"
s
tyle=
"padding: 8px 7px;"
s
ize=
"small"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
icon=
"el-icon-refresh"
style=
"padding: 8px 7px;
"
size=
"small"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
<div
style=
"float: right"
>
<!--
<el-form-item>
...
...
@@ -214,22 +214,22 @@
<el-dialog
:title=
"abandonTitle"
:visible
.
sync=
"abandonOpen"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
>
<el-form
ref=
"form"
:model=
"abandonFrom"
:rules=
"abandonFromRules"
size=
"small"
label-width=
"80px"
>
<el-form-item
label=
"fq_bz"
prop=
"fq_bz"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_bz"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_bz"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_bz"
:maxlength=
"30"
placeholder=
"请输入fq_bz"
/>
</el-form-item>
<el-form-item
label=
"fq_dd"
prop=
"fq_dd"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_dd"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_dd"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_dd"
:maxlength=
"30"
placeholder=
"请输入fq_dd"
/>
</el-form-item>
<el-form-item
label=
"fq_mcode"
prop=
"fq_mcode"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_mcode"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_mcode"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_mcode"
:maxlength=
"30"
placeholder=
"请输入fq_mcode"
/>
</el-form-item>
<el-form-item
label=
"fq_ys"
prop=
"fq_ys"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_ys"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_ys"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_ys"
:maxlength=
"30"
placeholder=
"请输入fq_ys"
/>
</el-form-item>
<el-form-item
label=
"fq_dbxi"
prop=
"fq_dbxi"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_dbxi"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_dbxi"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_dbxi"
:maxlength=
"30"
placeholder=
"请输入fq_dbxi"
/>
</el-form-item>
<el-form-item
label=
"fq_yy"
prop=
"fq_yy"
>
<el-input
v-model
.
trim=
"abandonFrom.fq_yy"
show-word-limit
:maxlength=
"30"
placeholder=
"请输入fq_yy"
/>
<el-input
v-model
.
trim=
"abandonFrom.fq_yy"
:maxlength=
"30"
placeholder=
"请输入fq_yy"
/>
</el-form-item>
</el-form>
...
...
@@ -276,7 +276,7 @@ export default {
},
abandonFromRules
:
{
fq_ys
:
[{
pattern
:
/^
\d
+$/
,
message
:
'仅能输入数字'
,
trigger
:
'change'
}]
},
// TODO: 表单里的单项详情参数
singleDetails
:
{
...
...
@@ -586,7 +586,7 @@ export default {
},
// 取消按钮
cancel
()
{
this
.
o
pen
=
false
this
.
abandonO
pen
=
false
this
.
reset
()
},
// 取消按钮(数据权限)
...
...
@@ -756,6 +756,7 @@ export default {
this
.
abandonTitle
=
"废弃表单信息"
this
.
abandonFrom
.
businessId
=
row
.
businessId
this
.
abandonOpen
=
true
// const EquipmentIds = row.businessId || this.ids;
// const vm = this; // 保存当前上下文
...
...
src/views/equipment/income.vue
View file @
aa4027d9
...
...
@@ -54,7 +54,6 @@
<
script
>
import
{
add
,
updatadevice
}
from
'@/api/magnagement'
export
default
{
name
:
'Role'
,
data
()
{
...
...
@@ -105,36 +104,40 @@ export default {
},
// 提交时要调的接口
submitForm
()
{
this
.
$refs
.
form
.
validate
((
valid
)
=>
{
if
(
valid
)
{
console
.
log
(
'form'
,
this
.
form
)
// 校验通过,提交表单或进行其他操作
if
(
this
.
form
.
businessId
!==
undefined
)
{
updatadevice
(
this
.
form
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
open
=
false
this
.
$message
.
success
(
'操作成功'
)
this
.
getList
()
this
.
reFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
error
(
res
.
message
)
}
})
this
.
$confirm
(
'是否确认操作?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
$refs
.
form
.
validate
((
valid
)
=>
{
if
(
valid
)
{
console
.
log
(
'form'
,
this
.
form
)
// 校验通过,提交表单或进行其他操作
if
(
this
.
form
.
businessId
!==
undefined
)
{
updatadevice
(
this
.
form
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
open
=
false
this
.
$message
.
success
(
'操作成功'
)
this
.
resetFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
error
(
res
.
message
)
}
})
}
else
{
add
(
this
.
form
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
open
=
false
this
.
$message
.
success
(
'操作成功'
)
this
.
resetFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
error
(
res
.
message
)
}
})
}
}
else
{
add
(
this
.
form
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
open
=
false
this
.
$message
.
success
(
'操作成功'
)
this
.
getList
()
this
.
reFrom
()
}
else
if
(
res
.
code
===
null
)
{
this
.
$message
.
error
(
res
.
message
)
}
})
// 校验失败,显示错误信息或进行其他操作
}
}
else
{
// 校验失败,显示错误信息或进行其他操作
}
})
})
},
// 调数据字典查询
...
...
@@ -161,7 +164,7 @@ export default {
}
.button
{
margin-top
:
7%
;
margin-left
:
48
%
;
margin-left
:
11
%
;
}
}
...
...
src/views/processManagement/draw.vue
View file @
aa4027d9
...
...
@@ -12,9 +12,9 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"phd"
prop=
"phd"
>
<el-form-item
label=
"phd"
prop=
"phd
Str
"
>
<el-input
v-model=
"queryParams.phd"
v-model=
"queryParams.phd
Str
"
placeholder=
"请输入phd"
clearable
size=
"small"
...
...
@@ -22,9 +22,9 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"prank"
prop=
"prank"
>
<el-form-item
label=
"prank"
prop=
"prank
Str
"
>
<el-input
v-model=
"queryParams.prank"
v-model=
"queryParams.prank
Str
"
placeholder=
"请输入prank"
clearable
size=
"small"
...
...
@@ -157,21 +157,7 @@
</template>
<
script
>
// import {
// addRole,
// changeRoleStatus,
// dataScope,
// delRole,
// exportRole,
// getRole,
// listBasicInfo,
// updateRole
// } from '@/api/equipment/basicInfo'
import
{
roleMenuTreeselect
,
roleMenuTreeselectMC
,
treeselect
as
menuTreeselect
}
from
'@/api/system/menu'
import
{
roleDeptTreeselect
,
treeselect
as
deptTreeselect
}
from
'@/api/system/dept'
import
{
listBasicInfo
}
from
'@/api/equipment/basicInfo'
import
{
listWbApply
}
from
'@/api/equipment/draw'
// import { getRolesByInsId } from '../../../api/businessManage/template'
import
{
listWbApply
,
deleteLogical
}
from
'@/api/equipment/draw'
export
default
{
name
:
'Role'
,
data
()
{
...
...
@@ -486,22 +472,22 @@ export default {
this
.
title
=
'添加角色'
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
()
const
roleId
=
row
.
businessId
||
this
.
ids
const
roleMenu
=
this
.
getRoleMenuTreeselect
(
roleId
)
getRole
(
roleId
).
then
(
response
=>
{
this
.
form
=
response
.
data
this
.
open
=
true
this
.
getMenuTreeselect
(
roleId
)
this
.
$nextTick
(()
=>
{
roleMenu
.
then
(
res
=>
{
this
.
$refs
.
menu
.
setCheckedKeys
(
res
.
data
.
checkedKeys
)
})
})
this
.
title
=
'修改角色'
})
},
//
handleUpdate(row) {
//
this.reset()
//
const roleId = row.businessId || this.ids
//
const roleMenu = this.getRoleMenuTreeselect(roleId)
//
getRole(roleId).then(response => {
//
this.form = response.data
//
this.open = true
//
this.getMenuTreeselect(roleId)
//
this.$nextTick(() => {
//
roleMenu.then(res => {
//
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
//
})
//
})
//
this.title = '修改角色'
//
})
//
},
/** 提交按钮 */
submitForm
:
function
()
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
...
...
@@ -528,20 +514,18 @@ export default {
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
roleIds
=
row
.
businessId
||
this
.
ids
this
.
$confirm
(
'
所选择数据被删除后不可再恢复,是否继续?
'
,
'提示'
,
{
const
id
=
row
.
businessId
this
.
$confirm
(
'
是否确认操作?
'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(
function
()
{
return
delRole
(
roleIds
)
}).
then
(()
=>
{
this
.
getList
()
this
.
$message
({
message
:
'删除成功'
,
type
:
'success'
}).
then
(
res
=>
{
deleteLogical
(
id
).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
$message
.
success
(
'操作成功'
)
this
.
getList
()
}
})
}).
catch
(
function
()
{
})
}
}
...
...
src/views/sample/sampleType/index.vue
View file @
aa4027d9
...
...
@@ -80,7 +80,7 @@
</el-table-column>
<el-table-column
label=
"操作时间"
prop=
"createDate"
:show-overflow-tooltip=
"true"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
createDate
||
'-'
}}
{{
parseTime
(
scope
.
row
.
createDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
||
'-'
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"操作"
>
...
...
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