Skip to content

F
factory_front
Commit 191b0f9b by wusiyi
Options

feat: podus优化

parent 25010773
Showing with 87 additions and 69 deletions
src/types/api/podMakeOrder.ts
...@@ -27,6 +27,7 @@ export interface OrderData { ...@@ -27,6 +27,7 @@ export interface OrderData {
printResult?: string printResult?: string
remark?: string remark?: string
version?: number version?: number
factoryOrderNumber?: number
} }
export interface ProductList { export interface ProductList {
......
src/views/order/orderTracking/index.vue
...@@ -153,37 +153,49 @@ const goodsColumns = computed(() => { ...@@ -153,37 +153,49 @@ const goodsColumns = computed(() => {
label: '商品图片', label: '商品图片',
prop: 'productImg', prop: 'productImg',
slot: 'productImg', slot: 'productImg',
width: 150, width: 90,
}, },
{ {
label: '商品名称', label: '商品名称',
prop: 'productName', prop: 'productName',
width: 170, width: 170,
align: 'center', align: 'center',
showOverflowTooltip: true,
},
{
label: '状态',
prop: 'subStatus',
width: 130,
align: 'center',
showOverflowTooltip: true,
}, },
{ {
label: '生产单号', label: '生产单号',
prop: 'factorySubOrderNumber', prop: 'factorySubOrderNumber',
width: 170, width: 170,
align: 'center', align: 'center',
showOverflowTooltip: true,
}, },
{ {
label: '变体sku', label: '变体sku',
prop: 'variantSku', prop: 'variantSku',
width: 170, width: 170,
align: 'center', align: 'center',
showOverflowTooltip: true,
}, },
{ {
label: '第三方生产单号', label: '第三方生产单号',
prop: 'thirdSubOrderNumber', prop: 'thirdSubOrderNumber',
width: 170, width: 170,
align: 'center', align: 'center',
showOverflowTooltip: true,
}, },
{ {
label: '库存SKU', label: '库存SKU',
prop: 'thirdSkuCode', prop: 'thirdSkuCode',
width: 170, width: 170,
align: 'center', align: 'center',
showOverflowTooltip: true,
}, },
{ {
label: '工厂', label: '工厂',
...@@ -217,36 +229,38 @@ const goodsColumns = computed(() => { ...@@ -217,36 +229,38 @@ const goodsColumns = computed(() => {
{ {
label: '模板金额($)', label: '模板金额($)',
prop: 'templatePrice', prop: 'templatePrice',
width: 100, width: 120,
align: 'center', align: 'center',
}, },
{ {
label: '工艺金额($)', label: '工艺金额($)',
prop: 'craftPrice', prop: 'craftPrice',
width: 100, width: 120,
align: 'center', align: 'center',
}, },
{ {
label: '付款金额($)', label: '付款金额($)',
prop: 'payAmount', prop: 'payAmount',
width: 100, width: 120,
align: 'center', align: 'center',
}, },
{ {
label: '补胚数量', label: '补胚数量',
prop: 'replenishmentSumNum', prop: 'replenishmentSumNum',
width: 100,
align: 'center', align: 'center',
}, },
{ {
label: '克重(g)', label: '克重(g)',
prop: 'weight', prop: 'weight',
width: 100,
align: 'center', align: 'center',
}, },
{ {
label: '备注', label: '备注',
prop: 'remark', prop: 'remark',
width: 100,
align: 'center', align: 'center',
}, },
] ]
...@@ -521,43 +535,42 @@ onMounted(() => { ...@@ -521,43 +535,42 @@ onMounted(() => {
</ElOption> </ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="订单号">
<ElFormItem label="工艺"> <ElInput
v-model="searchForm.factoryOrderNumber"
placeholder="订单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="物流类型">
<ElSelect <ElSelect
v-model="searchForm.craftCode" v-model="searchForm.shipmentType"
placeholder="物流类型"
clearable clearable
filterable
placeholder="请输入工艺"
style="width: 150px" style="width: 150px"
> >
<el-option <ElOption
v-for="item in craftList" v-for="(item, index) in ['自有物流', '工厂物流']"
:key="item.craftCode" :key="index"
:label="item.craftName" :value="index"
:value="item.craftCode" :label="item"
></el-option> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="库存SKU"> <ElFormItem label="物流跟踪号">
<ElInput <ElInput
v-model.trim="searchForm.thirdSkuCode" v-model.trim="searchForm.processNumber"
placeholder="库存SKU" placeholder="物流跟踪号"
clearable clearable
style="width: 150px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="款号">
<ElInput <ElFormItem label="店铺单号">
v-model="searchForm.supplierProductNo"
placeholder="款号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="批次号">
<ElInput <ElInput
v-model="searchForm.batchArrangeNumber" v-model="searchForm.shopNumber"
placeholder="批次号" placeholder="店铺单号"
clearable clearable
style="width: 150px" style="width: 150px"
/> />
...@@ -570,14 +583,6 @@ onMounted(() => { ...@@ -570,14 +583,6 @@ onMounted(() => {
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="状态"> <ElFormItem label="状态">
<ElSelect <ElSelect
v-model="searchForm.status" v-model="searchForm.status"
...@@ -647,15 +652,31 @@ onMounted(() => { ...@@ -647,15 +652,31 @@ onMounted(() => {
</el-date-picker> </el-date-picker>
</div> </div>
</ElFormItem> </ElFormItem>
<ElFormItem label="订单号">
<ElFormItem label="工艺">
<ElSelect
v-model="searchForm.craftCode"
clearable
filterable
placeholder="请输入工艺"
style="width: 150px"
>
<el-option
v-for="item in craftList"
:key="item.craftCode"
:label="item.craftName"
:value="item.craftCode"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="款号">
<ElInput <ElInput
v-model="searchForm.factoryOrderNumber" v-model="searchForm.supplierProductNo"
placeholder="订单号" placeholder="款号"
clearable clearable
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="客户"> <ElFormItem label="客户">
<el-select <el-select
v-model="searchForm.userMark" v-model="searchForm.userMark"
...@@ -673,7 +694,14 @@ onMounted(() => { ...@@ -673,7 +694,14 @@ onMounted(() => {
></el-option> ></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="批次号">
<ElInput
v-model="searchForm.batchArrangeNumber"
placeholder="批次号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="生产端"> <ElFormItem label="生产端">
<ElSelect <ElSelect
v-model="searchForm.productionClient" v-model="searchForm.productionClient"
...@@ -690,6 +718,14 @@ onMounted(() => { ...@@ -690,6 +718,14 @@ onMounted(() => {
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="库存SKU">
<ElInput
v-model.trim="searchForm.thirdSkuCode"
placeholder="库存SKU"
clearable
style="width: 150px"
></ElInput>
</ElFormItem>
<ElFormItem label="Variant SKU"> <ElFormItem label="Variant SKU">
<ElInput <ElInput
v-model.trim="searchForm.sku" v-model.trim="searchForm.sku"
...@@ -706,30 +742,6 @@ onMounted(() => { ...@@ -706,30 +742,6 @@ onMounted(() => {
style="width: 150px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> --> </ElFormItem> -->
<ElFormItem label="物流跟踪号">
<ElInput
v-model.trim="searchForm.processNumber"
placeholder="物流跟踪号"
clearable
style="width: 150px"
></ElInput>
</ElFormItem>
<ElFormItem label="物流类型">
<ElSelect
v-model="searchForm.shipmentType"
placeholder="物流类型"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['自有物流', '工厂物流']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
</ElForm> </ElForm>
<template #reference> <template #reference>
<el-button <el-button
...@@ -806,14 +818,14 @@ onMounted(() => { ...@@ -806,14 +818,14 @@ onMounted(() => {
<el-tabs> <el-tabs>
<el-tab-pane label="商品明细"> <el-tab-pane label="商品明细">
<TableView <TableView
v-loading="goodsLoading"
ref="tableRef" ref="tableRef"
v-loading="goodsLoading"
:columns="goodsColumns" :columns="goodsColumns"
:serial-numberable="true" :serial-numberable="true"
:paginated-data="goodsData" :paginated-data="goodsData"
> >
<template #productImg="{ row }"> <template #productImg="{ row }">
<div><img :src="row.variantImage" alt="商品图片" /></div> <ImageView :src="row.variantImage" width="30px" height="30px" />
</template> </template>
</TableView> </TableView>
</el-tab-pane> </el-tab-pane>
......
src/views/order/podUs/PodMakeOrder.vue
...@@ -97,7 +97,12 @@ ...@@ -97,7 +97,12 @@
<span>发货备注：</span> <span>发货备注：</span>
<span>{{ podOrderDetailsData?.remark }}</span> <span>{{ podOrderDetailsData?.remark }}</span>
</div> </div>
<div class="basic-info-item">
<span>订单号：</span>
<span>{{ podOrderDetailsData?.factoryOrderNumber }}</span>
</div>
</div> </div>
<div class="table-content"> <div class="table-content">
<TableView <TableView
ref="tableRef" ref="tableRef"
......
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