Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
b96e807b
Commit
b96e807b
authored
Aug 22, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
30fb65ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
173 additions
and
219 deletions
+173
-219
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+1
-1
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+1
-1
busHandBook.vue
src/components/busManagement/busHandBook.vue
+170
-216
No files found.
src/components/LeaderManagement/leaderReimbursement.vue
View file @
b96e807b
...
@@ -1500,7 +1500,7 @@
...
@@ -1500,7 +1500,7 @@
}
}
if
(
!
num
)
{
if
(
!
num
)
{
if
(
totailMoney
>
leadrPlanPrice
)
if
(
totailMoney
>
leadrPlanPrice
)
return
this
.
$message
.
error
(
"最大领款为预付合计金额的95%!"
);
//
return this.$message.error("最大领款为预付合计金额的95%!");
if
(
!
leadr
.
LeaderGetPriceT
||
leadr
.
LeaderGetPriceT
<=
0
)
if
(
!
leadr
.
LeaderGetPriceT
||
leadr
.
LeaderGetPriceT
<=
0
)
return
this
.
$message
.
error
(
"请输入金额!"
);
return
this
.
$message
.
error
(
"请输入金额!"
);
}
}
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
b96e807b
...
@@ -1936,7 +1936,7 @@
...
@@ -1936,7 +1936,7 @@
item.confirmFileList.length > 0 &&
item.confirmFileList.length > 0 &&
item.commissionSharePeople !== userId
item.commissionSharePeople !== userId
"
@
click=
"deleteFile(item)"
style=
"margin-left: 5px"
class=
"el-icon-error color999"
></i>
"
@
click=
"deleteFile(item)"
style=
"margin-left: 5px"
class=
"el-icon-error color999"
></i>
<template
v-if=
"item.con
tractNum
.length == 0"
>
<template
v-if=
"item.con
firmFileList
.length == 0"
>
<el-upload
v-if=
"
<el-upload
v-if=
"
item.confirmFileList.length == 0 &&
item.confirmFileList.length == 0 &&
item.commissionSharePeople !== userId
item.commissionSharePeople !== userId
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
b96e807b
...
@@ -2102,7 +2102,7 @@
...
@@ -2102,7 +2102,7 @@
item.confirmFileList.length > 0 &&
item.confirmFileList.length > 0 &&
item.commissionSharePeople !== userId
item.commissionSharePeople !== userId
"
@
click=
"deleteFile(item)"
style=
"margin-left: 5px"
class=
"el-icon-error color999"
></i>
"
@
click=
"deleteFile(item)"
style=
"margin-left: 5px"
class=
"el-icon-error color999"
></i>
<
template
v-if=
"item.con
tractNum
.length == 0"
>
<
template
v-if=
"item.con
firmFileList
.length == 0"
>
<el-upload
v-if=
"
<el-upload
v-if=
"
(item.confirmFileList.length == 0 && item.isOwn == 1) ||
(item.confirmFileList.length == 0 && item.isOwn == 1) ||
IsSupperOrderEdit
IsSupperOrderEdit
...
...
src/components/busManagement/busHandBook.vue
View file @
b96e807b
<
style
>
<
style
>
.busManagerTalbe
{
.busManagerTalbe
{
font-size
:
12px
;
font-size
:
12px
;
border-collapse
:
collapse
;
border-collapse
:
collapse
;
background-color
:
#fff
;
background-color
:
#fff
;
border
:
1px
solid
#ccc
;
border
:
1px
solid
#ccc
;
}
}
.busManagerTalbe
tr
{
text-align
:
center
;
.busManagerTalbe
tr
{
height
:
40px
;
text-align
:
center
;
}
height
:
40px
;
.busManagerTalbe
tr
td
{
}
padding
:
0
5px
;
background-color
:
#fff
;
.busManagerTalbe
tr
td
{
border
:
1px
solid
#ccc
;
padding
:
0
5px
;
}
background-color
:
#fff
;
.commonBackColor
{
border
:
1px
solid
#ccc
;
background-color
:
#e6e6e6
!important
;
}
color
:
#333
;
}
.commonBackColor
{
background-color
:
#e6e6e6
!important
;
color
:
#333
;
}
.comTextAlign
{
text-align
:
left
;
padding-left
:
20px
;
}
.comTextAlign
{
.addHandBook
{
text-align
:
left
;
margin-right
:
5px
;
padding-left
:
20px
;
color
:
seagreen
;
}
cursor
:
pointer
;
visibility
:
hidden
;
}
.addHandBook
{
.addHandBookDIS
{
margin-right
:
5px
;
visibility
:
visible
!important
;
color
:
seagreen
;
}
cursor
:
pointer
;
visibility
:
hidden
;
.disClick
{
}
background-color
:
#d1d1d1
;
.addHandBookDIS
{
color
:
#fff
;
visibility
:
visible
!important
;
border
:
1px
solid
#d1d1d1
;
}
}
.disClick
{
background-color
:
#d1d1d1
;
.disClick
:hover
{
color
:
#fff
;
background-color
:
#d1d1d1
!important
;
border
:
1px
solid
#d1d1d1
;
cursor
:
default
!important
;
}
box-shadow
:
none
!important
;
}
.disClick
:hover
{
background-color
:
#d1d1d1
!important
;
cursor
:
default
!important
;
box-shadow
:
none
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div>
<div>
<table
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busManagerTalbe"
style=
"width: 100%;"
v-loading=
"loading"
>
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busManagerTalbe"
style=
"width: 100%;"
v-loading=
"loading"
>
<tr>
<tr>
<td
colspan=
"6"
>
印象ジャパンバス手配依頼書
</td>
<td
colspan=
"6"
>
印象ジャパンバス手配依頼書
</td>
</tr>
</tr>
...
@@ -100,20 +99,11 @@
...
@@ -100,20 +99,11 @@
</tr>
</tr>
<tr
v-for=
"(subItem, index) in DataObj.Details_Extends"
>
<tr
v-for=
"(subItem, index) in DataObj.Details_Extends"
>
<td>
<td>
<i
<i
class=
"iconfont icon-bumenguanli-tianjia addHandBook"
:class=
"
{
class=
"iconfont icon-bumenguanli-tianjia addHandBook"
:class=
"
{
addHandBookDIS:
addHandBookDIS:
index == 0 || index == DataObj.Details_Extends.length - 1
index == 0 || index == DataObj.Details_Extends.length - 1
}"
}" @click="addHand(index)">
</i>
@click="addHand(index)"
<el-date-picker
v-model=
"subItem.UseDate"
class=
"w135"
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
>
</i>
<el-date-picker
v-model=
"subItem.UseDate"
class=
"w135"
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
</td>
</td>
<td>
<td>
<el-input
type=
"text"
v-model=
"subItem.BusType"
/>
<el-input
type=
"text"
v-model=
"subItem.BusType"
/>
...
@@ -122,28 +112,13 @@
...
@@ -122,28 +112,13 @@
<el-input
type=
"text"
v-model=
"subItem.FlightNum"
/>
<el-input
type=
"text"
v-model=
"subItem.FlightNum"
/>
</td>
</td>
<td>
<td>
<el-input
<el-input
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.BusContent"
/>
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.BusContent"
/>
</td>
</td>
<td>
<td>
<el-input
<el-input
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.HotelName"
/>
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.HotelName"
/>
</td>
</td>
<td>
<td>
<el-input
<el-input
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.HotelTel"
/>
type=
"textarea"
resize=
"none"
style=
"padding:5px 0;"
v-model=
"subItem.HotelTel"
/>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -165,39 +140,17 @@
...
@@ -165,39 +140,17 @@
<tfoot>
<tfoot>
<tr>
<tr>
<td
colspan=
"6"
>
<td
colspan=
"6"
>
<input
<input
type=
"button"
class=
"normalBtn"
:class=
"
{ disClick: isSave }" @click="SaveData()" value="保存" />
type=
"button"
<input
type=
"button"
class=
"normalBtn"
:class=
"
{ disClick: isSave }" @click="DownLoadFile()" value="下载" />
class=
"normalBtn"
:class=
"
{ disClick: isSave }"
@click="SaveData()"
value="保存"
/>
<input
type=
"button"
class=
"normalBtn"
:class=
"
{ disClick: isSave }"
@click="DownLoadFile()"
value="下载"
/>
<template
v-if=
"BusObj.BusId > 0"
>
<template
v-if=
"BusObj.BusId > 0"
>
<template
v-if=
"BusObj.OrderState == 0"
>
<template
v-if=
"BusObj.OrderState == 0"
>
<span
style=
"color:red;"
>
未确认手配
</span>
<span
style=
"color:red;"
>
未确认手配
</span>
<input
<input
type=
"button"
class=
"normalBtn"
@
click=
"SureBus(1)"
value=
"确认手配"
/>
type=
"button"
class=
"normalBtn"
@
click=
"SureBus(1)"
value=
"确认手配"
/>
</
template
>
</
template
>
<
template
v-if=
"BusObj.OrderState == 1"
>
<
template
v-if=
"BusObj.OrderState == 1"
>
<span
style=
"color:green;"
>
已确认手配
</span>
<span
style=
"color:green;"
>
已确认手配
</span>
<input
<input
type=
"button"
class=
"normalBtn"
@
click=
"SureBus(0)"
value=
"暂定手配"
/>
type=
"button"
class=
"normalBtn"
@
click=
"SureBus(0)"
value=
"暂定手配"
/>
</
template
>
</
template
>
</template>
</template>
</td>
</td>
...
@@ -212,131 +165,132 @@
...
@@ -212,131 +165,132 @@
</template>
</template>
<
script
>
<
script
>
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
DataObj
:
{
DataObj
:
{
Id
:
0
,
Id
:
0
,
TCIDS
:
""
,
TCIDS
:
""
,
TeamNum
:
""
,
TeamNum
:
""
,
GuideName
:
""
,
GuideName
:
""
,
GuideTel
:
""
,
GuideTel
:
""
,
PeopleNum
:
""
,
PeopleNum
:
""
,
BusType
:
""
,
BusType
:
""
,
DayNight
:
""
,
DayNight
:
""
,
Remarks
:
""
,
Remarks
:
""
,
Details_Extends
:
[]
Details_Extends
:
[]
},
BusObj
:
{
BusId
:
0
,
OrderState
:
1
//0暂定,1-OK
},
isSave
:
false
,
TCIDS
:
""
};
},
methods
:
{
//确认手配
SureBus
(
type
)
{
this
.
loading
=
true
;
this
.
BusObj
.
OrderState
=
type
;
this
.
apipost
(
"bus_post_SetBusService"
,
this
.
BusObj
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
GetData
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
},
DownLoadFile
(
item
)
{
if
(
!
this
.
isSave
)
{
this
.
isSave
=
true
;
let
msg
=
{
TCIDS
:
this
.
TCIDS
};
this
.
loading
=
true
;
var
fileName
=
"バス手配依頼書"
+
this
.
DataObj
.
TeamNum
+
".xls"
;
this
.
GetLocalFile
(
"bus_get_DownLoadBusConfig"
,
msg
,
fileName
,
res
=>
{
this
.
loading
=
false
;
this
.
isSave
=
false
;
});
}
},
GetData
()
{
this
.
loading
=
true
;
this
.
apipost
(
"bus_Get_GetBusDownLoadData"
,
{
TCIDs
:
this
.
TCIDS
},
},
res
=>
{
BusObj
:
{
this
.
loading
=
false
;
BusId
:
0
,
if
(
res
.
data
.
resultCode
==
1
)
{
OrderState
:
1
//0暂定,1-OK
this
.
DataObj
=
res
.
data
.
data
.
model
;
this
.
BusObj
.
BusId
=
res
.
data
.
data
.
BusId
;
this
.
BusObj
.
OrderState
=
res
.
data
.
data
.
OrderState
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
},
err
=>
{}
isSave
:
false
,
);
TCIDS
:
""
};
},
},
SaveData
()
{
methods
:
{
if
(
!
this
.
isSave
)
{
//确认手配
this
.
isSave
=
true
;
SureBus
(
type
)
{
this
.
DataObj
.
TCIDS
=
this
.
TCIDS
;
this
.
loading
=
true
;
this
.
BusObj
.
OrderState
=
type
;
this
.
apipost
(
this
.
apipost
(
"bus_
Post_SaveBusDownLoadData
"
,
"bus_
post_SetBusService
"
,
this
.
Data
Obj
,
this
.
Bus
Obj
,
res
=>
{
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
"操作成功"
);
this
.
GetData
();
this
.
GetData
();
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
},
err
=>
{}
);
},
DownLoadFile
(
item
)
{
if
(
!
this
.
isSave
)
{
this
.
isSave
=
true
;
let
msg
=
{
TCIDS
:
this
.
TCIDS
};
this
.
loading
=
true
;
var
fileName
=
"バス手配依頼書"
+
this
.
DataObj
.
TeamNum
+
".xls"
;
this
.
GetLocalFile
(
"bus_get_DownLoadBusConfig"
,
msg
,
fileName
,
res
=>
{
this
.
loading
=
false
;
this
.
isSave
=
false
;
this
.
isSave
=
false
;
});
}
},
GetData
()
{
this
.
loading
=
true
;
this
.
apipost
(
"bus_Get_GetBusDownLoadData"
,
{
TCIDs
:
this
.
TCIDS
},
res
=>
{
console
.
log
(
"bus_Get_GetBusDownLoadData"
,
res
.
data
);
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DataObj
=
res
.
data
.
data
.
model
;
this
.
BusObj
.
BusId
=
res
.
data
.
data
.
BusId
;
this
.
BusObj
.
OrderState
=
res
.
data
.
data
.
OrderState
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
},
err
=>
{}
err
=>
{}
);
);
},
SaveData
()
{
if
(
!
this
.
isSave
)
{
this
.
isSave
=
true
;
this
.
DataObj
.
TCIDS
=
this
.
TCIDS
;
this
.
apipost
(
"bus_Post_SaveBusDownLoadData"
,
this
.
DataObj
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
"操作成功"
);
this
.
GetData
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
this
.
isSave
=
false
;
},
err
=>
{}
);
}
},
//添加
addHand
(
index
)
{
var
obj
=
{
BusContent
:
""
,
BusType
:
""
,
FlightNum
:
""
,
HotelName
:
""
,
HotelTel
:
""
,
Id
:
0
,
MainId
:
0
,
UseDate
:
""
};
var
date
=
new
Date
();
var
year
=
date
.
getFullYear
();
var
month
=
date
.
getMonth
()
+
1
;
var
day
=
date
.
getDate
();
var
UseDate
=
year
+
"-"
+
month
+
"-"
+
day
;
obj
.
UseDate
=
UseDate
;
if
(
index
==
0
)
{
this
.
DataObj
.
Details_Extends
.
unshift
(
obj
);
}
else
{
this
.
DataObj
.
Details_Extends
.
push
(
obj
);
}
}
}
},
},
//添加
mounted
()
{
addHand
(
index
)
{
this
.
TCIDS
=
this
.
$route
.
query
.
TCID
;
var
obj
=
{
this
.
GetData
();
BusContent
:
""
,
BusType
:
""
,
FlightNum
:
""
,
HotelName
:
""
,
HotelTel
:
""
,
Id
:
0
,
MainId
:
0
,
UseDate
:
""
};
var
date
=
new
Date
();
var
year
=
date
.
getFullYear
();
var
month
=
date
.
getMonth
()
+
1
;
var
day
=
date
.
getDate
();
var
UseDate
=
year
+
"-"
+
month
+
"-"
+
day
;
obj
.
UseDate
=
UseDate
;
if
(
index
==
0
)
{
this
.
DataObj
.
Details_Extends
.
unshift
(
obj
);
}
else
{
this
.
DataObj
.
Details_Extends
.
push
(
obj
);
}
}
}
},
};
mounted
()
{
this
.
TCIDS
=
this
.
$route
.
query
.
TCID
;
this
.
GetData
();
}
};
</
script
>
</
script
>
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