Skip to content

F
factory_front
Commit 9ba71cf8 by linjinhong
Options

修改podus页面筛选条件顺序，card添加右上角工艺图片，右下角平台图片，userinfo右上角添加工厂字段

parent 06efc3c0
Showing with 145 additions and 98 deletions
src/components/NavMenu.vue
...@@ -35,6 +35,9 @@ ...@@ -35,6 +35,9 @@
</template> </template>
</el-menu> </el-menu>
<div v-if="userInfo" class="user-info"> <div v-if="userInfo" class="user-info">
<span class="user-avatar" style="color: #fff; font-size: 14px">
工厂： {{ userInfo.factoryCode }}
</span>
<span class="user-avatar"> <span class="user-avatar">
<el-icon><User /></el-icon> <el-icon><User /></el-icon>
</span> </span>
...@@ -530,4 +533,8 @@ onUnmounted(() => { ...@@ -530,4 +533,8 @@ onUnmounted(() => {
border: none !important; border: none !important;
} }
} }
.user-info {
display: flex;
align-items: center;
}
</style> </style>
src/types/api/podUsOrder.ts
...@@ -85,6 +85,8 @@ export interface ProductList { ...@@ -85,6 +85,8 @@ export interface ProductList {
templatePrice?: number templatePrice?: number
variantImage?: string variantImage?: string
craftPrice?: number craftPrice?: number
craftCode: string
platform: string
imageAry?: string imageAry?: string
designImages?: string designImages?: string
categoryId?: number categoryId?: number
......
src/views/logistics/logisticsMethod.vue
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
v-model="editForm" v-model="editForm"
:config="formConfig" :config="formConfig"
form-item-width="100%" form-item-width="100%"
labelWidth="110"
> >
</CustomizeForm> </CustomizeForm>
......
src/views/order/podUs/index.vue
...@@ -2,46 +2,49 @@ ...@@ -2,46 +2,49 @@
<div class="card flex-column h-100 overflow-hidden"> <div class="card flex-column h-100 overflow-hidden">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline> <ElForm :model="searchForm" size="default" inline>
<ElFormItem> <div>
<el-select <ElFormItem label="仓库">
v-model="searchForm.timeType" <ElSelect
style="width: 100px; margin-right: 5px" v-model="searchForm.warehouseId"
clearable clearable
placeholder="时间类型" filterable
placeholder="请输入"
style="width: 150px"
> >
<el-option :value="1" label="创建时间"></el-option> <el-option
<el-option :value="2" label="确认时间"></el-option> v-for="item in warehouseList"
<el-option :value="3" label="完成时间"></el-option> :key="item.id"
</el-select> :label="item.name"
<el-date-picker :value="item.id"
v-model="timeRange" ></el-option>
:default-time="[ </ElSelect>
new Date(0, 0, 0, 0, 0, 0), </ElFormItem>
new Date(0, 0, 0, 23, 59, 59), <ElFormItem label="平台">
]" <ElSelect
placeholder="收货人" v-model="searchForm.platform"
value-format="YYYY-MM-DD HH:mm:ss" value-key=""
type="datetimerange" placeholder="请选择"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable clearable
filterable
popper-class="customize-select-style"
style="width: 150px"
> >
</el-date-picker> <ElOption
</ElFormItem> v-for="(item, index) in platformJson"
<ElFormItem label="类型"> :key="index"
<el-radio-group v-model="searchForm.customizedQuantity"> :label="item.type"
<el-radio-button label="single">单面</el-radio-button> :value="item.type"
<el-radio-button label="multiple">多面</el-radio-button> style="width: 160px"
</el-radio-group> >
</ElFormItem> <img
<ElFormItem label="数量"> :src="`/images/icon/${item.icon.split('/').pop()}`"
<el-radio-group v-model="searchForm.multi"> style="height: 20px; margin: 5px 10px 0 0"
<el-radio-button :label="false">单件</el-radio-button> />
<el-radio-button :label="true">多件</el-radio-button> <span :title="item.type">{{ item.type }}</span>
</el-radio-group> </ElOption>
</ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="工艺"> <ElFormItem label="工艺">
<ElSelect <ElSelect
v-model="searchForm.craftCode" v-model="searchForm.craftCode"
...@@ -74,22 +77,6 @@ ...@@ -74,22 +77,6 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="生产单号">
<ElInput
v-model="searchForm.factorySubOrderNumber"
placeholder="生产单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="订单号">
<ElInput
v-model="searchForm.factoryOrderNumber"
placeholder="订单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="批次号"> <ElFormItem label="批次号">
<ElInput <ElInput
v-model="searchForm.batchArrangeNumber" v-model="searchForm.batchArrangeNumber"
...@@ -98,14 +85,28 @@ ...@@ -98,14 +85,28 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号"> <ElFormItem label="生产单号">
<ElInput <ElInput
v-model="searchForm.shopNumber" v-model="searchForm.factorySubOrderNumber"
placeholder="店铺单号" placeholder="生产单号"
clearable clearable
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
</div>
<ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity">
<el-radio-button label="single">单面</el-radio-button>
<el-radio-button label="multiple">多面</el-radio-button>
</el-radio-group>
</ElFormItem>
<ElFormItem label="数量">
<el-radio-group v-model="searchForm.multi">
<el-radio-button :label="false">单件</el-radio-button>
<el-radio-button :label="true">多件</el-radio-button>
</el-radio-group>
</ElFormItem>
<ElFormItem> <ElFormItem>
<ElPopover placement="bottom" width="600" trigger="click"> <ElPopover placement="bottom" width="600" trigger="click">
<ElForm <ElForm
...@@ -114,21 +115,52 @@ ...@@ -114,21 +115,52 @@
inline inline
label-width="100px" label-width="100px"
> >
<ElFormItem label="仓库"> <ElFormItem style="width: 100%; padding-right: 40px">
<ElSelect <div style="width: 100%; display: flex; flex-wrap: nowrap">
v-model="searchForm.warehouseId" <el-select
v-model="searchForm.timeType"
clearable clearable
filterable placeholder="时间类型"
placeholder="请输入" style="flex: 1; margin-right: 10px"
style="width: 150px"
> >
<el-option <el-option :value="1" label="创建时间"></el-option>
v-for="item in warehouseList" <el-option :value="2" label="确认时间"></el-option>
:key="item.id" <el-option :value="3" label="完成时间"></el-option>
:label="item.name" </el-select>
:value="item.id" <el-date-picker
></el-option> v-model="timeRange"
</ElSelect> :default-time="[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
placeholder="收货人"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable
>
</el-date-picker>
</div>
</ElFormItem>
<ElFormItem label="订单号">
<ElInput
v-model="searchForm.factoryOrderNumber"
placeholder="订单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem> </ElFormItem>
<ElFormItem label="客户"> <ElFormItem label="客户">
<el-select <el-select
...@@ -146,31 +178,7 @@ ...@@ -146,31 +178,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="平台">
<ElSelect
v-model="searchForm.platform"
value-key=""
placeholder="请选择"
clearable
filterable
popper-class="customize-select-style"
style="width: 150px"
>
<ElOption
v-for="(item, index) in platformJson"
:key="index"
:label="item.type"
:value="item.type"
style="width: 160px"
>
<img
:src="`/images/icon/${item.icon.split('/').pop()}`"
style="height: 20px; margin: 5px 10px 0 0"
/>
<span :title="item.type">{{ item.type }}</span>
</ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="生产端"> <ElFormItem label="生产端">
<ElSelect <ElSelect
v-model="searchForm.productionClient" v-model="searchForm.productionClient"
...@@ -424,9 +432,7 @@ ...@@ -424,9 +432,7 @@
</ElButton> </ElButton>
</span> </span>
<span v-if="status === 'STOCK_OUT'" class="item"> <span v-if="status === 'STOCK_OUT'" class="item">
<ElButton type="success" @click="toBePicking"> <ElButton type="success" @click="toBePicking"> 转至生产 </ElButton>
转至待创建物流
</ElButton>
</span> </span>
<span v-if="status === 'TO_BE_ARRANGE'" class="item"> <span v-if="status === 'TO_BE_ARRANGE'" class="item">
<ElButton type="warning" @click="arrangeFinish">排单完成</ElButton> <ElButton type="warning" @click="arrangeFinish">排单完成</ElButton>
...@@ -447,7 +453,7 @@ ...@@ -447,7 +453,7 @@
class="item" class="item"
> >
<ElButton type="success" @click="refreshMaterial"> <ElButton type="success" @click="refreshMaterial">
刷新素材图 刷新素材
</ElButton> </ElButton>
</span> </span>
</ElFormItem> </ElFormItem>
...@@ -1146,6 +1152,17 @@ ...@@ -1146,6 +1152,17 @@
:image-field="'variantImage'" :image-field="'variantImage'"
@contextmenu.prevent="(v: MouseEvent) => rightClick(v)" @contextmenu.prevent="(v: MouseEvent) => rightClick(v)"
> >
<template
#top_right
v-if="['ZPZY', 'CXZY', 'THZY'].includes(cardItem.craftCode)"
>
<img
:src="`/images/pic/${cardItem.craftCode}.png`"
width="100px;"
height="100px"
alt=""
/>
</template>
<template #bottom_left> <template #bottom_left>
<span <span
v-if="cardItem?.factorySubOrderNumber" v-if="cardItem?.factorySubOrderNumber"
...@@ -1159,6 +1176,16 @@ ...@@ -1159,6 +1176,16 @@
</span> </span>
</template> </template>
<template #operations> <template #operations>
<div
style="position: absolute; top: -35px; right: 2px"
v-if="cardItem.platform"
>
<img
:src="`/images/icon/${getPlatformImg(cardItem.platform)}`"
style="height: 30px"
/>
</div>
<Icon <Icon
name="caozuorizhi" name="caozuorizhi"
@click="(e: MouseEvent) => operationLog(cardItem.podJomallOrderUsId, e)" @click="(e: MouseEvent) => operationLog(cardItem.podJomallOrderUsId, e)"
...@@ -1833,7 +1860,7 @@ const confirmRowData = ref<ProductList | null>(null) ...@@ -1833,7 +1860,7 @@ const confirmRowData = ref<ProductList | null>(null)
const status = ref('TO_BE_CONFIRMED') const status = ref('TO_BE_CONFIRMED')
const detailData = ref({}) const detailData = ref({})
const [searchForm, resetSearchForm] = useValue<SearchForm>({ const [searchForm, resetSearchForm] = useValue<SearchForm>({
timeType: null, timeType: 1,
shopNumber: '', shopNumber: '',
shipmentType: '', shipmentType: '',
userMark: '', userMark: '',
...@@ -3272,7 +3299,7 @@ const stockOutCheck = async () => { ...@@ -3272,7 +3299,7 @@ const stockOutCheck = async () => {
// 添加表格ref // 添加表格ref
const tableRef = ref() const tableRef = ref()
//转至待创建物流 //转至生产
const toBePicking = async () => { const toBePicking = async () => {
if (selection.value.length === 0) { if (selection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
...@@ -3773,6 +3800,16 @@ const replenishmentSuccess = async () => { ...@@ -3773,6 +3800,16 @@ const replenishmentSuccess = async () => {
loading.close() loading.close()
} }
} }
function getPlatformImg(code: string) {
const item = platformJson.find(
(el) => el.name.toLowerCase() === code.toLowerCase(),
)
if (item) {
return item.icon.split('/').pop()
}
return ''
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.header-filter-form { .header-filter-form {
......
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