Skip to content

F
factory_front
Commit 3b6601d6 by qinjianhui
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !163
parents 6ee06ebd 85e7298e
Showing with 47 additions and 12 deletions
src/types/api/podCnOrder.ts
...@@ -56,6 +56,7 @@ export interface SearchForm { ...@@ -56,6 +56,7 @@ export interface SearchForm {
blocking?: boolean blocking?: boolean
outOfStock?: boolean outOfStock?: boolean
receiverCountry?: string receiverCountry?: string
standardDesignImage?: boolean
} }
export interface PodCnOrderListData { export interface PodCnOrderListData {
id: number id: number
...@@ -161,6 +162,7 @@ export interface ProductList { ...@@ -161,6 +162,7 @@ export interface ProductList {
sizeType?: number | null sizeType?: number | null
customTagList?: { name: string }[] customTagList?: { name: string }[]
outOfStock?: boolean outOfStock?: boolean
standardDesignImage?: 0 | 1 | 2 | null
} }
export interface cardImages { export interface cardImages {
title: string title: string
......
src/views/logistics/logisticsCompany.vue
...@@ -344,19 +344,18 @@ getLogisticsList() ...@@ -344,19 +344,18 @@ getLogisticsList()
<el-dialog <el-dialog
v-model="createData.show" v-model="createData.show"
:close-on-click-modal="false" :close-on-click-modal="false"
width="900px" width="800px"
:title="createData.title" :title="createData.title"
> >
<el-form <el-form
v-if="createData.show" v-if="createData.show"
ref="formRef" ref="formRef"
style="padding: 30px"
label-width="110px" label-width="110px"
:rules="rules" :rules="rules"
:model="form" :model="form"
class="el-row" class="el-row"
> >
<el-form-item class="el-col-12" label="物流公司编码" prop="code"> <el-form-item class="el-col-24" label="物流公司编码" prop="code">
<el-select <el-select
v-model="form.code" v-model="form.code"
clearable clearable
...@@ -378,7 +377,7 @@ getLogisticsList() ...@@ -378,7 +377,7 @@ getLogisticsList()
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="el-col-12" label="名称"> <el-form-item class="el-col-24" label="名称">
<el-input <el-input
v-model="form.name" v-model="form.name"
clearable clearable
...@@ -386,28 +385,28 @@ getLogisticsList() ...@@ -386,28 +385,28 @@ getLogisticsList()
placeholder="选择物流公司编码后展示" placeholder="选择物流公司编码后展示"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="el-col-12" label="联系人" prop="contact"> <el-form-item class="el-col-24" label="联系人" prop="contact">
<el-input <el-input
v-model="form.contact" v-model="form.contact"
clearable clearable
placeholder="请输入联系人" placeholder="请输入联系人"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="el-col-12" label="电话/手机" prop="phone"> <el-form-item class="el-col-24" label="电话/手机" prop="phone">
<el-input <el-input
v-model="form.phone" v-model="form.phone"
clearable clearable
placeholder="请输入电话/手机" placeholder="请输入电话/手机"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="el-col-12" label="网址" prop="siteUrl"> <el-form-item class="el-col-24" label="网址" prop="siteUrl">
<el-input <el-input
v-model="form.siteUrl" v-model="form.siteUrl"
clearable clearable
placeholder="请输入网址" placeholder="请输入网址"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="el-col-12" label="地址" prop="address"> <el-form-item class="el-col-24" label="地址" prop="address">
<el-input <el-input
v-model="form.address" v-model="form.address"
clearable clearable
...@@ -417,7 +416,7 @@ getLogisticsList() ...@@ -417,7 +416,7 @@ getLogisticsList()
<el-form-item <el-form-item
v-for="o in otherFields" v-for="o in otherFields"
:key="o" :key="o"
class="el-col-12" class="el-col-24"
required required
:label="o" :label="o"
:prop="`apiData.${o}`" :prop="`apiData.${o}`"
......
src/views/order/podCN/index.vue
...@@ -573,6 +573,22 @@ ...@@ -573,6 +573,22 @@
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="规范素材">
<ElSelect
v-model="searchForm.standardDesignImage"
placeholder="请选择"
clearable
filterable
style="width: 150px"
>
<ElOption
v-for="(_, index) in ['否', '是']"
:key="index"
:value="!!index"
:label="index === 0 ? '否' : '是'"
></ElOption>
</ElSelect>
</ElFormItem>
</ElForm> </ElForm>
<template #reference> <template #reference>
<el-button type="warning" @click="searchVisible = !searchVisible"> <el-button type="warning" @click="searchVisible = !searchVisible">
...@@ -1516,8 +1532,11 @@ ...@@ -1516,8 +1532,11 @@
<span class="goods-item-info-item-label" <span class="goods-item-info-item-label"
>申报重量(g):</span >申报重量(g):</span
> >
<span :title="item.customsWeight" class="goods-item-info-item-value"> <span
{{ item.customsWeight }} :title="item.customsWeight"
class="goods-item-info-item-value"
>
{{ item.customsWeight }}
</span> </span>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
...@@ -1874,6 +1893,11 @@ ...@@ -1874,6 +1893,11 @@
{{ row.failTime?.replace('T', ' ') }} {{ row.failTime?.replace('T', ' ') }}
</div> </div>
</template> </template>
<template #standardDesignImage="{ row }">
<div style="white-space: pre-line">
{{ getStandardDesignImageText(row.standardDesignImage) }}
</div>
</template>
<template #failReason="{ row }"> <template #failReason="{ row }">
<span style="white-space: pre-line" v-html="row.failReason"></span> <span style="white-space: pre-line" v-html="row.failReason"></span>
</template> </template>
...@@ -2959,7 +2983,6 @@ import { ...@@ -2959,7 +2983,6 @@ import {
} from '@/api/podCnOrder' } from '@/api/podCnOrder'
import { loadWarehouseListApi, getEmployeeListApi } from '@/api/common' import { loadWarehouseListApi, getEmployeeListApi } from '@/api/common'
// import { logisticsCompanyAllCodelist } from '@/api/logistics.ts' // import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
import { BaseRespData } from '@/types/api' import { BaseRespData } from '@/types/api'
import ChangeWayDialog from './components/ChangeWayDialog.vue' import ChangeWayDialog from './components/ChangeWayDialog.vue'
...@@ -3261,6 +3284,10 @@ const pickerOptions = { ...@@ -3261,6 +3284,10 @@ const pickerOptions = {
}, },
], ],
} }
const getStandardDesignImageText = (value: number): string => {
const map: Record<number, string> = { 0: '否', 1: '是', 2: '混合' }
return map[value] ?? '-'
}
const timeRange = ref<string[]>([]) const timeRange = ref<string[]>([])
const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => { const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
const end = dayjs() const end = dayjs()
...@@ -3917,6 +3944,13 @@ const tableColumns = computed(() => { ...@@ -3917,6 +3944,13 @@ const tableColumns = computed(() => {
}, },
}, },
{ {
label: '规范素材',
minWidth: 180,
prop: 'standardDesignImage',
slot: 'standardDesignImage',
align: 'center',
},
{
label: '失败原因', label: '失败原因',
minWidth: 250, minWidth: 250,
prop: 'failReason', prop: 'failReason',
......
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