Skip to content

E
ElectricitySheep
Commit 71cd23e5 authored by 黄奎's avatar 黄奎
Browse files
Options

代码优化

parent c8cee3d4
Show whitespace changes
Inline Side-by-side
Showing with 395 additions and 412 deletions
src/components/director/directorOrderList.vue
View file @ 71cd23e5
...@@ -2,18 +2,16 @@ ...@@ -2,18 +2,16 @@
<div class="orderList"> <div class="orderList">
<div class="head-title"> <div class="head-title">
订单列表 订单列表
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出 <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button> </el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary"> <el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
清空回收站</el-button> 清空回收站</el-button>
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<span>下单时间：</span> <span>下单时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至" <el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left:15px">所属平台：</span> <span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small" <el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
...@@ -36,23 +34,24 @@ ...@@ -36,23 +34,24 @@
<el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-left:15px;width:300px" class="input-with-select" <el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
placeholder="请输入内容" v-model="msgVal" size="small"> style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择"> <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id"> <el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-input> </el-input>
</div> </div>
<div style="display: flex;flex-direction: row;align-items: center;justify-content: space-between"> <div style="display: flex;flex-direction: row;align-items: center;justify-content: space-between">
<div> <div>
<span >主播名称：</span> <span>主播名称：</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-top:10px;width:200px" class="input-with-select" <el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
placeholder="请输入主播名称" v-model="msg.AnchorName" size="small"> style="margin-top:10px;width:200px" class="input-with-select" placeholder="请输入主播名称" v-model="msg.AnchorName"
size="small">
</el-input> </el-input>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px" @change="msg.pageIndex=1,getList()">只看已付款</el-checkbox> <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px"
@change="msg.pageIndex=1,getList()">只看已付款</el-checkbox>
</div> </div>
<div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1"> <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1">
<div class="fkbox"> <div class="fkbox">
...@@ -75,14 +74,13 @@ ...@@ -75,14 +74,13 @@
<div class="fkbox_item" style="background: #FFF100"></div> <div class="fkbox_item" style="background: #FFF100"></div>
<span>驳回</span> <span>驳回</span>
</div> </div>
</div> </div>
</div> </div>
<div> <div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick"> <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 :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 v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()"
:label="item.Name">
</el-tab-pane> </el-tab-pane>
<el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane> <el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
</el-tabs> </el-tabs>
...@@ -105,7 +103,8 @@ ...@@ -105,7 +103,8 @@
<el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderSourceName}}</el-tag>
<el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderSourceName}}</el-tag>
</div> </div>
<div class="app-order-user" v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 "> <div class="app-order-user"
v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 ">
<span class="app-order-time">微店名称：</span>{{item.SmallShopsName}} <span class="app-order-time">微店名称：</span>{{item.SmallShopsName}}
</div> </div>
<div flex="cross:center" class="app-order-user"> <div flex="cross:center" class="app-order-user">
...@@ -119,9 +118,6 @@ ...@@ -119,9 +118,6 @@
</div> </div>
<div flex="dir:left wrap:wrap" class="app-order-offline"> <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&#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==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag <el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''" v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
...@@ -151,7 +147,8 @@ ...@@ -151,7 +147,8 @@
<div class="goods-item" style="width: 65%;"> <div class="goods-item" style="width: 65%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods"> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
<div> <div>
<el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]"></el-image> <el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]">
</el-image>
<div flex="dir:left"> <div flex="dir:left">
<div class="goods-info"> <div class="goods-info">
<div class="goods-name"> <div class="goods-name">
...@@ -169,10 +166,8 @@ ...@@ -169,10 +166,8 @@
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
车辆：{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}} 车辆：{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}}
</span> </span>
</div> </div>
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
导游：{{list.GuideName}} 导游：{{list.GuideName}}
</span> </span>
...@@ -180,22 +175,19 @@ ...@@ -180,22 +175,19 @@
服务类型：{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}} 服务类型：{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
</span> </span>
</div> </div>
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
出发时间：{{list.TripSTime}} 出发时间：{{list.TripSTime}}
</span> </span>
</div> </div>
<div style=" display: flex;flex-direction: row;align-items: center;" v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0"> <div style=" display: flex;flex-direction: row;align-items: center;"
v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
<span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span> <span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 350px;"> <div flex="dir:left box:mean" style="width: 350px;">
<div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;"> <div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计：￥{{list.Final_Price}} <span style="cursor:pointer">小计：￥{{list.Final_Price}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)" <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../assets/img/userman/edit1.png" alt=""> src="../../assets/img/userman/edit1.png" alt="">
...@@ -214,10 +206,9 @@ ...@@ -214,10 +206,9 @@
</span> </span>
</div> </div>
<div flex="cross:center main:center" style="width: 45px;">人数：x {{list.Number}}</div> <div flex="cross:center main:center" style="width: 45px;">人数：x {{list.Number}}</div>
</div> </div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center" v-if="TenantId==1"> <div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if="TenantId==1">
<el-dropdown trigger="click" style="margin-left: 50px"> <el-dropdown trigger="click" style="margin-left: 50px">
<span class="el-dropdown-link">制单</span> <span class="el-dropdown-link">制单</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
...@@ -229,7 +220,8 @@ ...@@ -229,7 +220,8 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div style="margin-top: 10px;font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0"> <div style="margin-top: 10px;font-size: 12px"
v-if="list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0">
其他费用： 其他费用：
</div> </div>
<div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0"> <div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0">
...@@ -243,30 +235,33 @@ ...@@ -243,30 +235,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="billStyle" v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1"> <div class="billStyle"
v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5"> <div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据: 收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)"> <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 == 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"
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span> :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2" >{{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 == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span> <span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span> </span>
</div> </div>
<div class="billStyle_item"> <div class="billStyle_item">
支出单据: 支出单据:
<span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(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 == 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"
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span> :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2" >{{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 == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span> <span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
...@@ -275,15 +270,12 @@ ...@@ -275,15 +270,12 @@
<div flex="dir:top"> <div flex="dir:top">
<div> <div>
<span style="font-size: 16px;">￥{{item.Income}}</span> <span style="font-size: 16px;">￥{{item.Income}}</span>
<el-popover placement="bottom" width="200" trigger="hover" <el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 '+ item.Income +'元'">
:content="'商品小计 '+ item.Income +'元'" >
<img slot="reference" src="../../assets/img/userman/price.png" alt=""> <img slot="reference" src="../../assets/img/userman/price.png" alt="">
</el-popover> </el-popover>
</div> </div>
<div class="express-price"><span> <div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含保险￥{{item.InsuranceMoney}}) <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>
</span></div> </span></div>
<div> <div>
...@@ -292,13 +284,16 @@ ...@@ -292,13 +284,16 @@
<div style="font-size: 12px" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0"> <div style="font-size: 12px" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<span>优惠金额:￥{{item.CouponMoney}}</span> <span>优惠金额:￥{{item.CouponMoney}}</span>
</div> </div>
<div style="font-size: 12px" v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0"> <div style="font-size: 12px"
v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<span>积分抵用金额:￥{{item.IntegralMoney}}</span> <span>积分抵用金额:￥{{item.IntegralMoney}}</span>
</div> </div>
<div style="font-size: 12px" v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0"> <div style="font-size: 12px"
v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
<span>积分数:￥{{item.IntegralNumber}}</span> <span>积分数:￥{{item.IntegralNumber}}</span>
</div> </div>
<div style="font-size: 12px" v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0"> <div style="font-size: 12px"
v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0">
<span>优惠券信息:</span> <span>优惠券信息:</span>
<span v-for="(MItem,Mindex) in item.MemberDiscountCouponList" :key="Mindex"> <span v-for="(MItem,Mindex) in item.MemberDiscountCouponList" :key="Mindex">
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}} {{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
...@@ -306,7 +301,6 @@ ...@@ -306,7 +301,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;"> <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center"> <div flex="wrap:wrap cross:center">
<template v-if="msg.Recycled==2"> <template v-if="msg.Recycled==2">
...@@ -334,9 +328,7 @@ ...@@ -334,9 +328,7 @@
<img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon" <img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/nopass.png" alt=""> src="../../assets/img/userman/nopass.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
<!-- 回收站 --> <!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top"> <el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz(item,7)" v-if="msg.Recycled==1" class="app-order-icon" <img @click="fRhsz(item,7)" v-if="msg.Recycled==1" class="app-order-icon"
...@@ -357,12 +349,7 @@ ...@@ -357,12 +349,7 @@
<img @click="OrderExit(item,1)" class="app-order-icon" <img @click="OrderExit(item,1)" class="app-order-icon"
src="../../assets/img/userman/add_remark.png" alt=""> src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip> </el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="修改快递单号" placement="top">-->
<!-- <img @click="getOrderSend(item)" v-if="item.OrderStatus==3" class="app-order-icon"-->
<!-- src="../../assets/img/userman/change.png" alt="">-->
<!-- </el-tooltip>-->
</template> </template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top"> <el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('directorOrderDetails',{OrderId:item.OrderId})" class="app-order-icon" <img @click="CommonJump('directorOrderDetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../assets/img/userman/detail.png" alt=""> src="../../assets/img/userman/detail.png" alt="">
...@@ -374,7 +361,6 @@ ...@@ -374,7 +361,6 @@
<div> <div>
<div flex="dir:left"> <div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}} <div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}}
出发地：{{item.ShoppingAddress}} 出发地：{{item.ShoppingAddress}}
{{item.DetailList[0].CarType!=5 ?('目的地：'+item.DestinationAddress):''}} {{item.DetailList[0].CarType!=5 ?('目的地：'+item.DestinationAddress):''}}
</div> </div>
...@@ -391,8 +377,8 @@ ...@@ -391,8 +377,8 @@
</div> </div>
</el-card> </el-card>
</div> </div>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" layout="prev, pager, next" :total="total"> :current-page.sync="msg.pageIndex" :page-size="msg.pageSize" layout="prev, pager, next" :total="total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -421,7 +407,8 @@ ...@@ -421,7 +407,8 @@
</el-dialog> </el-dialog>
<!--待处理--> <!--待处理-->
<el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi"> <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi">
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input> <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由">
</el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="pendD = false">取 消</el-button> <el-button size="small" @click="pendD = false">取 消</el-button>
<el-button size="small" type="primary" @click="pendingForm()">确 定</el-button> <el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
...@@ -453,7 +440,6 @@ ...@@ -453,7 +440,6 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span :key="index2" <span :key="index2"
v-for="(msg,index2) in scope.row.SpecificationList">{{msg}}{{scope.row.SpecificationList.length == index2+1?'':','}}</span> v-for="(msg,index2) in scope.row.SpecificationList">{{msg}}{{scope.row.SpecificationList.length == index2+1?'':','}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -475,7 +461,6 @@ ...@@ -475,7 +461,6 @@
</el-form-item> </el-form-item>
<el-form-item label="快递单号" prop="ExpressNumber"> <el-form-item label="快递单号" prop="ExpressNumber">
<el-input size="small" v-model="fhMsg.ExpressNumber"> <el-input size="small" v-model="fhMsg.ExpressNumber">
<!-- <el-button slot="append"> 获取面单</el-button> -->
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商家留言"> <el-form-item label="商家留言">
...@@ -487,7 +472,6 @@ ...@@ -487,7 +472,6 @@
<el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input> <el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button> <el-button size="small" @click="fhDig = false">取 消</el-button>
...@@ -539,7 +523,8 @@ ...@@ -539,7 +523,8 @@
<div style="margin: 15px 0;"></div> <div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;"> <div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange"> <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name"> <el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id"
:key="city.Name">
{{city.Name}}</el-checkbox> {{city.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
...@@ -587,7 +572,9 @@ ...@@ -587,7 +572,9 @@
<el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px"> <el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
<el-form :model="costMsg" ref="costMsg" label-width="80px"> <el-form :model="costMsg" ref="costMsg" label-width="80px">
<el-form-item :label="cosType==1?'商品成本':'运费成本'"> <el-form-item :label="cosType==1?'商品成本':'运费成本'">
<el-input size="small" v-model="costMsg.Money" 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-input size="small" v-model="costMsg.Money" 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-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -599,7 +586,9 @@ ...@@ -599,7 +586,9 @@
<el-dialog title="保险成本修改" :visible.sync="costDig2" width="600px"> <el-dialog title="保险成本修改" :visible.sync="costDig2" width="600px">
<el-form :model="CostMoney" ref="CostMoney" label-width="80px"> <el-form :model="CostMoney" ref="CostMoney" label-width="80px">
<el-form-item label="保险成本"> <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-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-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -622,7 +611,6 @@ ...@@ -622,7 +611,6 @@
<el-button size="small" type="primary" @click="SaveSuplier">确 定</el-button> <el-button size="small" type="primary" @click="SaveSuplier">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -638,16 +626,16 @@ ...@@ -638,16 +626,16 @@
FreightMoney: '', FreightMoney: '',
}, },
priceDig: false, priceDig: false,
costDig:false,//商品、运费成本的修改 costDig: false, //商品、运费成本的修改
costDig2:false,//商品、运费成本的修改 costDig2: false, //商品、运费成本的修改
cosType:1, cosType: 1,
costMsg:{ costMsg: {
Id:0, Id: 0,
Money:0, Money: 0,
}, },
CostMoney:{//设置司导订单 保险成本 CostMoney: { //设置司导订单 保险成本
OrderDetailId:0, OrderDetailId: 0,
InsuranceCostMoney:0, InsuranceCostMoney: 0,
}, },
hstips: '是否放入回收站(可在回收站中恢复)?', hstips: '是否放入回收站(可在回收站中恢复)?',
orderStatusList: [], orderStatusList: [],
...@@ -714,14 +702,14 @@ ...@@ -714,14 +702,14 @@
OrderDetailIdList: [], OrderDetailIdList: [],
}, },
// 待处理 // 待处理
pendMgs:{ pendMgs: {
OrderId:0, OrderId: 0,
Type:1, Type: 1,
Remark:0, Remark: 0,
}, },
fahuoList: [], fahuoList: [],
fhDig: false, fhDig: false,
pendD:false, pendD: false,
exitMsg: { exitMsg: {
OrderId: 0, OrderId: 0,
Type: 1, Type: 1,
...@@ -752,10 +740,10 @@ ...@@ -752,10 +740,10 @@
Mobile: '', Mobile: '',
ProductCode: '', ProductCode: '',
Recycled: 2, Recycled: 2,
AnchorName:'', AnchorName: '',
IsSelectPayMoney:0, IsSelectPayMoney: 0,
}, },
IsSelectPayMoney:0, IsSelectPayMoney: 0,
platList: [], platList: [],
option: [{ option: [{
Id: 1, Id: 1,
...@@ -799,30 +787,30 @@ ...@@ -799,30 +787,30 @@
total: 0, total: 0,
deliveryList: [], deliveryList: [],
orderTypeList: [], orderTypeList: [],
statusEnumList:[], statusEnumList: [],
loading: false, loading: false,
checkfhList: [], checkfhList: [],
moresendDig: false, moresendDig: false,
moresendtips: '', moresendtips: '',
hszDig: false, hszDig: false,
hszMsg: {}, hszMsg: {},
btnLoad:false, btnLoad: false,
upSupliDilog:false, // 修改供应商弹窗 upSupliDilog: false, // 修改供应商弹窗
SuplierList:[], // 供应商下拉数据 SuplierList: [], // 供应商下拉数据
SupplierId:0, //公用供应商id 给弹窗用 SupplierId: 0, //公用供应商id 给弹窗用
CommonId:0, //公用id 给弹窗用 CommonId: 0, //公用id 给弹窗用
TenantId:0, TenantId: 0,
} }
}, },
created() { created() {
let currentUser = this.getLocalStorage() let currentUser = this.getLocalStorage()
this.TenantId = currentUser.TenantId this.TenantId = currentUser.TenantId
if(this.$route.query.TypeId){ if (this.$route.query.TypeId) {
this.msgId=Number(this.$route.query.TypeId) this.msgId = Number(this.$route.query.TypeId)
} }
if(this.$route.query.UserId){ if (this.$route.query.UserId) {
this.msgVal=Number(this.$route.query.UserId); this.msgVal = Number(this.$route.query.UserId);
this.msg.UserId=Number(this.$route.query.UserId) this.msg.UserId = Number(this.$route.query.UserId)
} }
this.getList(); this.getList();
this.getplat(); this.getplat();
...@@ -892,8 +880,7 @@ ...@@ -892,8 +880,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 2) {
else if (val == 2) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = msgVal; this.msg.MerchantsNo = msgVal;
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -902,8 +889,7 @@ ...@@ -902,8 +889,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 3) {
else if (val == 3) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = msgVal; this.msg.UserName = msgVal;
...@@ -912,8 +898,7 @@ ...@@ -912,8 +898,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 4) {
else if (val == 4) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -922,8 +907,7 @@ ...@@ -922,8 +907,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 5) {
else if (val == 5) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -932,8 +916,7 @@ ...@@ -932,8 +916,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 6) {
else if (val == 6) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -942,8 +925,7 @@ ...@@ -942,8 +925,7 @@
this.msg.Consignee = msgVal; this.msg.Consignee = msgVal;
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 7) {
else if (val == 7) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -952,8 +934,7 @@ ...@@ -952,8 +934,7 @@
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = msgVal; this.msg.Mobile = msgVal;
this.msg.ProductCode = ''; this.msg.ProductCode = '';
} } else if (val == 8) {
else if (val == 8) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = ''; this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
...@@ -979,8 +960,8 @@ ...@@ -979,8 +960,8 @@
null null
); );
}, },
pending(item,type){ pending(item, type) {
this.pendD=true; this.pendD = true;
this.pendMgs.OrderId = item.OrderId; this.pendMgs.OrderId = item.OrderId;
this.pendMgs.Type = type; this.pendMgs.Type = type;
this.pendMgs.Remark = ''; this.pendMgs.Remark = '';
...@@ -988,18 +969,18 @@ ...@@ -988,18 +969,18 @@
}, },
// 待处理调用接口 // 待处理调用接口
pendingForm(){ pendingForm() {
this.loading=true; this.loading = true;
this.apipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs, this.apipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.pendD= false; this.pendD = false;
this.loading=false; this.loading = false;
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
this.loading=false; this.loading = false;
} }
}, },
...@@ -1014,11 +995,11 @@ ...@@ -1014,11 +995,11 @@
}; };
let that = this; let that = this;
let text let text
if(num == 1){ if (num == 1) {
text = '是否确定订单？' text = '是否确定订单？'
}else if(num == 2){ } else if (num == 2) {
text = '是否出行？' text = '是否出行？'
}else if(num == 3){ } else if (num == 3) {
text = '是否完成该订单？' text = '是否完成该订单？'
} }
that.$confirm(text, '提示', { that.$confirm(text, '提示', {
...@@ -1333,27 +1314,28 @@ ...@@ -1333,27 +1314,28 @@
this.exitDig = true; this.exitDig = true;
}, },
// 强制取消 // 强制取消
OrderExit2(item){ OrderExit2(item) {
let that=this; let that = this;
let text=''; let text = '';
if(item.OrderStatus==1){ if (item.OrderStatus == 1) {
text='确认取消?' text = '确认取消?'
}else if(item.OrderStatus==2){ } else if (item.OrderStatus == 2) {
text='确认取消?客人付款金额将原路退回。' text = '确认取消?客人付款金额将原路退回。'
} }
that.Confirm(text, function () { that.Confirm(text, function () {
that.loading= true that.loading = true
that.apipost( that.apipost(
"/api/order/SetOrderForcedToCancel", "/api/order/SetOrderForcedToCancel", {
{OrderId:item.OrderId}, OrderId: item.OrderId
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.loading= false that.loading = false
that.Success(res.data.message); that.Success(res.data.message);
that.getList(); that.getList();
} else { } else {
that.Error(res.data.message); that.Error(res.data.message);
that.loading= false that.loading = false
} }
}, },
...@@ -1371,12 +1353,12 @@ ...@@ -1371,12 +1353,12 @@
this.msg.OrderStatus = 0; this.msg.OrderStatus = 0;
this.msg.Recycled = 1; this.msg.Recycled = 1;
} }
this.msg.pageIndex=1 this.msg.pageIndex = 1
this.getList(); this.getList();
}, },
getList() { getList() {
let that=this; let that = this;
that.ChangeId(that.msgId); that.ChangeId(that.msgId);
if (!this.msgVal || this.msgVal == '') { if (!this.msgVal || this.msgVal == '') {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
...@@ -1470,18 +1452,18 @@ ...@@ -1470,18 +1452,18 @@
} }
}) })
}, },
costBtn(list,type){ costBtn(list, type) {
this.cosType=type; this.cosType = type;
if(type==1){ if (type == 1) {
this.costMsg.Id = list.Id; this.costMsg.Id = list.Id;
this.costMsg.Money = list.CostMoney; this.costMsg.Money = list.CostMoney;
}else if(type==2){ } else if (type == 2) {
this.costMsg.Id = list.Id; this.costMsg.Id = list.Id;
this.costMsg.Money = list.FreightCostMoney>0 ? list.FreightCostMoney:list.FreightMoney; this.costMsg.Money = list.FreightCostMoney > 0 ? list.FreightCostMoney : list.FreightMoney;
} }
this.costDig = true; this.costDig = true;
}, },
costBtn2(list,type){ costBtn2(list, type) {
this.CostMoney.OrderDetailId = list.Id; this.CostMoney.OrderDetailId = list.Id;
this.CostMoney.InsuranceCostMoney = list.InsuranceCostMoney; this.CostMoney.InsuranceCostMoney = list.InsuranceCostMoney;
...@@ -1497,16 +1479,16 @@ ...@@ -1497,16 +1479,16 @@
if (this.cosType == 1) { if (this.cosType == 1) {
cmd = '/api/order/SetOrderCostMoney'; cmd = '/api/order/SetOrderCostMoney';
msg = { msg = {
Id:this.costMsg.Id, Id: this.costMsg.Id,
CostMoney:Number(this.costMsg.Money), CostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} else if(this.cosType == 2){ } else if (this.cosType == 2) {
cmd = '/api/order/SetOrderFreightCostMoney'; cmd = '/api/order/SetOrderFreightCostMoney';
msg = { msg = {
Id:this.costMsg.Id, Id: this.costMsg.Id,
FreightCostMoney:Number(this.costMsg.Money) , FreightCostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} }
this.apipost(cmd, msg, this.apipost(cmd, msg,
...@@ -1526,15 +1508,15 @@ ...@@ -1526,15 +1508,15 @@
} }
}); });
}, },
costForm2(formName){//成本修改 costForm2(formName) { //成本修改
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let cmd = ''; let cmd = '';
let msg = {} let msg = {}
cmd = '/api/order/SetOrderInsuranceCostMoney'; cmd = '/api/order/SetOrderInsuranceCostMoney';
msg = { msg = {
OrderDetailId:this.CostMoney.OrderDetailId, OrderDetailId: this.CostMoney.OrderDetailId,
InsuranceCostMoney:Number(this.CostMoney.InsuranceCostMoney), InsuranceCostMoney: Number(this.CostMoney.InsuranceCostMoney),
} }
this.apipost(cmd, msg, this.apipost(cmd, msg,
...@@ -1565,59 +1547,69 @@ ...@@ -1565,59 +1547,69 @@
}, },
//修改供应商 //修改供应商
UpdateSuplier(item){ UpdateSuplier(item) {
this.upSupliDilog=true; this.upSupliDilog = true;
this.SupplierId=item.SupplierId; this.SupplierId = item.SupplierId;
this.CommonId=item.Id; this.CommonId = item.Id;
this.getSupplierList(); this.getSupplierList();
}, },
//保存供应商 //保存供应商
SaveSuplier(){ SaveSuplier() {
let msg={ let msg = {
Id:this.CommonId, Id: this.CommonId,
SupplierId:this.SupplierId SupplierId: this.SupplierId
} }
this.apipost("/api/Order/SetOrderSupplierId", msg, res => { this.apipost("/api/Order/SetOrderSupplierId", msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.upSupliDilog=false; this.upSupliDilog = false;
this.getList(); this.getList();
} }
}); });
}, },
goCollection(item,list){//跳到erp收款单 goCollection(item, list) { //跳到erp收款单
let currentUser = this.getLocalStorage() let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId !=0 ?currentUser.ERPBranchId :1224; let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224;
let orderObj = { let orderObj = {
OrderSource:16, OrderSource: 16,
OtherType:21, OtherType: 21,
ReFinanceId:item.OrderId,//订单id ReFinanceId: item.OrderId, //订单id
ReFinanceId2:list.Id,//订单商品id ReFinanceId2: list.Id, //订单商品id
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}] ECOrderList: [{
ECOrderId: item.OrderId,
ECOrderDetailId: list.Id
}]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) // window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj))
}, },
goPayment(item,list){//跳到erp付款单 goPayment(item, list) { //跳到erp付款单
let currentUser = this.getLocalStorage() let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId !=0 ?currentUser.ERPBranchId :1224; let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224;
let orderObj = { let orderObj = {
OrderSource:16, OrderSource: 16,
OtherType:22, OtherType: 22,
ReFinanceId:item.OrderId, ReFinanceId: item.OrderId,
ReFinanceId2:list.Id, ReFinanceId2: list.Id,
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}] ECOrderList: [{
ECOrderId: item.OrderId,
ECOrderDetailId: list.Id
}]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) // window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj))
}, },
goSF(item){//收入详情 goSF(item) { //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') // window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
}, },
goZF(item){//付款详情 goZF(item) { //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') // window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
} }
}, },
}; };
...@@ -1625,15 +1617,17 @@ ...@@ -1625,15 +1617,17 @@
</script> </script>
<style> <style>
.orderList .remark-box { .orderList .remark-box {
padding-top: 3px; padding-top: 3px;
margin-left: 7px; margin-left: 7px;
} }
.orderList .upload-demo{
float:right; .orderList .upload-demo {
float: right;
margin-top: -5px; margin-top: -5px;
margin-left:20px; margin-left: 20px;
} }
.orderList .pendSelect .el-input { .orderList .pendSelect .el-input {
width: 100px; width: 100px;
} }
...@@ -1641,11 +1635,11 @@ ...@@ -1641,11 +1635,11 @@
.hszDigClass .el-dialog__body { .hszDigClass .el-dialog__body {
padding: 0 10px 20px 0; padding: 0 10px 20px 0;
} }
.orderList .tyi .el-dialog__body{
padding:0 20px
.orderList .tyi .el-dialog__body {
padding: 0 20px
} }
.sendDigClass .el-dialog__body { .sendDigClass .el-dialog__body {
padding: 0 10px 10px 0; padding: 0 10px 10px 0;
} }
...@@ -1849,24 +1843,29 @@ ...@@ -1849,24 +1843,29 @@
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.orderList .billStyle{
.orderList .billStyle {
width: 100%; width: 100%;
display: flex;flex-direction: row; display: flex;
flex-direction: row;
align-items: center; align-items: center;
border: 1px solid #EBEEF5; border: 1px solid #EBEEF5;
margin-top: 20px; margin-top: 20px;
} }
.orderList .billStyle .billStyle_item{
.orderList .billStyle .billStyle_item {
width: 50%; width: 50%;
padding: 5px; padding: 5px;
} }
.orderList .billStyle .billtext{
.orderList .billStyle .billtext {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
margin-right: 5px; margin-right: 5px;
text-decoration:underline; text-decoration: underline;
} }
.orderList .el-dropdown-link{
.orderList .el-dropdown-link {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
background-color: #409EFF; background-color: #409EFF;
...@@ -1878,17 +1877,19 @@ ...@@ -1878,17 +1877,19 @@
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
} }
.orderList .fkbox{
.orderList .fkbox {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin-right: 15px; margin-right: 15px;
} }
.orderList .fkbox .fkbox_item{
.orderList .fkbox .fkbox_item {
width: 10px; width: 10px;
height: 10px; height: 10px;
border-radius: 2px; border-radius: 2px;
margin-right: 4px; margin-right: 4px;
} }
</style> </style>
src/components/empower/empowerManage.vue
View file @ 71cd23e5
...@@ -44,12 +44,9 @@ ...@@ -44,12 +44,9 @@
<span v-if="scope.row.Type==2">集团</span> <span v-if="scope.row.Type==2">集团</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="CreateBy" label="创建人Id"></el-table-column> -->
<el-table-column prop="DomainName" label="域名"></el-table-column> <el-table-column prop="DomainName" label="域名"></el-table-column>
<el-table-column prop="Account" label="关联erp账号"></el-table-column> <el-table-column prop="Account" label="关联erp账号"></el-table-column>
<el-table-column prop="MallUserName" label="电商员工姓名"></el-table-column> <el-table-column prop="MallUserName" label="电商员工姓名"></el-table-column>
<!-- <el-table-column prop="EmpName" label="创建人姓名"></el-table-column> -->
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.Status==1">待审核</span> <span v-if="scope.row.Status==1">待审核</span>
......
src/components/empower/groupEmpower.vue
View file @ 71cd23e5
<style> <style>
.groupEmpower .mimitBody { .groupEmpower .mimitBody {
padding: 20px; padding: 20px;
background-color: #fff; background-color: #fff;
margin: 10px 0 20px 0; margin: 10px 0 20px 0;
display: table; display: table;
width: 100%; width: 100%;
} }
.groupEmpower .mimitList { .groupEmpower .mimitList {
margin-bottom: 15px; margin-bottom: 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.groupEmpower .mimitBody .el-tag { .groupEmpower .mimitBody .el-tag {
min-width: 120px; min-width: 120px;
padding-right: 50px; padding-right: 50px;
} }
.groupEmpower .el-button--small { .groupEmpower .el-button--small {
padding: 9px 25px; padding: 9px 25px;
} }
</style> </style>
<template> <template>
<div class="groupEmpower"> <div class="groupEmpower">
<div class="CommonHeader">集团授权</div> <div class="CommonHeader">集团授权</div>
<div class="mimitBody"> <div class="mimitBody">
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form <el-form :model="msg" :rules="rules" ref="msg" label-width="150px">
:model="msg"
:rules="rules"
ref="msg"
label-width="150px"
>
<el-form-item label="集团域名" size="small" prop="DomainName"> <el-form-item label="集团域名" size="small" prop="DomainName">
<el-input <el-input type="text" size="small" :disabled="msg.Status==3 || !msg.Status ? false: true" maxlength="200"
type="text" v-model="msg.DomainName">
size="small"
:disabled="msg.Status==3 || !msg.Status ? false: true"
maxlength="200"
v-model="msg.DomainName"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="审核状态" size="small">
label="审核状态"
size="small"
>
<span v-if="msg.Status ==1 ">待审核</span> <span v-if="msg.Status ==1 ">待审核</span>
<span v-if="msg.Status ==2 ">已审核</span> <span v-if="msg.Status ==2 ">已审核</span>
<span v-if="msg.Status ==3 ">已拒绝</span> <span v-if="msg.Status ==3 ">已拒绝</span>
...@@ -55,17 +43,15 @@ ...@@ -55,17 +43,15 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<el-button size="small" type="primary" @click="submitForm('msg')" v-if=" (msg.Status==3) || !msg.Status">保存
<el-button size="small" type="primary" @click="submitForm('msg')" v-if=" (msg.Status==3) || !msg.Status" </el-button>
>保存</el-button
>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
msg:{}, msg: {},
rules: { rules: {
DomainName: [{ DomainName: [{
required: true, required: true,
...@@ -82,11 +68,12 @@ export default { ...@@ -82,11 +68,12 @@ export default {
GetWeiXinAppConfig() { GetWeiXinAppConfig() {
// type 1-个人，2-集团 // type 1-个人，2-集团
this.assetsApipost( this.assetsApipost(
"/api/Authorize/GetAuthorizeModel", "/api/Authorize/GetAuthorizeModel", {
{Type:2}, Type: 2
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if( res.data.data !=null){ if (res.data.data != null) {
this.msg = res.data.data this.msg = res.data.data
} }
...@@ -96,17 +83,16 @@ export default { ...@@ -96,17 +83,16 @@ export default {
} }
); );
}, },
submitForm(msg){ submitForm(msg) {
this.$refs[msg].validate(valid => { this.$refs[msg].validate(valid => {
if (valid) { if (valid) {
this.assetsApipost( this.assetsApipost(
"/api/Authorize/SetAuthorize", "/api/Authorize/SetAuthorize", {
{ ID: this.msg.ID ? this.msg.ID : 0,
ID:this.msg.ID? this.msg.ID:0, DomainName: this.msg.DomainName,
DomainName:this.msg.DomainName, Account: '',
Account:'', Password: '',
Password:'', Type: 2
Type:2
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -126,5 +112,6 @@ export default { ...@@ -126,5 +112,6 @@ export default {
mounted() { mounted() {
this.GetWeiXinAppConfig(); this.GetWeiXinAppConfig();
} }
}; };
</script> </script>
src/components/orderMan/orderList.vue
View file @ 71cd23e5
...@@ -85,9 +85,7 @@ ...@@ -85,9 +85,7 @@
<div class="fkbox_item" style="background: #FFF100"></div> <div class="fkbox_item" style="background: #FFF100"></div>
<span>驳回</span> <span>驳回</span>
</div> </div>
</div> </div>
</div> </div>
<div> <div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick"> <el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
......
src/components/tradePavilion/consultList.vue
View file @ 71cd23e5
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt=""> <img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="回复" placement="top" v-if="scope.row.AskStatus==0"> <el-tooltip class="item" effect="dark" content="回复" placement="top" v-if="scope.row.AskStatus==0">
<img @click="getInfo(scope.row,1)" src="../../assets/img/userman/edit.png" alt=""> <img @click="getInfo(scope.row,1)" src="../../assets/img/userman/reply.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
......
src/components/tradePavilion/investmentList.vue
View file @ 71cd23e5
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt=""> <img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip v-if="scope.row.AuditStatus==0" class="item" effect="dark" content="审核" placement="top"> <el-tooltip v-if="scope.row.AuditStatus==0" class="item" effect="dark" content="审核" placement="top">
<img @click="getInfo(scope.row,1)" src="../../assets/img/userman/icon-show.png" alt=""> <img @click="getInfo(scope.row,1)" src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
......
src/components/tradePavilion/procurementList.vue
View file @ 71cd23e5
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt=""> <img @click="getInfo(scope.row,0)" src="../../assets/img/userman/icon-show.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip v-if="scope.row.AuditStatus==0" class="item" effect="dark" content="审核" placement="top"> <el-tooltip v-if="scope.row.AuditStatus==0" class="item" effect="dark" content="审核" placement="top">
<img @click="getInfo(scope.row,1)" src="../../assets/img/userman/icon-show.png" alt=""> <img @click="getInfo(scope.row,1)" src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
......
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