Skip to content

F
factory_front
Commit 1b9a33d0 by zhuzhequan
Options

添加 title

parent a08185fc
Showing with 219 additions and 143 deletions
src/views/DeliveryNotePage.vue
......@@ -119,6 +119,7 @@
></ElTableColumn>
<ElTableColumn
label="发货单号"
show-overflow-tooltip
prop="billNumber"
header-align="center"
align="center"
......@@ -148,6 +149,7 @@
<div
v-for="(pi, index) in p"
:key="index"
:title=" pi.label +'：'+ val(od, pi.key || '')"
class="send-order-prop-item"
>
<span> {{ pi.label }}：{{ val(od, pi.key || '') }} </span>
......@@ -173,6 +175,7 @@
<div
v-for="pi in logisticsProps"
:key="pi.label"
:title=" pi.label +'：'+ val(row, pi.key)"
class="send-order-prop-item"
>
<span v-if="val(row, pi.key)"
......
src/views/order/ProductInfo.vue
......@@ -11,13 +11,13 @@
<img :src="item.variantImage" style="width: 100%; height: 100%" />
</div>
<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_value">{{
item.productName || '--'
}}</span>
</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_value"
>{{ item.baseSku || '--'
......@@ -25,7 +25,7 @@
><DocumentCopy /></el-icon
></span>
</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_value"
>{{ item.variantSku || '--' }}
......@@ -34,7 +34,7 @@
/></el-icon>
</span>
</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_value"
>{{ item.shopNumber || '--' }}
......@@ -43,7 +43,7 @@
/></el-icon>
</span>
</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_value"
>{{ item.subOrderNumber || '--'
......@@ -76,7 +76,7 @@
<el-tag effect="dark" type="danger"> 未发货 </el-tag>
</span>
</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_value"
>{{ item.material || '--'
......
src/views/order/ProductInfoInspected.vue
......@@ -11,13 +11,20 @@
<img :src="item.variantImage" style="width: 100%; height: 100%" />
</div>
<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_value">{{
item.productName || '--'
}}</span>
</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_value"
>{{ item.baseSku || '--'
......@@ -25,7 +32,10 @@
><DocumentCopy /></el-icon
></span>
</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_value"
>{{ item.variantSku || '--' }}
......@@ -34,7 +44,10 @@
/></el-icon>
</span>
</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_value"
>{{ item.shopNumber || '--' }}
......@@ -43,98 +56,106 @@
/></el-icon>
</span>
</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_value"
>{{ item.material || '--' }}
</span>
</div>
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">店铺单号:</span>-->
<!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.shopNumber || '&#45;&#45;' }}-->
<!-- <el-icon class="icon" @click="copy(item.shopNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">生产单号:</span>-->
<!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.subOrderNumber || '&#45;&#45;'-->
<!-- }}<el-icon class="icon" @click="copy(item.subOrderNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">发货状态:</span>-->
<!-- <span-->
<!-- v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark" type="success"> 已发货 </el-tag>-->
<!-- </span>-->
<!-- <span-->
<!-- v-if="-->
<!-- item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0) &&-->
<!-- (item.shipmentNum || 0) > 0-->
<!-- "-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark"> 部分发货 </el-tag>-->
<!-- </span>-->
<!-- <span-->
<!-- v-if="item.shipmentNum === 0"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark" type="danger"> 未发货 </el-tag>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">店铺单号:</span>-->
<!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.shopNumber || '&#45;&#45;' }}-->
<!-- <el-icon class="icon" @click="copy(item.shopNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">生产单号:</span>-->
<!-- <span class="order-list-expand_item_value"-->
<!-- >{{ item.subOrderNumber || '&#45;&#45;'-->
<!-- }}<el-icon class="icon" @click="copy(item.subOrderNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">发货状态:</span>-->
<!-- <span-->
<!-- v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark" type="success"> 已发货 </el-tag>-->
<!-- </span>-->
<!-- <span-->
<!-- v-if="-->
<!-- item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0) &&-->
<!-- (item.shipmentNum || 0) > 0-->
<!-- "-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark"> 部分发货 </el-tag>-->
<!-- </span>-->
<!-- <span-->
<!-- v-if="item.shipmentNum === 0"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!-- <el-tag effect="dark" type="danger"> 未发货 </el-tag>-->
<!-- </span>-->
<!-- </div>-->
</div>
<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_value">{{
item.subOrderNumber || '--'
}}</span>
</div>
<!-- <div class="order-list-expand_item_info_title font-bold">-->
<!-- <span class="order-list-expand_item_label">工厂单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{ item.factorySubOrderNumber || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<div class="order-list-expand_item_info_title">
<!-- <div class="order-list-expand_item_info_title font-bold">-->
<!-- <span class="order-list-expand_item_label">工厂单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{ item.factorySubOrderNumber || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<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_value">{{
item.shipmentNum || 0
}}</span>
</div>
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">未发数:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">待质检:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.shipmentNum || 0) - -->
<!-- ((item.passNum || 0) + (item.notPassNum || 0))-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- item.passNum || 0-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(不通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- item.notPassNum || 0-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">未发数:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">待质检:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- (item.shipmentNum || 0) - -->
<!-- ((item.passNum || 0) + (item.notPassNum || 0))-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- item.passNum || 0-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">质检(不通过):</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- item.notPassNum || 0-->
<!-- }}</span>-->
<!-- </div>-->
<div
v-if="
(status === 3 || status === 4 || status === 2) &&
......
src/views/order/index.vue
......@@ -59,16 +59,19 @@
@blur="searchForm.internalMemo = searchForm.internalMemo.trim()"
></ElInput>
</ElFormItem>
<ElFormItem v-if="statusCode===6" label="物流跟踪号">
<ElFormItem v-if="statusCode === 6" label="物流跟踪号">
<ElInput
v-model="searchForm.logisticsTracking"
placeholder="物流跟踪号"
clearable
style="width: 160px"
@blur="searchForm.logisticsTracking = searchForm.logisticsTracking.trim()"
@blur="
searchForm.logisticsTracking =
searchForm.logisticsTracking.trim()
"
></ElInput>
</ElFormItem>
<ElFormItem v-if="statusCode===6" label="发货单号">
<ElFormItem v-if="statusCode === 6" label="发货单号">
<ElInput
v-model="searchForm.billNumber"
placeholder="发货单号"
......@@ -77,7 +80,7 @@
@blur="searchForm.billNumber = searchForm.billNumber.trim()"
></ElInput>
</ElFormItem>
<ElFormItem v-if="statusCode===6" label="收货人">
<ElFormItem v-if="statusCode === 6" label="收货人">
<ElInput
v-model="searchForm.lanshouName"
placeholder="收货人"
......@@ -171,7 +174,7 @@
class="order-list flex-1 overflow-hidden"
>
<ElTable
v-show="statusCode!==6"
v-show="statusCode !== 6"
:data="tableData"
:span-method="arraySpanMethod"
default-expand-all
......@@ -319,54 +322,66 @@
</div>
</div>
</div>
</template>
</ElTableColumn>
<ElTableColumn
label="订单详情"
header-align="center"
show-overflow-tooltip
class-name="th-order-detail"
min-width="800"
>
<template #default="scope">
<div class="order-detail">
<div class="order-detail_item">
<div :title="scope.row.orderNumber" class="order-detail_item">
<span class="label">订单号:</span>
<span class="value">{{ scope.row.orderNumber }}</span>
</div>
<div class="order-detail_item">
<div
:title="scope.row.erpOrderNumber"
class="order-detail_item"
>
<span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.erpOrderNumber">{{
scope.row.erpOrderNumber || '--'
}}</span>
</div>
<div class="order-detail_item">
<div
:title="scope.row.manuscriptStatusStr"
class="order-detail_item"
>
<span class="label">稿件下载状态:</span>
<span class="value" :title="scope.row.manuscriptStatusStr">{{
scope.row.manuscriptStatusStr || '--'
}}</span>
</div>
<div class="order-detail_item">
<div
:title="scope.row.productionFileStatus"
class="order-detail_item"
>
<span class="label">稿件生成状态:</span>
<span class="value" :title="scope.row.productionFileStatus">{{
scope.row.productionFileStatus || '--'
}}</span>
</div>
<div class="order-detail_item">
<div :title="scope.row.lanshouName" class="order-detail_item">
<span class="label">收货人:</span>
<span class="value">{{ scope.row.lanshouName }}</span>
</div>
<div class="order-detail_item">
<div :title="scope.row.lanshouPhone" class="order-detail_item">
<span class="label">电话:</span>
<span class="value">{{ scope.row.lanshouPhone }}</span>
</div>
<div class="order-detail_item">
<div
:title="scope.row.lanshouAddress"
class="order-detail_item"
>
<span class="label">收货地址:</span>
<span class="value" :title="scope.row.lanshouAddress">{{
scope.row.lanshouAddress
}}</span>
</div>
<div class="order-detail_item">
<div :title="scope.row.lanshouPost" class="order-detail_item">
<span class="label">邮编:</span>
<span class="value">{{ scope.row.lanshouPost }}</span>
</div>
......@@ -375,16 +390,19 @@
</ElTableColumn>
<ElTableColumn
label="实付款"
show-overflow-tooltip
width="280"
header-align="center"
></ElTableColumn>
<ElTableColumn
label="内部标签"
show-overflow-tooltip
width="280"
header-align="center"
></ElTableColumn>
<ElTableColumn
label="时间"
show-overflow-tooltip
width="280"
header-align="center"
></ElTableColumn>
......@@ -392,7 +410,7 @@
</ElTableColumn>
</ElTable>
<ElTable
v-show="statusCode===6"
v-show="statusCode === 6"
:data="tableData"
:span-method="arraySpanMethod"
default-expand-all
......@@ -404,20 +422,20 @@
<ElTableColumn
label="发货单号"
width="280"
show-overflow-tooltip
prop="billNumber"
header-align="center"
></ElTableColumn>
<ElTableColumn
label="发货单信息"
header-align="center"
<ElTableColumn label="发货单信息" header-align="center">
<template #default="{ row }">
<div
v-if="row.detailList"
class="table-expand"
style="margin-right: -14px"
>
<template #default="{row}">
<div v-if="row.detailList" class="table-expand" style="margin-right: -14px;">
<div
style="flex: 1;flex-shrink: 0;overflow: hidden"
style="flex: 1; flex-shrink: 0; overflow: hidden"
class="order-list-expand"
>
<ProductInfoInspected :row="row" :status="statusCode" />
<template v-if="row.detailList.length > 2">
......@@ -450,54 +468,82 @@
/></el-icon>
</div>
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">工厂订单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- row.factoryOrderNumber || '&#45;&#45;'-->
<!-- }}</span>-->
<!-- <el-icon class="icon" @click="copy(row.factoryOrderNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </div>-->
<!-- <div class="order-list-expand_item_info_title">-->
<!-- <span class="order-list-expand_item_label">工厂订单号:</span>-->
<!-- <span class="order-list-expand_item_value">{{-->
<!-- row.factoryOrderNumber || '&#45;&#45;'-->
<!-- }}</span>-->
<!-- <el-icon class="icon" @click="copy(row.factoryOrderNumber || '')"-->
<!-- ><DocumentCopy-->
<!-- /></el-icon>-->
<!-- </div>-->
<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">{{
row.shippingWay === 1?'送货上门':'快递'
row.shippingWay === 1 ? '送货上门' : '快递'
}}</span>
</div>
<div v-if="row.shippingWay!==1" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">物流名称:</span>
<div
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">{{
row.carriageName
}}</span>
</div>
<div v-if="row.shippingWay === 2" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">物流跟踪号:</span>
<span style="color: red" class="order-list-expand_item_value">{{
row.logisticsTracking
}}</span>
<div
v-if="row.shippingWay === 2"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label"
>物流跟踪号:</span
>
<span
style="color: red"
class="order-list-expand_item_value"
>{{ row.logisticsTracking }}</span
>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">发货时间:</span>
<span style="color: red" class="order-list-expand_item_value">{{
row.createTime || '--'
}}</span>
<span class="order-list-expand_item_label"
>发货时间:</span
>
<span
style="color: red"
class="order-list-expand_item_value"
>{{ row.createTime || '--' }}</span
>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">确认时间:</span>
<span style="color: red" class="order-list-expand_item_value">{{
<span class="order-list-expand_item_label"
>确认时间:</span
>
<span
style="color: red"
class="order-list-expand_item_value"
>{{
row.order ? row.order.startStockingTime : ''
}}</span>
}}</span
>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">收货人:</span>
<span style="color: red" class="order-list-expand_item_value">{{
row.lanshouName || '--'
}}</span>
<span
style="color: red"
class="order-list-expand_item_value"
>{{ row.lanshouName || '--' }}</span
>
</div>
<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">{{
row.lanshouPhone || '--'
}}</span>
......@@ -509,31 +555,36 @@
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">收货地址:</span>
<span class="order-list-expand_item_value">{{row.lanshouRegion + row.lanshouAddress}}</span>
<span class="order-list-expand_item_label"
>收货地址:</span
>
<span class="order-list-expand_item_value">{{
row.lanshouRegion + row.lanshouAddress
}}</span>
</div>
</div>
</div>
<div class="order-operate">
<div class="order-operate_info">
<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>
</div>
</div>
</div>
</div>
</template>
</ElTableColumn>
<ElTableColumn
show-overflow-tooltip
label="发货单详情"
width="280"
header-align="center"
>
</ElTableColumn>
<ElTableColumn label="操作" width="100" header-align="center">
</ElTableColumn>
......@@ -797,6 +848,7 @@ const rules = reactive<FormRules<ShipmentForm>>({
},
],
})
// 分页查询
const {
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