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
dfb3cddd
Commit
dfb3cddd
authored
Jan 03, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
a1d5d500
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
820 additions
and
672 deletions
+820
-672
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+0
-1
accountingWork.vue
src/components/FinancialModule/accountingWork.vue
+0
-1
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+0
-1
HotelInfo.vue
src/components/Hotel/HotelInfo.vue
+35
-14
XaddFinancialProcess.vue
src/components/administrative/XaddFinancialProcess.vue
+0
-2
scenicSpotInfoManage.vue
src/components/scenicSpot/scenicSpotInfoManage.vue
+785
-653
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
dfb3cddd
...
...
@@ -273,7 +273,6 @@
this
.
active
=
parseInt
(
this
.
$route
.
query
.
Type
)?
parseInt
(
this
.
$route
.
query
.
Type
):
1
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
?
this
.
$route
.
query
.
Handmsg
:
this
.
Handmsg
;
console
.
log
(
"this.Handmsg"
,
this
.
Handmsg
)
this
.
Financial_post_GetList
();
},
components
:
{
"my-FlowChartModule"
:
myFlowChartModule
...
...
src/components/FinancialModule/accountingWork.vue
View file @
dfb3cddd
...
...
@@ -316,7 +316,6 @@ export default {
},
methods
:{
getSingleList
(){
// 获取费用类型
this
.
apipost
(
'FinancialFlowTemplate_post_GetSingleList'
,{},
res
=>
{
console
.
log
(
"1231"
,
res
);
if
(
res
.
data
.
resultCode
==
1
){
this
.
SingleList
=
res
.
data
.
data
;
}
else
{}
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
dfb3cddd
...
...
@@ -1099,7 +1099,6 @@ export default {
this
.
msg
.
OrderTradeWay
=
this
.
tradeWay
;
this
.
msg
.
PlatformAccountId
=
this
.
platformAccount
;
this
.
loading
=
true
;
console
.
log
(
"this.msg"
,
this
.
msg
)
this
.
apipost
(
'Financial_post_Set'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
$confirm
(
this
.
$t
(
'tips.czcgsfjxzhidan'
),
this
.
$t
(
'tips.tips'
),
{
...
...
src/components/Hotel/HotelInfo.vue
View file @
dfb3cddd
...
...
@@ -73,24 +73,28 @@
</el-select>
</span>
</div>
<span
class=
"resource-lititle sheshi"
>
{{$t('ground.jiudianyouhui')}}
<el-button
icon=
"el-icon-plus"
circle
@
click=
"addAir"
></el-button>
<span
class=
"resource-lititle sheshi"
>
{{$t('ground.jiudianyouhui')}}
<el-button
icon=
"el-icon-plus"
circle
@
click=
"addAir"
></el-button>
</span>
<div
class=
"jiudianyouhuiDiv"
>
<el-row
v-for=
"(list,index) in addMsg.DiscountList"
:key=
"index"
>
<el-col
:span=
"6"
:gutter=
"35"
>
<el-form-item
:label=
"$t('ground.kaishishuliang')"
>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.StartNum"
@
keyup
.
native=
"checkInteger(list,'StartNum')"
maxlength=
"2"
></el-input>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.StartNum"
@
keyup
.
native=
"checkInteger(list,'StartNum')"
maxlength=
"2"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
:gutter=
"35"
>
<el-form-item
:label=
"$t('ground.jieshushuliang')"
>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.EndNum"
@
keyup
.
native=
"checkInteger(list,'EndNum')"
maxlength=
"2"
></el-input>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.EndNum"
@
keyup
.
native=
"checkInteger(list,'EndNum')"
maxlength=
"2"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
:gutter=
"35"
>
<el-form-item
:label=
"$t('ground.fanhuanshuliang')"
>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.DisCountNum"
@
keyup
.
native=
"checkInteger(list,'DisCountNum')"
maxlength=
"2"
></el-input>
<el-input
class=
'w80'
type=
"text"
v-model=
"list.DisCountNum"
@
keyup
.
native=
"checkInteger(list,'DisCountNum')"
maxlength=
"2"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
:gutter=
"35"
v-if=
"index==0"
>
...
...
@@ -125,8 +129,8 @@
class=
"w300"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('system.table_country')"
>
<el-select
:placeholder=
"$t('visaT.qxzguojia')"
filterable
v-model=
"addMsg.Country"
class=
'multiple_input w300'
@
change=
"GetSubAreaList(addMsg.Country,1)"
>
<el-select
:placeholder=
"$t('visaT.qxzguojia')"
filterable
v-model=
"addMsg.Country"
class=
'multiple_input w300'
@
change=
"GetSubAreaList(addMsg.Country,1)"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in CountryList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
...
...
@@ -134,8 +138,8 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('hotel.hotel_province')"
>
<el-select
:placeholder=
"$t('ground.qingxuanzesheng')"
filterable
class=
'multiple_input w300'
v-model=
"addMsg.Province"
@
change=
"GetSubAreaList(addMsg.Province,2)"
>
<el-select
:placeholder=
"$t('ground.qingxuanzesheng')"
filterable
class=
'multiple_input w300'
v-model=
"addMsg.Province"
@
change=
"GetSubAreaList(addMsg.Province,2)"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in ProvinceList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
...
...
@@ -143,7 +147,8 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('hotel.hotel_city')"
>
<el-select
:placeholder=
"$t('ground.qingxuanzeshi')"
filterable
class=
'multiple_input w300'
v-model=
"addMsg.City"
>
<el-select
:placeholder=
"$t('ground.qingxuanzeshi')"
filterable
class=
'multiple_input w300'
v-model=
"addMsg.City"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in CityList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
...
...
@@ -155,6 +160,19 @@
<el-button
slot=
"append"
@
click=
"selectAddress = true"
icon=
"iconfont icon-img_dw"
></el-button>
</el-input>
</el-form-item>
<div
class=
"toolOne"
>
<span
class=
"fanbili"
>
地理位置
</span>
<div
class=
"RabateDiv clearfix"
>
<div
class=
"RebateCount reOne"
>
<div
class=
"leftPnum"
>
经度
</div>
<input
type=
"text"
class=
"toolInput inpuOne"
v-model=
"addMsg.Lng"
maxlength=
"20"
>
</div>
<div
class=
"RebateCount reTwo"
>
<div
class=
"fanNum"
>
纬度
</div>
<input
type=
"text"
class=
"toolInput inpuTwo"
v-model=
"addMsg.Lat"
maxlength=
"20"
>
</div>
</div>
</div>
<el-form-item
:label=
"$t('hotel.hotel_fax')"
>
<el-input
type=
"text"
v-model=
"addMsg.Fax"
maxlength=
"20"
class=
"w300"
></el-input>
</el-form-item>
...
...
@@ -169,8 +187,8 @@
<el-input
type=
"textarea"
v-model=
"addMsg.WarmTip"
class=
"w300"
></el-input>
</el-form-item>
<el-form-item>
<el-switch
v-model=
"isBook"
active-color=
"#13ce66"
inactive-color=
"#ff4949"
:active-text=
"$t('hotel.hotel_Supplier')"
:inactive-text=
"$t('ground.ziding')"
></el-switch>
<el-switch
v-model=
"isBook"
active-color=
"#13ce66"
inactive-color=
"#ff4949"
:
active-text=
"$t('hotel.hotel_Supplier')"
:
inactive-text=
"$t('ground.ziding')"
></el-switch>
</el-form-item>
<el-form-item>
<el-switch
v-model=
"isDinner"
active-color=
"#13ce66"
@
change=
"getDinnerList"
inactive-color=
"#ff4949"
...
...
@@ -187,13 +205,16 @@
<el-switch
v-model=
"addMsg.IsHavearking"
:active-value=
"1"
:inactive-value=
"0"
></el-switch>
</el-form-item>
<el-form-item
:label=
"$t('ground.tingchefei')"
v-if=
"addMsg.IsHavearking==1"
>
<el-input
type=
"text"
v-model=
"addMsg.ParkFee"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'ParkFee')"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.ParkFee"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'ParkFee')"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('ground.rutangshui')"
>
<el-input
type=
"text"
v-model=
"addMsg.InTangTax"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'InTangTax')"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.InTangTax"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'InTangTax')"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('ground.chengshishui')"
>
<el-input
type=
"text"
v-model=
"addMsg.CityTax"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'CityTax')"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.CityTax"
class=
"w300"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(addMsg,'CityTax')"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('ground.fanyongleixing')"
>
<el-select
v-model=
"addMsg.RebateType"
class=
'multiple_input w300'
:placeholder=
"$t('pub.pleaseSel')"
>
...
...
src/components/administrative/XaddFinancialProcess.vue
View file @
dfb3cddd
...
...
@@ -1476,7 +1476,6 @@ export default {
addNode
(){
// 添加节点
let
AuditList
=
{};
let
type
=
this
.
approvalType
console
.
log
(
"this.approvalType"
,
this
.
approvalType
)
if
(
this
.
AuditDescription
==
''
){
return
this
.
$message
.
error
(
this
.
$t
(
'tips.qtxjdmiaoshu'
))
}
...
...
@@ -1648,7 +1647,6 @@ export default {
AuditList
.
SpecialNode
=
this
.
GetNodeValue
;
this
.
myAuditList
.
push
(
AuditList
);
}
console
.
log
(
"this.myAuditList"
,
this
.
myAuditList
)
this
.
closeLayer
()
},
clearValue
(
t
){
// 选择会计出纳窗口获取对应下拉
...
...
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @
dfb3cddd
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