Skip to content

E
ElectricitySheep
Commit 7eb81def authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 81a00218
Show whitespace changes
Inline Side-by-side
Showing with 1498 additions and 2205 deletions
src/components/orderMan/orderList.vue
View file @ 7eb81def
...@@ -2,179 +2,82 @@ ...@@ -2,179 +2,82 @@
<div class="orderList"> <div class="orderList">
<div class="head-title"> <div class="head-title">
订单列表 订单列表
<el-upload <el-upload class="upload-demo" ref="upload" :action="importFileUrl" :multiple="true" :on-success="successUpload"
class="upload-demo" :show-file-list="false" accept=".csv">
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 :loading="btnLoad" size="small" type="primary">
赞羊导入</el-button 赞羊导入</el-button>
>
</el-upload> </el-upload>
<el-button <el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" size="small" type="primary">批量导出
@click="dialogVisible = true"
style="float: right; margin-top: -5px"
size="small"
type="primary"
>批量导出
</el-button> </el-button>
<el-button <el-button @click="ClearHsz" style="float: right; margin-top: -5px; margin-right: 20px" size="small"
@click="ClearHsz" type="primary">
style="float: right; margin-top: -5px; margin-right: 20px" 清空回收站</el-button>
size="small"
type="primary"
>
清空回收站</el-button
>
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<span>下单时间：</span> <span>下单时间：</span>
<el-date-picker <el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange"
v-model="dateList" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
@change="(msg.pageIndex = 1), getList()"
size="small"
type="datetimerange"
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 <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderSource" size="small"
class="w120" placeholder="请选择">
@change="(msg.pageIndex = 1), getList()"
v-model="msg.OrderSource"
size="small"
placeholder="请选择"
>
<el-option label="全部平台" :value="0"></el-option> <el-option label="全部平台" :value="0"></el-option>
<el-option <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left: 15px">订单类型：</span> <span style="margin-left: 15px">订单类型：</span>
<el-select <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderType" size="small"
class="w120" placeholder="请选择">
@change="(msg.pageIndex = 1), getList()"
v-model="msg.OrderType"
size="small"
placeholder="请选择"
>
<el-option label="全部订单" :value="0"></el-option> <el-option label="全部订单" :value="0"></el-option>
<el-option <el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in orderTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left: 15px">配送方式：</span> <span style="margin-left: 15px">配送方式：</span>
<el-select <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small"
class="w120" placeholder="请选择">
@change="(msg.pageIndex = 1), getList()"
v-model="msg.DeliveryMethod"
size="small"
placeholder="请选择"
>
<el-option label="全部订单" :value="0"></el-option> <el-option label="全部订单" :value="0"></el-option>
<el-option <el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in deliveryList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option> </el-option>
</el-select> </el-select>
<el-input <el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" clearable
@clear="(msg.pageIndex = 1), getList()" style="margin-left: 15px; width: 300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
@keyup.enter.native="(msg.pageIndex = 1), getList()" size="small">
clearable <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
style="margin-left: 15px; width: 300px" <el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
class="input-with-select"
placeholder="请输入内容"
v-model="msgVal"
size="small"
>
<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> </el-option>
</el-select> </el-select>
</el-input> </el-input>
</div> </div>
<div <div style="
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
" ">
>
<div> <div>
<span style="margin-left: 15px">线下订单：</span> <span style="margin-left: 15px">线下订单：</span>
<el-select <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.IsOffline" size="small"
class="w120" placeholder="请选择">
@change="(msg.pageIndex = 1), getList()"
v-model="msg.IsOffline"
size="small"
placeholder="请选择"
>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
<span style="margin-left: 15px">主播名称：</span> <span style="margin-left: 15px">主播名称：</span>
<el-input <el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()" clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
@keyup.enter.native="(msg.pageIndex = 1), getList()" v-model="msg.AnchorName" size="small">
clearable
style="margin-top: 10px; width: 200px"
class="input-with-select"
placeholder="请输入主播名称"
v-model="msg.AnchorName"
size="small"
>
</el-input> </el-input>
<el-checkbox <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px"
v-model="IsSelectPayMoney" @change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
true-label="1" </div>
false-label="0" <div style="
style="margin-left: 15px"
@change="(msg.pageIndex = 1), getList()"
>只看已付款</el-checkbox
>
</div>
<div
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
font-size: 12px; font-size: 12px;
" " v-if="TenantId == 1||TenantId == 15">
v-if="TenantId == 1||TenantId == 15"
>
<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>
...@@ -202,31 +105,12 @@ ...@@ -202,31 +105,12 @@
</div> </div>
</div> </div>
<div> <div>
<el-tabs <el-tabs style="margin-top: 20px" v-model="activeName" @tab-click="handleClick">
style="margin-top: 20px" <el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
v-model="activeName" <el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()"
@tab-click="handleClick" :label="item.Name">
>
<el-tab-pane
:dataId="0"
label="全部"
name="first"
:key="0"
></el-tab-pane>
<el-tab-pane
v-for="item in orderStatusList"
:key="item.Id"
:dataId="item.Id"
:name="item.Id.toString()"
:label="item.Name"
>
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
:dataId="8"
label="回收站"
:key="8"
name="8"
></el-tab-pane>
</el-tabs> </el-tabs>
<div class="app-order-title"> <div class="app-order-title">
<div style="width: 55%">订单信息</div> <div style="width: 55%">订单信息</div>
...@@ -234,237 +118,99 @@ ...@@ -234,237 +118,99 @@
<div style="width: 20%">操作</div> <div style="width: 20%">操作</div>
</div> </div>
<div v-loading="loading" class="app-order-list"> <div v-loading="loading" class="app-order-list">
<el-card <el-card v-for="(item, index) in tableData" :key="index" class="app-order-item" shadow="never">
v-for="(item, index) in tableData"
:key="index"
class="app-order-item"
shadow="never"
>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head"> <div flex="cross:center" class="app-order-head">
<div class="app-order-time">{{ item.CreateDate }}</div> <div class="app-order-time">{{ item.CreateDate }}</div>
<div class="app-order-user"> <div class="app-order-user">
<span class="app-order-time" style="margin-right: 5px" <span class="app-order-time"
>订单号：</span style="margin-right: 5px">订单号：</span>{{ item.OrderNo }}({{ item.OrderId }})
>{{ item.OrderNo }}({{ item.OrderId }})
<el-tag v-if="item.OrderSource == 1" size="small">{{ <el-tag v-if="item.OrderSource == 1" size="small">{{
item.OrderSourceName item.OrderSourceName
}}</el-tag> }}</el-tag>
<el-tag <el-tag v-if="item.OrderSource == 2" size="small" type="success">{{ item.OrderSourceName }}</el-tag>
v-if="item.OrderSource == 2" <el-tag v-if="item.OrderSource == 3" size="small" type="info">{{ item.OrderSourceName }}</el-tag>
size="small" <el-tag v-if="item.OrderSource == 4" size="small" type="warning">{{ item.OrderSourceName }}</el-tag>
type="success" <el-tag v-if="item.OrderSource == 5" size="small" type="danger">{{ item.OrderSourceName }}</el-tag>
>{{ item.OrderSourceName }}</el-tag <el-tag v-if="item.OrderSource == 6" size="small" type="danger">{{ item.OrderSourceName }}</el-tag>
> </div>
<el-tag <el-tag style="margin-left: 30px" size="small" type="success" v-if="item.IsOffline === 1">线下订单</el-tag>
v-if="item.OrderSource == 3" <div class="app-order-user" v-if="
size="small"
type="info"
>{{ item.OrderSourceName }}</el-tag
>
<el-tag
v-if="item.OrderSource == 4"
size="small"
type="warning"
>{{ 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
>
</div>
<el-tag
style="margin-left: 30px"
size="small"
type="success"
v-if="item.IsOffline === 1"
>线下订单</el-tag
>
<div
class="app-order-user"
v-if="
item.SmallShopsName != '' && item.SmallShopsName != '' &&
item.SmallShopsName != null && item.SmallShopsName != null &&
item.SmallShopsId != 0 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">
<img <img v-if="item.OrderSource == 1" src="../../assets/img/userman/wx.png" alt="" />
v-if="item.OrderSource == 1" <img v-if="item.OrderSource == 2" style="width:25px;height:25px;"
src="../../assets/img/userman/wx.png" src="../../assets/img/userman/alipay.png" alt="" />
alt=""
/>
<img
v-if="item.OrderSource == 2"
style="width:25px;height:25px;"
src="../../assets/img/userman/alipay.png"
alt=""
/>
<span>{{ item.UserName }}({{ item.UserId }})</span> <span>{{ item.UserName }}({{ item.UserId }})</span>
</div> </div>
<div <div v-if="item.BuyerMessage && item.BuyerMessage != ''" flex="cross:center" class="remark-box">
v-if="item.BuyerMessage && item.BuyerMessage != ''" <el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
flex="cross:center"
class="remark-box"
>
<el-tooltip
class="item"
effect="dark"
:content="item.BuyerMessage"
placement="top"
>
<img src="../../assets/img/userman/remark.png" alt="" /> <img src="../../assets/img/userman/remark.png" alt="" />
</el-tooltip> </el-tooltip>
</div> </div>
<div flex="dir:left wrap:wrap" class="app-order-offline"> <div flex="dir:left wrap:wrap" class="app-order-offline">
<div <div v-if="
v-if="
item.DeliveryMethodName && item.DeliveryMethodName != '' item.DeliveryMethodName && item.DeliveryMethodName != ''
" " class="express-send-box">
class="express-send-box"
>
<span class="el-tag el-tag--small el-tag--light">{{ <span class="el-tag el-tag--small el-tag--light">{{
item.DeliveryMethodName item.DeliveryMethodName
}}</span> }}</span>
</div> </div>
<el-tag <el-tag v-if="item.PaymentTime == ''" style="margin-left: 5px" size="small" type="warning">未付款
v-if="item.PaymentTime == ''" </el-tag>
style="margin-left: 5px" <el-tag v-if="
size="small"
type="warning"
>未付款</el-tag
>
<el-tag
v-if="
item.PaymentTime != '' && item.PaymentTime != '' &&
item.DeliveryTime == '' && item.DeliveryTime == '' &&
item.ReceivingTime == '' && item.ReceivingTime == '' &&
item.FinishTime == '' item.FinishTime == ''
" " style="margin-left: 5px" size="small" type="warning">已付款</el-tag>
style="margin-left: 5px" <el-tag v-if="item.DeliveryTime == '' && item.ReceivingTime == ''" style="margin-left: 5px"
size="small" size="small" type="success">未发货</el-tag>
type="warning" <el-tag v-if="item.DeliveryTime != '' && item.ReceivingTime == ''" style="margin-left: 5px"
>已付款</el-tag size="small" type="success">已发货</el-tag>
> <el-tag v-if="item.DeliveryTime != '' && item.ReceivingTime == ''" style="margin-left: 5px"
<el-tag size="small" type="success">未收货</el-tag>
v-if="item.DeliveryTime == '' && item.ReceivingTime == ''" <el-tag v-if="item.ReceivingTime != '' && item.FinishTime == ''" style="margin-left: 5px" size="small"
style="margin-left: 5px" type="success">已收货</el-tag>
size="small" <el-tag v-if="item.FinishTime != ''" style="margin-left: 5px" size="small" type="success">已完成</el-tag>
type="success" <el-tag v-if="item.OrderStatus == 7" style="margin-left: 5px" size="small" type="danger">已取消</el-tag>
>未发货</el-tag </div>
> <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<el-tag <img v-if="item.OrderStatus == 1 || item.OrderStatus == 2" @click="OrderExit2(item)"
v-if="item.DeliveryTime != '' && item.ReceivingTime == ''" style="right: 60px" class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="" />
style="margin-left: 5px"
size="small"
type="success"
>已发货</el-tag
>
<el-tag
v-if="item.DeliveryTime != '' && item.ReceivingTime == ''"
style="margin-left: 5px"
size="small"
type="success"
>未收货</el-tag
>
<el-tag
v-if="item.ReceivingTime != '' && item.FinishTime == ''"
style="margin-left: 5px"
size="small"
type="success"
>已收货</el-tag
>
<el-tag
v-if="item.FinishTime != ''"
style="margin-left: 5px"
size="small"
type="success"
>已完成</el-tag
>
<el-tag
v-if="item.OrderStatus == 7"
style="margin-left: 5px"
size="small"
type="danger"
>已取消</el-tag
>
</div>
<el-tooltip
class="item"
effect="dark"
content="强制取消"
placement="top-start"
>
<img
v-if="item.OrderStatus == 1 || item.OrderStatus == 2"
@click="OrderExit2(item)"
style="right: 60px"
class="app-order-btnimg"
src="../../assets/img/userman/force.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
class="item" <img v-if="msg.Recycled != 1" @click="fRhsz(item, 4)" class="app-order-btnimg"
effect="dark" src="../../assets/img/userman/del1.png" alt="" />
content="加入回收站"
placement="top-start"
>
<img
v-if="msg.Recycled != 1"
@click="fRhsz(item, 4)"
class="app-order-btnimg"
src="../../assets/img/userman/del1.png"
alt=""
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="app-order-body"> <div class="app-order-body">
<div class="goods-item" style="width: 65%"> <div class="goods-item" style="width: 65%">
<div <div v-for="(list, index2) in item.DetailList" :key="index2" class="goods">
v-for="(list, index2) in item.DetailList"
:key="index2"
class="goods"
>
<div> <div>
<el-image <el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]">
:src="list.CoverImagePath" </el-image>
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 <div class="vue-line-clamp" style="
class="vue-line-clamp"
style="
word-break: break-all; word-break: break-all;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
" ">
> <span class="
<span
class="
el-tag el-tag
el-tag--warning el-tag--warning
el-tag--mini el-tag--mini
el-tag--light el-tag--light
is-hit is-hit
" " style="margin-right: 5px">
style="margin-right: 5px"
>
{{ list.OrderTypeName }} {{ list.OrderTypeName }}
</span> </span>
{{ list.GoodsName }} {{ list.GoodsName }}
...@@ -474,10 +220,7 @@ ...@@ -474,10 +220,7 @@
<div style="margin-bottom: 5px"> <div style="margin-bottom: 5px">
<span style="margin-right: 10px"> <span style="margin-right: 10px">
规格： 规格：
<el-tag <el-tag :key="index2" v-for="(msg, index2) in list.SpecificationList" style="
:key="index2"
v-for="(msg, index2) in list.SpecificationList"
style="
top: 5px; top: 5px;
position: relative; position: relative;
margin-right: 5px; margin-right: 5px;
...@@ -485,314 +228,169 @@ ...@@ -485,314 +228,169 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
" " size="mini">
size="mini"
>
{{ msg }} {{ msg }}
</el-tag> </el-tag>
</span> </span>
</div> </div>
<div <div style="
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
" " v-if="
v-if="
list.SmallShopsCostPrice != null && list.SmallShopsCostPrice != null &&
list.SmallShopsCostPrice != '' && list.SmallShopsCostPrice != '' &&
list.SmallShopsCostPrice > 0 && list.SmallShopsCostPrice > 0 &&
item.SmallShopsId != 0 item.SmallShopsId != 0
" ">
> <span>赞羊小计：￥{{ list.SmallShopsCostPrice }}</span>
<span </div>
>赞羊小计：￥{{ list.SmallShopsCostPrice }}</span <div style="
>
</div>
<div
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
" ">
> <span>货号：{{
<span
>货号：{{
list.ProductCode != null && list.ProductCode != "" list.ProductCode != null && list.ProductCode != ""
? list.ProductCode ? list.ProductCode
: "无" : "无"
}}</span }}</span>
> <span style="margin-left: 20px"
<span v-if="list.FreeShippingRemarks != null">{{ list.FreeShippingRemarks }}</span>
style="margin-left: 20px"
v-if="list.FreeShippingRemarks != null"
>{{ list.FreeShippingRemarks }}</span
>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 350px"> <div flex="dir:left box:mean" style="width: 350px">
<div <div flex="cross:center main:center" style="
flex="cross:center main:center"
style="
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
width: 55%; width: 55%;
" ">
> <span style="cursor: pointer">小计：￥{{ list.Final_Price }}
<span style="cursor: pointer" <img v-if="item.PaymentTime == ''" @click="EditPrice(item, 1, list)"
>小计：￥{{ list.Final_Price }} src="../../assets/img/userman/edit1.png" alt="" />
<img
v-if="item.PaymentTime == ''"
@click="EditPrice(item, 1, list)"
src="../../assets/img/userman/edit1.png"
alt=""
/>
</span> </span>
<span style="cursor: pointer" <span style="cursor: pointer">商品成本：￥{{ list.CostMoney }}
>商品成本：￥{{ list.CostMoney }} <img @click="costBtn(list, 1)" src="../../assets/img/userman/edit1.png" alt="" />
<img
@click="costBtn(list, 1)"
src="../../assets/img/userman/edit1.png"
alt=""
/>
</span> </span>
<span style="cursor: pointer" <span style="cursor: pointer">运费成本：￥{{ list.FreightCostMoney }}
>运费成本：￥{{ list.FreightCostMoney }} <img v-if="item.OrderStatus !== 7" @click="costBtn(list, 2)"
<img src="../../assets/img/userman/edit1.png" alt="" />
v-if="item.OrderStatus !== 7"
@click="costBtn(list, 2)"
src="../../assets/img/userman/edit1.png"
alt=""
/>
</span> </span>
<span style="cursor: pointer" <span style="cursor: pointer">供应商：{{
>供应商：{{
list.SupplierName != null ? list.SupplierName : "" list.SupplierName != null ? list.SupplierName : ""
}} }}
<img <img v-if="item.OrderStatus !== 7" @click="UpdateSuplier(list)"
v-if="item.OrderStatus !== 7" src="../../assets/img/userman/edit1.png" alt="" />
@click="UpdateSuplier(list)"
src="../../assets/img/userman/edit1.png"
alt=""
/>
</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 flex="cross:center main:center" style="display: flex; flex-direction: column">
flex="cross:center main:center"
style="display: flex; flex-direction: column"
>
<div>数量：x {{ list.Number }}</div> <div>数量：x {{ list.Number }}</div>
<el-tag <el-tag v-if="
v-if="
list.IsApplyForAfterSale && list.IsApplyForAfterSale &&
list.IsApplyForAfterSale == 1 list.IsApplyForAfterSale == 1
" " size="small" type="danger">已退货退款</el-tag>
size="small"
type="danger"
>已退货退款</el-tag
>
</div> </div>
</div> </div>
<div <div style="
style="
width: 200px; width: 200px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
" " v-if="TenantId == 1">
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">
<el-dropdown-item <el-dropdown-item @click.native="goCollection(item, list)">
@click.native="goCollection(item, list)"
>
收入制单 收入制单
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item @click.native="goPayment(item, list)">
@click.native="goPayment(item, list)"
>
付款制单 付款制单
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div <div style="margin-top: 10px; font-size: 12px" v-if="
style="margin-top: 10px; font-size: 12px"
v-if="
list.YSMoney != 0 || list.YSMoney != 0 ||
list.RealMoney != 0 || list.RealMoney != 0 ||
list.YFMoney != 0 || list.YFMoney != 0 ||
list.PayMoney != 0 list.PayMoney != 0
" ">
>
其他费用： 其他费用：
</div> </div>
<div <div style="font-size: 12px" v-if="list.YSMoney != 0 || list.RealMoney != 0">
style="font-size: 12px"
v-if="list.YSMoney != 0 || list.RealMoney != 0"
>
<span>应收：￥{{ list.YSMoney }}</span> <span>应收：￥{{ list.YSMoney }}</span>
<span style="margin-left: 10px" <span style="margin-left: 10px">实收：￥{{ list.RealMoney }}</span>
>实收：￥{{ list.RealMoney }}</span </div>
> <div style="font-size: 12px" v-if="list.YFMoney != 0 || list.PayMoney != 0">
</div>
<div
style="font-size: 12px"
v-if="list.YFMoney != 0 || list.PayMoney != 0"
>
<span>应付：￥{{ list.YFMoney }}</span> <span>应付：￥{{ list.YFMoney }}</span>
<span style="margin-left: 10px" <span style="margin-left: 10px">实付：￥{{ list.PayMoney }}</span>
>实付：￥{{ list.PayMoney }}</span
>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div <div class="billStyle" v-if="
class="billStyle"
v-if="
(list.SFinanceList.length > 0 || (list.SFinanceList.length > 0 ||
list.ZFinanceList.length > 0) && list.ZFinanceList.length > 0) &&
(TenantId == 1||TenantId == 15) (TenantId == 1||TenantId == 15)
" ">
> <div class="billStyle_item" style="border-right: 1px solid #ebeef5">
<div
class="billStyle_item"
style="border-right: 1px solid #ebeef5"
>
收入单据: 收入单据:
<span <span v-for="(item, index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
v-for="(item, index2) in list.SFinanceList" <span class="billtext" v-if="item.Status == 0"
:key="index2" :style="{ color: '#00FFFF' }">{{ item.FrID }}</span>
@click="goSF(item)" <span class="billtext" v-if="item.Status == 1 && item.Is_Cashier != 1"
> :style="{ color: '#0080FF' }">{{ item.FrID }}</span>
<span <span class="billtext" v-if="item.Status == 1 && item.Is_Cashier == 1"
class="billtext" :style="{ color: '#FF4048' }">{{ item.FrID }}</span>
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">{{ <span class="billtext" v-if="item.Status == 2">{{
item.FrID item.FrID
}}</span> }}</span>
<span <span class="billtext" v-if="item.Status == 3"
class="billtext" :style="{ color: '#FFF100' }">{{ item.FrID }}</span>
v-if="item.Status == 3" <span class="billtext" v-if="item.Status == 4"
:style="{ color: '#FFF100' }" :style="{ color: '#800080' }">{{ item.FrID }}</span>
>{{ item.FrID }}</span <span class="billtext" v-if="item.Status == 5"
> :style="{ color: '#E6A23C' }">{{ item.FrID }}</span>
<span
class="billtext"
v-if="item.Status == 4"
:style="{ color: '#800080' }"
>{{ item.FrID }}</span
>
<span
class="billtext"
v-if="item.Status == 5"
:style="{ color: '#E6A23C' }"
>{{ item.FrID }}</span
>
</span> </span>
</div> </div>
<div class="billStyle_item"> <div class="billStyle_item">
支出单据: 支出单据:
<span <span v-for="(item, index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">
v-for="(item, index2) in list.ZFinanceList" <span class="billtext" v-if="item.Status == 0"
:key="index2" :style="{ color: '#00FFFF' }">{{ item.FrID }}</span>
@click="goZF(item)" <span class="billtext" v-if="item.Status == 1 && item.Is_Cashier != 1"
> :style="{ color: '#0080FF' }">{{ item.FrID }}</span>
<span <span class="billtext" v-if="item.Status == 1 && item.Is_Cashier == 1"
class="billtext" :style="{ color: '#FF4048' }">{{ item.FrID }}</span>
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">{{ <span class="billtext" v-if="item.Status == 2">{{
item.FrID item.FrID
}}</span> }}</span>
<span <span class="billtext" v-if="item.Status == 3"
class="billtext" :style="{ color: '#FFF100' }">{{ item.FrID }}</span>
v-if="item.Status == 3" <span class="billtext" v-if="item.Status == 4"
:style="{ color: '#FFF100' }" :style="{ color: '#800080' }">{{ item.FrID }}</span>
>{{ item.FrID }}</span <span class="billtext" v-if="item.Status == 5"
> :style="{ color: '#E6A23C' }">{{ item.FrID }}</span>
<span
class="billtext"
v-if="item.Status == 4"
:style="{ color: '#800080' }"
>{{ item.FrID }}</span
>
<span
class="billtext"
v-if="item.Status == 5"
:style="{ color: '#E6A23C' }"
>{{ item.FrID }}</span
>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div <div flex="cross:center" class="app-order-info" style="width: 15%">
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 <el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 ' + item.Income + '元'">
placement="bottom" <img slot="reference" src="../../assets/img/userman/price.png" alt="" />
width="200"
trigger="hover"
:content="'商品小计 ' + item.Income + '元'"
>
<img
slot="reference"
src="../../assets/img/userman/price.png"
alt=""
/>
</el-popover> </el-popover>
</div> </div>
<div class="express-price"> <div class="express-price">
<span> <span>
<span style="color: rgb(144, 147, 153)" <span style="color: rgb(144, 147, 153)">(含运费￥{{ item.FreightMoney }})
>(含运费￥{{ item.FreightMoney }}) <img v-if="item.PaymentTime == ''" @click="EditPrice(item, 2)"
<img src="../../assets/img/userman/edit1.png" alt="" />
v-if="item.PaymentTime == ''"
@click="EditPrice(item, 2)"
src="../../assets/img/userman/edit1.png"
alt=""
/>
</span> </span>
</span> </span>
</div> </div>
...@@ -801,66 +399,45 @@ ...@@ -801,66 +399,45 @@
item.PaymentWayName item.PaymentWayName
}}</el-tag> }}</el-tag>
</div> </div>
<div <div style="font-size: 12px; margin-top: 3px" v-if="
style="font-size: 12px; margin-top: 3px"
v-if="
item.CouponMoney && item.CouponMoney &&
item.CouponMoney != '' && item.CouponMoney != '' &&
item.CouponMoney > 0 item.CouponMoney > 0
" ">
>
<span>优惠金额:￥{{ item.CouponMoney }}</span> <span>优惠金额:￥{{ item.CouponMoney }}</span>
</div> </div>
<div <div style="font-size: 12px; margin-top: 3px" v-if="
style="font-size: 12px; margin-top: 3px"
v-if="
item.DepositMoney && item.DepositMoney &&
item.DepositMoney != '' && item.DepositMoney != '' &&
item.DepositMoney > 0 item.DepositMoney > 0
" ">
>
<span>储蓄卡抵扣:￥{{ item.DepositMoney }}</span> <span>储蓄卡抵扣:￥{{ item.DepositMoney }}</span>
</div> </div>
<div <div style="font-size: 12px; margin-top: 3px" v-if="
style="font-size: 12px; margin-top: 3px"
v-if="
item.IntegralMoney && item.IntegralMoney &&
item.IntegralMoney != '' && item.IntegralMoney != '' &&
item.IntegralMoney > 0 item.IntegralMoney > 0
" ">
>
<span>积分抵用金额:￥{{ item.IntegralMoney }}</span> <span>积分抵用金额:￥{{ item.IntegralMoney }}</span>
</div> </div>
<div <div style="font-size: 12px; margin-top: 3px" v-if="
style="font-size: 12px; margin-top: 3px"
v-if="
item.DeductionCommission && item.DeductionCommission > 0 item.DeductionCommission && item.DeductionCommission > 0
" ">
>
<span>佣金抵用:￥{{ item.DeductionCommission }}</span> <span>佣金抵用:￥{{ item.DeductionCommission }}</span>
</div> </div>
<div <div style="font-size: 12px" v-if="
style="font-size: 12px"
v-if="
item.IntegralNumber && item.IntegralNumber &&
item.IntegralNumber != '' && item.IntegralNumber != '' &&
item.IntegralNumber > 0 item.IntegralNumber > 0
" ">
>
<span>积分数:￥{{ item.IntegralNumber }}</span> <span>积分数:￥{{ item.IntegralNumber }}</span>
</div> </div>
<div <div style="font-size: 12px" v-if="
style="font-size: 12px"
v-if="
item.MemberDiscountCouponList && item.MemberDiscountCouponList &&
item.MemberDiscountCouponList.length > 0 item.MemberDiscountCouponList.length > 0
" ">
>
<span>优惠券信息:</span> <span>优惠券信息:</span>
<span <span v-for="(MItem, Mindex) in item.MemberDiscountCouponList" :key="Mindex">
v-for="(MItem, Mindex) in item.MemberDiscountCouponList"
:key="Mindex"
>
{{ MItem.Name }}券,{{ {{ MItem.Name }}券,{{
MItem.CouponType == 1 MItem.CouponType == 1
? "满" + ? "满" +
...@@ -879,206 +456,71 @@ ...@@ -879,206 +456,71 @@
</div> </div>
</div> </div>
<div <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%">
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">
<!-- 未发货 --> <!-- 未发货 -->
<el-tooltip <el-tooltip class="item" effect="dark" content="发货" placement="top" v-if="item.OrderStatus == 2">
class="item" <img v-if="item.OrderStatus == 2" @click="fhBtn(item)" class="app-order-icon"
effect="dark" src="../../assets/img/userman/send.png" alt="" />
content="发货"
placement="top"
v-if="item.OrderStatus == 2"
>
<img
v-if="item.OrderStatus == 2"
@click="fhBtn(item)"
class="app-order-icon"
src="../../assets/img/userman/send.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<!-- 待收货 --> <!-- 待收货 -->
<el-tooltip <el-tooltip class="item" effect="dark" content="确认收货" placement="top" v-if="item.OrderStatus == 3">
class="item" <img @click="ConfirmSh(item)" v-if="item.OrderStatus == 3" class="app-order-icon"
effect="dark" src="../../assets/img/userman/confirm.png" alt="" />
content="确认收货"
placement="top"
v-if="item.OrderStatus == 3"
>
<img
@click="ConfirmSh(item)"
v-if="item.OrderStatus == 3"
class="app-order-icon"
src="../../assets/img/userman/confirm.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<!-- 已收货 --> <!-- 已收货 -->
<el-tooltip <el-tooltip class="item" effect="dark" content="确认完成" placement="top" v-if="item.OrderStatus == 4">
class="item" <img @click="qrEnd(item, 6)" v-if="item.OrderStatus == 4" class="app-order-icon"
effect="dark" src="../../assets/img/userman/sale.png" alt="" />
content="确认完成"
placement="top"
v-if="item.OrderStatus == 4"
>
<img
@click="qrEnd(item, 6)"
v-if="item.OrderStatus == 4"
class="app-order-icon"
src="../../assets/img/userman/sale.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<!--待处理--> <!--待处理-->
<el-tooltip <el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus == 6">
class="item" <img @click="pending(item, 1)" v-if="item.OrderStatus == 6" class="app-order-icon"
effect="dark" src="../../assets/img/userman/pass.png" alt="" />
content="同意"
placement="top"
v-if="item.OrderStatus == 6"
>
<img
@click="pending(item, 1)"
v-if="item.OrderStatus == 6"
class="app-order-icon"
src="../../assets/img/userman/pass.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus == 6">
class="item" <img @click="pending(item, 2)" v-if="item.OrderStatus == 6" class="app-order-icon"
effect="dark" src="../../assets/img/userman/nopass.png" alt="" />
content="拒绝"
placement="top"
v-if="item.OrderStatus == 6"
>
<img
@click="pending(item, 2)"
v-if="item.OrderStatus == 6"
class="app-order-icon"
src="../../assets/img/userman/nopass.png"
alt=""
/>
</el-tooltip> </el-tooltip>
</template> </template>
<!-- 回收站 --> <!-- 回收站 -->
<el-tooltip <el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
class="item" <img @click="fRhsz(item, 7)" v-if="msg.Recycled == 1" class="app-order-icon"
effect="dark" src="../../assets/img/userman/renew.png" alt="" />
content="恢复订单"
placement="top"
>
<img
@click="fRhsz(item, 7)"
v-if="msg.Recycled == 1"
class="app-order-icon"
src="../../assets/img/userman/renew.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="删除订单" placement="top">
class="item" <img @click="DeleteOrder(item)" v-if="msg.Recycled == 1" class="app-order-icon"
effect="dark" src="../../assets/img/userman/del.png" alt="" />
content="删除订单"
placement="top"
>
<img
@click="DeleteOrder(item)"
v-if="msg.Recycled == 1"
class="app-order-icon"
src="../../assets/img/userman/del.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<template v-if="msg.Recycled == 2"> <template v-if="msg.Recycled == 2">
<el-tooltip <el-tooltip class="item" effect="dark" content="打印小票" placement="top">
class="item" <img class="app-order-icon" src="../../assets/img/userman/print.png" alt="" />
effect="dark"
content="打印小票"
placement="top"
>
<img
class="app-order-icon"
src="../../assets/img/userman/print.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
class="item" <img class="app-order-icon" src="../../assets/img/userman/invoice.png" alt="" />
effect="dark"
content="打印发货单"
placement="top"
>
<img
class="app-order-icon"
src="../../assets/img/userman/invoice.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="添加备注" placement="top">
class="item" <img @click="OrderExit(item, 1)" class="app-order-icon"
effect="dark" src="../../assets/img/userman/add_remark.png" alt="" />
content="添加备注"
placement="top"
>
<img
@click="OrderExit(item, 1)"
class="app-order-icon"
src="../../assets/img/userman/add_remark.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="修改快递单号" v-if="item.OrderStatus == 3"
class="item" placement="top">
effect="dark" <img @click="getOrderSend(item)" v-if="item.OrderStatus == 3" class="app-order-icon"
content="修改快递单号" src="../../assets/img/userman/change.png" alt="" />
v-if="item.OrderStatus == 3"
placement="top"
>
<img
@click="getOrderSend(item)"
v-if="item.OrderStatus == 3"
class="app-order-icon"
src="../../assets/img/userman/change.png"
alt=""
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="线下付款"
class="item" v-if="item.OrderStatus == 1 || item.OrderStatus == 7" placement="top">
effect="dark" <img @click="Offpayment(item)" v-if="item.OrderStatus == 1 || item.OrderStatus == 7"
content="线下付款" class="app-order-icon" src="../../assets/img/userman/OfflinePayment.png" alt="" />
v-if="item.OrderStatus == 1 || item.OrderStatus == 7"
placement="top"
>
<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 <el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
class="item" <img @click="
effect="dark"
content="查看订单详情"
placement="top"
>
<img
@click="
CommonJump('orderDetails', { OrderId: item.OrderId }) CommonJump('orderDetails', { OrderId: item.OrderId })
" " class="app-order-icon" src="../../assets/img/userman/detail.png" alt="" />
class="app-order-icon"
src="../../assets/img/userman/detail.png"
alt=""
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -1092,43 +534,36 @@ ...@@ -1092,43 +534,36 @@
}} }}
地址：{{ item.DistrictAddress }} {{ item.ShoppingAddress }} 地址：{{ item.DistrictAddress }} {{ item.ShoppingAddress }}
</div> </div>
<button <button v-if="item.OrderStatus == 2" @click="ExitshAdress(item)" type="button"
v-if="item.OrderStatus == 2" class="el-button el-button--text is-circle">
@click="ExitshAdress(item)"
type="button"
class="el-button el-button--text is-circle"
>
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
</button> </button>
</div> </div>
</div> </div>
<div <template v-if="item.TenantId==29 && item.CustomFormInfo &&item.CustomFormInfo.length>0">
v-if="item.Remark && item.Remark != ''" <div>
class="seller-remark" <div flex="dir:left">
> <div class="address-box">
<template v-for="(subItem) in item.CustomFormInfo">
{{subItem.CompData.Name}}:{{subItem.CompData.TextValue}} &nbsp;&nbsp;
</template>
</div>
</div>
</div>
</template>
<div v-if="item.Remark && item.Remark != ''" class="seller-remark">
商家备注：{{ item.Remark }} 商家备注：{{ item.Remark }}
</div> </div>
</div> </div>
</el-card> </el-card>
<el-card <el-card v-if="tableData.length == 0" class="app-order-item" shadow="never">
v-if="tableData.length == 0"
class="app-order-item"
shadow="never"
>
<div style="height: 100px; line-height: 100px; text-align: center"> <div style="height: 100px; line-height: 100px; text-align: center">
暂无订单信息 暂无订单信息
</div> </div>
</el-card> </el-card>
</div> </div>
<el-pagination <el-pagination style="text-align: right" background @current-change="handleCurrentChange"
style="text-align: right" :current-page.sync="msg.pageIndex" :page-size="msg.pageSize" layout="prev, pager, next" :total="total">
background
@current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex"
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total"
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -1141,89 +576,47 @@ ...@@ -1141,89 +576,47 @@
<el-form-item label-width="80px" label="商品总价"> <el-form-item label-width="80px" label="商品总价">
<el-input size="small" v-model="exitMsg.Income"></el-input> <el-input size="small" v-model="exitMsg.Income"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="exitMsg.moneyType == 2" label-width="80px" label="运费">
v-if="exitMsg.moneyType == 2"
label-width="80px"
label="运费"
>
<el-input size="small" v-model="exitMsg.Remark"></el-input> <el-input size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item v-if="exitMsg.Type != 2"> <el-form-item v-if="exitMsg.Type != 2">
<el-input <el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></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>
<el-button size="small" type="primary" @click="submitForm('exitMsg')" <el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!--待处理--> <!--待处理-->
<el-dialog <el-dialog custom-class="app-send" :title="pendMgs.Type == 1 ? '同意' : '拒绝'" :visible.sync="pendD" width="15%"
custom-class="app-send" class="tyi">
:title="pendMgs.Type == 1 ? '同意' : '拒绝'" <el-input v-if="pendMgs.Type == 2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由">
:visible.sync="pendD" </el-input>
width="15%"
class="tyi"
>
<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 size="small" type="primary" @click="pendingForm()">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!-- 发货 --> <!-- 发货 -->
<el-dialog <el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
custom-class="app-send"
title="发货"
:visible.sync="fhDig"
width="35%"
>
<div class="title-box"> <div class="title-box">
<span class="text">选择发货商品</span> <span class="text">选择发货商品</span>
<span>(默认全选)</span> <span>(默认全选)</span>
</div> </div>
<el-table <el-table ref="fahuoTable" :data="fahuoList" @selection-change="TableSelectChange" style="width: 100%">
ref="fahuoTable"
:data="fahuoList"
@selection-change="TableSelectChange"
style="width: 100%"
>
<el-table-column :selectable="selectable" type="selection" width="55"> <el-table-column :selectable="selectable" type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column prop="id" label="图片" width="60"> <el-table-column prop="id" label="图片" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<img <img style="width: 30px; height: 30px" :src="getIconLink(scope.row.CoverImagePath)" alt="" />
style="width: 30px; height: 30px"
:src="getIconLink(scope.row.CoverImagePath)"
alt=""
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="GoodsName" label="名称" width="314"> <el-table-column prop="GoodsName" label="名称" width="314">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag v-if="scope.row.IsBindExpress == 1" style="margin-left: 5px" size="small" type="success">已发货
v-if="scope.row.IsBindExpress == 1" </el-tag>
style="margin-left: 5px"
size="small"
type="success"
>已发货</el-tag
>
<span>{{ scope.row.GoodsName }}</span> <span>{{ scope.row.GoodsName }}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1231,14 +624,10 @@ ...@@ -1231,14 +624,10 @@
</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 <span :key="index2" v-for="(msg, index2) in scope.row.SpecificationList">{{ msg
:key="index2"
v-for="(msg, index2) in scope.row.SpecificationList"
>{{ msg
}}{{ }}{{
scope.row.SpecificationList.length == index2 + 1 ? "" : "," scope.row.SpecificationList.length == index2 + 1 ? "" : ","
}}</span }}</span>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -1250,29 +639,13 @@ ...@@ -1250,29 +639,13 @@
</el-form-item> </el-form-item>
<template v-if="fhMsg.Type == 1"> <template v-if="fhMsg.Type == 1">
<el-form-item label="快递公司" prop="ExpressId"> <el-form-item label="快递公司" prop="ExpressId">
<el-select <el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable placeholder="请选择">
class="w200" <el-option v-for="item in ExpressList" :key="item.ID" :label="item.Name" :value="item.ID">
size="small"
v-model="fhMsg.ExpressId"
filterable
placeholder="请选择"
>
<el-option
v-for="item in ExpressList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="收件人邮编"> <el-form-item label="收件人邮编">
<el-input <el-input type="number" min="1" size="small" v-model="fhMsg.PostCode"></el-input>
type="number"
min="1"
size="small"
v-model="fhMsg.PostCode"
></el-input>
</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">
...@@ -1280,30 +653,18 @@ ...@@ -1280,30 +653,18 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商家留言"> <el-form-item label="商家留言">
<el-input <el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
type="textarea"
row="2"
size="small"
v-model="fhMsg.Remark"
></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-if="fhMsg.Type == 2"> <template v-if="fhMsg.Type == 2">
<el-form-item label="物流内容"> <el-form-item label="物流内容">
<el-input <el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></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>
<el-button size="small" type="primary" @click="FhsubmitForm('fhMsg')" <el-button size="small" type="primary" @click="FhsubmitForm('fhMsg')">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!-- 修改收货地址 --> <!-- 修改收货地址 -->
...@@ -1313,58 +674,21 @@ ...@@ -1313,58 +674,21 @@
<el-input size="small" v-model="shMsg.Consignee"></el-input> <el-input size="small" v-model="shMsg.Consignee"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="电话" prop="Mobile"> <el-form-item label="电话" prop="Mobile">
<el-input <el-input type="number" size="small" v-model="shMsg.Mobile"></el-input>
type="number"
size="small"
v-model="shMsg.Mobile"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所在区域" prop="Province"> <el-form-item label="所在区域" prop="Province">
<el-select <el-select size="small" @change="(shMsg.City = ''), getCity(shMsg.Province)" v-model="shMsg.Province"
size="small" style="width: 144px" filterable placeholder="请选择">
@change="(shMsg.City = ''), getCity(shMsg.Province)" <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID">
v-model="shMsg.Province"
style="width: 144px"
filterable
placeholder="请选择"
>
<el-option
v-for="item in provinceList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select size="small" @change="(shMsg.District = ''), getArea(shMsg.City)" v-model="shMsg.City"
size="small" style="width: 144px" filterable placeholder="请选择">
@change="(shMsg.District = ''), getArea(shMsg.City)" <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID">
v-model="shMsg.City"
style="width: 144px"
filterable
placeholder="请选择"
>
<el-option
v-for="item in cityList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select size="small" v-model="shMsg.District" style="width: 144px" filterable placeholder="请选择">
size="small" <el-option v-for="item in areaList" :key="item.ID" :label="item.Name" :value="item.ID">
v-model="shMsg.District"
style="width: 144px"
filterable
placeholder="请选择"
>
<el-option
v-for="item in areaList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1374,50 +698,29 @@ ...@@ -1374,50 +698,29 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="shDig = false">取 消</el-button> <el-button size="small" @click="shDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="shsubmitForm('shMsg')" <el-button size="small" type="primary" @click="shsubmitForm('shMsg')">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!-- 选择导出信息 --> <!-- 选择导出信息 -->
<el-dialog title="选择导出信息" :visible.sync="dialogVisible" width="960px"> <el-dialog title="选择导出信息" :visible.sync="dialogVisible" width="960px">
<el-form <el-form style="border: 1px solid #f0f2f7" :model="addMsg" ref="addMsg" label-width="100px">
style="border: 1px solid #f0f2f7" <div style="
:model="addMsg"
ref="addMsg"
label-width="100px"
>
<div
style="
box-sizing: border-box; box-sizing: border-box;
background-color: #f3f5f6; background-color: #f3f5f6;
width: 100%; width: 100%;
padding-left: 20px; padding-left: 20px;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
" ">
> <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选
</el-checkbox> </el-checkbox>
</div> </div>
<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 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
v-model="checkedCities" <el-checkbox style="margin-bottom: 10px; width: 135px" v-for="city in cities" :label="city.Id"
@change="handleCheckedCitiesChange" :key="city.Name">
> {{ city.Name }}</el-checkbox>
<el-checkbox
style="margin-bottom: 10px; width: 135px"
v-for="city in cities"
:label="city.Id"
:key="city.Name"
>
{{ city.Name }}</el-checkbox
>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</el-form> </el-form>
...@@ -1426,17 +729,10 @@ ...@@ -1426,17 +729,10 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 多个物流信息 --> <!-- 多个物流信息 -->
<el-dialog <el-dialog custom-class="sendDigClass" title="提示" :visible.sync="moresendDig" width="420px">
custom-class="sendDigClass"
title="提示"
:visible.sync="moresendDig"
width="420px"
>
<p style="padding: 10px 15px">{{ moresendtips }}</p> <p style="padding: 10px 15px">{{ moresendtips }}</p>
<div style="text-align: right; margin-top: 20px"> <div style="text-align: right; margin-top: 20px">
<el-button size="small" type="primary" @click="moresendDig = fasle" <el-button size="small" type="primary" @click="moresendDig = fasle">确定</el-button>
>确定</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<!-- 放入回收站 --> <!-- 放入回收站 -->
...@@ -1463,69 +759,47 @@ ...@@ -1463,69 +759,47 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="priceDig = false">取 消</el-button> <el-button size="small" @click="priceDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="priceForm('priceMsg')" <el-button size="small" type="primary" @click="priceForm('priceMsg')">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!-- 商品、运费成本的修改 --> <!-- 商品、运费成本的修改 -->
<el-dialog <el-dialog :title="cosType == 1 ? '商品成本修改' : '运费成本修改'" :visible.sync="costDig" width="600px">
: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 <el-input size="small" v-model="costMsg.Money" step="1" min="0"
size="small" onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''">
v-model="costMsg.Money" </el-input>
step="1" <div style="color: red;margin-top: 5px;"
min="0" v-if="cosType == 1&& currentUserInfo && currentUserInfo.TenantId == 1 && currentUserInfo.MallBaseId ==1">
onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''" *注：商品成本调高会触发重置订单商品返佣</div>
></el-input>
<div style="color: red;margin-top: 5px;" v-if="cosType == 1&& currentUserInfo && currentUserInfo.TenantId == 1 && currentUserInfo.MallBaseId ==1">*注：商品成本调高会触发重置订单商品返佣</div>
</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="costDig = false">取 消</el-button> <el-button size="small" @click="costDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm('costMsg')" <el-button size="small" type="primary" @click="costForm('costMsg')">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
<!-- 商品 供应商修改 --> <!-- 商品 供应商修改 -->
<el-dialog title="修改供应商" :visible.sync="upSupliDilog" width="400px"> <el-dialog title="修改供应商" :visible.sync="upSupliDilog" width="400px">
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="供应商"> <el-form-item label="供应商">
<el-select <el-select filterable v-model="SupplierId" size="small" placeholder="请选择">
filterable <el-option v-for="item in SuplierList" :key="item.ID" :label="item.Name" :value="item.ID">
v-model="SupplierId"
size="small"
placeholder="请选择"
>
<el-option
v-for="item in SuplierList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option> </el-option>
</el-select> </el-select>
</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="upSupliDilog = false">取 消</el-button> <el-button size="small" @click="upSupliDilog = false">取 消</el-button>
<el-button size="small" type="primary" @click="SaveSuplier" <el-button size="small" type="primary" @click="SaveSuplier">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "orderList", name: "orderList",
data() { data() {
return { return {
...@@ -1562,51 +836,39 @@ export default { ...@@ -1562,51 +836,39 @@ export default {
ShoppingAddress: "", ShoppingAddress: "",
}, },
shMsgrule: { shMsgrule: {
Province: [ Province: [{
{
required: true, required: true,
message: "请选择省", message: "请选择省",
trigger: "change", trigger: "change",
}, }, ],
], ShoppingAddress: [{
ShoppingAddress: [
{
required: true, required: true,
message: "请输入详细地址", message: "请输入详细地址",
trigger: "blur", trigger: "blur",
}, }, ],
], Mobile: [{
Mobile: [
{
required: true, required: true,
message: "请输入手机号", message: "请输入手机号",
trigger: "blur", trigger: "blur",
}, }, ],
], Consignee: [{
Consignee: [
{
required: true, required: true,
message: "请输入收件人", message: "请输入收件人",
trigger: "blur", trigger: "blur",
}, }, ],
],
}, },
fhrules: { fhrules: {
ExpressId: [ ExpressId: [{
{
required: true, required: true,
message: "请选择快递公司", message: "请选择快递公司",
trigger: "change", trigger: "change",
}, }, ],
], ExpressNumber: [{
ExpressNumber: [
{
required: true, required: true,
message: "请输入快递单号", message: "请输入快递单号",
trigger: "blur", trigger: "blur",
}, }, ],
],
}, },
fhMsg: { fhMsg: {
Id: 0, Id: 0,
...@@ -1663,8 +925,7 @@ export default { ...@@ -1663,8 +925,7 @@ export default {
}, },
IsSelectPayMoney: 0, IsSelectPayMoney: 0,
platList: [], platList: [],
option: [ option: [{
{
Id: 1, Id: 1,
name: "订单号", name: "订单号",
}, },
...@@ -1718,7 +979,7 @@ export default { ...@@ -1718,7 +979,7 @@ export default {
SupplierId: 0, //公用供应商id 给弹窗用 SupplierId: 0, //公用供应商id 给弹窗用
CommonId: 0, //公用id 给弹窗用 CommonId: 0, //公用id 给弹窗用
TenantId: 0, TenantId: 0,
currentUserInfo:{}, currentUserInfo: {},
}; };
}, },
created() { created() {
...@@ -1748,8 +1009,9 @@ export default { ...@@ -1748,8 +1009,9 @@ export default {
let path = file.data.Path; let path = file.data.Path;
this.btnLoad = true; this.btnLoad = true;
this.apipost( this.apipost(
"/api/order/SetGoodsOrderBatchImport", "/api/order/SetGoodsOrderBatchImport", {
{ FilePath: path }, FilePath: path
},
(res) => { (res) => {
this.btnLoad = false; this.btnLoad = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -2053,8 +1315,9 @@ export default { ...@@ -2053,8 +1315,9 @@ export default {
}) })
.then(() => { .then(() => {
this.apipost( this.apipost(
"/api/order/SetOrderOfflinePayment", "/api/order/SetOrderOfflinePayment", {
{ OrderId: item.OrderId }, OrderId: item.OrderId
},
(res) => { (res) => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
...@@ -2071,16 +1334,14 @@ export default { ...@@ -2071,16 +1334,14 @@ export default {
// 判断是否有多个物流 // 判断是否有多个物流
getOrderSend(item) { getOrderSend(item) {
this.apipost( this.apipost(
"/api/order/GetOrderSendGoodsExpressIdByOrderId", "/api/order/GetOrderSendGoodsExpressIdByOrderId", {
{
OrderId: item.OrderId, OrderId: item.OrderId,
}, },
(res) => { (res) => {
let Id = res.data.data; let Id = res.data.data;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.apipost( this.apipost(
"/api/order/GetOrderSendGoodsInfo", "/api/order/GetOrderSendGoodsInfo", {
{
OrderExpressId: Id, OrderExpressId: Id,
}, },
(res) => { (res) => {
...@@ -2296,8 +1557,9 @@ export default { ...@@ -2296,8 +1557,9 @@ export default {
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;
...@@ -2350,6 +1612,22 @@ export default { ...@@ -2350,6 +1612,22 @@ export default {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
let pageData = res.data.data.pageData; let pageData = res.data.data.pageData;
if (pageData && pageData.length > 0) {
pageData.forEach(item => {
item.CustomFormInfo = null;
var customerInfo = "";
if (item.DetailList && item.DetailList.length > 0) {
customerInfo = item.DetailList[0].CustomFormInfo;
}
if (customerInfo) {
try {
item.CustomFormInfo = JSON.parse(customerInfo);
} catch (err) {
}
}
})
}
this.tableData = pageData; this.tableData = pageData;
} }
}); });
...@@ -2381,8 +1659,7 @@ export default { ...@@ -2381,8 +1659,7 @@ export default {
}, },
getArea(val) { getArea(val) {
this.apipost( this.apipost(
"/api/Destination/GetChildList", "/api/Destination/GetChildList", {
{
Id: val, Id: val,
}, },
(res) => { (res) => {
...@@ -2392,8 +1669,7 @@ export default { ...@@ -2392,8 +1669,7 @@ export default {
}, },
getCity(val) { getCity(val) {
this.apipost( this.apipost(
"/api/Destination/GetChildList", "/api/Destination/GetChildList", {
{
Id: val, Id: val,
}, },
(res) => { (res) => {
...@@ -2406,8 +1682,7 @@ export default { ...@@ -2406,8 +1682,7 @@ export default {
}, },
getProvince() { getProvince() {
this.apipost( this.apipost(
"/api/Destination/GetChildList", "/api/Destination/GetChildList", {
{
Id: 1, Id: 1,
}, },
(res) => { (res) => {
...@@ -2521,7 +1796,10 @@ export default { ...@@ -2521,7 +1796,10 @@ export default {
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( window.open(
...@@ -2541,7 +1819,10 @@ export default { ...@@ -2541,7 +1819,10 @@ export default {
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( window.open(
...@@ -2570,119 +1851,124 @@ export default { ...@@ -2570,119 +1851,124 @@ export default {
); );
}, },
}, },
}; };
</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 {
.orderList .upload-demo {
float: right; 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;
} }
.hszDigClass .el-dialog__body { .hszDigClass .el-dialog__body {
padding: 0 10px 20px 0; padding: 0 10px 20px 0;
} }
.orderList .tyi .el-dialog__body {
.orderList .tyi .el-dialog__body {
padding: 0 20px; padding: 0 20px;
} }
.sendDigClass .el-dialog__body {
.sendDigClass .el-dialog__body {
padding: 0 10px 10px 0; padding: 0 10px 10px 0;
} }
.app-order-list .card-footer .seller-remark { .app-order-list .card-footer .seller-remark {
margin-top: 10px; margin-top: 10px;
color: #e6a23c; color: #e6a23c;
} }
.app-send .el-table__header-wrapper th { .app-send .el-table__header-wrapper th {
background-color: #f5f7fa; background-color: #f5f7fa;
} }
.app-send .title-box .text { .app-send .title-box .text {
background-color: #fefaef; background-color: #fefaef;
color: #e6a23c; color: #e6a23c;
padding: 6px; padding: 6px;
} }
.app-send .title-box { .app-send .title-box {
margin: 15px 0; margin: 15px 0;
} }
.app-order-list .app-order-item .el-button { .app-order-list .app-order-item .el-button {
padding: 0; padding: 0;
} }
.app-order-list .card-footer .address-box { .app-order-list .card-footer .address-box {
margin-right: 10px; margin-right: 10px;
} }
.app-order-list .card-footer { .app-order-list .card-footer {
background: #f3f5f6; background: #f3f5f6;
padding: 10px 20px; padding: 10px 20px;
} }
.app-order-list .app-order-info > div { .app-order-list .app-order-info>div {
width: 100%; width: 100%;
} }
.app-order-icon { .app-order-icon {
margin-right: 5%; margin-right: 5%;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
} }
.app-order-body { .app-order-body {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.app-order-list .app-order-info { .app-order-list .app-order-info {
display: flex; display: flex;
align-items: center; align-items: center;
width: 15%; width: 15%;
text-align: center; text-align: center;
border-right: 1px solid #ebeef5; border-right: 1px solid #ebeef5;
justify-content: center; justify-content: center;
} }
.app-order-list .el-card__body { .app-order-list .el-card__body {
padding: 0; padding: 0;
} }
.app-order-list .express-price { .app-order-list .express-price {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
.app-order-list .goods-item { .app-order-list .goods-item {
border-right: 1px solid #ebeef5; border-right: 1px solid #ebeef5;
} }
.app-order-list .app-order-info { .app-order-list .app-order-info {
display: flex; display: flex;
align-items: center; align-items: center;
width: 15%; width: 15%;
text-align: center; text-align: center;
border-right: 1px solid #ebeef5; border-right: 1px solid #ebeef5;
} }
.app-order-list .goods-item .goods .app-order-goods-price { .app-order-list .goods-item .goods .app-order-goods-price {
height: 24px; height: 24px;
margin-top: 3px; margin-top: 3px;
position: absolute; position: absolute;
bottom: 20px; bottom: 20px;
left: 125px; left: 125px;
} }
.app-order-list .goods-item .goods-info .goods-name { .app-order-list .goods-item .goods-info .goods-name {
margin-bottom: 5px; margin-bottom: 5px;
word-break: break-all; word-break: break-all;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -2690,40 +1976,40 @@ export default { ...@@ -2690,40 +1976,40 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
overflow: hidden; overflow: hidden;
} }
.app-order-list .goods-item .goods-info { .app-order-list .goods-item .goods-info {
width: 50%; width: 50%;
margin-top: 5px; margin-top: 5px;
} }
.app-order-list .goods-image { .app-order-list .goods-image {
height: 90px; height: 90px;
width: 90px; width: 90px;
margin-right: 15px; margin-right: 15px;
float: left; float: left;
} }
.app-order-list .goods-item .goods { .app-order-list .goods-item .goods {
position: relative; position: relative;
padding: 20px; padding: 20px;
min-height: 130px; min-height: 130px;
border-top: 1px solid #ebeef5; border-top: 1px solid #ebeef5;
} }
.app-order-list .goods-item .goods:first-of-type { .app-order-list .goods-item .goods:first-of-type {
border-top: 0; border-top: 0;
} }
.orderList .app-order-list .app-order-item:hover .app-order-btnimg { .orderList .app-order-list .app-order-item:hover .app-order-btnimg {
display: block; display: block;
} }
.orderList .app-order-list .app-order-item:hover { .orderList .app-order-list .app-order-item:hover {
border: 1px solid #3399ff; border: 1px solid #3399ff;
} }
.orderList .app-order-btnimg { .orderList .app-order-btnimg {
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 25px; right: 25px;
...@@ -2731,89 +2017,93 @@ export default { ...@@ -2731,89 +2017,93 @@ export default {
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
display: none; display: none;
} }
.orderList .app-order-offline { .orderList .app-order-offline {
margin-left: 30px; margin-left: 30px;
margin-top: -2px; margin-top: -2px;
} }
.orderList .app-order-user img { .orderList .app-order-user img {
height: 20px; height: 20px;
width: 20px; width: 20px;
display: block; display: block;
float: left; float: left;
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
.orderList .app-order-list .app-order-time { .orderList .app-order-list .app-order-time {
color: #909399; color: #909399;
} }
.orderList .app-order-user { .orderList .app-order-user {
margin-left: 30px; margin-left: 30px;
} }
.orderList .app-order-list .app-order-time { .orderList .app-order-list .app-order-time {
color: #909399; color: #909399;
} }
.orderList .app-order-list .app-order-item .el-card__header { .orderList .app-order-list .app-order-item .el-card__header {
padding: 0; padding: 0;
} }
.orderList .app-order-list .app-order-item { .orderList .app-order-list .app-order-item {
margin-top: 20px; margin-top: 20px;
min-width: 750px; min-width: 750px;
} }
.orderList .app-order-list .app-order-head { .orderList .app-order-list .app-order-head {
padding: 20px; padding: 20px;
background-color: #f3f5f6; background-color: #f3f5f6;
color: #303133; color: #303133;
min-width: 750px; min-width: 750px;
display: flex; display: flex;
position: relative; position: relative;
} }
.orderList .app-order-title div { .orderList .app-order-title div {
text-align: center; text-align: center;
} }
.orderList .app-order-title { .orderList .app-order-title {
background-color: #f3f5f6; background-color: #f3f5f6;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
display: flex; display: flex;
min-width: 750px; min-width: 750px;
} }
.orderList .content { .orderList .content {
background: #fff; background: #fff;
margin-top: 10px; margin-top: 10px;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.orderList .billStyle {
.orderList .billStyle {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; 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;
...@@ -2824,17 +2114,20 @@ export default { ...@@ -2824,17 +2114,20 @@ export default {
border-radius: 4px; border-radius: 4px;
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>
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