Commit 3508378b authored by 黄奎's avatar 黄奎

页面修改

parent 69f88c0e
......@@ -79,9 +79,9 @@
</div>
<div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
          <el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()" :label="item.Name">
          </el-tab-pane>
<el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>     
<el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()" :label="item.Name">
</el-tab-pane>
</el-tabs>
<div class="app-order-title">
<div style="width: 55%;">订单信息</div>
......@@ -116,12 +116,12 @@
</el-tooltip>
</div>
<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.PaymentTime!='' && item.PaymentWay!=4 " style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag v-if="item.PaymentTime!='' && item.PaymentWay!=4 " style="margin-left:5px" size="small"
type="warning">已付款</el-tag>
<el-tag v-if="item.OrderStatus==2||item.OrderStatus==3" style="margin-left:5px" size="small"
type="success">未使用</el-tag>
<el-tag v-if="item.OrderStatus==4" style="margin-left:5px" size="small"
type="success">已使用</el-tag>
<el-tag v-if="item.OrderStatus==4" style="margin-left:5px" size="small" type="success">已使用</el-tag>
<el-tag v-if="item.OrderStatus==5" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div>
......@@ -167,6 +167,41 @@
<template v-else>
<el-tag size="mini">到店分配</el-tag>
</template>
<el-popover placement="right" popper-class="piliangPop" width="350" trigger="click" >
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>服务人员</td>
<td>
&nbsp;&nbsp;
<el-select class="w200" size="small" v-model="ServicePersionId" placeholder="请选择">
<el-option :key="0" label="请选择服务人员" :value="0">
</el-option>
<el-option v-for="item in ServicePersionList" :key="item.ServiceId"
:label="item.Name" :value="item.ServiceId">
</el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2">
&nbsp;
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<el-button @click="SavePersion(item.OrderId)" size="small" type="primary">保存
</el-button>
</td>
</tr>
<tr>
<td colspan="2">
&nbsp;
</td>
</tr>
</table>
<img slot="reference" @click="getServerPersion(item.StoresId,list)"
src="../../assets/img/userman/edit1.png" alt="" style="cursor:pointer;" />
</el-popover>
</span>
</div>
<div style="margin-bottom: 5px;" v-if="list.MemberEducationCouponList.length>0">
......@@ -771,6 +806,9 @@
CommonId: 0, //公用id 给弹窗用
TenantId: 0,
OrderStateList: [], //配置订单状态
ServicePersionList: [], //服务人员列表
ServicePersionId: 0, //服务人员Id
IsShowPersion: false, //是否显示服务人员弹窗
}
},
created() {
......@@ -795,6 +833,50 @@
},
mounted() {},
methods: {
//保存服务人员
SavePersion(orderId) {
var msg = {
OrderId: orderId,
ServicepersonalId: this.ServicePersionId
}
this.apipost(
"/api/AppletOrder/SetOfflineOrderServicepersion", msg,
res => {
if (res.data.resultCode == 1) {
this.ServicePersionId = 0;
this.ServicePersionList = [];
this.Success(res.data.message);
this.getList();
this.IsShowPersion = false;
} else {
this.Info(res.data.message);
}
}
);
},
//获取服务人员列表
getServerPersion(StoresId, item) {
var qMsg = {
StoreId: StoresId,
GoodsId: item.GoodsId,
chooseDate: item.ServiceDate,
servicePersionId: 0,
};
this.ServicePersionId = 0;
this.ServicePersionList = [];
this.apipost(
"/api/AppletGoods/GetServerpersionListInfo", qMsg,
res => {
if (res.data.resultCode == 1) {
var jsonData = res.data.data;
if (jsonData && jsonData.persionList) {
this.ServicePersionList = jsonData.persionList;
}
}
}
);
},
//获取基础配置
getConfig() {
this.apipost(
......@@ -1169,7 +1251,6 @@
this.getList();
this.fhDig = false;
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
......@@ -1377,11 +1458,11 @@
this.getList();
},
getOrderStatus() {
        this.apipost("/api/Reserve/GetReserveBaseInfo", {}, res => {
          if (res.data.resultCode == 1) {
            this.orderStatusList = res.data.data.OrderStateList;
          }
        })
this.apipost("/api/Reserve/GetReserveBaseInfo", {}, res => {
if (res.data.resultCode == 1) {
this.orderStatusList = res.data.data.OrderStateList;
}
})
},
getDelivery() {
this.apipost("/api/order/GetOrderDeliveryMethodEnumList", {}, 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