Skip to content

F
factory_front
Commit 97d95c22 by zhuzhequan
Options

Merge branch 'dev_logistics_cn' into 'release' 

Dev logistics cn

See merge request !147
parents b62d6eb9 430cbb36
Showing with 91 additions and 4 deletions
src/types/api/podCnOrder.ts
...@@ -216,6 +216,7 @@ export interface LogisticsData { ...@@ -216,6 +216,7 @@ export interface LogisticsData {
export interface AddressInfo { export interface AddressInfo {
id?: string id?: string
receiverName: string receiverName: string
rfcNumber: string
receiverPhone: string receiverPhone: string
receiverCountry: string receiverCountry: string
receiverProvince: string receiverProvince: string
......
src/views/logistics/logisticsMethod.vue
...@@ -398,6 +398,34 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -398,6 +398,34 @@ const formConfig = computed<IFormConfig[]>(() => [
message: '请输入物流编码', message: '请输入物流编码',
}, },
], ],
},{
prop: 'vat',
type: 'input',
label: 'vat编号',
fixed: 'last',
attrs: {
placeholder: '请输入vat编号',
},
rules: [
{
required: false,
message: '请输入vat编号',
},
],
},{
prop: 'ioss',
type: 'input',
label: 'IOSS编号',
fixed: 'last',
attrs: {
placeholder: '请输入IOSS编号',
},
rules: [
{
required: false,
message: '请输入IOSS编号',
},
],
}, },
{ {
prop: 'status', prop: 'status',
...@@ -605,6 +633,16 @@ const tableConfig = ref<TableColumn[]>([ ...@@ -605,6 +633,16 @@ const tableConfig = ref<TableColumn[]>([
}, },
}, },
{ {
prop: 'vat',
label: 'vat编号',
},
{
prop: 'ioss',
label: 'IOSS编号',
},
{
prop: 'opeare', prop: 'opeare',
label: '操作', label: '操作',
attrs: { attrs: {
......
src/views/order/podCN/components/updateAddress.vue
...@@ -11,6 +11,7 @@ const visible = defineModel<boolean>('visible') ...@@ -11,6 +11,7 @@ const visible = defineModel<boolean>('visible')
const form = defineModel<AddressInfo>('form', { const form = defineModel<AddressInfo>('form', {
default: { default: {
receiverName: '', receiverName: '',
rfcNumber: '',
receiverPhone: '', receiverPhone: '',
receiverCountry: '', receiverCountry: '',
receiverProvince: '', receiverProvince: '',
...@@ -133,6 +134,13 @@ const submitForm = async () => { ...@@ -133,6 +134,13 @@ const submitForm = async () => {
placeholder="请输入邮政编码" placeholder="请输入邮政编码"
/> />
</el-form-item> </el-form-item>
<el-form-item label="RFC税号" prop="rfcNumber">
<el-input
v-model="form.rfcNumber"
clearable
placeholder="请输入RFC税号"
/>
</el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
......
src/views/order/podCN/index.vue
...@@ -1486,6 +1486,43 @@ ...@@ -1486,6 +1486,43 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="goods-item-info">
<div class="goods-item-info-item">
<span class="goods-item-info-item-label"
>英文报关名称:</span
>
<span class="goods-item-info-item-value">
{{ item.customsNameEnglish }}
</span>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label"
>中文报关名称:</span
>
<span class="goods-item-info-item-value">
{{ item.customsNameChinese }}
</span>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label"
>申报重量(g):</span
>
<span class="goods-item-info-item-value">
{{ item.customsWeight }}
</span>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label"
>申报价值($):</span
>
<span class="goods-item-info-item-value">
{{ item.customsValue }}
</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -3013,6 +3050,7 @@ const totalAmountPrice = (item: PodCnOrderListData): string => { ...@@ -3013,6 +3050,7 @@ const totalAmountPrice = (item: PodCnOrderListData): string => {
const countryList = ref([]) const countryList = ref([])
const currentRow = ref<AddressInfo>({ const currentRow = ref<AddressInfo>({
receiverName: '', receiverName: '',
rfcNumber: '',
receiverPhone: '', receiverPhone: '',
receiverCountry: '', receiverCountry: '',
receiverProvince: '', receiverProvince: '',
...@@ -3902,7 +3940,7 @@ const tableColumns = computed(() => { ...@@ -3902,7 +3940,7 @@ const tableColumns = computed(() => {
{ {
label: '操作', label: '操作',
slot: 'operate', slot: 'operate',
width: 260, width: 120,
align: 'center', align: 'center',
fixed: 'right', fixed: 'right',
prop: 'operate', prop: 'operate',
...@@ -3921,7 +3959,7 @@ const tableColumns = computed(() => { ...@@ -3921,7 +3959,7 @@ const tableColumns = computed(() => {
label: '商品', label: '商品',
prop: 'goods', prop: 'goods',
slot: 'goods', slot: 'goods',
minWidth: 920, minWidth: 1100,
}, },
{ {
label: '订单详情', label: '订单详情',
...@@ -3946,7 +3984,7 @@ const tableColumns = computed(() => { ...@@ -3946,7 +3984,7 @@ const tableColumns = computed(() => {
{ {
label: '操作', label: '操作',
slot: 'operate', slot: 'operate',
width: 180, width: 100,
align: 'center', align: 'center',
fixed: 'right', fixed: 'right',
prop: 'operate', prop: 'operate',
...@@ -6184,7 +6222,8 @@ const onUpdateCustomsDeclarationInfo = () => { ...@@ -6184,7 +6222,8 @@ const onUpdateCustomsDeclarationInfo = () => {
.goods-item { .goods-item {
display: grid; display: grid;
grid-template-columns: 100px 1fr minmax(150px, 1fr) 150px; // grid-template-columns: 100px 1fr minmax(150px, 1fr) 150px;
grid-template-columns: 100px 254px 1fr minmax(150px, 1fr) 150px 200px;
gap: 15px; gap: 15px;
.goods-item-img { .goods-item-img {
......
src/views/order/podUs/PodMakeOrder.vue
...@@ -650,6 +650,7 @@ const getPackingData = async (code: string) => { ...@@ -650,6 +650,7 @@ const getPackingData = async (code: string) => {
background: 'rgba(0, 0, 0, 0.3)', background: 'rgba(0, 0, 0, 0.3)',
}) })
currentCode = code currentCode = code
try { try {
const factoryNo = userStore.user?.factory.id const factoryNo = userStore.user?.factory.id
if (!factoryNo) { if (!factoryNo) {
......
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