Skip to content

F
factory_front
Commit 4ce66963 by linjinhong
Options

Merge remote-tracking branch 'origin/dev'

parents fe21f5fc e1a021c3
Showing with 13 additions and 8 deletions
components.d.ts
...@@ -32,6 +32,7 @@ declare module 'vue' { ...@@ -32,6 +32,7 @@ declare module 'vue' {
ElImage: typeof import('element-plus/es')['ElImage'] ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
...@@ -50,6 +51,7 @@ declare module 'vue' { ...@@ -50,6 +51,7 @@ declare module 'vue' {
ElTag: typeof import('element-plus/es')['ElTag'] ElTag: typeof import('element-plus/es')['ElTag']
ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTree: typeof import('element-plus/es')['ElTree'] ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
Icon: typeof import('./src/components/Icon.vue')['default'] Icon: typeof import('./src/components/Icon.vue')['default']
ImageView: typeof import('./src/components/ImageView.vue')['default'] ImageView: typeof import('./src/components/ImageView.vue')['default']
LogList: typeof import('./src/components/LogList.vue')['default'] LogList: typeof import('./src/components/LogList.vue')['default']
......
src/views/logistics/logisticsCompany.vue
...@@ -297,7 +297,7 @@ getLogisticsList() ...@@ -297,7 +297,7 @@ getLogisticsList()
<el-form-item class="el-col-12" label="物流公司编码" prop="code"> <el-form-item class="el-col-12" label="物流公司编码" prop="code">
<el-select v-model="form.code" clearable filterable @change="codeChange"> <el-select v-model="form.code" clearable filterable @change="codeChange">
<el-option <el-option
v-for="it in logisticsList" :key="it.code" :label="it.basicsName" v-for="it in logisticsList" :key="it.code" :label="it.code"
:value="it.code"> :value="it.code">
{{ it.code }} {{ it.code }}
<span style="font-size: 14px; color: #999; line-height: 24px"> <span style="font-size: 14px; color: #999; line-height: 24px">
......
src/views/logistics/shippingAddress.vue
...@@ -250,6 +250,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -250,6 +250,7 @@ const formConfig = computed<IFormConfig[]>(() => [
options: countryList.value, options: countryList.value,
label: 'countryCode', label: 'countryCode',
value: 'countryCode', value: 'countryCode',
filterable: true,
placeholder: '请选择国家代码', placeholder: '请选择国家代码',
onChange: (val: ICountryObj) => { onChange: (val: ICountryObj) => {
editForm.value.countryName = val.nameCn editForm.value.countryName = val.nameCn
...@@ -265,6 +266,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -265,6 +266,7 @@ const formConfig = computed<IFormConfig[]>(() => [
options: countryList.value, options: countryList.value,
label: 'nameCn', label: 'nameCn',
value: 'nameCn', value: 'nameCn',
filterable: true,
placeholder: '请选择国家名称', placeholder: '请选择国家名称',
onChange: (val: ICountryObj) => { onChange: (val: ICountryObj) => {
editForm.value.countryCode = val.countryCode editForm.value.countryCode = val.countryCode
......
src/views/order/podUs/PodMakeOrder.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@opened="handleOpened" @opened="handleOpened"
@close="onClose" @close="onClose"
> >
<template #title> <template #header>
<div class="title"> <div class="title">
<span>POD打单</span> <span>POD打单</span>
<span v-if="socketConnect === 'online'" class="online">[在线]</span> <span v-if="socketConnect === 'online'" class="online">[在线]</span>
......
src/views/order/podUs/index.vue
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<template #dropdown> <template #dropdown>
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')" <ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')"
>创建物流</ElDropdownItem >创建物流订单</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')" <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
>获取跟踪号</ElDropdownItem >获取跟踪号</ElDropdownItem
...@@ -1698,7 +1698,7 @@ const getOrderByIdApi = async (type: string) => { ...@@ -1698,7 +1698,7 @@ const getOrderByIdApi = async (type: string) => {
wayDialogTitle.value = wayDialogTitle.value =
type === 'batchChangeLogistics' type === 'batchChangeLogistics'
? `切换物流(当前物流方式：${selection.value[0]?.logisticsWayName})` ? `切换物流(当前物流方式：${selection.value[0]?.logisticsWayName})`
: '创建物流' : '创建物流订单'
isChangeWay.value = true isChangeWay.value = true
const { data } = await getLogisticsCalculation(selection.value[0]?.id) const { data } = await getLogisticsCalculation(selection.value[0]?.id)
...@@ -1759,14 +1759,15 @@ const wayDialogTitle = ref('') ...@@ -1759,14 +1759,15 @@ const wayDialogTitle = ref('')
const rowClick = (row: LogisticsData, title: string) => { const rowClick = (row: LogisticsData, title: string) => {
try { try {
if (title == '创建物流') { if (title == '创建物流订单') {
changeWayRow.value = row changeWayRow.value = row
} else { } else {
if (row.logisticsWayId === selection.value[0]?.logisticsWayId) { if (row.logisticsWayId === selection.value[0]?.logisticsWayId) {
ElMessage.warning('不能选择相同的物流方式')
changeWayRow.value = {} as LogisticsData changeWayRow.value = {} as LogisticsData
// nextTick(() => {
changeWayRef.value?.setCurrentRow() changeWayRef.value?.setCurrentRow()
// })
return return
} }
changeWayRow.value = row changeWayRow.value = row
...@@ -1790,7 +1791,7 @@ const changeWaySubmit = async (title: string) => { ...@@ -1790,7 +1791,7 @@ const changeWaySubmit = async (title: string) => {
return ElMessage.warning('请选择状态为成功的物流方式') return ElMessage.warning('请选择状态为成功的物流方式')
} }
let Fn let Fn
if (title !== '创建物流') { if (title !== '创建物流订单') {
if ( if (
changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId
) { ) {
......
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