Skip to content

C
CRM
Commit d4cf151d authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 79d48d33
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 85 deletions
src/components/customerManage/customerOrder.vue
View file @ d4cf151d
...@@ -78,13 +78,8 @@ ...@@ -78,13 +78,8 @@
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出发城市</span> <span class="font-size-12" style="padding-right: 10px">出行概述</span>
<el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出发城市" <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述"
@keyup.enter.native="getList"></el-input>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">到达城市</span>
<el-input size="mini" class="w210" v-model="msg.EndCityName" placeholder="到达城市"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
......
src/components/customerManage/myCustomerOrder.vue
View file @ d4cf151d
...@@ -78,13 +78,8 @@ ...@@ -78,13 +78,8 @@
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出发城市</span> <span class="font-size-12" style="padding-right: 10px">出行概述</span>
<el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出发城市" <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述"
@keyup.enter.native="getList"></el-input>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">到达城市</span>
<el-input size="mini" class="w210" v-model="msg.EndCityName" placeholder="到达城市"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
......
src/components/customerManage/orderList.vue
View file @ d4cf151d
...@@ -500,12 +500,7 @@ ...@@ -500,12 +500,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{ let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
...@@ -528,12 +523,7 @@ ...@@ -528,12 +523,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{ let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
...@@ -557,12 +547,7 @@ ...@@ -557,12 +547,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data let data
if(num==1||num==2){ if(num==1||num==2){
data = [{ data = [{
...@@ -704,12 +689,7 @@ ...@@ -704,12 +689,7 @@
}, },
openDetails(item) { openDetails(item) {
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8080/#/'
}
let data = [{ let data = [{
path: 'FinancialDocumentsDetail', path: 'FinancialDocumentsDetail',
id: item.FrID id: item.FrID
......
src/components/guestManagement/Agreement.vue
View file @ d4cf151d
...@@ -167,10 +167,10 @@ ...@@ -167,10 +167,10 @@
<p>{{scope.row.CreateTime}}</p> <p>{{scope.row.CreateTime}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="起始城市" show-overflow-tooltip :width="120"> <el-table-column label="出行概述" show-overflow-tooltip :width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<p>人数：{{scope.row.GuestCount}}人</p> <p>人数：{{scope.row.GuestCount}}人</p>
<p>出行概述：{{scope.row.StartCityName}}</p> <p>{{scope.row.StartCityName}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="应收" show-overflow-tooltip> <el-table-column label="应收" show-overflow-tooltip>
...@@ -585,12 +585,7 @@ ...@@ -585,12 +585,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{ let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
...@@ -613,12 +608,7 @@ ...@@ -613,12 +608,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{ let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
...@@ -642,12 +632,7 @@ ...@@ -642,12 +632,7 @@
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data let data
if(num==1||num==2){ if(num==1||num==2){
data = [{ data = [{
...@@ -780,12 +765,7 @@ ...@@ -780,12 +765,7 @@
}, },
openDetails(row) { openDetails(row) {
let href let href
let url let url = this.domainManager().erpRoutingUrl
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8080/#/'
}
let data = [{ let data = [{
path: 'FinancialDocumentsDetail', path: 'FinancialDocumentsDetail',
id: row id: row
......
src/components/guestManagement/ticketOrder.vue
View file @ d4cf151d
...@@ -511,18 +511,10 @@ ...@@ -511,18 +511,10 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="到达城市" prop="EndCityName">
<el-input placeholder="请输入到达城市" v-model="form.EndCityName"></el-input>
</el-form-item>
</div>
</el-col> -->
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'"> <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="报价总金额" prop="Money"> <el-form-item label="报价总金额" prop="Money">
<el-input :value="form.Money" disabled></el-input> <el-input :value="form.Money" disabled></el-input>
<!-- <el-input placeholder="请输入报价总金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.Money"></el-input> -->
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -649,7 +641,6 @@ ...@@ -649,7 +641,6 @@
> >
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<!-- <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div> -->
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </div>
...@@ -672,7 +663,6 @@ ...@@ -672,7 +663,6 @@
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input> -->
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -871,7 +861,6 @@ ...@@ -871,7 +861,6 @@
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>原币：</span> <span>原币：</span>
<!-- <span>{{item.OriginalMoney}}</span> -->
<el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney" disabled></el-input> v-model="item.OriginalMoney" disabled></el-input>
</div> </div>
...@@ -896,10 +885,6 @@ ...@@ -896,10 +885,6 @@
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="visa.OriginalFee"></el-input> v-model="visa.OriginalFee"></el-input>
</div> </div>
<!-- <div class="BillingTotal-center">
<span>总价：</span>
<span>{{visa.TotalCost}}</span>
</div> -->
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>应收金额：</span> <span>应收金额：</span>
<span style="min-width:50px">{{visa.WBMoney}}</span> <span style="min-width:50px">{{visa.WBMoney}}</span>
...@@ -932,7 +917,6 @@ ...@@ -932,7 +917,6 @@
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>原币：</span> <span>原币：</span>
<!-- <span>{{item.OriginalMoney}}</span> -->
<el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney" disabled></el-input> v-model="item.OriginalMoney" disabled></el-input>
</div> </div>
...@@ -957,10 +941,6 @@ ...@@ -957,10 +941,6 @@
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="ground.OriginalFee"></el-input> v-model="ground.OriginalFee"></el-input>
</div> </div>
<!-- <div class="BillingTotal-center">
<span>总价：</span>
<span>{{ground.TotalCost}}</span>
</div> -->
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>应收金额：</span> <span>应收金额：</span>
<span style="min-width:50px">{{ground.WBMoney}}</span> <span style="min-width:50px">{{ground.WBMoney}}</span>
...@@ -979,7 +959,6 @@ ...@@ -979,7 +959,6 @@
<i class="iconfont imgdelete" @click="deleteImg(index)">&#xe608;</i> <i class="iconfont imgdelete" @click="deleteImg(index)">&#xe608;</i>
</div> </div>
<div class="appendix-bottom"> <div class="appendix-bottom">
<!-- :file-list="fileList" -->
<el-upload <el-upload
ref="ticketUpload" ref="ticketUpload"
class="appendix-upload-demo" class="appendix-upload-demo"
......
src/plugins/index.js
View file @ d4cf151d
...@@ -42,6 +42,7 @@ export default { ...@@ -42,6 +42,7 @@ export default {
javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000", javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
erpRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://yx.oytour.com/#/" : "http://www.test.com:8081/#/",
}; };
return obj; return obj;
}, },
......
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