Skip to content

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

1

parent 04e8cfd2
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 27 deletions
src/components/TravelManager/customizedcar/costManagement.vue
View file @ 21215129
......@@ -283,6 +283,12 @@
this.Success('设置成功');
this.choiceFin = false;
loading.close();
this.finMsg= {
OrderList: [],
IsPublic: '0', //0-私账1-公账
ClientType:'',//客人类型
ClientID:'',//账户id
}
}else {
this.Error(res.data.message)
this.choiceFin = false;
......
src/components/TravelManager/customizedcar/lineoffer.vue
View file @ 21215129
......@@ -941,6 +941,21 @@
isshow = true;
return
}
if(x.CostPrice==''){
this.Error('请输入b2b价格')
isshow = true;
return
}
if(x.B2CPrice==''){
this.Error('请输b2c价格')
isshow = true;
return
}
if(x.CostPrice==''){
this.Error('请输入成本价格')
isshow = true;
return
}
})
if(isshow == true){
return
......
src/components/TravelManager/customizedcar/travelOrders.vue
View file @ 21215129
......@@ -107,9 +107,11 @@
<div flex="dir:left wrap:wrap" class="app-order-offline">
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag v-if="item.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认</el-tag>
<!-- <el-tag
<el-tag v-if="item.OrderStatus== 5 " style="margin-left:5px" size="small" type="success">待处理</el-tag>
<el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<!--
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">待出行</el-tag>
......@@ -196,35 +198,36 @@
</div>
</div>
</div>
<div class="billStyle"
v-if="((list.SFinanceList && list.SFinanceList.length>0)||(list.ZFinanceList && list.ZFinanceList.length >0) ) ">
<div class="billStyle"
v-if="((item.SFinanceList && item.SFinanceList.length>0)||(item.ZFinanceList && item.ZFinanceList.length >0) ) ">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&& item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
<span v-for="(x,index2) in item.SFinanceList" :key="index2" @click="goSF(x)">
<span class="billtext" v-if="x.Status == 0" :style="{color:'#00FFFF'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 1&& x.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 1&&x.Is_Cashier==1"
:style="{color:'#FF4048'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 2">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 3" :style="{color:'#FFF100'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 4" :style="{color:'#800080'}">{{x.FrID}}</span>
</span>
</div>
<div class="billStyle_item">
支出单据:
<span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1 && item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
<span v-for="(x,index2) in item.ZFinanceList" :key="index2" @click="goZF(x)">
<span class="billtext" v-if="x.Status == 0" :style="{color:'#00FFFF'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 1 && x.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 1&&x.Is_Cashier==1"
:style="{color:'#FF4048'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 2">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 3" :style="{color:'#FFF100'}">{{x.FrID}}</span>
<span class="billtext" v-if="x.Status == 4" :style="{color:'#800080'}">{{x.FrID}}</span>
</span>
</div>
</div>
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 15%;">
......@@ -249,10 +252,10 @@
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!-- 待出行 -->
<el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3">
<!-- <el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3">
<img @click="qrEnd(item,2)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
</el-tooltip> -->
<!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==5">
......@@ -291,8 +294,8 @@
<div>
<div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}} </div>
<button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
<!-- <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button> -->
</div>
</div>
<div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
......@@ -1075,7 +1078,7 @@
pendingForm() {
this.loading = true;
let url = '/api/DmcOrder/SetDmcOrderCancelAudit'
if(this.pendMgs.OrderType){
if(this.pendMgs.OrderType==5){
url = '/api/order/SetOrderApplyForCancelAudit'
}
this.lxymallapipost(url, this.pendMgs,
......@@ -1105,7 +1108,7 @@
if (num == 1) {
text = '是否确定订单？'
} else if (num == 2) {
text = '是否出行？'
text = '是否确认？'
} else if (num == 3) {
text = '是否完成该订单？'
}
......
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