Skip to content

F
factory_front
Commit 1b9a33d0 by zhuzhequan
Options

添加 title

parent a08185fc
Showing with 284 additions and 208 deletions
src/views/DeliveryNotePage.vue
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
></ElTableColumn> ></ElTableColumn>
<ElTableColumn <ElTableColumn
label="发货单号" label="发货单号"
show-overflow-tooltip
prop="billNumber" prop="billNumber"
header-align="center" header-align="center"
align="center" align="center"
...@@ -148,6 +149,7 @@ ...@@ -148,6 +149,7 @@
<div <div
v-for="(pi, index) in p" v-for="(pi, index) in p"
:key="index" :key="index"
:title=" pi.label +'：'+ val(od, pi.key || '')"
class="send-order-prop-item" class="send-order-prop-item"
> >
<span> {{ pi.label }}：{{ val(od, pi.key || '') }} </span> <span> {{ pi.label }}：{{ val(od, pi.key || '') }} </span>
...@@ -173,6 +175,7 @@ ...@@ -173,6 +175,7 @@
<div <div
v-for="pi in logisticsProps" v-for="pi in logisticsProps"
:key="pi.label" :key="pi.label"
:title=" pi.label +'：'+ val(row, pi.key)"
class="send-order-prop-item" class="send-order-prop-item"
> >
<span v-if="val(row, pi.key)" <span v-if="val(row, pi.key)"
......
src/views/order/ProductInfo.vue
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<img :src="item.variantImage" style="width: 100%; height: 100%" /> <img :src="item.variantImage" style="width: 100%; height: 100%" />
</div> </div>
<div class="order-list-expand_item_info"> <div class="order-list-expand_item_info">
<div class="order-list-expand_item_info_title" style="font-weight: bold"> <div :title="item.productName || '--'" class="order-list-expand_item_info_title" style="font-weight: bold">
<span class="order-list-expand_item_label">商品名:</span> <span class="order-list-expand_item_label">商品名:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item.productName || '--' item.productName || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div :title="item.baseSku || ''" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">Base SKU:</span> <span class="order-list-expand_item_label">Base SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.baseSku || '--' >{{ item.baseSku || '--'
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
><DocumentCopy /></el-icon ><DocumentCopy /></el-icon
></span> ></span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div :title="item.variantSku || ''" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">Variant SKU:</span> <span class="order-list-expand_item_label">Variant SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.variantSku || '--' }} >{{ item.variantSku || '--' }}
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div :title="item.shopNumber || ''" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">店铺单号:</span> <span class="order-list-expand_item_label">店铺单号:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.shopNumber || '--' }} >{{ item.shopNumber || '--' }}
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div :title="item.subOrderNumber || ''" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">生产单号:</span> <span class="order-list-expand_item_label">生产单号:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.subOrderNumber || '--' >{{ item.subOrderNumber || '--'
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">发货状态:</span> <span class="order-list-expand_item_label">发货状态:</span>
<span <span
v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num" v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<el-tag effect="dark" type="danger"> 未发货 </el-tag> <el-tag effect="dark" type="danger"> 未发货 </el-tag>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div :title="item.material || ''" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">材质:</span> <span class="order-list-expand_item_label">材质:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.material || '--' >{{ item.material || '--'
......
src/views/order/ProductInfoInspected.vue
...@@ -11,13 +11,20 @@ ...@@ -11,13 +11,20 @@
<img :src="item.variantImage" style="width: 100%; height: 100%" /> <img :src="item.variantImage" style="width: 100%; height: 100%" />
</div> </div>
<div class="order-list-expand_item_info"> <div class="order-list-expand_item_info">
<div class="order-list-expand_item_info_title" style="font-weight: bold"> <div
:title="item.productName || ''"
class="order-list-expand_item_info_title"
style="font-weight: bold"
>
<span class="order-list-expand_item_label">商品名:</span> <span class="order-list-expand_item_label">商品名:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item.productName || '--' item.productName || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div
:title="item.baseSku || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">Base SKU:</span> <span class="order-list-expand_item_label">Base SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.baseSku || '--' >{{ item.baseSku || '--'
...@@ -25,7 +32,10 @@ ...@@ -25,7 +32,10 @@
><DocumentCopy /></el-icon ><DocumentCopy /></el-icon
></span> ></span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div
:title="item.variantSku || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">Variant SKU:</span> <span class="order-list-expand_item_label">Variant SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.variantSku || '--' }} >{{ item.variantSku || '--' }}
...@@ -34,7 +44,10 @@ ...@@ -34,7 +44,10 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div
:title="item.shopNumber || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">店铺单号:</span> <span class="order-list-expand_item_label">店铺单号:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.shopNumber || '--' }} >{{ item.shopNumber || '--' }}
...@@ -43,98 +56,106 @@ ...@@ -43,98 +56,106 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div
:title="item.material || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">材质:</span> <span class="order-list-expand_item_label">材质:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.material || '--' }} >{{ item.material || '--' }}
</span> </span>
</div> </div>
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">店铺单号:</span>--> <!-- <span class="order-list-expand_item_label">店铺单号:</span>-->
<!-- <span class="order-list-expand_item_value"--> <!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.shopNumber || '&#45;&#45;' }}--> <!-- >{{ item.shopNumber || '&#45;&#45;' }}-->
<!-- <el-icon class="icon" @click="copy(item.shopNumber || '')"--> <!-- <el-icon class="icon" @click="copy(item.shopNumber || '')"-->
<!-- ><DocumentCopy--> <!-- ><DocumentCopy-->
<!-- /></el-icon>--> <!-- /></el-icon>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">生产单号:</span>--> <!-- <span class="order-list-expand_item_label">生产单号:</span>-->
<!-- <span class="order-list-expand_item_value"--> <!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.subOrderNumber || '&#45;&#45;'--> <!-- >{{ item.subOrderNumber || '&#45;&#45;'-->
<!-- }}<el-icon class="icon" @click="copy(item.subOrderNumber || '')"--> <!-- }}<el-icon class="icon" @click="copy(item.subOrderNumber || '')"-->
<!-- ><DocumentCopy--> <!-- ><DocumentCopy-->
<!-- /></el-icon>--> <!-- /></el-icon>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">发货状态:</span>--> <!-- <span class="order-list-expand_item_label">发货状态:</span>-->
<!-- <span--> <!-- <span-->
<!-- v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"--> <!-- v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"-->
<!-- class="order-list-expand_item_value"--> <!-- class="order-list-expand_item_value"-->
<!-- >--> <!-- >-->
<!-- <el-tag effect="dark" type="success"> 已发货 </el-tag>--> <!-- <el-tag effect="dark" type="success"> 已发货 </el-tag>-->
<!-- </span>--> <!-- </span>-->
<!-- <span--> <!-- <span-->
<!-- v-if="--> <!-- v-if="-->
<!-- item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0) &&--> <!-- item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0) &&-->
<!-- (item.shipmentNum || 0) > 0--> <!-- (item.shipmentNum || 0) > 0-->
<!-- "--> <!-- "-->
<!-- class="order-list-expand_item_value"--> <!-- class="order-list-expand_item_value"-->
<!-- >--> <!-- >-->
<!-- <el-tag effect="dark"> 部分发货 </el-tag>--> <!-- <el-tag effect="dark"> 部分发货 </el-tag>-->
<!-- </span>--> <!-- </span>-->
<!-- <span--> <!-- <span-->
<!-- v-if="item.shipmentNum === 0"--> <!-- v-if="item.shipmentNum === 0"-->
<!-- class="order-list-expand_item_value"--> <!-- class="order-list-expand_item_value"-->
<!-- >--> <!-- >-->
<!-- <el-tag effect="dark" type="danger"> 未发货 </el-tag>--> <!-- <el-tag effect="dark" type="danger"> 未发货 </el-tag>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
<div class="order-list-expand_item_price"> <div class="order-list-expand_item_price">
<div class="order-list-expand_item_info_title"> <div
:title="item.subOrderNumber || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">生产单号:</span> <span class="order-list-expand_item_label">生产单号:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item.subOrderNumber || '--' item.subOrderNumber || '--'
}}</span> }}</span>
</div> </div>
<!-- <div class="order-list-expand_item_info_title font-bold">--> <!-- <div class="order-list-expand_item_info_title font-bold">-->
<!-- <span class="order-list-expand_item_label">工厂单号:</span>--> <!-- <span class="order-list-expand_item_label">工厂单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{ item.factorySubOrderNumber || '&#45;&#45;'}}</span>--> <!-- <span class="order-list-expand_item_value">{{ item.factorySubOrderNumber || '&#45;&#45;'}}</span>-->
<!-- </div>--> <!-- </div>-->
<div class="order-list-expand_item_info_title"> <div
:title="item.shipmentNum || 0"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">发货数量:</span> <span class="order-list-expand_item_label">发货数量:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item.shipmentNum || 0 item.shipmentNum || 0
}}</span> }}</span>
</div> </div>
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">未发数:</span>--> <!-- <span class="order-list-expand_item_label">未发数:</span>-->
<!-- <span class="order-list-expand_item_value">{{--> <!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))--> <!-- (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">待质检:</span>--> <!-- <span class="order-list-expand_item_label">待质检:</span>-->
<!-- <span class="order-list-expand_item_value">{{--> <!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.shipmentNum || 0) - --> <!-- (item.shipmentNum || 0) - -->
<!-- ((item.passNum || 0) + (item.notPassNum || 0))--> <!-- ((item.passNum || 0) + (item.notPassNum || 0))-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(通过):</span>--> <!-- <span class="order-list-expand_item_label">质检(通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{--> <!-- <span class="order-list-expand_item_value">{{-->
<!-- item.passNum || 0--> <!-- item.passNum || 0-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(不通过):</span>--> <!-- <span class="order-list-expand_item_label">质检(不通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{--> <!-- <span class="order-list-expand_item_value">{{-->
<!-- item.notPassNum || 0--> <!-- item.notPassNum || 0-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
<div <div
v-if=" v-if="
(status === 3 || status === 4 || status === 2) && (status === 3 || status === 4 || status === 2) &&
......
src/views/order/index.vue
...@@ -59,16 +59,19 @@ ...@@ -59,16 +59,19 @@
@blur="searchForm.internalMemo = searchForm.internalMemo.trim()" @blur="searchForm.internalMemo = searchForm.internalMemo.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="statusCode===6" label="物流跟踪号"> <ElFormItem v-if="statusCode === 6" label="物流跟踪号">
<ElInput <ElInput
v-model="searchForm.logisticsTracking" v-model="searchForm.logisticsTracking"
placeholder="物流跟踪号" placeholder="物流跟踪号"
clearable clearable
style="width: 160px" style="width: 160px"
@blur="searchForm.logisticsTracking = searchForm.logisticsTracking.trim()" @blur="
searchForm.logisticsTracking =
searchForm.logisticsTracking.trim()
"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="statusCode===6" label="发货单号"> <ElFormItem v-if="statusCode === 6" label="发货单号">
<ElInput <ElInput
v-model="searchForm.billNumber" v-model="searchForm.billNumber"
placeholder="发货单号" placeholder="发货单号"
...@@ -77,7 +80,7 @@ ...@@ -77,7 +80,7 @@
@blur="searchForm.billNumber = searchForm.billNumber.trim()" @blur="searchForm.billNumber = searchForm.billNumber.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="statusCode===6" label="收货人"> <ElFormItem v-if="statusCode === 6" label="收货人">
<ElInput <ElInput
v-model="searchForm.lanshouName" v-model="searchForm.lanshouName"
placeholder="收货人" placeholder="收货人"
...@@ -120,7 +123,7 @@ ...@@ -120,7 +123,7 @@
class="item" class="item"
> >
<ElButton type="warning" is-dark @click="downloadManuscript" <ElButton type="warning" is-dark @click="downloadManuscript"
>下载稿件</ElButton >下载稿件</ElButton
> >
</span> </span>
<span <span
...@@ -128,12 +131,12 @@ ...@@ -128,12 +131,12 @@
class="item" class="item"
> >
<ElButton type="success" is-dark @click="reGenerateManuscript" <ElButton type="success" is-dark @click="reGenerateManuscript"
>更新稿件</ElButton >更新稿件</ElButton
> >
</span> </span>
<span v-if="statusCode === 2 || statusCode === 3" class="item"> <span v-if="statusCode === 2 || statusCode === 3" class="item">
<ElButton type="primary" dark @click="printManuscript" <ElButton type="primary" dark @click="printManuscript"
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </span>
<span <span
...@@ -141,12 +144,12 @@ ...@@ -141,12 +144,12 @@
class="item" class="item"
> >
<ElButton type="success" dark @click="exportManuscript" <ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton >导出生产单</ElButton
> >
</span> </span>
<span class="item"> <span class="item">
<ElButton type="warning" @click="addInternalTag" <ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton >添加内部标签</ElButton
> >
</span> </span>
<span <span
...@@ -154,7 +157,7 @@ ...@@ -154,7 +157,7 @@
class="item" class="item"
> >
<ElButton type="primary" @click="refreshProduct" <ElButton type="primary" @click="refreshProduct"
>刷新商品信息</ElButton >刷新商品信息</ElButton
> >
</span> </span>
<span v-if="statusCode === 3 || statusCode === 4" class="item"> <span v-if="statusCode === 3 || statusCode === 4" class="item">
...@@ -171,7 +174,7 @@ ...@@ -171,7 +174,7 @@
class="order-list flex-1 overflow-hidden" class="order-list flex-1 overflow-hidden"
> >
<ElTable <ElTable
v-show="statusCode!==6" v-show="statusCode !== 6"
:data="tableData" :data="tableData"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
default-expand-all default-expand-all
...@@ -180,8 +183,8 @@ ...@@ -180,8 +183,8 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<ElTableColumn type="selection" width="50"></ElTableColumn> <ElTableColumn type="selection" width="50"></ElTableColumn>
<ElTableColumn type="expand" width="1"> <ElTableColumn type="expand" width="1">
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.productList" class="table-expand"> <div v-if="row.productList" class="table-expand">
<div <div
class="order-list-expand" class="order-list-expand"
...@@ -193,14 +196,14 @@ ...@@ -193,14 +196,14 @@
<span @click="openAll(row)"> <span @click="openAll(row)">
<template v-if="!row.moreable"> <template v-if="!row.moreable">
展开全部<strong style="color: red" 展开全部<strong style="color: red"
>({{ row.productList.length }})</strong >({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle" >条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon ><ArrowDown /></el-icon
></template> ></template>
<template v-else> <template v-else>
收起商品信息<el-icon style="vertical-align: middle" 收起商品信息<el-icon style="vertical-align: middle"
><ArrowUp ><ArrowUp
/></el-icon> /></el-icon>
</template> </template>
</span> </span>
</div> </div>
...@@ -211,22 +214,22 @@ ...@@ -211,22 +214,22 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">商品价:</span> <span class="order-list-expand_item_label">商品价:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.productAmount row.productAmount
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">小计:</span> <span class="order-list-expand_item_label">小计:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.totalAmount || '--' row.totalAmount || '--'
}}</span> }}</span>
</div> </div>
<div <div
v-if="row.totolBuyNumber" v-if="row.totolBuyNumber"
class="order-list-expand_item_info_title" class="order-list-expand_item_info_title"
> >
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>共{{ row.totolBuyNumber }}件</span >共{{ row.totolBuyNumber }}件</span
> >
</div> </div>
</div> </div>
...@@ -260,27 +263,27 @@ ...@@ -260,27 +263,27 @@
<div class="order-time_info"> <div class="order-time_info">
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label" <span class="order-list-expand_item_label"
>创建时间:</span >创建时间:</span
> >
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.createTime || '--' row.createTime || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label" <span class="order-list-expand_item_label"
>确认时间:</span >确认时间:</span
> >
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.startStockingTime || '--' row.startStockingTime || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label" <span class="order-list-expand_item_label"
>完成时间:</span >完成时间:</span
> >
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.finishTime || '--' row.finishTime || '--'
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -288,7 +291,7 @@ ...@@ -288,7 +291,7 @@
<div class="order-operate_info"> <div class="order-operate_info">
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openDetail(row.id)" <ElButton text type="primary" @click="openDetail(row.id)"
>查看详情 >查看详情
</ElButton> </ElButton>
</div> </div>
<div <div
...@@ -299,13 +302,13 @@ ...@@ -299,13 +302,13 @@
text text
type="primary" type="primary"
@click="openShipment(row.id)" @click="openShipment(row.id)"
>查看发货单 >查看发货单
</ElButton> </ElButton>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.id)" <ElButton text type="primary" @click="openLog(row.id)"
>操作日志 >操作日志
</ElButton> </ElButton>
</div> </div>
<div <div
...@@ -313,60 +316,72 @@ ...@@ -313,60 +316,72 @@
class="order-list-expand_item_info_title" class="order-list-expand_item_info_title"
> >
<ElButton text type="danger" @click="cancelOrder(row.id)" <ElButton text type="danger" @click="cancelOrder(row.id)"
>取消 >取消
</ElButton> </ElButton>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn <ElTableColumn
label="订单详情" label="订单详情"
header-align="center" header-align="center"
show-overflow-tooltip
class-name="th-order-detail" class-name="th-order-detail"
min-width="800" min-width="800"
> >
<template #default="scope"> <template #default="scope">
<div class="order-detail"> <div class="order-detail">
<div class="order-detail_item"> <div :title="scope.row.orderNumber" class="order-detail_item">
<span class="label">订单号:</span> <span class="label">订单号:</span>
<span class="value">{{ scope.row.orderNumber }}</span> <span class="value">{{ scope.row.orderNumber }}</span>
</div> </div>
<div class="order-detail_item"> <div
:title="scope.row.erpOrderNumber"
class="order-detail_item"
>
<span class="label">第三方订单号:</span> <span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.erpOrderNumber">{{ <span class="value" :title="scope.row.erpOrderNumber">{{
scope.row.erpOrderNumber || '--' scope.row.erpOrderNumber || '--'
}}</span> }}</span>
</div> </div>
<div class="order-detail_item"> <div
:title="scope.row.manuscriptStatusStr"
class="order-detail_item"
>
<span class="label">稿件下载状态:</span> <span class="label">稿件下载状态:</span>
<span class="value" :title="scope.row.manuscriptStatusStr">{{ <span class="value" :title="scope.row.manuscriptStatusStr">{{
scope.row.manuscriptStatusStr || '--' scope.row.manuscriptStatusStr || '--'
}}</span> }}</span>
</div> </div>
<div class="order-detail_item"> <div
:title="scope.row.productionFileStatus"
class="order-detail_item"
>
<span class="label">稿件生成状态:</span> <span class="label">稿件生成状态:</span>
<span class="value" :title="scope.row.productionFileStatus">{{ <span class="value" :title="scope.row.productionFileStatus">{{
scope.row.productionFileStatus || '--' scope.row.productionFileStatus || '--'
}}</span> }}</span>
</div> </div>
<div class="order-detail_item"> <div :title="scope.row.lanshouName" class="order-detail_item">
<span class="label">收货人:</span> <span class="label">收货人:</span>
<span class="value">{{ scope.row.lanshouName }}</span> <span class="value">{{ scope.row.lanshouName }}</span>
</div> </div>
<div class="order-detail_item"> <div :title="scope.row.lanshouPhone" class="order-detail_item">
<span class="label">电话:</span> <span class="label">电话:</span>
<span class="value">{{ scope.row.lanshouPhone }}</span> <span class="value">{{ scope.row.lanshouPhone }}</span>
</div> </div>
<div class="order-detail_item"> <div
:title="scope.row.lanshouAddress"
class="order-detail_item"
>
<span class="label">收货地址:</span> <span class="label">收货地址:</span>
<span class="value" :title="scope.row.lanshouAddress">{{ <span class="value" :title="scope.row.lanshouAddress">{{
scope.row.lanshouAddress scope.row.lanshouAddress
}}</span> }}</span>
</div> </div>
<div class="order-detail_item"> <div :title="scope.row.lanshouPost" class="order-detail_item">
<span class="label">邮编:</span> <span class="label">邮编:</span>
<span class="value">{{ scope.row.lanshouPost }}</span> <span class="value">{{ scope.row.lanshouPost }}</span>
</div> </div>
...@@ -375,16 +390,19 @@ ...@@ -375,16 +390,19 @@
</ElTableColumn> </ElTableColumn>
<ElTableColumn <ElTableColumn
label="实付款" label="实付款"
show-overflow-tooltip
width="280" width="280"
header-align="center" header-align="center"
></ElTableColumn> ></ElTableColumn>
<ElTableColumn <ElTableColumn
label="内部标签" label="内部标签"
show-overflow-tooltip
width="280" width="280"
header-align="center" header-align="center"
></ElTableColumn> ></ElTableColumn>
<ElTableColumn <ElTableColumn
label="时间" label="时间"
show-overflow-tooltip
width="280" width="280"
header-align="center" header-align="center"
></ElTableColumn> ></ElTableColumn>
...@@ -392,7 +410,7 @@ ...@@ -392,7 +410,7 @@
</ElTableColumn> </ElTableColumn>
</ElTable> </ElTable>
<ElTable <ElTable
v-show="statusCode===6" v-show="statusCode === 6"
:data="tableData" :data="tableData"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
default-expand-all default-expand-all
...@@ -404,20 +422,20 @@ ...@@ -404,20 +422,20 @@
<ElTableColumn <ElTableColumn
label="发货单号" label="发货单号"
width="280" width="280"
show-overflow-tooltip
prop="billNumber" prop="billNumber"
header-align="center" header-align="center"
></ElTableColumn> ></ElTableColumn>
<ElTableColumn <ElTableColumn label="发货单信息" header-align="center">
label="发货单信息" <template #default="{ row }">
<div
header-align="center" v-if="row.detailList"
> class="table-expand"
<template #default="{row}"> style="margin-right: -14px"
<div v-if="row.detailList" class="table-expand" style="margin-right: -14px;"> >
<div <div
style="flex: 1;flex-shrink: 0;overflow: hidden" style="flex: 1; flex-shrink: 0; overflow: hidden"
class="order-list-expand" class="order-list-expand"
> >
<ProductInfoInspected :row="row" :status="statusCode" /> <ProductInfoInspected :row="row" :status="statusCode" />
<template v-if="row.detailList.length > 2"> <template v-if="row.detailList.length > 2">
...@@ -425,14 +443,14 @@ ...@@ -425,14 +443,14 @@
<span @click="openAll(row)"> <span @click="openAll(row)">
<template v-if="!row.moreable"> <template v-if="!row.moreable">
展开全部<strong style="color: red" 展开全部<strong style="color: red"
>({{ row.detailList.length }})</strong >({{ row.detailList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle" >条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon ><ArrowDown /></el-icon
></template> ></template>
<template v-else> <template v-else>
收起商品信息<el-icon style="vertical-align: middle" 收起商品信息<el-icon style="vertical-align: middle"
><ArrowUp ><ArrowUp
/></el-icon> /></el-icon>
</template> </template>
</span> </span>
</div> </div>
...@@ -443,97 +461,130 @@ ...@@ -443,97 +461,130 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">订单号:</span> <span class="order-list-expand_item_label">订单号:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.orderNumber row.orderNumber
}}</span> }}</span>
<el-icon class="icon" @click="copy(row.orderNumber || '')" <el-icon class="icon" @click="copy(row.orderNumber || '')"
><DocumentCopy ><DocumentCopy
/></el-icon> /></el-icon>
</div> </div>
<!-- <div class="order-list-expand_item_info_title">--> <!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">工厂订单号:</span>--> <!-- <span class="order-list-expand_item_label">工厂订单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{--> <!-- <span class="order-list-expand_item_value">{{-->
<!-- row.factoryOrderNumber || '&#45;&#45;'--> <!-- row.factoryOrderNumber || '&#45;&#45;'-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- <el-icon class="icon" @click="copy(row.factoryOrderNumber || '')"--> <!-- <el-icon class="icon" @click="copy(row.factoryOrderNumber || '')"-->
<!-- ><DocumentCopy--> <!-- ><DocumentCopy-->
<!-- /></el-icon>--> <!-- /></el-icon>-->
<!-- </div>--> <!-- </div>-->
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">发货方式:</span> <span class="order-list-expand_item_label"
>发货方式:</span
>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.shippingWay === 1?'送货上门':'快递' row.shippingWay === 1 ? '送货上门' : '快递'
}}</span> }}</span>
</div> </div>
<div v-if="row.shippingWay!==1" class="order-list-expand_item_info_title"> <div
<span class="order-list-expand_item_label">物流名称:</span> v-if="row.shippingWay !== 1"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label"
>物流名称:</span
>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.carriageName row.carriageName
}}</span> }}</span>
</div> </div>
<div v-if="row.shippingWay === 2" class="order-list-expand_item_info_title"> <div
<span class="order-list-expand_item_label">物流跟踪号:</span> v-if="row.shippingWay === 2"
<span style="color: red" class="order-list-expand_item_value">{{ class="order-list-expand_item_info_title"
row.logisticsTracking >
}}</span> <span class="order-list-expand_item_label"
>物流跟踪号:</span
>
<span
style="color: red"
class="order-list-expand_item_value"
>{{ row.logisticsTracking }}</span
>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">发货时间:</span> <span class="order-list-expand_item_label"
<span style="color: red" class="order-list-expand_item_value">{{ >发货时间:</span
row.createTime || '--' >
}}</span> <span
style="color: red"
class="order-list-expand_item_value"
>{{ row.createTime || '--' }}</span
>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">确认时间:</span> <span class="order-list-expand_item_label"
<span style="color: red" class="order-list-expand_item_value">{{ >确认时间:</span
>
<span
style="color: red"
class="order-list-expand_item_value"
>{{
row.order ? row.order.startStockingTime : '' row.order ? row.order.startStockingTime : ''
}}</span> }}</span
>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">收货人:</span> <span class="order-list-expand_item_label">收货人:</span>
<span style="color: red" class="order-list-expand_item_value">{{ <span
row.lanshouName || '--' style="color: red"
}}</span> class="order-list-expand_item_value"
>{{ row.lanshouName || '--' }}</span
>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">收货人电话:</span> <span class="order-list-expand_item_label"
>收货人电话:</span
>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.lanshouPhone || '--' row.lanshouPhone || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">邮编:</span> <span class="order-list-expand_item_label">邮编:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.lanshouPost || '--' row.lanshouPost || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">收货地址:</span> <span class="order-list-expand_item_label"
<span class="order-list-expand_item_value">{{row.lanshouRegion + row.lanshouAddress}}</span> >收货地址:</span
>
<span class="order-list-expand_item_value">{{
row.lanshouRegion + row.lanshouAddress
}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="order-operate"> <div class="order-operate">
<div class="order-operate_info"> <div class="order-operate_info">
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.orderId)" <ElButton
>操作日志 text
type="primary"
@click="openLog(row.orderId)"
>操作日志
</ElButton> </ElButton>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn <ElTableColumn
show-overflow-tooltip
label="发货单详情" label="发货单详情"
width="280" width="280"
header-align="center" header-align="center"
> >
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="操作" width="100" header-align="center"> <ElTableColumn label="操作" width="100" header-align="center">
</ElTableColumn> </ElTableColumn>
...@@ -573,7 +624,7 @@ ...@@ -573,7 +624,7 @@
type="primary" type="primary"
size="large" size="large"
@click="searchShipmentByOrderNumber" @click="searchShipmentByOrderNumber"
>查询 >查询
</el-button> </el-button>
</div> </div>
<Shipment <Shipment
...@@ -642,10 +693,10 @@ ...@@ -642,10 +693,10 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button size="large" @click="shipmentVisible = false" <el-button size="large" @click="shipmentVisible = false"
>取消 >取消
</el-button> </el-button>
<el-button size="large" type="primary" @click="saveShipment" <el-button size="large" type="primary" @click="saveShipment"
>发货 >发货
</el-button> </el-button>
</div> </div>
</template> </template>
...@@ -685,17 +736,17 @@ ...@@ -685,17 +736,17 @@
@keyup.enter="searchQaByOrderNumber" @keyup.enter="searchQaByOrderNumber"
/> />
<el-button type="primary" size="large" @click="searchQaByOrderNumber" <el-button type="primary" size="large" @click="searchQaByOrderNumber"
>查询 >查询
</el-button> </el-button>
</div> </div>
<Quarantine :quarantine="quarantine" /> <Quarantine :quarantine="quarantine" />
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button size="large" @click="quarantineVisible = false" <el-button size="large" @click="quarantineVisible = false"
>取消 >取消
</el-button> </el-button>
<el-button size="large" type="primary" @click="() => saveQuarantine()" <el-button size="large" type="primary" @click="() => saveQuarantine()"
>质检完成 >质检完成
</el-button> </el-button>
</div> </div>
</template> </template>
...@@ -797,6 +848,7 @@ const rules = reactive<FormRules<ShipmentForm>>({ ...@@ -797,6 +848,7 @@ const rules = reactive<FormRules<ShipmentForm>>({
}, },
], ],
}) })
// 分页查询 // 分页查询
const { const {
loading, loading,
......
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