Skip to content

F
factory_front
Commit 23fdcb39 by qinjianhui
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !240
parents 3269bc05 44208a18
Showing with 76 additions and 33 deletions
src/types/api/logistics.ts
export interface Ilogistics { export interface Ilogistics {
id: number code?: string
name: string basicsName?: string
warehouseId: number id?: number
warehouseName: string name?: string
uinuinWarehouseId: number | null warehouseId?: number
companyId: number | null warehouseName?: string
company: string | null uinuinWarehouseId?: number | null
serviceCode: string companyId?: number | null
siteUrl: string company?: string | null
status: number serviceCode?: string
factoryId: number siteUrl?: string
createTime: string status?: number
updateTime: string | null factoryId?: number
createTime?: string
updateTime?: string | null
} }
export interface IsortingInfo { export interface IsortingInfo {
id?: number id?: number
......
src/views/logistics/sortingConfiguration.vue
...@@ -7,16 +7,17 @@ import { ...@@ -7,16 +7,17 @@ import {
QuestionFilled, QuestionFilled,
} from '@element-plus/icons-vue' } from '@element-plus/icons-vue'
import platformJson from '@/json/platform.json' import platformJson from '@/json/platform.json'
import useImagePreview from '@/utils/hooks/useImagePreview.' // import useImagePreview from '@/utils/hooks/useImagePreview.'
const { mouseoverImg, mouseleaveImg } = useImagePreview() // const { mouseoverImg, mouseleaveImg } = useImagePreview()
import sortingImg from '@/assets/images/分拣口说明.png' import sortingImg from '@/assets/images/分拣口说明.png'
import { import {
getsortingConfigListApi, getsortingConfigListApi,
usableAllList, // usableAllList,
createSortingApi, createSortingApi,
updateSortingApi, updateSortingApi,
deleteSortingApi, deleteSortingApi,
} from '@/api/logistics' } from '@/api/logistics'
import { allErpCodeListApi } from '@/api/podCnOrder'
import { nextTick, ref } from 'vue' import { nextTick, ref } from 'vue'
import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts' import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
...@@ -66,7 +67,7 @@ const rules = computed(() => { ...@@ -66,7 +67,7 @@ const rules = computed(() => {
serviceCode: [ serviceCode: [
{ {
required: true, required: true,
message: `请选择${activeName.value == '1' ? '物流方式' : '平台'}`, message: `请选择${activeName.value == '1' ? '物流公司' : '平台'}`,
trigger: 'change', trigger: 'change',
}, },
], ],
...@@ -94,8 +95,15 @@ const { ...@@ -94,8 +95,15 @@ const {
}) })
const logisticsMethodsList = ref<Ilogistics[]>([]) const logisticsMethodsList = ref<Ilogistics[]>([])
const getlogisticsMethods = async () => { const getlogisticsMethods = async () => {
const res = await usableAllList() const res = await allErpCodeListApi()
logisticsMethodsList.value = res.data || [] logisticsMethodsList.value = res.data || []
logisticsMethodsList.value = [
...logisticsMethodsList.value,
{
code: 'JOMALL_FACTORY',
basicsName: '九猫统筹物流',
},
]
} }
interface interSorting { interface interSorting {
...@@ -136,6 +144,30 @@ const sortingList = ref<interSorting[]>([ ...@@ -136,6 +144,30 @@ const sortingList = ref<interSorting[]>([
value: 8, value: 8,
}, },
{ {
label: 'L5',
value: 9,
},
{
label: 'R5',
value: 10,
},
{
label: 'L6',
value: 11,
},
{
label: 'R6',
value: 12,
},
{
label: 'L7',
value: 13,
},
{
label: 'R7',
value: 14,
},
{
label: 'E0', label: 'E0',
value: 99, value: 99,
}, },
...@@ -302,7 +334,7 @@ useEnterKeyTrigger({ ...@@ -302,7 +334,7 @@ useEnterKeyTrigger({
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物流方式"> <el-form-item label="物流公司">
<el-select <el-select
v-model="searchForm.serviceCode" v-model="searchForm.serviceCode"
clearable clearable
...@@ -310,13 +342,13 @@ useEnterKeyTrigger({ ...@@ -310,13 +342,13 @@ useEnterKeyTrigger({
multiple multiple
collapse-tags collapse-tags
collapse-tags-tooltip collapse-tags-tooltip
style="width: 200px" style="width: 220px"
> >
<el-option <el-option
v-for="item in logisticsMethodsList" v-for="item in logisticsMethodsList"
:key="item.serviceCode" :key="item.code"
:label="item.serviceCode" :label="item.basicsName"
:value="item.serviceCode" :value="item.code"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -362,7 +394,7 @@ useEnterKeyTrigger({ ...@@ -362,7 +394,7 @@ useEnterKeyTrigger({
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="物流编码" label="物流公司"
show-overflow-tooltip show-overflow-tooltip
prop="serviceCode" prop="serviceCode"
></el-table-column> ></el-table-column>
...@@ -569,19 +601,28 @@ useEnterKeyTrigger({ ...@@ -569,19 +601,28 @@ useEnterKeyTrigger({
></el-option> ></el-option>
</el-select> </el-select>
&ensp; &ensp;
<el-icon <el-popover placement="bottom-start" width="700" trigger="click">
<img :src="sortingImg" alt="分拣口示意图" style="width: 100%" />
<template #reference>
<el-icon size="30" color="#606266" style="cursor: pointer">
<QuestionFilled />
</el-icon>
</template>
</el-popover>
<!-- <el-icon
size="30" size="30"
title="分拣口示意图" title="分拣口示意图"
style="cursor: pointer" style="cursor: pointer"
@click="mouseoverImg(ev, sortingImg, '700px', true, true)"
@mouseover="(ev:MouseEvent) => mouseoverImg(ev, sortingImg,'700px',true,true)" @mouseover="(ev:MouseEvent) => mouseoverImg(ev, sortingImg,'700px',true,true)"
@mouseleave="mouseleaveImg" @mouseleave="mouseleaveImg"
><QuestionFilled ><QuestionFilled
/></el-icon> /></el-icon> -->
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="activeName == '1'" v-if="activeName == '1'"
label="物流方式" label="物流公司"
prop="serviceCode" prop="serviceCode"
> >
<div class="flex"> <div class="flex">
...@@ -594,9 +635,9 @@ useEnterKeyTrigger({ ...@@ -594,9 +635,9 @@ useEnterKeyTrigger({
> >
<el-option <el-option
v-for="item in logisticsMethodsList" v-for="item in logisticsMethodsList"
:key="item.serviceCode" :key="item.code"
:label="item.serviceCode" :label="item.basicsName"
:value="item.serviceCode" :value="item.code"
></el-option> ></el-option>
</el-select> </el-select>
&ensp; &ensp;
......
src/views/order/podUs/PodMakeOrder.vue
...@@ -851,9 +851,9 @@ const handleSearch = () => { ...@@ -851,9 +851,9 @@ const handleSearch = () => {
} }
productionOrder.value = '' productionOrder.value = ''
isLock.value = true isLock.value = true
const everyPower = podOrderDetailsData.value?.productList?.every( const everyPower =
(item) => item.power, podOrderDetailsData.value &&
) podOrderDetailsData.value?.productList?.every((item) => item.power)
if (props.wallType === 'sort' && !isAutoPrint.value) { if (props.wallType === 'sort' && !isAutoPrint.value) {
getPackingData(code) getPackingData(code)
return return
......
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