Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
卡
卡车调度系统
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
caicaicai
卡车调度系统
Commits
5e7a447f
Commit
5e7a447f
authored
Nov 11, 2022
by
xxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改人员管理表
parent
458c8bce
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
157 additions
and
34 deletions
+157
-34
common.js
src/assets/js/common.js
+26
-0
index.vue
src/views/driverManagement/index.vue
+129
-33
vue.config.js
vue.config.js
+2
-1
No files found.
src/assets/js/common.js
View file @
5e7a447f
...
...
@@ -2281,6 +2281,32 @@ var HttpReq = function(){
params
:
param
,
})
},
//新增用户
apiusersAdd
:
function
(
data
){
return
request
({
url
:
'
/api/users
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
//修改用户
apiusersUpdate
:
function
(
data
){
return
request
({
url
:
'
/api/users
'
,
method
:
'
PUT
'
,
data
:
data
,
})
},
//删除用户
apiusersDel
:
function
(
data
){
return
request
({
url
:
'
/api/users
'
,
method
:
'
Delete
'
,
data
:
data
,
})
},
//获取用于选择用户的用户名(没用过的用户名)
getNoUseSystemUserNameQuery
:
function
(
param
){
return
request
({
...
...
src/views/driverManagement/index.vue
View file @
5e7a447f
...
...
@@ -9,10 +9,10 @@
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
人员姓名
</label>
<el-input
v-model=
"query.name"
clearable
size=
"small"
placeholder=
"请输入人员姓名"
style=
"width:180px;"
/>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
驾驶车辆
</label>
<
!--
<
label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
驾驶车辆
</label>
<el-select
v-model=
"query.car"
placeholder=
"请选择驾驶车辆"
style=
"width:180px;"
>
<el-option
v-for=
"(obj,index) in selectList"
:label=
"obj.number"
:value=
"obj.number"
:key=
"index"
></el-option>
</el-select>
</el-select>
-->
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
...
...
@@ -38,7 +38,6 @@
<el-table-column
prop=
"post"
label=
"岗位"
align=
"center"
></el-table-column>
<el-table-column
prop=
"company"
label=
"公司名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"adr"
label=
"住址"
align=
"center"
></el-table-column>
<el-table-column
prop=
"car"
label=
"驾驶车辆"
align=
"center"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
>
<template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-edit"
@
click=
"toEdit(scope.row)"
></el-button>
...
...
@@ -61,9 +60,7 @@
<el-input
v-model=
"form.item.name"
style=
"width:280px;"
placeholder=
"请输入名称"
/>
</el-form-item>
<el-form-item
label=
"用户名"
prop=
"userName"
>
<el-select
v-model=
"form.item.userName"
placeholder=
"请选择用户名"
style=
"width:280px;"
>
<el-option
v-for=
"(obj,index) in allSystemUserNameData"
:label=
"obj.username"
:value=
"obj.username"
:key=
"index"
></el-option>
</el-select>
<el-input
v-model=
"form.item.userName"
style=
"width:280px;"
placeholder=
"请选择用户名"
:disabled=
"form.reqType == 'edit'"
/>
</el-form-item>
<el-form-item
label=
"电话"
prop=
"phone"
>
<el-input
v-model=
"form.item.phone"
style=
"width:280px;"
placeholder=
"请输入电话"
/>
...
...
@@ -82,11 +79,6 @@
v-model=
"form.item.depart"
/>
</el-form-item>
<!-- <el-form-item label="部门" prop="depart">
<el-select v-model="form.item.depart" placeholder="请选择部门" style="width:280px;">
<el-option v-for="(obj,index) in allDepartmentData" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item> -->
<el-form-item
label=
"岗位"
prop=
"post"
>
<el-select
v-model=
"form.item.post"
placeholder=
"请选择岗位"
style=
"width:280px;"
>
<el-option
v-for=
"(obj,index) in allPostData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
...
...
@@ -98,11 +90,6 @@
<el-form-item
label=
"住址"
prop=
"adr"
>
<el-input
v-model=
"form.item.adr"
style=
"width:280px;"
placeholder=
"请输入住址"
/>
</el-form-item>
<el-form-item
label=
"驾驶车辆"
prop=
"car"
>
<el-select
v-model=
"form.item.car"
placeholder=
"请选择驾驶车辆"
style=
"width:280px;"
>
<el-option
v-for=
"(obj,index) in selectList"
:label=
"obj.number"
:value=
"obj.number"
:key=
"index"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"text"
@
click=
"cancelForm"
>
取消
</el-button>
...
...
@@ -134,6 +121,12 @@ export default {
allSystemUserNameData
:[],
allDepartmentData
:[],
allPostData
:[],
//最终选择部门信息
lastDeptData
:{},
//修改用户信息
xiugaiUserData
:{},
//所有用户信息
getAllSystemUserNameData
:[],
form
:
{
title
:
'
新增司机人员
'
,
visible
:
false
,
...
...
@@ -177,9 +170,6 @@ export default {
adr
:
[
{
required
:
true
,
message
:
'
请输入住址
'
,
trigger
:
'
blur
'
}
],
car
:
[
{
required
:
true
,
message
:
'
请选择驾驶的车辆
'
,
trigger
:
'
blur
'
}
]
},
}
},
...
...
@@ -192,6 +182,7 @@ export default {
methods
:
{
selectDepart
(
val
){
console
.
log
(
'
selectDepart
'
,
val
);
this
.
lastDeptData
=
val
;
return
this
.
depts
=
val
.
label
},
loadOptions
({
action
,
parentNode
,
callback
})
{
...
...
@@ -208,6 +199,7 @@ export default {
if
(
obj
.
hasChildren
)
{
obj
.
children
=
null
;
}
console
.
log
(
obj
);
return
obj
})
});
...
...
@@ -257,6 +249,10 @@ export default {
HttpReq
.
truckDispatching
.
getAllPostQuery
({
size
:
9999
}).
then
((
res
)
=>
{
this
.
allPostData
=
res
.
content
;
})
//获取所有的用户信息
HttpReq
.
truckDispatching
.
getAllSystemUserNameQuery
({
size
:
9999
}).
then
((
res
)
=>
{
this
.
getAllSystemUserNameData
=
res
.
content
;
})
})
},
...
...
@@ -298,9 +294,19 @@ export default {
this
.
form
.
visible
=
true
;
this
.
form
.
item
=
{...
item
};
this
.
form
.
reqType
=
'
edit
'
;
this
.
getAllSystemUserNameData
.
forEach
((
item1
,
index1
)
=>
{
if
(
item1
.
username
==
item
.
userName
){
this
.
xiugaiUserData
=
item1
;
}
})
},
toDelete
(
item
)
{
var
id
=
item
.
id
;
this
.
getAllSystemUserNameData
.
forEach
((
item1
,
index1
)
=>
{
if
(
item1
.
username
==
item
.
userName
){
this
.
xiugaiUserData
=
item1
;
}
})
this
.
$confirm
(
'
确认删除该条数据吗?
'
,
'
提示
'
,
{
confirmButtonText
:
'
确定
'
,
cancelButtonText
:
'
取消
'
,
...
...
@@ -340,6 +346,19 @@ export default {
},
//新增司机人员
reqAddItem
(
form
,
item
){
let
panduanchongfu
=
true
;
let
panduanchongfu2
=
true
;
this
.
getAllSystemUserNameData
.
forEach
((
obj1
,
index1
)
=>
{
if
(
obj1
.
username
==
item
.
userName
){
panduanchongfu
=
false
;
}
})
// this.getAllSystemUserNameData.forEach((obj1,index1)=>{
// if(obj1.phone == item.phone){
// panduanchongfu2 = false;
// }
// })
if
(
panduanchongfu
&&
panduanchongfu2
){
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
driverManagementPCAdd
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
...
...
@@ -360,6 +379,45 @@ export default {
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
let
addUsers
=
{};
addUsers
.
createBy
=
"
admin
"
;
addUsers
.
createTime
=
this
.
currentTime
();
addUsers
.
dept
=
{
id
:
this
.
lastDeptData
.
id
};
addUsers
.
deptId
=
this
.
lastDeptData
.
id
;
addUsers
.
email
=
lastData
.
phone
+
'
@qq.com
'
;
addUsers
.
enabled
=
"
true
"
;
addUsers
.
gender
=
"
男
"
;
addUsers
.
id
=
null
;
this
.
allPostData
.
forEach
((
item1
,
index1
)
=>
{
if
(
item1
.
name
==
lastData
.
post
){
addUsers
.
jobs
=
[{
id
:
item1
.
id
}];
}
})
addUsers
.
nickName
=
lastData
.
userName
;
addUsers
.
phone
=
lastData
.
phone
;
addUsers
.
pwdResetTime
=
"
2022-11-10 14:49:59
"
;
addUsers
.
roles
=
[{
id
:
2
}];
addUsers
.
updateBy
=
"
admin
"
;
addUsers
.
updateTime
=
this
.
currentTime
();
addUsers
.
username
=
lastData
.
userName
;
HttpReq
.
truckDispatching
.
apiusersAdd
(
addUsers
).
then
((
res
)
=>
{})
this
.
lastDeptData
=
{};
}
else
{
form
.
status
.
cu
=
0
if
(
!
panduanchongfu
){
this
.
$notify
({
title
:
'
用户名不允许重复,请重新输入!
'
,
type
:
'
error
'
,
duration
:
2500
})
}
else
if
(
!
panduanchongfu2
){
this
.
$notify
({
title
:
'
手机号已存在,请重新输入!
'
,
type
:
'
error
'
,
duration
:
2500
})
}
}
},
//修改司机人员
reqUpdateItem
(
form
,
item
){
...
...
@@ -383,6 +441,7 @@ export default {
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
this
.
lastDeptData
=
{};
},
//删除司机人员
reqRemoveProject
(
item
){
...
...
@@ -402,7 +461,44 @@ export default {
}
this
.
loadData
();
})
if
(
this
.
xiugaiUserData
.
id
){
HttpReq
.
truckDispatching
.
apiusersDel
([
this
.
xiugaiUserData
.
id
]).
then
((
res
)
=>
{})
}
},
//转换时间
currentTime
(){
var
date
=
new
Date
();
var
year
=
date
.
getFullYear
();
//年 ,从 Date 对象以四位数字返回年份
var
month
=
date
.
getMonth
()
+
1
;
//月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
var
day
=
date
.
getDate
();
//日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
var
hours
=
date
.
getHours
();
//小时 ,返回 Date 对象的小时 (0 ~ 23)
var
minutes
=
date
.
getMinutes
();
//分钟 ,返回 Date 对象的分钟 (0 ~ 59)
var
seconds
=
date
.
getSeconds
();
//秒 ,返回 Date 对象的秒数 (0 ~ 59)
//修改月份格式
if
(
month
>=
1
&&
month
<=
9
)
{
month
=
"
0
"
+
month
;
}
//修改日期格式
if
(
day
>=
0
&&
day
<=
9
)
{
day
=
"
0
"
+
day
;
}
//修改小时格式
if
(
hours
>=
0
&&
hours
<=
9
)
{
hours
=
"
0
"
+
hours
;
}
//修改分钟格式
if
(
minutes
>=
0
&&
minutes
<=
9
)
{
minutes
=
"
0
"
+
minutes
;
}
//修改秒格式
if
(
seconds
>=
0
&&
seconds
<=
9
)
{
seconds
=
"
0
"
+
seconds
;
}
//获取当前系统时间 格式(yyyy-mm-dd hh:mm:ss)
let
currentFormatDate
=
year
+
"
-
"
+
month
+
"
-
"
+
day
+
"
"
+
hours
+
"
:
"
+
minutes
+
"
:
"
+
seconds
;
return
currentFormatDate
;
}
}
}
</
script
>
...
...
vue.config.js
View file @
5e7a447f
...
...
@@ -24,7 +24,8 @@ module.exports = {
lintOnSave
:
process
.
env
.
NODE_ENV
===
'
development
'
,
productionSourceMap
:
false
,
devServer
:
{
host
:
'
localhost
'
,
// 也可以直接写IP地址这样方便真机测试
//host: 'localhost', // 也可以直接写IP地址这样方便真机测试
host
:
'
192.168.0.100
'
,
// 也可以直接写IP地址这样方便真机测试
port
:
port
,
open
:
true
,
//https: true,
...
...
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