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