Skip to content

F
factory_front
Commit 116afe3f by linjinhong
Options

Merge remote-tracking branch 'origin/dev' into linjinhong

parents 2a825f89 83a950e9
Showing with 33 additions and 20 deletions
src/types/api/podUsOrder.ts
...@@ -26,6 +26,7 @@ export interface SearchForm { ...@@ -26,6 +26,7 @@ export interface SearchForm {
supplierProductNo: string supplierProductNo: string
batchArrangeNumber: string batchArrangeNumber: string
craftCode: string craftCode: string
thirdStockSku: string
} }
export interface PodUsOrderListData { export interface PodUsOrderListData {
id: number id: number
......
src/views/order/podUs/index.vue
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
style="width: 150px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="供应货号"> <ElFormItem label="款号">
<ElInput <ElInput
v-model="searchForm.supplierProductNo" v-model="searchForm.supplierProductNo"
placeholder="供应货号" placeholder="款号"
clearable clearable
style="width: 150px" style="width: 150px"
/> />
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
<el-radio-button :label="true">多件</el-radio-button> <el-radio-button :label="true">多件</el-radio-button>
</el-radio-group> </el-radio-group>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<ElPopover placement="bottom" width="600" trigger="click"> <ElPopover placement="bottom" width="600" trigger="click">
<ElForm <ElForm
...@@ -584,7 +583,7 @@ ...@@ -584,7 +583,7 @@
{{ item.productName }} {{ item.productName }}
</span> </span>
</div> </div>
<div class="goods-item-info-item"> <!-- <div class="goods-item-info-item">
<span class="goods-item-info-item-label">Base SKU:</span> <span class="goods-item-info-item-label">Base SKU:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.baseSku }} {{ item.baseSku }}
...@@ -592,7 +591,7 @@ ...@@ -592,7 +591,7 @@
<el-icon class="icon" @click="copy(item.baseSku || '')"> <el-icon class="icon" @click="copy(item.baseSku || '')">
<DocumentCopy /> <DocumentCopy />
</el-icon> </el-icon>
</div> </div> -->
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">变体SKU:</span> <span class="goods-item-info-item-label">变体SKU:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
...@@ -617,6 +616,18 @@ ...@@ -617,6 +616,18 @@
<DocumentCopy /> <DocumentCopy />
</el-icon> </el-icon>
</div> </div>
<div v-if="item.thirdStockSku" class="goods-item-info-item">
<span class="goods-item-info-item-label">货号:</span>
<span class="goods-item-info-item-value">
{{ item.thirdStockSku }}
</span>
<el-icon
class="icon"
@click="copy(item.thirdStockSku || '')"
>
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">工艺:</span> <span class="goods-item-info-item-label">工艺:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
...@@ -681,7 +692,7 @@ ...@@ -681,7 +692,7 @@
</span> </span>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">供应货号:</span> <span class="goods-item-info-item-label">款号:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.supplierProductNo }} {{ item.supplierProductNo }}
</span> </span>
...@@ -1279,9 +1290,9 @@ ...@@ -1279,9 +1290,9 @@
</span> </span>
</div> </div>
<div class="grid-item"> <div class="grid-item">
<span class="grid-item-label">供应货号：</span> <span class="grid-item-label">款号：</span>
<span <span
:title="`供应货号: ${cardItem?.supplierProductNo}`" :title="`款号: ${cardItem?.supplierProductNo}`"
class="grid-item-value" class="grid-item-value"
> >
{{ cardItem?.supplierProductNo }} {{ cardItem?.supplierProductNo }}
...@@ -1887,6 +1898,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({ ...@@ -1887,6 +1898,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
supplierProductNo: '', supplierProductNo: '',
batchArrangeNumber: '', batchArrangeNumber: '',
craftCode: '', craftCode: '',
thirdStockSku:''
}) })
const exceptionStatus = ref(1) const exceptionStatus = ref(1)
const userMarkList = ref<string[]>([]) const userMarkList = ref<string[]>([])
......
src/views/warehouse/issueDoc.vue
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -616,7 +616,7 @@ ...@@ -616,7 +616,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -748,7 +748,7 @@ ...@@ -748,7 +748,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="supplierItemNo" prop="supplierItemNo"
label="供应货号" label="款号"
></el-table-column> ></el-table-column>
<el-table-column align="center" prop="number" label="打印数量"> <el-table-column align="center" prop="number" label="打印数量">
<template #default="{ row }"> <template #default="{ row }">
......
src/views/warehouse/receiptDoc.vue
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn align="center" label="入库数量" prop="buyStored"> <ElTableColumn align="center" label="入库数量" prop="buyStored">
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="供应货号" label="款号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="supplierItemNo" prop="supplierItemNo"
label="供应货号" label="款号"
></el-table-column> ></el-table-column>
<el-table-column align="center" prop="number" label="打印数量"> <el-table-column align="center" prop="number" label="打印数量">
<template #default="{ row }"> <template #default="{ row }">
......
src/views/warehouse/warning.vue
...@@ -241,7 +241,7 @@ getWarehouse() ...@@ -241,7 +241,7 @@ getWarehouse()
<el-table-column <el-table-column
align="center" align="center"
prop="productNo" prop="productNo"
label="供应货号 " label="款号 "
></el-table-column> ></el-table-column>
<el-table-column align="center" prop="number" label="打印数量"> <el-table-column align="center" prop="number" label="打印数量">
<template #default="{ row }"> <template #default="{ row }">
...@@ -295,11 +295,11 @@ getWarehouse() ...@@ -295,11 +295,11 @@ getWarehouse()
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="供应货号"> <el-form-item label="款号">
<el-input <el-input
v-model="searchForm.productNo" v-model="searchForm.productNo"
style="width: 140px" style="width: 140px"
placeholder="请输入货号" placeholder="请输入款号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -439,7 +439,7 @@ getWarehouse() ...@@ -439,7 +439,7 @@ getWarehouse()
<el-table-column <el-table-column
align="center" align="center"
prop="productNo" prop="productNo"
label="供应货号" label="款号"
width="150" width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
......
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