Skip to content

S
SuperMan
Commit 129ecc57 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 3de32eb5 a0ef0422
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6351 additions and 5710 deletions
src/components/DomesticTravelcontract.vue
View file @ 129ecc57
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Hotel/HotelManagement.vue
View file @ 129ecc57
......@@ -167,8 +167,8 @@
text-align: center;
}
.hotelmanagement .hotelBtn {
width: 80px;
.hotelmanagement .hotelBtnMan {
width: 50px;
height: 28px;
border-radius: 14px;
color: #fff;
......@@ -176,10 +176,6 @@
background-color: #f76f6f;
}
.hotelmanagement .hotelBtn:first-child {
margin-right: 19px;
}
.hotelmanagement .w150 .el-input {
width: 150px;
}
......@@ -335,8 +331,9 @@
</div>
</div>
<div class="btnList">
<button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button v-if="IsHotelPriceStock==1" @click="goUrl('HotelProductManage2',item)" class="hotelBtn">{{$t('ground.baojiayukucun')}}</button>
<button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
<button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>
<button v-if="IsHotelPriceStock==1" style="width:80px;" @click="goUrl('HotelProductManage2',item)" class="hotelBtnMan">{{$t('ground.baojiayukucun')}}</button>
</div>
</div>
</div>
......@@ -387,6 +384,29 @@
};
},
methods: {
CopyHotel(Id)
{
var that = this;
that.Confirm('是否要复制此酒店?', function () {
var msg = {
Id: Id
};
that.apipost(
"hotel_post_CopyHotelService",
msg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.selectResource();
}
else {
that.Error(res.data.message);
}
},
null
);
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.selectResource();
......
src/components/SalesModule/customerTransfer.vue
View file @ 129ecc57
......@@ -220,7 +220,7 @@
</td>
<td>{{item.Address}}</td>
<td>{{item.AllianceName}}</td>
<td>{{item.EmName}}</td>
<td>{{item.EmName}}{{item.IsSys==1?"(导入)":""}}</td>
<td>{{valueToWord(item.CustomerStatus)}}</td>
<td>{{item.TotalPrice}}</td>
<td>{{item.TotalGuestNum}}</td>
......
src/components/SingleContract.vue
View file @ 129ecc57
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 129ecc57
......@@ -5007,7 +5007,6 @@
res => {
this.loading = false;
if (res.data.resultCode == 1) {
console.log(res,'resssssssss');
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
}
......
src/components/activity/PersonnelManagement.vue
View file @ 129ecc57
......@@ -655,13 +655,11 @@ export default {
}else if(this.index1 + 1==3){
period=this.yearVal
}
console.log(this.yearVal,this.weekVal,this.monthVal)
let msg = {
timeRange: this.index1 + 1,
userRange: this.index2 + 1,
period
};
console.log(msg)
this.apipost("user_get_usedsixSatistics", msg, r => {
if(r.data.data && r.data.data.length>0){
this.tableData = this.orderBy(
......
src/components/commonPage/commonTripList.vue
View file @ 129ecc57
<style>
.leftDayList{
display:inline-block;
}
.dayNum{
font-weight: bold;
font-size: 16px;
margin-left: -42px;
position: relative;
z-index: 2;
margin-bottom: 5px;
display: block;
}
.siteList{
display: inline-block;
position: relative;
border-left: 2px solid #ebebec;
position: relative;
padding: 0 0 20px;
margin-left: 10px;
}
.ComTripList .leftDayList {
display: inline-block;
width: 30px;
height: 100%;
vertical-align: top;
}
.ComTripList .dayNum {
font-weight: bold;
font-size: 16px;
margin-left: -42px;
position: relative;
z-index: 2;
margin-bottom: 5px;
display: block;
}
.ComTripList .siteList {
display: inline-block;
position: relative;
border-left: 2px solid #ebebec;
position: relative;
padding: 0 0 50px 50px;
margin-left: 10px;
}
.ComTripList .Trip_Content {
margin-left: 100px;
}
.ComTripList .Trip_Content:first-child {
margin-top: 20px;
}
.ComTripList .Trip_Content:last-child {
margin-bottom: 20px;
}
.ComTripList .TC_circles {
width: 18px;
height: 18px;
background: #fff;
border-radius: 100%;
border: 2px solid #90b7ec;
position: absolute;
left: -11px;
top: 0;
}
.ComTripList .TripControl {
display: inline-block;
vertical-align: middle;
position: relative;
top: -170px;
margin-left: 30px;
}
.ComTripList .TripControl i {
display: inline-block;
width: 30px;
height: 30px;
line-height: 30px;
cursor: pointer;
border-radius: 50%;
text-align: center;
}
.ComTripList .TripControl i:hover {
background-color: #90b7ec;
color: #fff;
}
.ComTripList .addTrip {
width: 30px;
height: 30px;
color: #fff;
text-align: center;
font-size: 25px;
line-height: 28px;
background-color: #f60;
border-radius: 100%;
cursor: pointer;
margin: -2px 0 20px 130px;
}
</style>
<template>
<div>
<div class="leftDayList">
<span class="dayNum">第1天</span>
</div>
<div class="siteList">
<el-form-item label="前往地" label-width='100px'>
<el-input type="text" class="w300"></el-input
>&nbsp;仲裁委员会仲裁；
</el-form-item>
</div>
<div class="ComTripList">
<div v-if="TripType==0">
<quill-editor v-model="TripListArr[0].TravelContent" style="height:400px;"></quill-editor>
</div>
<div v-else class="Trip_Content" v-for="(item,index) in TripListArr" :key="index">
<div class="leftDayList">
<span class="dayNum">第{{index+1}}天</span>
</div>
<div class="siteList">
<el-form-item label="前往地" label-width='100px' style="display:inline-block;">
<el-input type="text" class="w150" v-model="item.Go"></el-input>
</el-form-item>
<el-form-item label="前往省份/国家地区" label-width='160px' style="display:inline-block;">
<el-input type="text" class="w150" v-model="item.GoProvice"></el-input>
</el-form-item>
<el-form-item label="是否过境" label-width='100px' style="display:inline-block;">
<el-checkbox v-model="item.IsOut" :true-label="CheckedVaule" :false-label="UnCheckedVaule"></el-checkbox>
</el-form-item>
<quill-editor v-model="item.TravelContent" style="height:300px;"></quill-editor>
<div class="TC_circles"></div>
</div>
<div class="TripControl">
<i class="iconfont icon-img_delete_small" style="margin-left:10px;" @click="delTrip(index)"></i>
</div>
<div class="addTrip" @click="addTrip()">+</div>
</div>
</div>
</template>
<script>
export default {
props: ["ContractTripList", "TripType"],
data() {
return {
checked: false,
TripListArr: [],
//选中过境
CheckedVaule: 1,
//不过境
UnCheckedVaule: 0,
};
},
mounted() {
},
created() {
if (this.ContractTripList) {
if (this.ContractTripList.length > 0) {
this.TripListArr = JSON.parse(JSON.stringify(this.ContractTripList));
} else {
var tripObj = {
DayNum: 1, //天数
Go: '', // 前往地
GoProvice: '', //前往国家地区
IsOut: 0, // 是否过境(0-不过，1-过)
TravelContent: '', //行程内容
}
this.TripListArr.push(tripObj);
}
}
},
methods: {
//添加行程
addTrip() {
let obj = {
DayNum: '', //天数
Go: '', // 前往地
GoProvice: '', //前往国家地区
IsOut: 0, // 是否过境(0-不过，1-过)
TravelContent: '', //行程内容
}
this.TripListArr.push(obj);
this.getSavedData();
},
//删除行程
delTrip(index) {
this.TripListArr.splice(index, 1);
this.getSavedData();
},
//遍历已经保存数据
getSavedData() {
this.TripListArr.forEach((x, index) => {
x.DayNum = index + 1;
})
}
},
watch: {
//监听参数
TripListArr: {
handler: function (val, oldVal) {
this.$emit('tripData', this.TripListArr);
},
deep: true
},
}
};
</script>
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 129ecc57
......@@ -67,8 +67,6 @@
<div v-if="FeatureData.FeatureType==FeatureTypeState.userDefined">
<span class="userDeSpan">{{$t('sm.xiaoguoyldzxg')}}</span>
<div class="userDefined">
<!-- <quill-editor @change="onEditorChange($event)" v-model="FeatureData.FeatureContent">
</quill-editor>-->
<my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]"
v-bind:editValue="FeatureData.FeatureContent" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 129ecc57
......@@ -303,9 +303,6 @@
methods: {
//非直采切换
NoDirectScenicCheck(number) {
// this.dayObj.ScenicArray.forEach(x=>{
// x.ScenicJson = x.ScenicJsonStr ? JSON.parse(x.ScenicJsonStr) : { x:0, y:0 };
// })
if (this.dayObj.ScenicArray == null) {
this.dayObj.ScenicArray = [];
}
......
src/components/onedayTripContract.vue
View file @ 129ecc57
This diff is collapsed.
src/components/scenicSpot/scenicSpotList.vue
View file @ 129ecc57
......@@ -155,7 +155,7 @@
}
.scenicSpotList .hotelBtn {
width: 80px;
width: 60px;
height: 28px;
background: #f76f6f;
border-radius: 14px;
......@@ -163,10 +163,6 @@
cursor: pointer;
}
.scenicSpotList .hotelBtn:first-child {
margin-right: 19px;
}
.scenicSpotList .w150 .el-input {
width: 150px !important;
}
......@@ -319,6 +315,7 @@
</el-tooltip>
<div class="btnList">
<button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="CopyScenic(item.ID)" class="hotelBtn">复制</button>
<button @click="goUrlT('ticketManagement',item.ID)" class="hotelBtn">{{$t('scen.sc_piao')}}</button>
</div>
</div>
......@@ -380,6 +377,29 @@
};
},
methods: {
CopyScenic(Id)
{
var that = this;
that.Confirm('是否要复制此景点?', function () {
var msg = {
ID: Id
};
that.apipost(
"ticketcoupons_post_CopyTicketCouponsService",
msg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.selectResource();
}
else {
that.Error(res.data.message);
}
},
null
);
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.selectResource();
......
src/store/actions/msgs.js
View file @ 129ecc57
......@@ -2,7 +2,7 @@ import store from '../'
import config from '../../configs'
import util from '../../utils'
export function formatMsg (msg) {
export function formatMsg(msg) {
const nim = store.state.nim
if (msg.type === 'robot') {
if (msg.content && msg.content.flag === 'bot') {
......@@ -25,21 +25,21 @@ export function formatMsg (msg) {
return msg
}
export function onRoamingMsgs (obj) {
export function onRoamingMsgs(obj) {
let msgs = obj.msgs.map(msg => {
return formatMsg(msg)
})
store.commit('updateMsgs', msgs)
}
export function onOfflineMsgs (obj) {
export function onOfflineMsgs(obj) {
let msgs = obj.msgs.map(msg => {
return formatMsg(msg)
})
store.commit('updateMsgs', msgs)
}
export function onMsg (msg) {
export function onMsg(msg) {
msg = formatMsg(msg)
store.commit('putMsg', msg)
if (msg.sessionId === store.state.currSessionId) {
......@@ -52,7 +52,7 @@ export function onMsg (msg) {
}
}
function onSendMsgDone (error, msg) {
function onSendMsgDone(error, msg) {
store.dispatch('hideLoading')
if (error) {
// 被拉黑
......@@ -67,7 +67,7 @@ function onSendMsgDone (error, msg) {
}
// 消息撤回
export function onRevocateMsg (error, msg) {
export function onRevocateMsg(error, msg) {
const nim = store.state.nim
if (error) {
if (error.code === 508) {
......@@ -94,7 +94,7 @@ export function onRevocateMsg (error, msg) {
to: msg.to,
tip,
time: msg.time,
done: function sendTipMsgDone (error, tipMsg) {
done: function sendTipMsgDone(error, tipMsg) {
let idClient = msg.deletedIdClient || msg.idClient
store.commit('replaceMsg', {
sessionId: msg.sessionId,
......@@ -112,20 +112,28 @@ export function onRevocateMsg (error, msg) {
})
}
export function revocateMsg ({state, commit}, msg) {
export function revocateMsg({
state,
commit
}, msg) {
const nim = state.nim
let {idClient} = msg
let {
idClient
} = msg
msg = Object.assign(msg, state.msgsMap[idClient])
nim.deleteMsg({
msg,
done: function deleteMsgDone (error) {
done: function deleteMsgDone(error) {
onRevocateMsg(error, msg)
}
})
}
// 发送普通消息
export function sendMsg ({state, commit}, obj) {
export function sendMsg({
state,
commit
}, obj) {
const nim = state.nim
obj = obj || {}
let type = obj.type || ''
......@@ -152,13 +160,16 @@ export function sendMsg ({state, commit}, obj) {
}
}
export function sendTip ({state, commit}, obj) {
export function sendTip({
state,
commit
}, obj) {
const nim = store.state.nim
nim.sendTipMsg({
scene: obj.scene,
to: obj.to,
tip: obj.tip,
done: function sendTipMsgDone (error, msg) {
done: function sendTipMsgDone(error, msg) {
// 超哥 do something
onSendMsgDone(error, msg)
}
......@@ -166,9 +177,16 @@ export function sendTip ({state, commit}, obj) {
}
// 发送文件消息
export function sendFileMsg ({state, commit}, obj) {
export function sendFileMsg({
state,
commit
}, obj) {
const nim = state.nim
let {scene, to, fileInput} = obj
let {
scene,
to,
fileInput
} = obj
let type = 'file'
if (/\.(png|jpg|bmp|jpeg|gif)$/i.test(fileInput.value)) {
type = 'image'
......@@ -191,7 +209,7 @@ export function sendFileMsg ({state, commit}, obj) {
},
beforesend: function (msg) {
},
done: function (error, msg) {
onSendMsgDone(error, msg)
......@@ -199,16 +217,26 @@ export function sendFileMsg ({state, commit}, obj) {
})
}
export function sendDataUrlMsg ({state, commit}, obj) {
export function sendDataUrlMsg({
state,
commit
}, obj) {
const nim = state.nim
let {scene, to, dataURL, name} = obj
let {
scene,
to,
dataURL,
name
} = obj
let type = 'file'
if (/(png|jpg|bmp|jpeg|gif)$/i.test(name)) {
type = 'image'
} else if (/(mov|mp4|ogg|webm)$/i.test(name)) {
type = 'video'
}
let otherMsg = {'fileName': name}
let otherMsg = {
'fileName': name
}
store.dispatch('showLoading')
nim.sendFile({
scene: scene,
......@@ -217,7 +245,7 @@ export function sendDataUrlMsg ({state, commit}, obj) {
dataURL: dataURL,
custom: JSON.stringify(otherMsg),
uploadprogress: function (data) {
},
uploaderror: function () {
console && console.log('上传失败')
......@@ -235,9 +263,21 @@ export function sendDataUrlMsg ({state, commit}, obj) {
}
// 发送机器人消息
export function sendRobotMsg ({state, commit}, obj) {
export function sendRobotMsg({
state,
commit
}, obj) {
const nim = state.nim
let {type, scene, to, robotAccid, content, params, target, body} = obj
let {
type,
scene,
to,
robotAccid,
content,
params,
target,
body
} = obj
scene = scene || 'p2p'
if (type === 'text') {
nim.sendRobotMsg({
......@@ -279,7 +319,10 @@ export function sendRobotMsg ({state, commit}, obj) {
}
// 发送消息已读回执
export function sendMsgReceipt ({state, commit}) {
export function sendMsgReceipt({
state,
commit
}) {
// 如果有当前会话
let currSessionId = store.state.currSessionId
if (currSessionId) {
......@@ -290,7 +333,7 @@ export function sendMsgReceipt ({state, commit}) {
if (state.sessionMap[currSessionId]) {
nim.sendMsgReceipt({
msg: state.sessionMap[currSessionId].lastMsg,
done: function sendMsgReceiptDone (error, obj) {
done: function sendMsgReceiptDone(error, obj) {
// do something
}
})
......@@ -299,21 +342,27 @@ export function sendMsgReceipt ({state, commit}) {
}
}
function sendMsgReceiptDone (error, obj) {
function sendMsgReceiptDone(error, obj) {
console.log('发送消息已读回执' + (!error ? '成功' : '失败'), error, obj)
}
export function getHistoryMsgs ({state, commit}, obj) {
export function getHistoryMsgs({
state,
commit
}, obj) {
const nim = state.nim
if (nim) {
let {scene, to} = obj
let {
scene,
to
} = obj
let options = {
scene,
to,
reverse: false,
asc: true,
limit: config.localMsglimit || 20,
done: function getHistoryMsgsDone (error, obj) {
done: function getHistoryMsgsDone(error, obj) {
if (obj.msgs) {
if (obj.msgs.length === 0) {
commit('setNoMoreHistoryMsgs')
......@@ -341,11 +390,15 @@ export function getHistoryMsgs ({state, commit}, obj) {
}
}
export function resetNoMoreHistoryMsgs ({commit}) {
export function resetNoMoreHistoryMsgs({
commit
}) {
commit('resetNoMoreHistoryMsgs')
}
// 继续与机器人会话交互
export function continueRobotMsg ({commit}, robotAccid) {
export function continueRobotMsg({
commit
}, robotAccid) {
commit('continueRobotMsg', robotAccid)
}
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