Skip to content

F
factory_front
Commit 217555a6 by linjinhong
Options

fix：修改 称重分拣按钮颜色

parent 1c8c8872
Showing with 134 additions and 161 deletions
src/views/order/podCN/index.vue
......@@ -11,121 +11,107 @@
label-width="70px"
>
<!-- 批量下载 -->
<ElFormItem label="创建时间" v-if="
status === 'BATCH_DOWNLOAD'
">
<el-date-picker
v-model="timeRange"
:teleported="false"
:default-time="[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable
>
</el-date-picker>
</ElFormItem>
<ElFormItem label="创建人" v-if="
status === 'BATCH_DOWNLOAD'
">
<ElSelect
v-model="searchForm.employeeId"
placeholder="请选择"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in employeeList"
:key="index"
:value="item.id"
:label="item.account"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺类型" v-if="
status === 'BATCH_DOWNLOAD'
">
<ElSelect
v-model="searchForm.craftType"
placeholder="请选择"
clearable
filterable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in processType"
:key="index"
:value="item.value"
:label="item.label"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="下载状态" v-if="
status === 'BATCH_DOWNLOAD'
">
<ElSelect
v-model="searchForm.downloadStatus"
placeholder="下载状态"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['未下载', '已下载']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="排版状态" v-if="
status === 'BATCH_DOWNLOAD'
">
<ElSelect
v-model="searchForm.syntheticStatus"
placeholder="排版状态"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['否', '是']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="自动排版" v-if="
status === 'BATCH_DOWNLOAD'
">
<ElSelect
v-model="searchForm.automaticComposing"
placeholder="自动排版"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['否', '是']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="仓库" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="创建时间" v-if="status === 'BATCH_DOWNLOAD'">
<el-date-picker
v-model="timeRange"
:teleported="false"
:default-time="[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable
>
</el-date-picker>
</ElFormItem>
<ElFormItem label="创建人" v-if="status === 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.employeeId"
placeholder="请选择"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in employeeList"
:key="index"
:value="item.id"
:label="item.account"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺类型" v-if="status === 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.craftType"
placeholder="请选择"
clearable
filterable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in processType"
:key="index"
:value="item.value"
:label="item.label"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="下载状态" v-if="status === 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.downloadStatus"
placeholder="下载状态"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['未下载', '已下载']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="排版状态" v-if="status === 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.syntheticStatus"
placeholder="排版状态"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['否', '是']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="自动排版" v-if="status === 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.automaticComposing"
placeholder="自动排版"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in ['否', '是']"
:key="index"
:value="index"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="仓库" v-if="status !== 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.warehouseId"
clearable
......@@ -141,9 +127,7 @@
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="平台" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="平台" v-if="status !== 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.platform"
value-key=""
......@@ -169,9 +153,7 @@
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="工艺" v-if="status !== 'BATCH_DOWNLOAD'">
<LogisticsWaySelect
v-model="searchForm.craftCode"
:company-list="craftList"
......@@ -180,9 +162,7 @@
start-placeholder="请选择工艺名称"
></LogisticsWaySelect>
</ElFormItem>
<ElFormItem label="库存SKU" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="库存SKU" v-if="status !== 'BATCH_DOWNLOAD'">
<ElInput
v-model.trim="searchForm.thirdSkuCode"
placeholder="库存SKU"
......@@ -190,9 +170,7 @@
style="width: 150px"
></ElInput>
</ElFormItem>
<ElFormItem label="款号" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="款号" v-if="status !== 'BATCH_DOWNLOAD'">
<ElInput
v-model.trim="searchForm.supplierProductNo"
placeholder="款号"
......@@ -208,9 +186,7 @@
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="生产单号" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="生产单号" v-if="status !== 'BATCH_DOWNLOAD'">
<ElInput
v-model.trim="searchForm.factorySubOrderNumber"
placeholder="生产单号"
......@@ -218,9 +194,7 @@
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="店铺单号" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="店铺单号" v-if="status !== 'BATCH_DOWNLOAD'">
<ElInput
v-model.trim="searchForm.shopNumber"
placeholder="店铺单号"
......@@ -228,9 +202,7 @@
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="尺码类型" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="尺码类型" v-if="status !== 'BATCH_DOWNLOAD'">
<ElSelect
v-model="searchForm.sizeType"
clearable
......@@ -246,9 +218,7 @@
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="排序" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="排序" v-if="status !== 'BATCH_DOWNLOAD'">
<el-select
v-model="searchForm.order"
clearable
......@@ -259,9 +229,7 @@
<el-option value="desc" label="倒序"></el-option>
</el-select>
</ElFormItem>
<ElFormItem label="类型" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="类型" v-if="status !== 'BATCH_DOWNLOAD'">
<el-radio-group
v-model="searchForm.customizedQuantity"
@click.stop="(e: Event) => handleRadioGroupClick(e)"
......@@ -270,9 +238,7 @@
<el-radio-button value="multiple">多面</el-radio-button>
</el-radio-group>
</ElFormItem>
<ElFormItem label="数量" v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem label="数量" v-if="status !== 'BATCH_DOWNLOAD'">
<el-radio-group
v-model="searchForm.multi"
@click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
......@@ -281,9 +247,7 @@
<el-radio-button :value="true">多件</el-radio-button>
</el-radio-group>
</ElFormItem>
<ElFormItem v-if="
status !== 'BATCH_DOWNLOAD'
">
<ElFormItem v-if="status !== 'BATCH_DOWNLOAD'">
<ElPopover placement="bottom" width="600" trigger="click">
<ElForm
ref="searchFormPopoverRef"
......@@ -535,7 +499,10 @@
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem v-if="status !== 'CANCEL' && status !== 'INTERCEPTED'" label="拦截订单">
<ElFormItem
v-if="status !== 'CANCEL' && status !== 'INTERCEPTED'"
label="拦截订单"
>
<ElSelect
v-model="searchForm.blocking"
placeholder="请选择"
......@@ -976,7 +943,7 @@
>
</span>
<span v-if="status === 'WAIT_WEIGHING'" class="item">
<ElButton type="danger" @click="weightDialogRef.open()"
<ElButton type="success" @click="weightDialogRef.open()"
>称重分拣</ElButton
>
</span>
......@@ -3685,7 +3652,7 @@ const tableColumns = computed(() => {
width: 150,
prop: 'craftType',
align: 'center',
render: (item:ProductList) => {
render: (item: ProductList) => {
if (!item.craftType) {
return (
<div>
......@@ -3693,20 +3660,23 @@ const tableColumns = computed(() => {
</div>
)
}
// 分割字符串并查找对应的 label
const labels = item.craftType
.split(',')
.map(type => type.trim())
.map(type => processType.value.find(e => e.value === type)?.label || type)
.map((type) => type.trim())
.map(
(type) =>
processType.value.find((e) => e.value === type)?.label || type,
)
.filter(Boolean)
return (
<div>
<span>{labels.join(',')}</span>
</div>
)
}
},
},
{
label: '失败原因',
......@@ -3863,7 +3833,6 @@ const asyncOrderAddress = async () => {
}
}
const getEmployeeList = async () => {
const { data } = await getEmployeeListApi()
employeeList.value = data
......@@ -3961,9 +3930,13 @@ const {
baseparams.tagsIdArr && delete baseparams.tagsIdArr
// 批量下载
if (status.value === 'BATCH_DOWNLOAD') {
return batchDownloadApi({
...baseparams
},page, pageSize).then((res) => {
return batchDownloadApi(
{
...baseparams,
},
page,
pageSize,
).then((res) => {
return res.data
}) as never
} else if (
......@@ -5325,7 +5298,7 @@ const loadWarehouseList = async () => {
}
interface ProcessTypeData {
label: string
value:string
value: string
}
const processType = ref<ProcessTypeData[]>([
{
......
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