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
0d6d5f5c
Commit
0d6d5f5c
authored
Mar 06, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
8e4f8fc1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3621 additions
and
3380 deletions
+3621
-3380
DinnerNeed.vue
src/components/NeedCenter/DinnerNeed.vue
+774
-714
HotelNeed.vue
src/components/NeedCenter/HotelNeed.vue
+773
-713
MyNeed.vue
src/components/NeedCenter/MyNeed.vue
+780
-708
ScenicNeed.vue
src/components/NeedCenter/ScenicNeed.vue
+775
-713
TicketNeed.vue
src/components/NeedCenter/TicketNeed.vue
+473
-402
ShoppingReimbursement.vue
src/components/ShoppingStore/ShoppingReimbursement.vue
+17
-38
ShoppingReimbursement2.vue
src/components/ShoppingStore/ShoppingReimbursement2.vue
+16
-40
ShoppingStore.vue
src/components/ShoppingStore/ShoppingStore.vue
+13
-52
No files found.
src/components/NeedCenter/DinnerNeed.vue
View file @
0d6d5f5c
This diff is collapsed.
Click to expand it.
src/components/NeedCenter/HotelNeed.vue
View file @
0d6d5f5c
This diff is collapsed.
Click to expand it.
src/components/NeedCenter/MyNeed.vue
View file @
0d6d5f5c
This diff is collapsed.
Click to expand it.
src/components/NeedCenter/ScenicNeed.vue
View file @
0d6d5f5c
This diff is collapsed.
Click to expand it.
src/components/NeedCenter/TicketNeed.vue
View file @
0d6d5f5c
This diff is collapsed.
Click to expand it.
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @
0d6d5f5c
...
@@ -144,47 +144,51 @@
...
@@ -144,47 +144,51 @@
</td>
</td>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<
template
v-if=
"item.PreTotalMoney!=item.ActualTotalMoney"
>
<
template
v-if=
"item.PreTotalMoney!=item.ActualTotalMoney"
>
<span
style=
"color:red;"
>
{{
item
.
PreTotalMoney
}}
</span>
<span
style=
"color:red;"
>
{{
item
.
PreTotalMoney
}}
</span>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
{{
item
.
PreTotalMoney
}}
{{
item
.
PreTotalMoney
}}
</
template
>
</
template
>
</td>
</td>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<
template
v-if=
"item.PreTotalMoney!=item.ActualTotalMoney"
>
<
template
v-if=
"item.PreTotalMoney!=item.ActualTotalMoney"
>
<span
style=
"color:red;"
>
{{
item
.
ActualTotalMoney
}}
</span>
<span
style=
"color:red;"
>
{{
item
.
ActualTotalMoney
}}
</span>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
{{
item
.
ActualTotalMoney
}}
{{
item
.
ActualTotalMoney
}}
</
template
>
</
template
>
</td>
</td>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<p
v-for=
"(img, imgIndex) in subItem.dmcImageList"
title=
"点击下载"
@
click=
"downLoadPZ(img)"
:key=
"imgIndex+500"
<p
v-for=
"(img, imgIndex) in subItem.dmcImageList"
title=
"点击下载"
@
click=
"downLoadPZ(img)"
v-if=
"img !== ''"
style=
"cursor: pointer;color:blue;"
>
{{ '凭证' + (imgIndex + 1)}}
</p>
:key=
"imgIndex+500"
v-if=
"img !== ''"
style=
"cursor: pointer;color:blue;"
>
{{ '凭证' + (imgIndex + 1)}}
</p>
</td>
</td>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
<td
width=
"80"
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
>
{{subItem.Remarks}}
{{subItem.Remarks}}
</td>
</td>
<td
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
style=
""
>
<td
:rowspan=
"item.ShopDetailsList.length"
v-if=
'subIndex==0'
style=
""
>
<div>
<div>
<p
style=
"cursor: pointer;color:blue;margin-top:10px;"
@
click=
"CreateHandBill(outItem)"
>
{{$t('ground.sdscdj')}}
</p>
<p
style=
"cursor: pointer;color:blue;margin-top:10px;"
@
click=
"CreateHandBill(outItem)"
>
{{$t('ground.sdscdj')}}
</p>
</div>
</div>
</td>
</td>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
{{$t('ground.scdanju')}}
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
{{$t('ground.scdanju')}}
</p>
</p>
<p
style=
"cursor: pointer;color:blue;margin-top:5px;"
<p
style=
"cursor: pointer;color:blue;margin-top:5px;"
@
click=
"goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)"
>
@
click=
"goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)"
>
{{$t('ground.xzgwd')}}
</p>
{{$t('ground.xzgwd')}}
</p>
<p
style=
"cursor: pointer;color:blue;margin-top:10px"
<p
style=
"cursor: pointer;color:blue;margin-top:10px"
@
click=
"goUrlT('ShoppingReimbursementDetails',outItem.TCIDs,'购物报账详情')"
>
{{$t('system.table_operation')}}
</p>
@
click=
"goUrlT('ShoppingReimbursementDetails',outItem.TCIDs,'购物报账详情')"
>
{{$t('system.table_operation')}}
</p>
</td>
</td>
</tr>
</tr>
</template>
</template>
</template>
</template>
</tbody>
</tbody>
<tbody
v-else
v-for=
"(outItem,outindex) in shopDataList"
:key=
"outindex+100"
>
<tbody
v-else
v-for=
"(outItem,outindex) in shopDataList"
:key=
"outindex+100"
>
<tr
>
<tr>
<td>
<td>
{{outItem.NewCombinationNum}}
{{outItem.NewCombinationNum}}
</td>
</td>
...
@@ -270,8 +274,8 @@
...
@@ -270,8 +274,8 @@
EndDate
:
''
,
EndDate
:
''
,
currentPage
:
1
,
currentPage
:
1
,
total
:
0
,
total
:
0
,
CombinationNum
:
""
,
//合团号
CombinationNum
:
""
,
//合团号
TCNUM
:
""
,
//团号
TCNUM
:
""
,
//团号
},
},
LineList
:
[],
LineList
:
[],
LineTeamList
:
[],
LineTeamList
:
[],
...
@@ -429,31 +433,6 @@
...
@@ -429,31 +433,6 @@
var
that
=
this
;
var
that
=
this
;
this
.
Confirm
(
'是否生成财务单据?'
,
function
()
{
this
.
Confirm
(
'是否生成财务单据?'
,
function
()
{
that
.
loading
=
true
;
that
.
loading
=
true
;
// var array = [];
// ShopDetailsList.forEach(subItem => {
// var obj = {
// LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
// LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
// TCID: subItem.TCID,
// GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
// GuideName: subItem.GuideName != null ? subItem.GuideName : "",
// TCNUM: subItem.TCNUMS,
// }
// array.push(obj)
// });
// var billMsg = {
// ShopDetailsList: ShopDetailsList,
// LeaderGuide: array
// };
// that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
// that.loading = false;
// if (res.data.resultCode == 1) {
// that.Success(res.data.message);
// } else {
// that.Error(res.data.message);
// }
// }, err => {})
var
nMsg
=
{
var
nMsg
=
{
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
PayType
:
that
.
PayType
,
PayType
:
that
.
PayType
,
...
@@ -489,7 +468,7 @@
...
@@ -489,7 +468,7 @@
"-"
+
"-"
+
myDate
.
getDate
();
myDate
.
getDate
();
this
.
msg
.
StartDate
=
nowDate
;
this
.
msg
.
StartDate
=
nowDate
;
this
.
msg
.
LineId
=
14
;
//默认日本线
this
.
msg
.
LineId
=
14
;
//默认日本线
//this.msg.StartDate = '2019-09-04';
//this.msg.StartDate = '2019-09-04';
// this.msg.CombinationNum = 'JVS0703HP-MUB';
// this.msg.CombinationNum = 'JVS0703HP-MUB';
this
.
getLineList
();
this
.
getLineList
();
...
...
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @
0d6d5f5c
...
@@ -126,7 +126,8 @@
...
@@ -126,7 +126,8 @@
</td>
</td>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<div>
<div>
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
{{$t('ground.scdanju')}}
</p>
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
{{$t('ground.scdanju')}}
</p>
</div>
</div>
</td>
</td>
</tr>
</tr>
...
@@ -162,18 +163,19 @@
...
@@ -162,18 +163,19 @@
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.currentPage"
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
></el-pagination>
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
></el-pagination>
</div>
</div>
<el-dialog
title=
"生成财务单据"
:visible
.
sync=
"isShowFinaceDailog"
custom-class=
'w400'
center
>
<el-dialog
title=
"生成财务单据"
:visible
.
sync=
"isShowFinaceDailog"
custom-class=
'w400'
center
>
<
template
>
<
template
>
<el-form
label-width=
"100px"
>
<el-form
label-width=
"100px"
>
<el-form-item
:label=
"$t('fnc.fkfangshi')"
>
<el-form-item
:label=
"$t('fnc.fkfangshi')"
>
<el-select
v-model=
"PayType"
>
<el-select
v-model=
"PayType"
>
<el-option
:label=
"$t('ground.cgfukuan')"
:value=
"1"
:key=
"1"
></el-option>
<el-option
:label=
"$t('ground.cgfukuan')"
:value=
"1"
:key=
"1"
></el-option>
<el-option
:label=
"$t('ground.zjcfk')"
:value=
"2"
:key=
"2"
></el-option>
<el-option
:label=
"$t('ground.zjcfk')"
:value=
"2"
:key=
"2"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"isShowFinaceDailog=false,CurrentOutItem=
{}">
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"isShowFinaceDailog=false,CurrentOutItem=
{}">
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"CreateBill()"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"CreateBill()"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
</div>
</div>
</
template
>
</
template
>
...
@@ -194,19 +196,19 @@
...
@@ -194,19 +196,19 @@
LineId
:
0
,
LineId
:
0
,
LineteamId
:
0
,
LineteamId
:
0
,
StartDate
:
''
,
StartDate
:
''
,
TCNUM
:
""
,
TCNUM
:
""
,
EndDate
:
''
,
EndDate
:
''
,
currentPage
:
1
,
currentPage
:
1
,
total
:
0
,
total
:
0
,
},
},
PayType
:
1
,
//付款方式
PayType
:
1
,
//付款方式
LineList
:
[],
LineList
:
[],
LineTeamList
:
[],
LineTeamList
:
[],
shopDataList
:
[],
shopDataList
:
[],
//是否显示
//是否显示
isShowFinaceDailog
:
false
,
isShowFinaceDailog
:
false
,
//当前点击的对象
//当前点击的对象
CurrentOutItem
:{},
CurrentOutItem
:
{},
}
}
},
},
methods
:
{
methods
:
{
...
@@ -317,46 +319,21 @@
...
@@ -317,46 +319,21 @@
}
}
},
err
=>
{})
},
err
=>
{})
},
},
//生成单据
//生成单据
CreateBill
()
{
CreateBill
()
{
var
that
=
this
;
var
that
=
this
;
this
.
Confirm
(
'是否生成财务单据?'
,
function
()
{
this
.
Confirm
(
'是否生成财务单据?'
,
function
()
{
that
.
loading
=
true
;
that
.
loading
=
true
;
// var array = [];
// ShopDetailsList.forEach(subItem => {
// var obj = {
// LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
// LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
// TCID: subItem.TCID,
// GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
// GuideName: subItem.GuideName != null ? subItem.GuideName : "",
// TCNUM: subItem.TCNUMS,
// }
// array.push(obj)
// });
// var billMsg = {
// ShopDetailsList: ShopDetailsList,
// LeaderGuide: array
// };
// that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
// that.loading = false;
// if (res.data.resultCode == 1) {
// that.Success(res.data.message);
// } else {
// that.Error(res.data.message);
// }
// }, err => {})
var
nMsg
=
{
var
nMsg
=
{
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
PayType
:
that
.
PayType
,
PayType
:
that
.
PayType
,
uid
:
that
.
getLocalStorage
().
EmployeeId
uid
:
that
.
getLocalStorage
().
EmployeeId
};
};
let
fileName
=
"生成["
+
that
.
CurrentOutItem
.
NewCombinationNum
+
"]购物店数据.xls"
;
let
fileName
=
"生成["
+
that
.
CurrentOutItem
.
NewCombinationNum
+
"]购物店数据.xls"
;
that
.
GetLocalFile
(
"dmcstatistics_post_ShopCreateBillAndExport"
,
nMsg
,
fileName
,
that
.
GetLocalFile
(
"dmcstatistics_post_ShopCreateBillAndExport"
,
nMsg
,
fileName
,
res
=>
{
res
=>
{
that
.
loading
=
false
;
that
.
loading
=
false
;
this
.
isShowFinaceDailog
=
false
;
this
.
isShowFinaceDailog
=
false
;
that
.
Success
(
"导入成功!"
);
that
.
Success
(
"导入成功!"
);
that
.
getList
();
that
.
getList
();
});
});
...
@@ -387,7 +364,6 @@
...
@@ -387,7 +364,6 @@
.more_td
>
div
{
.more_td
>
div
{
height
:
40px
;
height
:
40px
;
/*line-height: 40px;*/
border-bottom
:
1px
solid
rgb
(
204
,
204
,
204
);
border-bottom
:
1px
solid
rgb
(
204
,
204
,
204
);
}
}
...
...
src/components/ShoppingStore/ShoppingStore.vue
View file @
0d6d5f5c
...
@@ -465,9 +465,7 @@
...
@@ -465,9 +465,7 @@
.IsConflict
td
{
.IsConflict
td
{
background-color
:
pink
!important
;
background-color
:
pink
!important
;
}
}
/* 购物店 */
/* 购物店 */
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne shoppingStore"
>
<div
class=
"flexOne shoppingStore"
>
...
@@ -509,7 +507,6 @@
...
@@ -509,7 +507,6 @@
<button
class=
"normalBtn"
type=
"button"
@
click=
"showDiv"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"button"
@
click=
"showDiv"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
<button
class=
"normalBtn importBtn"
type=
"button"
@
click=
"outerVisible=true"
>
{{
$t
(
'ground.dryxsj'
)
}}
</button>
<button
class=
"normalBtn importBtn"
type=
"button"
@
click=
"outerVisible=true"
>
{{
$t
(
'ground.dryxsj'
)
}}
</button>
<a
class=
"hollowFixedBtn downBtn"
:href=
"downList"
>
{{
$t
(
'Airticket.Air_downloadTemplate'
)
}}
</a>
<a
class=
"hollowFixedBtn downBtn"
:href=
"downList"
>
{{
$t
(
'Airticket.Air_downloadTemplate'
)
}}
</a>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -536,7 +533,8 @@
...
@@ -536,7 +533,8 @@
{{
$t
(
'ground.gwd'
)
}}
:
{{
$t
(
'ground.gwd'
)
}}
:
</td>
</td>
<td>
<td>
<el-select
multiple=
""
class=
"w150"
v-model=
'DownLoadmsg.ShopIds'
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
multiple=
""
class=
"w150"
v-model=
'DownLoadmsg.ShopIds'
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in getShop'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
<el-option
v-for=
'item in getShop'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -589,7 +587,8 @@
...
@@ -589,7 +587,8 @@
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<input
type=
"button"
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
:value=
"$t('pub.saveBtn')"
/>
<input
type=
"button"
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
:value=
"$t('pub.saveBtn')"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"isShow=false,resetForm('addMsg')"
:value=
"$t('pub.cancelBtn')"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"isShow=false,resetForm('addMsg')"
:value=
"$t('pub.cancelBtn')"
/>
</el-col>
</el-col>
</el-row>
</el-row>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
...
@@ -609,8 +608,8 @@
...
@@ -609,8 +608,8 @@
</li>
</li>
<li>
<li>
<el-form-item
:label=
"$t('advmanager.v_country')"
>
<el-form-item
:label=
"$t('advmanager.v_country')"
>
<el-select
:placeholder=
"$t('visaT.qxzguojia')"
filterable
v-model=
"addMsg.Country"
class=
'multiple_input w150'
<el-select
:placeholder=
"$t('visaT.qxzguojia')"
filterable
v-model=
"addMsg.Country"
@
change=
"GetSubAreaList(addMsg.Country,1)"
>
class=
'multiple_input w150'
@
change=
"GetSubAreaList(addMsg.Country,1)"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in AddMsgCountryList"
:key=
"childItem.ID"
:label=
"childItem.Name"
<el-option
v-for=
"childItem in AddMsgCountryList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
:value=
"childItem.ID"
>
...
@@ -620,8 +619,8 @@
...
@@ -620,8 +619,8 @@
</li>
</li>
<li>
<li>
<el-form-item
:label=
"$t('hotel.hotel_province')"
>
<el-form-item
:label=
"$t('hotel.hotel_province')"
>
<el-select
:placeholder=
"$t('ground.qxzs')"
filterable
class=
'multiple_input w150'
v-model=
"addMsg.Province"
<el-select
:placeholder=
"$t('ground.qxzs')"
filterable
class=
'multiple_input w150'
@
change=
"GetSubAreaList(addMsg.Province,2)"
>
v-model=
"addMsg.Province"
@
change=
"GetSubAreaList(addMsg.Province,2)"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in AddMsgProvinceList"
:key=
"childItem.ID"
:label=
"childItem.Name"
<el-option
v-for=
"childItem in AddMsgProvinceList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
:value=
"childItem.ID"
>
...
@@ -631,7 +630,8 @@
...
@@ -631,7 +630,8 @@
</li>
</li>
<li>
<li>
<el-form-item
:label=
"$t('hotel.hotel_city')"
>
<el-form-item
:label=
"$t('hotel.hotel_city')"
>
<el-select
:placeholder=
"$t('ground.qingxuanzeshi')"
filterable
class=
'multiple_input w150'
v-model=
"addMsg.City"
>
<el-select
:placeholder=
"$t('ground.qingxuanzeshi')"
filterable
class=
'multiple_input w150'
v-model=
"addMsg.City"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'SelectDefaultValue'
></el-option>
<el-option
v-for=
"childItem in AddMsgCityList"
:key=
"childItem.ID"
:label=
"childItem.Name"
<el-option
v-for=
"childItem in AddMsgCityList"
:key=
"childItem.ID"
:label=
"childItem.Name"
:value=
"childItem.ID"
>
:value=
"childItem.ID"
>
...
@@ -651,8 +651,9 @@
...
@@ -651,8 +651,9 @@
<el-form-item
:label=
"$t('restaurant.res_BusinessHours')"
>
<el-form-item
:label=
"$t('restaurant.res_BusinessHours')"
>
<el-time-select
v-model=
"startTime"
:picker-options=
"
{start: '00:00',step: '00:05',end: '24:00'}"
<el-time-select
v-model=
"startTime"
:picker-options=
"
{start: '00:00',step: '00:05',end: '24:00'}"
class="w100" :placeholder="$t('pub.ChoiceTime')">
</el-time-select>
class="w100" :placeholder="$t('pub.ChoiceTime')">
</el-time-select>
{{
$t
(
'restaurant.res_To'
)
}}
<el-time-select
:placeholder=
"$t('salesModule.EndTime')"
v-model=
"endTime"
class=
"w100"
{{
$t
(
'restaurant.res_To'
)
}}
<el-time-select
:placeholder=
"$t('salesModule.EndTime')"
v-model=
"endTime"
:picker-options=
"
{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}">
</el-time-select>
class=
"w100"
:picker-options=
"
{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}">
</el-time-select>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<li>
...
@@ -727,30 +728,17 @@
...
@@ -727,30 +728,17 @@
</tr>
</tr>
<tr
v-for=
"(item,index) in importData"
:key=
"item.subCode"
:class=
"
{'IsConflict':item.IsConflict==1}">
<tr
v-for=
"(item,index) in importData"
:key=
"item.subCode"
:class=
"
{'IsConflict':item.IsConflict==1}">
<td
:class=
"
{'redType':item.TCIDExist==-1}">
<td
:class=
"
{'redType':item.TCIDExist==-1}">
<!--
<el-input
v-model=
"item.TCNUM"
class=
"w150"
></el-input>
-->
<span>
{{
item
.
TCNUM
}}
</span>
<span>
{{
item
.
TCNUM
}}
</span>
</td>
</td>
<td
:class=
"
{'redType':item.ShoppingNameExist==-1}">
<td
:class=
"
{'redType':item.ShoppingNameExist==-1}">
<!--
<el-select
clearable
class=
"w150"
v-model=
'item.ShoppingID'
filterable
placeholder=
"请选择购物店"
>
<el-option
v-for=
'item in getShop'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
-->
<span>
{{
item
.
Name
}}
</span>
<span>
{{
item
.
Name
}}
</span>
</td>
</td>
<td>
{{
item
.
EnterTime
}}
</td>
<td>
{{
item
.
EnterTime
}}
</td>
<td
:class=
"
{'redType':item.GuideID==0}">
<td
:class=
"
{'redType':item.GuideID==0}">
<!--
<el-select
clearable
class=
"w150"
v-model=
'item.GuideID'
filterable
placeholder=
"请选择导游"
>
<el-option
v-for=
'item in guidList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
-->
<span>
{{
item
.
GuideName
}}
</span>
<span>
{{
item
.
GuideName
}}
</span>
</td>
</td>
<td
:class=
"
{'redType':item.LeaderID==0}">
<td
:class=
"
{'redType':item.LeaderID==0}">
<span>
{{
item
.
LeaderName
}}
</span>
<span>
{{
item
.
LeaderName
}}
</span>
<!--
<el-select
clearable
class=
"w150"
v-model=
'item.LeaderID'
filterable
placeholder=
"请选择领队"
>
<el-option
v-for=
'item in leaderList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
-->
</td>
</td>
<td>
{{
item
.
TotalPrice
}}
</td>
<td>
{{
item
.
TotalPrice
}}
</td>
<td>
{{
item
.
GroupExtract
}}
</td>
<td>
{{
item
.
GroupExtract
}}
</td>
...
@@ -1237,26 +1225,6 @@
...
@@ -1237,26 +1225,6 @@
},
},
//导入数据
//导入数据
importInfo
()
{
importInfo
()
{
// var that = this;
// this.Confirm('是否导入此数据?', function () {
// that.tabLoading = true;
// let msg = that.importData;
// that.apipost(
// "ShoppingInfo_Post_Set",
// msg,
// res => {
// that.tabLoading = false;
// if (res.data.resultCode == 1) {
// that.fillShow = false;
// that.Success("导入成功,用时【" + (res.data.data / 1000) + "秒】");
// that.getList();
// } else {
// that.Error(res.data.message);
// }
// },
// err => {}
// );
// });
this
.
importInfoAndExport
();
this
.
importInfoAndExport
();
},
},
//导入数据
//导入数据
...
@@ -1269,13 +1237,6 @@
...
@@ -1269,13 +1237,6 @@
uid
:
that
.
getLocalStorage
().
EmployeeId
uid
:
that
.
getLocalStorage
().
EmployeeId
};
};
let
fileName
=
"生成购物店数据"
+
that
.
$commonUtils
.
getCurrentDate
()
+
".xls"
;
let
fileName
=
"生成购物店数据"
+
that
.
$commonUtils
.
getCurrentDate
()
+
".xls"
;
// that.GetLocalFile("ShoppingInfo_Post_ImportAndExport", qMsg, fileName,
// res => {
// that.tabLoading = false;
// that.fillShow = false;
// that.Success("导入成功!");
// that.getList();
// });
that
.
apipost
(
that
.
apipost
(
"ShoppingInfo_Post_ImportAndExport_V2"
,
"ShoppingInfo_Post_ImportAndExport_V2"
,
qMsg
,
qMsg
,
...
...
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