Skip to content

F
factory_front
Commit 1a32910e by zhuzhequan
Options

待质检修改

parent cb427077
Showing with 265 additions and 8 deletions
components.d.ts
......@@ -20,6 +20,7 @@ declare module 'vue' {
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
......
src/types/api/order.ts
......@@ -5,6 +5,9 @@ export interface SearchForm {
endProductId: string
orderNumber: string
shopNumber: string
logisticsTracking: string
lanshouName: string
billNumber: string
internalMemo: string
status?: number
subOrderNumber: string
......@@ -54,6 +57,7 @@ export interface OrderData {
internalMemoList?: MemoList[]
substrateAreaName?: string
productList?: ProductList[]
detailList?: ProductList[]
delayMinDay?: number
shipmentList?: string
sourceType?: string
......@@ -182,6 +186,7 @@ export interface QaData {
variantImage?: string
num?: number
shipmentNum?: number
shippingWay?: number
productName?: string
logisticsTracking?: string
lanshouName?: string
......@@ -193,7 +198,6 @@ export interface QaData {
notPassNum?: number
version?: number
factorySubOrderNumber?: string
shippingWay?: string
inspectionStatus?: boolean
source?: string
sourceType?: string
......
src/views/order/ProductInfoInspected.vue 0 → 100644
<template>
<div
v-for="item in row.detailList?.slice(
0,
row.moreable || isDetail ? row.detailList.length : 2,
)"
:key="item.id"
class="order-list-expand_item"
>
<div class="order-list-expand_item_img">
<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">
<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">
<span class="order-list-expand_item_label">Base SKU:</span>
<span class="order-list-expand_item_value"
>{{ item.baseSku || '--'
}}<el-icon class="icon" @click="copy(item.baseSku || '')"
><DocumentCopy /></el-icon
></span>
</div>
<div 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 || '--' }}
<el-icon class="icon" @click="copy(item.variantSku || '')"
><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.shopNumber || '--' }}
<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.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">
<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">
<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
v-if="
(status === 3 || status === 4 || status === 2) &&
(item.shipmentNum === 0 ||
item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0))
"
class="order-list-expand_item_info_title"
>
<el-button
type="success"
size="small"
@click="downloadManuscriptBySubOrder(item)"
>下载稿件</el-button
>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { DocumentCopy } from '@element-plus/icons-vue'
import { filePath } from '@/api/axios'
import { downloadOrder } from '@/api/order'
import { OrderData, ProductList } from '@/types/api/order'
import { showError } from '@/utils/ui'
import { PropType } from 'vue'
defineProps({
row: {
type: Object as PropType<OrderData>,
default: () => {},
},
isDetail: {
type: Boolean,
default: false,
},
status: {
type: Number,
},
})
const downloadManuscriptBySubOrder = async (item: ProductList) => {
try {
const res = await downloadOrder(item.id)
window.open(filePath + res.message)
} catch (e) {
showError(e)
}
}
const copy = (text: string) => {
navigator.clipboard.writeText(text)
ElMessage.success('复制成功')
}
</script>
<style lang="scss" scoped>
.order-list-expand_item {
display: flex;
border-bottom: 1px solid #eee;
padding: 20px;
}
.order-list-expand_item:last-child {
border-bottom: 0;
}
.order-list-expand_item_img {
width: 100px;
height: 100px;
margin-right: 20px;
border: 1px solid #eee;
}
.order-list-expand_item_info {
flex: 1;
margin-right: 20px;
}
.order-list-expand_item_price {
width: 180px;
}
.order-list-expand_item_info_title {
line-height: 26px;
display: flex;
}
.order-list-expand_item_label {
margin-right: 6px;
}
.order-list-expand_item_value {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
src/views/order/Quarantine.vue
......@@ -61,14 +61,14 @@
>
<template #default="{ row }">
<span v-if="row.num === row.shipmentNum - row.notPassNum"
>已发货</span
>已发货</span
>
<span
v-else-if="
row.num !== row.shipmentNum - row.notPassNum &&
row.shipmentNum > 0
"
>部分发货</span
>部分发货</span
>
<span v-else-if="row.shipmentNum === 0">未发货</span>
</template>
......@@ -109,8 +109,10 @@
font-weight: bold;
vertical-align: middle;
"
><CircleCheck
/></el-icon>
>
<CircleCheck
/>
</el-icon>
<el-icon
v-if="!row.isCheck"
style="
......@@ -119,8 +121,10 @@
font-weight: bold;
vertical-align: middle;
"
><CircleClose
/></el-icon>
>
<CircleClose
/>
</el-icon>
</template>
</el-table-column>
</el-table>
......@@ -175,10 +179,24 @@
<span class="value">
{{
(currentRow.lanshouRegion || '') +
(currentRow.lanshouAddress || '') || '--'
(currentRow.lanshouAddress || '') || '--'
}}
</span>
</div>
<div class="left-qa-order-basic-info_item">
<span class="label">发货方式:</span>
<span class="value">
{{
currentRow.shippingWay == 1 ? '送货上门' : '快递' || '--'
}}
</span>
</div>
<div class="left-qa-order-basic-info_item">
<span class="label">物流跟踪号:</span>
<span class="value">
{{ currentRow.logisticsTracking || '--' }}
</span>
</div>
</div>
</div>
<div class="left-qa-order-image-info">
......@@ -263,6 +281,7 @@ import { CircleClose, CircleCheck } from '@element-plus/icons-vue'
import useQuarantine from './hook/useQuarantine'
import { PropType } from 'vue'
import { QaData } from '@/types/api/order'
const props = defineProps({
quarantine: {
type: Object as PropType<ReturnType<typeof useQuarantine>>,
......@@ -315,17 +334,21 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
flex-direction: column;
gap: 10px;
}
.right-qa-order_top {
display: flex;
}
.right-qa-order_top_tab {
border: 1px solid #eee;
padding: 6px 20px;
cursor: pointer;
}
.right-qa-order_top_tab:first-child {
border-right: none;
}
.right-qa-order_top_tab:nth-child(2) {
border-right: none;
}
......@@ -368,6 +391,7 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
font-weight: bold;
color: red;
}
.qa-pass-btn {
border: 1px solid #eee;
padding: 8px 20px;
......@@ -383,12 +407,14 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
color: #fff;
margin-bottom: 10px;
}
.qa-pass-btn.primary {
background-color: #409eff;
border-color: #409eff;
color: #fff;
margin-bottom: 10px;
}
.qa-pass-btn.success {
background-color: #67c23a;
border-color: #67c23a;
......@@ -413,13 +439,16 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
:deep(.el-table__cell) {
padding: 0;
}
:deep(.el-table__row) {
font-size: 12px;
}
:deep(.current-row-active) {
background-color: #409eff !important;
color: #fff;
}
:deep(
.el-table--enable-row-transition
.el-table__body
......
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