Skip to content

E
ElectricitySheep
Commit d20f5ab8 authored by Mac's avatar Mac
Browse files
Options

1

parent 2f6ccfd2
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 25 deletions
src/components/director/directorOrderDetails.vue
View file @ d20f5ab8
......@@ -70,11 +70,7 @@
<span
class="el-tag el-tag--success el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.PaymentWayName}}</span>
</div>
<div v-if="dataInfo.OrderInfo.DeliveryMethodName && dataInfo.OrderInfo.DeliveryMethodName!=''" flex="dir:left cross:center" class="item-box">
<span class="label">配送方式:</span>
<span
class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.DeliveryMethodName}}</span>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.CouponMoney && dataInfo.CouponMoney !='' && dataInfo.CouponMoney>0">
<span class="label">优惠金额:</span>
<div>￥{{dataInfo.CouponMoney}}</div>
......@@ -100,7 +96,7 @@
<div>{{dataInfo.OrderInfo.UserName}}</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货人:</span>
<span class="label">联系人:</span>
<div>{{dataInfo.OrderInfo.Consignee}}</div>
</div>
<div flex="dir:left cross:center" class="item-box">
......@@ -108,8 +104,18 @@
<div>{{dataInfo.OrderInfo.Mobile}}</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货地址:</span>
<span class="label">地址:</span>
<div class="express-address">{{dataInfo.OrderInfo.DistrictAddress}}
<!-- {{dataInfo.OrderInfo.ShoppingAddress}}-->
<!-- <button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button"-->
<!-- class="el-button el-button&#45;&#45;text el-button&#45;&#45;small is-circle">-->
<!-- <i class="el-icon-edit"></i>-->
<!-- </button>-->
</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">出发地:</span>
<div class="express-address">
{{dataInfo.OrderInfo.ShoppingAddress}}
<button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button"
class="el-button el-button--text el-button--small is-circle">
......@@ -117,6 +123,16 @@
</button>
</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList[0].CarType!=5">
<span class="label">目的地:</span>
<div class="express-address">
{{dataInfo.OrderInfo.DestinationAddress}}
<button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button"
class="el-button el-button--text el-button--small is-circle">
<i class="el-icon-edit"></i>
</button>
</div>
</div>
<div v-if="OrderInfo.OrderExpressList && OrderInfo.OrderExpressList.length==1" flex="dir:top"
class="item-box">
<div flex="dir:left cross:center">
......@@ -287,13 +303,15 @@
</div>
</template>
</el-table-column>
<!-- <el-table-column prop="name" label="规格" width="200" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">-->
<!-- {{list}}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="name" label="信息" width="300" align="center">
<template slot-scope="scope">
<div>类型：{{scope.row.CarTypeName}}，{{scope.row.CarType==5? (scope.row.IsSpell==1?'拼车':'不拼车'):''}}</div>
<div>车牌号：{{scope.row.CarNumber}}，{{scope.row.CarName}},{{scope.row.CarColorName}}</div>
<div>导游：{{scope.row.GuideName}}</div>
</template>
</el-table-column>
<el-table-column prop="Unit_Price" label="单价" width="120" align="center">
<template slot-scope="scope">
￥{{scope.row.Unit_Price}}
......@@ -319,8 +337,8 @@
<el-form-item label="商品小计">
￥{{dataInfo.PreferPrice}}
</el-form-item>
<el-form-item label="运费">
￥{{dataInfo.FreightMoney}}
<el-form-item label="保险成本">
￥{{dataInfo.InsuranceMoney}}
</el-form-item>
<el-form-item label="实付款">
<span style="color: rgb(255, 69, 68);">￥<b>{{dataInfo.Income}}</b></span>
......
src/components/director/directorOrderList.vue
View file @ d20f5ab8
......@@ -119,9 +119,9 @@
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
</div>
<!-- <div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">-->
<!-- <span class="el-tag el-tag&#45;&#45;small el-tag&#45;&#45;light">{{item.DeliveryMethodName}}</span>-->
<!-- </div>-->
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
......@@ -174,7 +174,7 @@
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
类型:{{list.CarTypeName}}，{{list.IsSpell==1?'拼车':'不拼车'}}
类型:{{list.CarTypeName}}，{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
</span>
<span style="margin-right: 10px;">
导游:{{list.GuideName}}
......@@ -198,7 +198,7 @@
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer"> 保险成本：￥{{list.InsuranceCostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn(list,2)"
<img v-if="item.OrderStatus!==7" @click="costBtn2(list,2)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">供应商：{{list.SupplierName !=null ? list.SupplierName :''}}
......@@ -274,9 +274,9 @@
</el-popover>
</div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含运费￥{{item.FreightMoney}})
<img v-if="item.PaymentTime==''" @click="EditPrice(item,2)"
src="../../assets/img/userman/edit1.png" alt="">
<span style="color: rgb(144, 147, 153);">(含保险￥{{item.InsuranceMoney}})
<!-- <img v-if="item.PaymentTime==''" @click="EditPrice(item,2)"-->
<!-- src="../../assets/img/userman/edit1.png" alt="">-->
</span>
</span></div>
<div>
......@@ -369,7 +369,7 @@
<div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}}
地址：{{item.DistrictAddress}}
出发地：{{item.ShoppingAddress}}
目的地：{{item.DestinationAddress}}
{{item.DetailList[0].CarType!=5 ?('目的地：'+item.DestinationAddress):''}}
</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>
......@@ -588,6 +588,18 @@
<el-button size="small" type="primary" @click="costForm('costMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 保险成本的修改 -->
<el-dialog title="保险成本修改" :visible.sync="costDig2" width="600px">
<el-form :model="CostMoney" ref="CostMoney" label-width="80px">
<el-form-item label="保险成本">
<el-input size="small" v-model="CostMoney.InsuranceCostMoney" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="costDig2 = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm2('CostMoney')">确 定</el-button>
</span>
</el-dialog>
<!-- 商品 供应商修改 -->
<el-dialog title="修改供应商" :visible.sync="upSupliDilog" width="400px">
<el-form label-width="90px">
......@@ -620,11 +632,16 @@
},
priceDig: false,
costDig:false,//商品、运费成本的修改
costDig2:false,//商品、运费成本的修改
cosType:1,
costMsg:{
Id:0,
Money:0,
},
CostMoney:{//设置司导订单 保险成本
OrderDetailId:0,
InsuranceCostMoney:0,
},
hstips: '是否放入回收站(可在回收站中恢复)?',
orderStatusList: [],
checkAll: false,
......@@ -1457,6 +1474,13 @@
}
this.costDig = true;
},
costBtn2(list,type){
this.CostMoney.OrderDetailId = list.Id;
this.CostMoney.InsuranceCostMoney = list.InsuranceCostMoney;
this.costDig2 = true;
},
costForm(formName) {
this.$refs[formName].validate((valid) => {
......@@ -1493,6 +1517,34 @@
}
});
},
costForm2(formName){//成本修改
this.$refs[formName].validate((valid) => {
if (valid) {
let cmd = '';
let msg = {}
cmd = '/api/order/SetOrderInsuranceCostMoney';
msg = {
OrderDetailId:this.CostMoney.OrderDetailId,
InsuranceCostMoney:Number(this.CostMoney.InsuranceCostMoney),
}
this.apipost(cmd, msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.costDig2 = false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
//获取供应商下拉值
getSupplierList() {
this.apipost("/api/Supplier/GetSupplierAllList", {}, res => {
......
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