Skip to content

S
SuperMan
Commit 4f8aefc9 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 3965d0c6 325a4199
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 86 deletions
index.html
View file @ 4f8aefc9
......@@ -10,7 +10,6 @@
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="static/jquery.min.js"></script>
<title>四川和平国际旅行社</title>
</head>
<body>
......
package.json
View file @ 4f8aefc9
......@@ -19,6 +19,7 @@
"browser-md5-file": "^1.0.0",
"child_process": "^1.0.2",
"co": "^4.6.0",
"cropperjs": "^1.5.6",
"echarts": "^4.1.0",
"element-ui": "^2.3.4",
"file-saver": "^2.0.0",
......
src/assets/common/lang/zhCN/Ground.js
View file @ 4f8aefc9
......@@ -146,7 +146,7 @@ export const obj = {
anzhou: "按周",
zidingyi: "自定义",
zhou: "周",
yuefen: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
yuefen2: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
xingqiji: ["星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
qingxuanzekssj: "选择开始时间",
qingxuanzejssj: "选择结束时间",
......@@ -198,5 +198,20 @@ export const obj = {
chulijieguo: "处理结果",
qingxuanzcljg: "请选择处理结果",
chulichenggong: "处理成功",
tianjiajdcp: "添加酒店产品",
qingxuanzjdzy: "请选择酒店资源",
qingxuanzcpmc: "请选择产品名称",
qingxuanbizhong: "请选币种",
xiugaijiudcp: "修改酒店产品",
tijiaobaojia: "提交报价",
qingshurcbj: "请输入成本价",
qingshurlwxs: "请输入两位小数",
qingshurukc: "请输入库存",
qingshuruB2Bjg: "请输入B2B价格",
qingshuruB2Cjg: "请输入B2C价格",
qingshurnbjg: "请输入内部价格",
qingxuanzgys: "请输选择供应商",
qingxuanzeriq: "请选择日期",
zhengzaitijiao: "正在提交",
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ 4f8aefc9
......@@ -146,7 +146,7 @@ export const obj = {
anzhou:"按周",
zidingyi:"自定義",
zhou: "周",
yuefen: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
yuefen2: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
xingqiji: ["星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
qingxuanzekssj: "選擇開始時間",
qingxuanzejssj: "選擇結束時間",
......@@ -198,5 +198,20 @@ export const obj = {
chulijieguo: "處理結果",
qingxuanzcljg: "請選擇處理結果",
chulichenggong: "處理成功",
tianjiajdcp: "添加飯店產品",
qingxuanzjdzy: "請選擇飯店資源",
qingxuanzcpmc: "請選擇產品名稱",
qingxuanbizhong: "請選幣種",
xiugaijiudcp: "修改飯店產品",
tijiaobaojia: "提交報價",
qingshurcbj: "請輸入成本價",
qingshurlwxs: "請輸入兩位小數",
qingshurukc: "請輸入庫存",
qingshuruB2Bjg: "請輸入B2B價格",
qingshuruB2Cjg: "請輸入B2C價格",
qingshurnbjg: "請輸入內部價格",
qingxuanzgys: "請輸選擇供應商",
qingxuanzeriq: "請選擇日期",
zhengzaitijiao: "正在提交",
}
export default obj;
\ No newline at end of file
src/components/Hotel/HotelPrice.vue
View file @ 4f8aefc9
......@@ -330,17 +330,17 @@
<ul>
<li>
<i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">❮</i>
<input type="text" v-model="currentYear" class="currentInput" @input="getDateString(),initCalendar(dateString)" />年
<input type="text" v-model="currentYear" class="currentInput" @input="getDateString(),initCalendar(dateString)" />{{$t('pub.year')}}
<i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">❯</i>
</li>
<li>
<i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">❮</i>
<input type="text" v-model="currentMonth" class="currentInput" @input="getDateString(),initCalendar(dateString)" />月
<input type="text" v-model="currentMonth" class="currentInput" @input="getDateString(),initCalendar(dateString)" />{{$t('pub.month')}}
<i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">❯</i>
</li>
<li>
<div class="ckAll">
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">全选</el-checkbox>
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}</el-checkbox>
</div>
</li>
</ul>
......@@ -383,8 +383,8 @@
<label>{{$t('hotel.hotel_Supplier')}}：{{dayobject.SupplierName}}</label>
</div>
</div>
<input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)" value="删除" />
<button class="hollowFixedBtn delButton" @click="updateInfo(dayobject.ID,dayobject.date,index)">修改</button>
<input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)" :value="$t('system.table_delete')" />
<button class="hollowFixedBtn delButton" @click="updateInfo(dayobject.ID,dayobject.date,index)">{{$t('system.table_edit')}}</button>
</div>
</li>
</ul>
......@@ -444,21 +444,21 @@
</el-form-item>
<el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook==1" prop="Supplier">
<el-select v-model="addMsg.Supplier" class="w210" filterable clearable :placeholder="$t('hotel.hotel_inputholder')">
<el-option label='不限' value=''></el-option>
<el-option :label='$t("pub.ph_buxian")' value=''></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item>
</div>
<div class="resDiv">
<el-form-item label="币种">
<el-select placeholder="请选币种" filterable class='multiple_input w210' @change="getCurrentRate(addMsg.CurrencyId)"
<el-form-item :label="$t('hotel.hotel_Currency')">
<el-select placeholder="$t('ground.qingxuanbizhong')" filterable class='multiple_input w210' @change="getCurrentRate(addMsg.CurrencyId)"
v-model="addMsg.CurrencyId">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in allCurrencyList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="汇率" prop="Fax">
<el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="Fax">
<el-input class="w210" v-model='addMsg.CurrentRate' @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
</el-form-item>
</div>
......@@ -475,8 +475,8 @@
</div>
<button type="success" class="subPrice" :class="{'comDisableBtn':isDisable==true,'normalBtn':isDisable==false}"
:disabled='isDisable' @click="isDeleteNote=true,submitForm('addMsg')">{{comBtnText}}</button>
<button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">返回</button>
<button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>取消</button>
<button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">{{$t('ground.returnBack')}}</button>
<button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>{{$t('ground.cancelBtn')}}</button>
</div>
</div>
</div>
......@@ -507,7 +507,7 @@ export default {
IsSelfBook: 0,
Country:0,
//提交报价中
comBtnText: "提交报价",
comBtnText: this.$t('ground.tijiaobaojia'),
isDisable: false,
//选中状态
isCheckAll: false,
......@@ -537,62 +537,62 @@ export default {
CostPrice: [
{
required: true,
message: "请输入成本价",
message: this.$t('ground.qingshurcbj'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: "请输入两位小数"
message: this.$t('ground.qingshurlwxs')
}
],
Inventory: [
{
required: true,
message: "请输入库存",
message: this.$t('ground.qingshurukc'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: "请输入正确的数字"
message: this.$t('ground.qingshuruzqdsz')
}
],
B2BPrice: [
{
required: true,
message: "请输入B2B价格",
message: this.$t('ground.qingshuruB2Bjg'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: "请输入两位小数"
message: this.$t('ground.qingshurlwxs')
}
],
B2CPrice: [
{
required: true,
message: "请输入B2C价格",
message: this.$t('ground.qingshuruB2Cjg'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: "请输入两位小数"
message: this.$t('ground.qingshurlwxs')
}
],
SalesPrice: [
{
required: true,
message: "请输入内部价格",
message: this.$t('ground.qingshurnbjg'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: "请输入两位小数"
message: this.$t('ground.qingshurlwxs')
}
],
Supplier: [
{
required: true,
message: "请输选择供应商"
message: this.$t('ground.qingxuanzgys')
}
]
},
......@@ -682,21 +682,21 @@ export default {
this.addMsg.DateList == "" &&
(this.addMsg.StartDate == "" || this.addMsg.EndDate == "")
) {
this.Error("请选择日期");
this.Error(this.$t('ground.qingxuanzeriq'));
return;
}
this.isDisable = true;
this.comBtnText = "正在提交";
this.comBtnText = this.$t('ground.zhengzaitijiao');
this.apipost(
"dict_post_HotelOffer_Set",
this.addMsg,
res => {
this.isDisable = false;
this.comBtnText = "提交报价";
this.comBtnText = this.$t('ground.tijiaobaojia');
if (res.data.resultCode == 1) {
this.initDataTable();
this.addMsg = {};
this.Success("保存成功！");
this.Success(this.$t('tips.saveYes'));
this.DateArr = [];
this.resetForm("addMsg");
} else {
......@@ -708,7 +708,7 @@ export default {
},
isdelete(ID) {
var that = this;
that.Confirm("是否删除?", function() {
that.Confirm(this.$t('tips.shifoushanchu'), function() {
that.apipost(
"dict_post_HotelOffer_Remove",
{
......@@ -718,7 +718,7 @@ export default {
if (res.data.resultCode == 1) {
that.initDataTable();
that.initCalendar();
that.Success("删除成功！");
that.Success(this.$t('tips.shanchuchenggong'));
}
}
);
......
src/components/Hotel/HotelProductManage.vue
View file @ 4f8aefc9
......@@ -157,7 +157,7 @@
<button class="hollowFixedBtn" type="success"
@click="resetPageIndex(),initData()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="success"
@click="outerVisible = true,dialogTitle='添加酒店产品',initAddMsg()">{{$t('pub.addBtn')}}</button>
@click="outerVisible = true,dialogTitle=$t('ground.tianjiajdcp'),initAddMsg()">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
......@@ -230,11 +230,11 @@
</el-tooltip>
</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" @click="outerVisible = true,dialogTitle='修改酒店产品',updateProduct(index,item.ID)"
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" @click="outerVisible = true,dialogTitle=$t('ground.xiugaijiudcp'),updateProduct(index,item.ID)"
icon="el-icon-edit" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="报价管理" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
<el-button type="info" @click="goUrl('HotelPrice',item.ID)" icon="el-icon-document" circle></el-button>
</el-tooltip>
</td>
......@@ -284,16 +284,16 @@
//表单必填验证
Hotel_ID: [{
required: true,
message: "请选择酒店资源"
message: this.$t('ground.qingxuanzjdzy')
}],
HotelProductType: [{
required: true,
message: "请选择产品名称"
message: this.$t('ground.qingxuanzcpmc')
}],
ServiceNumber: [{
required: true,
pattern: this.$commonUtils.Regex.el_isInteger,
message: "请输入正确的数字"
message: this.$t('ground.qingshuruzqdsz')
}]
}
};
......@@ -335,7 +335,7 @@
},
isdelete(ID) {
this.innerVisible = true;
this.insideDialogTxt = "是否删除？";
this.insideDialogTxt = this.$t('tips.shifoushanchu');
this.isDeleteNote = false;
this.deleteID = ID;
},
......@@ -389,7 +389,7 @@
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.tips("保存成功！", "success");
this.tips(this.$t('tips.saveYes'), "success");
this.initData();
this.resetForm("addMsg");
this.outerVisible = false;
......
src/components/Hotel/HotelProductManage2.vue
View file @ 4f8aefc9
......@@ -330,18 +330,18 @@
<div v-show="msg.DayType==='3'">
<el-form-item :label="$t('pub.month')" label-width="30px" prop="Month">
<el-select v-model="msg.Month" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('ground.yuefen[0]')" value="01"></el-option>
<el-option :label="$t('ground.yuefen[1]')" value="02"></el-option>
<el-option :label="$t('ground.yuefen[2]')" value="03"></el-option>
<el-option :label="$t('ground.yuefen[3]')" value="04"></el-option>
<el-option :label="$t('ground.yuefen[4]')" value="05"></el-option>
<el-option :label="$t('ground.yuefen[5]')" value="06"></el-option>
<el-option :label="$t('ground.yuefen[6]')" value="07"></el-option>
<el-option :label="$t('ground.yuefen[7]')" value="08"></el-option>
<el-option :label="$t('ground.yuefen[8]')" value="09"></el-option>
<el-option :label="$t('ground.yuefen[9]')" value="10"></el-option>
<el-option :label="$t('ground.yuefen[10]')" value="11"></el-option>
<el-option :label="$t('ground.yuefen[11]')" value="12"></el-option>
<el-option :label="$t('ground.yuefen2[0]')" value="01"></el-option>
<el-option :label="$t('ground.yuefen2[1]')" value="02"></el-option>
<el-option :label="$t('ground.yuefen2[2]')" value="03"></el-option>
<el-option :label="$t('ground.yuefen2[3]')" value="04"></el-option>
<el-option :label="$t('ground.yuefen2[4]')" value="05"></el-option>
<el-option :label="$t('ground.yuefen2[5]')" value="06"></el-option>
<el-option :label="$t('ground.yuefen2[6]')" value="07"></el-option>
<el-option :label="$t('ground.yuefen2[7]')" value="08"></el-option>
<el-option :label="$t('ground.yuefen2[8]')" value="09"></el-option>
<el-option :label="$t('ground.yuefen2[9]')" value="10"></el-option>
<el-option :label="$t('ground.yuefen2[10]')" value="11"></el-option>
<el-option :label="$t('ground.yuefen2[11]')" value="12"></el-option>
</el-select>
</el-form-item>
</div>
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ 4f8aefc9
......@@ -473,7 +473,7 @@
<img v-else :src="imgBeforeFile+item.GuidePhoto" :onerror='defaultImg' />
</div>
<div style="white-space:nowrap;">{{item.GuideName}}/{{$t('leader.leader_Guide')}}</div>
<div style="white-space:nowrap;margin:5px 0;">{{$t(system.table_phone)}}：{{item.GuideMobilePhone}}</div>
<div style="white-space:nowrap;margin:5px 0;">{{$t('system.table_phone')}}：{{item.GuideMobilePhone}}</div>
<div style="white-space:nowrap;" v-if="item.SpareTel!=null&&item.SpareTel!=''">{{$t('ground.jingwaihao')}}：{{item.SpareTel}}
</div>
</div>
......
src/components/SalesconfirmationOrder.vue
View file @ 4f8aefc9
......@@ -766,22 +766,6 @@
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
$.ajax({
url: UploadUrl +
'/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype: "jsonP",
success: function (data) {
},
error: function () {
}
});
if (allNum !== document.querySelectorAll(cName).length) {
allNum += 1
} else {
......
src/components/confirmationOrderDownLoad - 副本.vue
View file @ 4f8aefc9
......@@ -699,22 +699,6 @@
})
return
$.ajax({
url: UploadUrl +
'/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype: "jsonP",
success: function (data) {
},
error: function () {
}
});
if (allNum !== document.querySelectorAll(cName).length) {
allNum += 1
} else {
......
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