Skip to content

S
SuperMan
Commit d90c828b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3e8d3ee1 aa364125
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 7 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ d90c828b
......@@ -29,7 +29,8 @@
</ul>
{{$t('ground.jisuan1')}} <br />
{{$t('ground.jisuan2')}} <br />
{{$t('ground.sidaobsuan')}}
{{$t('ground.sidaobsuan')}}<br />
付款方式是现付的，必須上传手配书.
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle">
......@@ -164,7 +165,10 @@
<tr>
<td colspan="2">
<p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
<template v-if="subItem.ContractUrl!=''">
<span style="color:green">已上传手配书</span>
&nbsp;&nbsp;<a v-if="subItem.ContractUrl" target="_blank" style="color:red" :href="subItem.ContractUrl">查看</a>
</template>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>
......@@ -706,11 +710,9 @@
let path = '/Upload/DMC/Hotel'
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager()
.ViittoFileUrl + x.data.FilePath
this.$message.success(x.data.Message)
let newlist = JSON.parse(JSON.stringify(this.list))
this.list = newlist
var fileUrl=this.domainManager()
.ViittoFileUrl + x.data.FilePath;
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl;
this.$forceUpdate()
})
},
......@@ -872,8 +874,15 @@
});
})
}
var flag=true;
var isUpload=true;
var str="";
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){
str+=`请上传${item.UseTimeStr}的手配书`
isUpload=false;
}
subItem.OrderDetailsList.forEach((y, sIndex) => {
if (y.HouseTypeCount) {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
......@@ -902,6 +911,10 @@
}
});
})
if(!isUpload){
this.Error(str);
return;
}
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
......@@ -916,8 +929,15 @@
//单条保存
SaveSingle(item) {
item.HotelOrderState = 1;
var flag=true;
var isUpload=true;
var str="";
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){
str+=`请上传${item.UseTimeStr}的手配书`
isUpload=false;
}
subItem.OrderDetailsList.forEach(y => {
if (y.HouseTypeCount) {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
......@@ -947,6 +967,10 @@
}
});
})
if(!isUpload){
this.Error(str);
return;
}
let mag = {
TotalList: this.list,
SingleItem: item
......
src/components/systemManagement/appUpdateLog.vue 0 → 100644
View file @ d90c828b
<style>
.syslog_Content {
width: 100%;
}
.syslog_ul li {
width: 100%;
min-height: 135px;
margin-bottom: 10px;
}
.syslog_top {
width: 100%;
height: 34px;
line-height: 34px;
background-color: #dfdfdf;
}
.sys_content {
width: 100%;
min-height: 101px;
padding: 20px;
font-size: 14px;
background-color: #fff;
}
.appUpdateLog .ql-editor {
min-height: 200px;
}
.sysTop_left {
float: left;
}
.sysTop_banben {
display: inline-block;
color: #38425d;
font-size: 14px;
font-weight: bold;
margin: 0 30px;
}
.sysTop_uptime {
font-size: 14px;
color: #666666;
}
.sysTop_right {
float: right;
margin-right: 30px;
}
.sysliteleBtn {
color: #fff;
padding: 0 10px;
height: 20px;
background: #e95252;
border: 1px solid #e95252;
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
</style>
<template>
<div class="flexOne appUpdateLog">
<table v-loading="loading" class="singeRowTable">
<tr>
<th width="150">名称</th>
<th width="150">Code</th>
<th>Content</th>
<th width="100">操作</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
<td>
{{ item.Name }}
</td>
<td>
{{ item.Code }}
</td>
<td style="text-align:left;padding:0 5px;">
{{ item.Content }}
</td>
<td>
<input
type="button"
class="sysliteleBtn"
@click="updateLog(item)"
value="修改"
/>
</td>
</tr>
</table>
<el-dialog
custom-class="w800"
:title="dialogTitle"
:visible.sync="outerVisible"
center
>
<el-form :model="addMsg" label-width="80px">
<table style="width:100%">
<tr>
<td colspan="2">
<el-form-item label="更新內容">
<el-input
v-model="addMsg.Content"
class="w595"
placeholder="请输入"
/>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" @click="SaveAppLog()">
{{ $t("pub.saveBtn") }}
</button>
&nbsp;
<button
class="hollowFixedBtn"
@click="(outerVisible = false), clearMsg()"
>
{{ $t("pub.cancelBtn") }}
</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
msg: {},
loading: false,
dataList: [],
dialogTitle: "",
outerVisible: false,
addMsg: {
ID: 0,
Content: ""
}
};
},
methods: {
getList() {
//获取现有线路列表
this.loading = true;
this.apipost(
"admin_get_GetDictValueListService",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//修改获取数据
updateLog(item) {
this.addMsg.ID = item.ID;
this.addMsg.Content = item.Content;
this.dialogTitle = "修改更新日志";
this.outerVisible = true;
},
clearMsg() {
this.addMsg.ID = 0;
this.addMsg.Content = "";
},
SaveAppLog() {
this.apipost(
"admin_post_SetDictValueListService",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.outerVisible = false;
this.clearMsg();
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
mounted() {
this.getList();
}
};
</script>
src/router/config.js
View file @ d90c828b
......@@ -940,6 +940,14 @@ export default {
title: '系统更新与日志管理'
},
},
{
path: '/appUpdateLog', //App更新与日志管理
name: 'appUpdateLog',
component: resolve => require(['@/components/systemManagement/appUpdateLog'], resolve),
meta: {
title: '系统更新与日志管理'
},
},
{
path: '/destinationManagement', //目的地管理
name: 'destinationManagement',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment