Skip to content

S
SuperMan
Commit 9e22af20 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents dc5036b1 75352255
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 21 deletions
src/components/SalesVisa/VisaProduct.vue
View file @ 9e22af20
...@@ -301,16 +301,16 @@ ...@@ -301,16 +301,16 @@
<tr> <tr>
<th width="10%">产品名称</th> <th width="10%">产品名称</th>
<th width="8%">签证类型</th> <th width="8%">签证类型</th>
<th width="10%">价格有效日期</th> <th width="8%">价格有效日期</th>
<th width="8%">成本价</th> <th width="8%">成本价</th>
<th width="8%">同业价</th> <th width="8%">同业价</th>
<th width="8%">直客价</th> <th width="8%">直客价</th>
<th width="6%">状态</th> <th width="6%">状态</th>
<th width="6%">订单数</th> <th width="6%">订单数</th>
<!-- <th width="12%">总人数（剩余人数）</th> --> <!-- <th width="12%">总人数（剩余人数）</th> -->
<th width="10%">创建者</th> <th width="8%">创建者</th>
<th width="10%">申请表</th>
<th width="10%">广告图</th> <th width="10%">广告图</th>
<th width="10%">申请表</th>
<th width="14%">操作</th> <th width="14%">操作</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
<i <i
class="iconfont icon-Close" class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;" style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2)" @click="delUnpload(item.Id,item2,'广告图',1)"
></i> ></i>
</p> </p>
<el-upload <el-upload
...@@ -367,11 +367,11 @@ ...@@ -367,11 +367,11 @@
:show-file-list="false" :show-file-list="false"
action action
> >
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传申请表</span> <span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,1)">上传广告图</span>
</el-upload> </el-upload>
</td> </td>
<td> <td>
<p v-for="(item2, index2) in item.AdvertisingFileList" :key="index2"> <p v-for="(item2, index2) in item.ApplyForCounterfoilList" :key="index2+100">
<span <span
style="cursor:pointer;text-decoration: underline;" style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)" @click="downloadFile(item2)"
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
<i <i
class="iconfont icon-Close" class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;" style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2)" @click="delUnpload(item.Id,item2,'申请表',2)"
></i> ></i>
</p> </p>
<el-upload <el-upload
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
:show-file-list="false" :show-file-list="false"
action action
> >
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传广告图</span> <span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,2)">上传申请表</span>
</el-upload> </el-upload>
</td> </td>
<td class="groupTourOrderIcon"> <td class="groupTourOrderIcon">
...@@ -666,6 +666,7 @@ export default { ...@@ -666,6 +666,7 @@ export default {
currentPage: 1, currentPage: 1,
VisaManagementList: [], VisaManagementList: [],
buttonshow:false, buttonshow:false,
Type:0,
}; };
}, },
created(){ created(){
...@@ -697,8 +698,9 @@ export default { ...@@ -697,8 +698,9 @@ export default {
} }
}); });
}, },
saveitem(tcid) { saveitem(tcid,Type) {
this.uploadTCID = tcid; this.uploadTCID = tcid;
this.Type=Type;
}, },
//上传 //上传
uploadImg(file) { uploadImg(file) {
...@@ -712,7 +714,8 @@ export default { ...@@ -712,7 +714,8 @@ export default {
Path: this.domainManager().ViittoFileUrl + x.data.FilePath, Path: this.domainManager().ViittoFileUrl + x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
Status: 1, Status: 1,
VId: this.uploadTCID VId: this.uploadTCID,
Type:this.Type,
}, },
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -725,8 +728,8 @@ export default { ...@@ -725,8 +728,8 @@ export default {
); );
}); });
}, },
delUnpload: function(tcid, item) { delUnpload: function(tcid, item,str,Type) {
this.$confirm("是否删除该广告图?", "提示", { this.$confirm( `是否删除该${str}?`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
...@@ -737,7 +740,8 @@ export default { ...@@ -737,7 +740,8 @@ export default {
Path: item.FullUrl, Path: item.FullUrl,
FileName: item.Name, FileName: item.Name,
Status: 2, Status: 2,
VId: tcid VId: tcid,
Type:Type,
}, },
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 9e22af20
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th width="10%">单号</th> <th width="10%">单号</th>
<th width="10%">业务员</th> <th width="8%">业务员</th>
<th width="4%">人数</th> <th width="4%">人数</th>
<th width="8%">出发日期</th> <th width="8%">出发日期</th>
<th width="8%">报名日期</th> <th width="8%">报名日期</th>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<th width="5%">在途</th> <th width="5%">在途</th>
<th width="7%">订单状态</th> <th width="7%">订单状态</th>
<th width="5%">状态</th> <th width="5%">状态</th>
<th width="8%">操作</th> <th width="12%">操作</th>
</tr> </tr>
<tbody v-for='item in dataList'> <tbody v-for='item in dataList'>
<tr> <tr>
...@@ -192,6 +192,10 @@ ...@@ -192,6 +192,10 @@
<!-- 订单拆分 --> <!-- 订单拆分 -->
<el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" placement="top-start"> <el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" placement="top-start">
<el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" @click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button> <el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" @click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button>
</el-tooltip>
<!-- 修改金额 -->
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
...@@ -247,6 +251,18 @@ ...@@ -247,6 +251,18 @@
:page-size="this.msg.pageSize" :page-size="this.msg.pageSize"
:total="total"> :total="total">
</el-pagination> </el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -271,9 +287,31 @@ export default { ...@@ -271,9 +287,31 @@ export default {
currentPage: 1, currentPage: 1,
isShow:0, isShow:0,
PreferPrice:0, PreferPrice:0,
IncomePrice:0 IncomePrice:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
} }
},methods:{ },methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.Id;
this.EditMsg.TotalPrice=item.TotalPrice;
},
goUrlVisaList(obj){ goUrlVisaList(obj){
if(obj.VisaPlanIdStr=="" || obj.VisaPlanIdStr==null){ if(obj.VisaPlanIdStr=="" || obj.VisaPlanIdStr==null){
this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} }) this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} })
...@@ -343,6 +381,8 @@ export default { ...@@ -343,6 +381,8 @@ export default {
this.getList(); this.getList();
}, },
},mounted(){ },mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) { if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")" this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true this.nameShow = true
......
src/components/SalesVisa/salesOrderToday.vue
View file @ 9e22af20
...@@ -109,11 +109,11 @@ ...@@ -109,11 +109,11 @@
<th width="10%">业务员</th> <th width="10%">业务员</th>
<th width="5%">人数</th> <th width="5%">人数</th>
<th width="10%">出发日期</th> <th width="10%">出发日期</th>
<th width="10%">报名日期</th> <th width="9%">报名日期</th>
<th width="15%">备注</th> <th width="15%">备注</th>
<th width="8%">应收金额</th> <th width="8%">应收金额</th>
<th width="7%">订单状态</th> <th width="7%">订单状态</th>
<!-- <th width="8%">操作</th> --> <th width="10%">操作</th>
</tr> </tr>
<tr v-for='(item,index) in dataList' :key="index"> <tr v-for='(item,index) in dataList' :key="index">
<td> <td>
...@@ -144,7 +144,11 @@ ...@@ -144,7 +144,11 @@
</td> </td>
<td> <td>
{{item.OrderStateStr}} {{item.OrderStateStr}}
<!-- <span class="fz12" v-if="item.VisaOrderStatus==2">操作：{{item.UpdateName}}</span> --> </td>
<td>
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip>
</td> </td>
<!-- <td class="groupTourOrderIcon"> <!-- <td class="groupTourOrderIcon">
<el-tooltip effect="dark" content="签证详情" placement="top-start"> <el-tooltip effect="dark" content="签证详情" placement="top-start">
...@@ -167,6 +171,19 @@ ...@@ -167,6 +171,19 @@
:page-size="this.msg.pageSize" :page-size="this.msg.pageSize"
:total="total"> :total="total">
</el-pagination> </el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -194,8 +211,31 @@ export default { ...@@ -194,8 +211,31 @@ export default {
total: 0, total: 0,
currentPage: 1, currentPage: 1,
isShow:0, isShow:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
} }
},methods:{ },
methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.OrderId;
this.EditMsg.TotalPrice=item.PreferPrice;
},
goUrlR: function (item) { goUrlR: function (item) {
if (item.VisaType === 1) { if (item.VisaType === 1) {
this.$router.push({ name: 'VisaProductOrder', query: { id: item.TCID, blank:'y', tab: '签证详情'} }); this.$router.push({ name: 'VisaProductOrder', query: { id: item.TCID, blank:'y', tab: '签证详情'} });
...@@ -250,7 +290,10 @@ export default { ...@@ -250,7 +290,10 @@ export default {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
},mounted(){ },
mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) { if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")" this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true this.nameShow = true
......
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