Skip to content

E
ElectricitySheep
Commit 189004a0 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2fdf3be7
Hide whitespace changes
Inline Side-by-side
Showing with 323 additions and 317 deletions
src/components/offlineService/osOrderList.vue
View file @ 189004a0
...@@ -2,28 +2,16 @@ ...@@ -2,28 +2,16 @@
<div class="orderList"> <div class="orderList">
<div class="head-title"> <div class="head-title">
订单列表 订单列表
<el-upload
class="upload-demo"
ref="upload"
:action="importFileUrl"
:multiple="true"
:on-success="successUpload"
:show-file-list="false"
accept=".csv">
<el-button :loading="btnLoad" size="small" type="primary">
赞羊导入</el-button>
</el-upload>
<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"
...@@ -33,7 +21,7 @@ ...@@ -33,7 +21,7 @@
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left:15px">订单类型：</span> <span style="margin-left:15px">订单类型：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderType" size="small" <el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderType" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="全部订单" :value="0"></el-option> <el-option label="全部订单" :value="0"></el-option>
<el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
...@@ -46,53 +34,53 @@ ...@@ -46,53 +34,53 @@
<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">
<div class="fkbox_item" style="background: #00FFFF"></div> <div class="fkbox_item" style="background: #00FFFF"></div>
<span>暂存</span> <span>暂存</span>
</div> </div>
<div class="fkbox"> <div class="fkbox">
<div class="fkbox_item" style="background: #0080FF"></div> <div class="fkbox_item" style="background: #0080FF"></div>
<span>审核中</span> <span>审核中</span>
</div> </div>
<div class="fkbox"> <div class="fkbox">
<div class="fkbox_item" style="background: #000"></div> <div class="fkbox_item" style="background: #000"></div>
<span>通过</span> <span>通过</span>
</div> </div>
<div class="fkbox"> <div class="fkbox">
<div class="fkbox_item" style="background: #FF4048"></div> <div class="fkbox_item" style="background: #FF4048"></div>
<span>出纳审核通过</span> <span>出纳审核通过</span>
</div> </div>
<div class="fkbox"> <div class="fkbox">
<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" v-if="item.Id!=2" :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>
...@@ -115,7 +103,8 @@ ...@@ -115,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">
...@@ -161,78 +150,55 @@ ...@@ -161,78 +150,55 @@
<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">
<div class="app-ellipsis"> <div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;"> <div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit" <span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit"
style="margin-right: 5px;"> style="margin-right: 5px;">
{{list.OrderTypeName}} {{list.OrderTypeName}}
</span> </span>
{{list.GoodsName}} {{list.GoodsName}}
</div>
</div> </div>
</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">
<span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
</div>
</div> </div>
<div style="margin-bottom: 5px;"> <div flex="dir:left box:mean" style="width: 350px;">
<span style="margin-right: 10px;"> <div flex="cross:center main:center"
规格： style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<el-tag <span style="cursor:pointer">小计：￥{{list.Final_Price}}
:key="index2" <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
v-for="(msg,index2) in list.SpecificationList" src="../../assets/img/userman/edit1.png" alt="">
style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" </span>
size="mini"> <span style="cursor:pointer">商品成本：￥{{ list.CostMoney}}
{{msg}} <img v-if="item.OrderStatus!==7" @click="costBtn(list,1)"
</el-tag> src="../../assets/img/userman/edit1.png" alt="">
</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 flex="cross:center main:center" style="width: 45px;">数量：x {{list.Number}}</div>
<span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
</div>
<div style=" display: flex;flex-direction: row;align-items: center;">
<span>货号：{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
<span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
</div>
</div>
<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%;">
<span style="cursor:pointer">小计：￥{{list.Final_Price}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">商品成本：￥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn(list,1)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">运费成本：￥{{list.FreightCostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn(list,2)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">供应商：{{list.SupplierName !=null ? list.SupplierName :''}}
<img v-if="item.OrderStatus!==7" @click="UpdateSuplier(list)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
</div> </div>
<div flex="cross:center main:center" style="width: 45px;">数量：x {{list.Number}}</div> <div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if="TenantId==1">
<el-dropdown trigger="click" style="margin-left: 50px">
</div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center" v-if="TenantId==1">
<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">
<el-dropdown-item @click.native="goCollection(item,list)"> <el-dropdown-item @click.native="goCollection(item,list)">
收入制单 收入制单
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goPayment(item,list)"> <el-dropdown-item @click.native="goPayment(item,list)">
付款制单 付款制单
</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">
...@@ -244,42 +210,45 @@ ...@@ -244,42 +210,45 @@
<span style="margin-left: 10px">实付：￥{{list.PayMoney}}</span> <span style="margin-left: 10px">实付：￥{{list.PayMoney}}</span>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> <div class="billStyle"
<div class="billStyle" v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1"> 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"
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span> :style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span> <span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
</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>
</div> </span>
<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>
</div>
</div> </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>
</div>
</div>
</div> </div>
</div> </div>
<div flex="cross:center" class="app-order-info" style="width: 15%;"> <div flex="cross:center" class="app-order-info" style="width: 15%;">
<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>
...@@ -295,13 +264,16 @@ ...@@ -295,13 +264,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+'折'}}
...@@ -309,7 +281,6 @@ ...@@ -309,7 +281,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">
...@@ -331,15 +302,13 @@ ...@@ -331,15 +302,13 @@
<!--待处理--> <!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6"> <el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6">
<img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon" <img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt=""> src="../../assets/img/userman/pass.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6"> <el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6">
<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"
...@@ -353,9 +322,6 @@ ...@@ -353,9 +322,6 @@
<el-tooltip class="item" effect="dark" content="打印小票" placement="top"> <el-tooltip class="item" effect="dark" content="打印小票" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/print.png" alt=""> <img class="app-order-icon" src="../../assets/img/userman/print.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/invoice.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top"> <el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<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="">
...@@ -364,12 +330,12 @@ ...@@ -364,12 +330,12 @@
<img @click="getOrderSend(item)" v-if="item.OrderStatus==3" class="app-order-icon" <img @click="getOrderSend(item)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../assets/img/userman/change.png" alt=""> src="../../assets/img/userman/change.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="线下付款" v-if="item.OrderStatus==1 || item.OrderStatus==7" placement="top"> <el-tooltip class="item" effect="dark" content="线下付款"
<img @click="Offpayment(item)" v-if="item.OrderStatus==1 || item.OrderStatus==7" class="app-order-icon" v-if="item.OrderStatus==1 || item.OrderStatus==7" placement="top">
src="../../assets/img/userman/OfflinePayment.png" alt=""> <img @click="Offpayment(item)" v-if="item.OrderStatus==1 || item.OrderStatus==7"
class="app-order-icon" src="../../assets/img/userman/OfflinePayment.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="CommonJump('orderDetails',{OrderId:item.OrderId})" class="app-order-icon" <img @click="CommonJump('orderDetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../assets/img/userman/detail.png" alt=""> src="../../assets/img/userman/detail.png" alt="">
...@@ -380,9 +346,8 @@ ...@@ -380,9 +346,8 @@
<div class="card-footer"> <div class="card-footer">
<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.DistrictAddress}} </div>
{{item.ShoppingAddress}}</div>
<button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="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> class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div> </div>
...@@ -396,8 +361,8 @@ ...@@ -396,8 +361,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>
...@@ -417,7 +382,6 @@ ...@@ -417,7 +382,6 @@
<el-form-item v-if="exitMsg.Type!=2"> <el-form-item v-if="exitMsg.Type!=2">
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input> <el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="exitDig = false">取 消</el-button> <el-button size="small" @click="exitDig = false">取 消</el-button>
...@@ -426,7 +390,8 @@ ...@@ -426,7 +390,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>
...@@ -455,10 +420,9 @@ ...@@ -455,10 +420,9 @@
<el-table-column prop="Number" label="数量" width="80"> <el-table-column prop="Number" label="数量" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="SpecificationList" label="规格"> <el-table-column prop="SpecificationList" label="规格">
<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>
...@@ -480,7 +444,6 @@ ...@@ -480,7 +444,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="商家留言">
...@@ -544,7 +507,8 @@ ...@@ -544,7 +507,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>
...@@ -592,7 +556,9 @@ ...@@ -592,7 +556,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">
...@@ -631,11 +597,11 @@ ...@@ -631,11 +597,11 @@
FreightMoney: '', FreightMoney: '',
}, },
priceDig: false, priceDig: false,
costDig:false,//商品、运费成本的修改 costDig: false, //商品、运费成本的修改
cosType:1, cosType: 1,
costMsg:{ costMsg: {
Id:0, Id: 0,
Money:0, Money: 0,
}, },
hstips: '是否放入回收站(可在回收站中恢复)?', hstips: '是否放入回收站(可在回收站中恢复)?',
orderStatusList: [], orderStatusList: [],
...@@ -678,7 +644,6 @@ ...@@ -678,7 +644,6 @@
trigger: 'blur' trigger: 'blur'
}], }],
}, },
fhrules: { fhrules: {
ExpressId: [{ ExpressId: [{
required: true, required: true,
...@@ -702,14 +667,14 @@ ...@@ -702,14 +667,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,
...@@ -740,10 +705,10 @@ ...@@ -740,10 +705,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,
...@@ -793,24 +758,26 @@ ...@@ -793,24 +758,26 @@
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,
OrderStateList: [], //配置订单状态
} }
}, },
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.getConfig();
this.getList(); this.getList();
this.getplat(); this.getplat();
this.getExpressInfo(); this.getExpressInfo();
...@@ -822,20 +789,34 @@ ...@@ -822,20 +789,34 @@
}, },
mounted() {}, mounted() {},
methods: { methods: {
successUpload(file){ //获取基础配置
let path=file.data.Path; getConfig() {
this.btnLoad=true; this.apipost(
this.apipost("/api/order/SetGoodsOrderBatchImport", {FilePath:path}, res => { "/api/Reserve/GetReserveBaseInfo", {},
this.btnLoad=false; res => {
if (res.data.resultCode == 1) {
var jsonData = res.data.data;
this.OrderStateList = jsonData.OrderStateList;
}
}
);
},
successUpload(file) {
let path = file.data.Path;
this.btnLoad = true;
this.apipost("/api/order/SetGoodsOrderBatchImport", {
FilePath: path
}, res => {
this.btnLoad = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.getList(); this.getList();
}else{ } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}) })
}, },
// 订单操作 // 订单操作
priceForm(formName) { priceForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
...@@ -892,8 +873,7 @@ ...@@ -892,8 +873,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 +882,7 @@ ...@@ -902,8 +882,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 +891,7 @@ ...@@ -912,8 +891,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 +900,7 @@ ...@@ -922,8 +900,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 +909,7 @@ ...@@ -932,8 +909,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 +918,7 @@ ...@@ -942,8 +918,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 +927,7 @@ ...@@ -952,8 +927,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,27 +953,27 @@ ...@@ -979,27 +953,27 @@
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 = '';
}, },
// 待处理调用接口 // 待处理调用接口
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;
} }
}, },
...@@ -1118,7 +1092,7 @@ ...@@ -1118,7 +1092,7 @@
}); });
}, },
Offpayment(item){//线下付款 Offpayment(item) { //线下付款
console.log(item) console.log(item)
let that = this; let that = this;
...@@ -1127,7 +1101,9 @@ ...@@ -1127,7 +1101,9 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('/api/order/SetOrderOfflinePayment', {OrderId:item.OrderId}, this.apipost('/api/order/SetOrderOfflinePayment', {
OrderId: item.OrderId
},
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
...@@ -1350,35 +1326,33 @@ ...@@ -1350,35 +1326,33 @@
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 => { },
if (res.data.resultCode == 1) { res => {
that.loading= false if (res.data.resultCode == 1) {
that.Success(res.data.message); that.loading = false
that.getList(); that.Success(res.data.message);
} else { that.getList();
that.Error(res.data.message); } else {
that.loading= false that.Error(res.data.message);
that.loading = false
}
},
);
});
}
},
);
});
}, },
handleClick(val) { handleClick(val) {
let dataId = val.$attrs.dataId; let dataId = val.$attrs.dataId;
...@@ -1388,12 +1362,12 @@ ...@@ -1388,12 +1362,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 = '';
...@@ -1414,7 +1388,7 @@ ...@@ -1414,7 +1388,7 @@
this.msg.EndTime = ''; this.msg.EndTime = '';
} }
this.loading = true; this.loading = true;
this.apipost("/api/order/GetGoodsOrderPageList", this.msg, res => { this.apipost("/api/order/GetOfflineServiceOrderPage", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -1430,7 +1404,20 @@ ...@@ -1430,7 +1404,20 @@
}, },
getOrderStatus() { getOrderStatus() {
this.apipost("/api/order/GetOrderStatusEnumList", {}, res => { this.apipost("/api/order/GetOrderStatusEnumList", {}, res => {
this.orderStatusList = res.data.data; var newArray = [];
var tempArray = res.data.data;
tempArray.forEach(item => {
if (item.Id != 2) {
var currentObj = this.OrderStateList.find(sitem => {
return sitem.Id === item.Id; //筛选出匹配数据
});
if (currentObj) {
item.Name = currentObj.Name;
}
newArray.push(item);
}
});
this.orderStatusList = newArray;
}) })
}, },
getDelivery() { getDelivery() {
...@@ -1486,14 +1473,14 @@ ...@@ -1486,14 +1473,14 @@
} }
}) })
}, },
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;
}, },
...@@ -1506,14 +1493,14 @@ ...@@ -1506,14 +1493,14 @@
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),
} }
} 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),
} }
} }
this.apipost(cmd, msg, this.apipost(cmd, msg,
...@@ -1544,59 +1531,69 @@ ...@@ -1544,59 +1531,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')
} }
}, },
}; };
...@@ -1604,15 +1601,17 @@ ...@@ -1604,15 +1601,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;
} }
...@@ -1620,11 +1619,11 @@ ...@@ -1620,11 +1619,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;
} }
...@@ -1828,24 +1827,29 @@ ...@@ -1828,24 +1827,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{
width: 50%; .orderList .billStyle .billStyle_item {
padding: 5px; width: 50%;
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;
...@@ -1857,17 +1861,19 @@ ...@@ -1857,17 +1861,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{
width: 10px; .orderList .fkbox .fkbox_item {
height: 10px; width: 10px;
border-radius: 2px; height: 10px;
margin-right: 4px; border-radius: 2px;
} margin-right: 4px;
}
</style> </style>
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