Skip to content

J
jiedao-web-master
Commit 403f7b36 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-06-26提交

parent 7f82bd13
Show whitespace changes
Inline Side-by-side
Showing with 237 additions and 151 deletions
.env.dev
View file @ 403f7b36
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
VUE_APP_BASE_API = 'http://127.0.0.1:48080'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://www.groupage.cn'
\ No newline at end of file
.env.development
View file @ 403f7b36
...@@ -3,6 +3,7 @@ ENV = 'development' ...@@ -3,6 +3,7 @@ ENV = 'development'
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
VUE_APP_BASE_API = 'http://127.0.0.1:48080'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://www.groupage.cn'
src/components/RightPanel/index.vue
View file @ 403f7b36
<template> <template>
<div ref="rightPanel" :class="{show:show}" class="rightPanel-container"> <div ref="rightPanel" :class="{ show: show }" class="rightPanel-container">
<div class="rightPanel-background" /> <div class="rightPanel-background" />
<div class="rightPanel"> <div class="rightPanel">
<div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show"> <div
<i :class="show?'el-icon-close':'el-icon-setting'" /> class="handle-button"
:style="{ top: buttonTop + 'px', 'background-color': theme }"
@click="show = !show"
>
<i :class="show ? 'el-icon-close' : 'el-icon-setting'" />
</div> </div>
<div class="rightPanel-items"> <div class="rightPanel-items">
<slot /> <slot />
...@@ -90,8 +94,8 @@ export default { ...@@ -90,8 +94,8 @@ export default {
top: 0; top: 0;
left: 0; left: 0;
opacity: 0; opacity: 0;
transition: opacity .3s cubic-bezier(.7, .3, .1, 1); transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
background: rgba(0, 0, 0, .2); background: rgba(0, 0, 0, 0.2);
z-index: -1; z-index: -1;
} }
...@@ -102,15 +106,15 @@ export default { ...@@ -102,15 +106,15 @@ export default {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05); box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.05);
transition: all .25s cubic-bezier(.7, .3, .1, 1); transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
transform: translate(100%); transform: translate(100%);
background: #fff; background: #fff;
z-index: 40000; z-index: 40000;
} }
.show { .show {
transition: all .3s cubic-bezier(.7, .3, .1, 1); transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
.rightPanel-background { .rightPanel-background {
z-index: 20000; z-index: 20000;
......
src/layout/components/Navbar.vue
View file @ 403f7b36
<template> <template>
<div class="navbar"> <div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <hamburger
id="hamburger-container"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device !== 'mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
<error-log class="errLog-container right-menu-item hover-effect" /> <error-log class="errLog-container right-menu-item hover-effect" />
<screenfull id="screenfull" class="right-menu-item hover-effect" /> <screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom"> <el-tooltip
:content="$t('navbar.size')"
effect="dark"
placement="bottom"
>
<size-select id="size-select" class="right-menu-item hover-effect" /> <size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<lang-select class="right-menu-item hover-effect" /> <lang-select class="right-menu-item hover-effect" />
</template> </template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar"> <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar">
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/profile/index"> <router-link to="/profile/index">
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.profile') }} {{ $t("navbar.profile") }}
</el-dropdown-item> </el-dropdown-item>
</router-link> </router-link>
<router-link to="/"> <router-link to="/">
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.dashboard') }} {{ $t("navbar.dashboard") }}
</el-dropdown-item> </el-dropdown-item>
</router-link> </router-link>
<a target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/"> <a
target="_blank"
href="https://github.com/PanJiaChen/vue-element-admin/"
>
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.github') }} {{ $t("navbar.github") }}
</el-dropdown-item> </el-dropdown-item>
</a> </a>
<a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/"> <a
target="_blank"
href="https://panjiachen.github.io/vue-element-admin-site/#/"
>
<el-dropdown-item>Docs</el-dropdown-item> <el-dropdown-item>Docs</el-dropdown-item>
</a> </a>
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">{{ $t('navbar.logOut') }}</span> <span style="display: block">{{ $t("navbar.logOut") }}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -74,11 +91,7 @@ export default { ...@@ -74,11 +91,7 @@ export default {
Search Search
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['sidebar', 'avatar', 'device'])
'sidebar',
'avatar',
'device'
])
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
...@@ -98,18 +111,18 @@ export default { ...@@ -98,18 +111,18 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container { .hamburger-container {
line-height: 46px; line-height: 46px;
height: 100%; height: 100%;
float: left; float: left;
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
-webkit-tap-highlight-color:transparent; -webkit-tap-highlight-color: transparent;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
...@@ -141,10 +154,10 @@ export default { ...@@ -141,10 +154,10 @@ export default {
&.hover-effect { &.hover-effect {
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
} }
......
src/layout/components/Sidebar/index.vue
View file @ 403f7b36
<template> <template>
<div :class="{'has-logo':showLogo}"> <div :class="{ 'has-logo': showLogo }">
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu <el-menu
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
:collapse-transition="false" :collapse-transition="false"
mode="vertical" mode="vertical"
> >
<sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" /> <sidebar-item
v-for="route in permission_routes"
:key="route.path"
:item="route"
:base-path="route.path"
/>
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
</div> </div>
...@@ -20,6 +25,7 @@ ...@@ -20,6 +25,7 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Logo from './Logo' import Logo from './Logo'
import SidebarItem from './SidebarItem' import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss' import variables from '@/styles/variables.scss'
...@@ -27,10 +33,7 @@ import variables from '@/styles/variables.scss' ...@@ -27,10 +33,7 @@ import variables from '@/styles/variables.scss'
export default { export default {
components: { SidebarItem, Logo }, components: { SidebarItem, Logo },
computed: { computed: {
...mapGetters([ ...mapGetters(['permission_routes', 'sidebar']),
'permission_routes',
'sidebar'
]),
activeMenu() { activeMenu() {
const route = this.$route const route = this.$route
const { meta, path } = route const { meta, path } = route
......
src/views/jiedao/profile/delivery.vue
View file @ 403f7b36
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
line-height: 26px; line-height: 26px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t('delivery.header') }}</span> >{{ $t("delivery.header") }}</span>
</div> </div>
<div style="display: flex; align-items: flex-end; margin-top: 5px"> <div style="display: flex; align-items: flex-end; margin-top: 5px">
<div style="width: 75px; height: 4px; background: #396fff" /> <div style="width: 75px; height: 4px; background: #396fff" />
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
(!selectedRouter || routeOtherServices.indexOf('1') > -1) && false (!selectedRouter || routeOtherServices.indexOf('1') > -1) && false
" "
label="1" label="1"
>{{ $t('delivery.orderType1') }}</el-checkbox> >{{ $t("delivery.orderType1") }}</el-checkbox>
<el-checkbox <el-checkbox
v-if="!selectedRouter || routeOtherServices.indexOf('2') > -1" v-if="!selectedRouter || routeOtherServices.indexOf('2') > -1"
label="2" label="2"
>{{ $t('delivery.orderType2') }}</el-checkbox> >{{ $t("delivery.orderType2") }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-row :gutter="20" style="margin-top: 30px"> <el-row :gutter="20" style="margin-top: 30px">
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
style="margin-left: 5px" style="margin-left: 5px"
type="text" type="text"
@click="openConsignee" @click="openConsignee"
>{{ $t('delivery.openConsignee') }}</el-button> >{{ $t("delivery.openConsignee") }}</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
:label="'+' + item.tel" :label="'+' + item.tel"
:value="item.tel" :value="item.tel"
> >
<span>{{ '+' + item.tel + ' ' + $l(item, 'name') }}</span> <span>{{ "+" + item.tel + " " + $l(item, "name") }}</span>
</el-option> </el-option>
</el-select> </el-select>
<el-input <el-input
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.transport') }}</span> ><span style="color: red">*</span>{{ $t("delivery.transport") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.departure') }}</span> ><span style="color: red">*</span>{{ $t("delivery.departure") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.objective') }}</span> ><span style="color: red">*</span>{{ $t("delivery.objective") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.router') }}</span> ><span style="color: red">*</span>{{ $t("delivery.router") }}</span>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-input <el-input
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
<select v-model="form.lineId" size="5" style="min-width: 300px"> <select v-model="form.lineId" size="5" style="min-width: 300px">
<template v-for="item in routerList"> <template v-for="item in routerList">
<option :key="item.id" :value="item.id"> <option :key="item.id" :value="item.id">
{{ $l(item, 'startTitle') }} >> {{ $l(item, "startTitle") }} >>
{{ $l(item, 'destTitle') }} {{ $l(item, "destTitle") }}
</option> </option>
</template> </template>
</select> </select>
...@@ -266,9 +266,7 @@ ...@@ -266,9 +266,7 @@
:label="$t('delivery.channel')" :label="$t('delivery.channel')"
label-style="width:100px" label-style="width:100px"
> >
<span <span slot="label">{{ $t("delivery.channel") }}</span>
slot="label"
>{{ $t('delivery.channel') }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -309,7 +307,7 @@ ...@@ -309,7 +307,7 @@
line-height: 26px; line-height: 26px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t('delivery.goods') }}</span> >{{ $t("delivery.goods") }}</span>
</div> </div>
<div> <div>
<el-button <el-button
...@@ -318,7 +316,7 @@ ...@@ -318,7 +316,7 @@
size="mini" size="mini"
:disabled="!canAddProduct" :disabled="!canAddProduct"
@click="addProduct(null)" @click="addProduct(null)"
>{{ $t('delivery.addPro') }}</el-button> >{{ $t("delivery.addPro") }}</el-button>
<el-button <el-button
v-if="false" v-if="false"
type="primary" type="primary"
...@@ -326,7 +324,7 @@ ...@@ -326,7 +324,7 @@
size="mini" size="mini"
:disabled="!canAddProduct" :disabled="!canAddProduct"
@click="showBatchImportDialog = true" @click="showBatchImportDialog = true"
>{{ $t('delivery.addPros') }}</el-button> >{{ $t("delivery.addPros") }}</el-button>
</div> </div>
</div> </div>
<el-table :data="form.orderItemVOList" class="product-list"> <el-table :data="form.orderItemVOList" class="product-list">
...@@ -338,7 +336,7 @@ ...@@ -338,7 +336,7 @@
<el-table-column :label="$t('delivery.proZh')" width="160px"> <el-table-column :label="$t('delivery.proZh')" width="160px">
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.proZh') }} <span class="red">*</span>{{ $t("delivery.proZh") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -347,7 +345,7 @@ ...@@ -347,7 +345,7 @@
:rules="{ :rules="{
required: true, required: true,
message: $t('delivery.proRules'), message: $t('delivery.proRules'),
trigger: 'blur' trigger: 'blur',
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -363,7 +361,7 @@ ...@@ -363,7 +361,7 @@
<el-table-column :label="$t('delivery.proEn')" width="160px"> <el-table-column :label="$t('delivery.proEn')" width="160px">
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.proEn') }} <span class="red">*</span>{{ $t("delivery.proEn") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<product-selector <product-selector
...@@ -383,7 +381,7 @@ ...@@ -383,7 +381,7 @@
<el-table-column :label="$t('delivery.brand')" width="100px"> <el-table-column :label="$t('delivery.brand')" width="100px">
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.brand') }} <span class="red">*</span>{{ $t("delivery.brand") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -392,7 +390,7 @@ ...@@ -392,7 +390,7 @@
:rules="{ :rules="{
required: true, required: true,
message: '请选择品牌', message: '请选择品牌',
trigger: 'blur' trigger: 'blur',
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -408,7 +406,7 @@ ...@@ -408,7 +406,7 @@
<el-table-column :label="$t('delivery.num')" width="100px"> <el-table-column :label="$t('delivery.num')" width="100px">
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.num') }} <span class="red">*</span>{{ $t("delivery.num") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -417,7 +415,7 @@ ...@@ -417,7 +415,7 @@
:rules="{ :rules="{
required: true, required: true,
message: $t('请输入件数'), message: $t('请输入件数'),
trigger: 'blur' trigger: 'blur',
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -434,7 +432,7 @@ ...@@ -434,7 +432,7 @@
<el-table-column :label="$t('delivery.unit')"> <el-table-column :label="$t('delivery.unit')">
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.unit') }} <span class="red">*</span>{{ $t("delivery.unit") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -443,7 +441,7 @@ ...@@ -443,7 +441,7 @@
:rules="{ :rules="{
required: true, required: true,
message: $t('请选择包装单位'), message: $t('请选择包装单位'),
trigger: 'blur' trigger: 'blur',
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -487,8 +485,8 @@ ...@@ -487,8 +485,8 @@
{ {
validator: validatorPositiveNumber, validator: validatorPositiveNumber,
message: $t('体积错误'), message: $t('体积错误'),
trigger: 'blur' trigger: 'blur',
} },
]" ]"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -511,8 +509,8 @@ ...@@ -511,8 +509,8 @@
{ {
validator: validatorPositiveNumber, validator: validatorPositiveNumber,
message: $t('重量错误'), message: $t('重量错误'),
trigger: 'blur' trigger: 'blur',
} },
]" ]"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -529,7 +527,7 @@ ...@@ -529,7 +527,7 @@
> >
<!-- eslint-disable-next-line vue/no-unused-vars --> <!-- eslint-disable-next-line vue/no-unused-vars -->
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span class="red">*</span>{{ $t('delivery.worth') }} <span class="red">*</span>{{ $t("delivery.worth") }}
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -539,13 +537,13 @@ ...@@ -539,13 +537,13 @@
{ {
required: true, required: true,
message: $t('delivery.worthRules'), message: $t('delivery.worthRules'),
trigger: 'blur' trigger: 'blur',
}, },
{ {
validator: validatorPositiveNumber, validator: validatorPositiveNumber,
message: $t('货值错误'), message: $t('货值错误'),
trigger: 'blur' trigger: 'blur',
} },
]" ]"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
...@@ -564,14 +562,14 @@ ...@@ -564,14 +562,14 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-checkbox-group <el-checkbox-group
v-model="row.prodAttrArr" v-model="row.prodAttrArr"
:disabled="!canAddProduct||row.prodAttrArr.indexOf(4)!=-1" :disabled="!canAddProduct || row.prodAttrArr.indexOf(4) != -1"
@change="onProductAttrChange(row, $event)" @change="onProductAttrChange(row, $event)"
> >
<el-checkbox <el-checkbox
v-for="item in productAttrList" v-for="item in productAttrList"
:key="item.id" :key="item.id"
:label="item.id" :label="item.id"
>{{ $l(item, 'attrName') }}</el-checkbox> >{{ $l(item, "attrName") }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
</el-table-column> </el-table-column>
...@@ -614,13 +612,13 @@ ...@@ -614,13 +612,13 @@
>{{ row.link }}</el-link> >{{ row.link }}</el-link>
<el-button type="primary" size="mini" @click="setLink(row)"> <el-button type="primary" size="mini" @click="setLink(row)">
{{ {{
row.link ? $t('delivery.linkedit') : $t('delivery.linkadd') row.link ? $t("delivery.linkedit") : $t("delivery.linkadd")
}} }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('快递单号')" width="100px"> <el-table-column :label="$t('快递单号')" width="100px">
<template slot-scope="{row}"> <template slot-scope="{ row }">
<el-input v-model="row.expressNo" :disabled="!canAddProduct" /> <el-input v-model="row.expressNo" :disabled="!canAddProduct" />
</template> </template>
</el-table-column> </el-table-column>
...@@ -634,7 +632,7 @@ ...@@ -634,7 +632,7 @@
size="mini" size="mini"
type="danger" type="danger"
@click="delProduct(scope.$index)" @click="delProduct(scope.$index)"
>{{ $t('common.delete') }}</el-button> >{{ $t("common.delete") }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -659,7 +657,7 @@ ...@@ -659,7 +657,7 @@
line-height: 26px; line-height: 26px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t('delivery.sum') }}</span> >{{ $t("delivery.sum") }}</span>
</div> </div>
</div> </div>
<el-descriptions :column="4" border> <el-descriptions :column="4" border>
...@@ -667,10 +665,14 @@ ...@@ -667,10 +665,14 @@
{{ sum.totalNum || 0 }} {{ sum.totalNum || 0 }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('delivery.totalWorth') + '(RMB)'"> <el-descriptions-item :label="$t('delivery.totalWorth') + '(RMB)'">
{{ sum.totalWorth || 0 }}{{ $t('delivery.rmb') }} {{ sum.totalWorth || 0 }}{{ $t("delivery.rmb") }}
</el-descriptions-item> </el-descriptions-item>
<!--报价费币种 lanbm 2024-05-14 修改BUG-->
<el-descriptions-item :label="$t('delivery.insuranceFee')"> <el-descriptions-item :label="$t('delivery.insuranceFee')">
{{ fee.insuranceFee || 0 }} {{ $t('delivery.dollar') }} {{ fee.insuranceFee || 0 }}<div v-if="fee.insuranceCurrencyId == 1">
{{ $t("delivery.dollar") }}
</div>
<div v-else>(RMB)</div>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -799,7 +801,7 @@ ...@@ -799,7 +801,7 @@
line-height: 26px; line-height: 26px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t('delivery.common') }}</span> >{{ $t("delivery.common") }}</span>
</div> </div>
</div> </div>
...@@ -807,7 +809,7 @@ ...@@ -807,7 +809,7 @@
<el-descriptions-item :label="$t('delivery.marks')"> <el-descriptions-item :label="$t('delivery.marks')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.marks') }}</span> ><span style="color: red">*</span>{{ $t("delivery.marks") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -823,8 +825,11 @@ ...@@ -823,8 +825,11 @@
<span <span
slot="label" slot="label"
><span style="color: red">*</span> ><span style="color: red">*</span>
{{ $t('delivery.isCargoControl') }} {{ $t("delivery.isCargoControl") }}
<el-tooltip :content="$t('delivery.isCargoControlNotice')" placement="top"> <el-tooltip
:content="$t('delivery.isCargoControlNotice')"
placement="top"
>
<i class="el-icon-question" /> <i class="el-icon-question" />
</el-tooltip> </el-tooltip>
</span> </span>
...@@ -850,7 +855,7 @@ ...@@ -850,7 +855,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.isCollection') }}</span> ><span style="color: red">*</span>{{ $t("delivery.isCollection") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -891,8 +896,11 @@ ...@@ -891,8 +896,11 @@
<span <span
slot="label" slot="label"
><span style="color: red">*</span> ><span style="color: red">*</span>
{{ $t('delivery.customsType') }} {{ $t("delivery.customsType") }}
<el-tooltip :content="$t('delivery.customsTypeNotice')" placement="top"> <el-tooltip
:content="$t('delivery.customsTypeNotice')"
placement="top"
>
<i class="el-icon-question" /> <i class="el-icon-question" />
</el-tooltip> </el-tooltip>
</span> </span>
...@@ -914,7 +922,7 @@ ...@@ -914,7 +922,7 @@
<el-descriptions-item :label="$t('delivery.issuingMethod')"> <el-descriptions-item :label="$t('delivery.issuingMethod')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.issuingMethod') }}</span> ><span style="color: red">*</span>{{ $t("delivery.issuingMethod") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -933,7 +941,7 @@ ...@@ -933,7 +941,7 @@
<el-descriptions-item :label="$t('delivery.deliveryDate')"> <el-descriptions-item :label="$t('delivery.deliveryDate')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.deliveryDate') }}</span> ><span style="color: red">*</span>{{ $t("delivery.deliveryDate") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -952,7 +960,7 @@ ...@@ -952,7 +960,7 @@
<el-descriptions-item :label="$t('delivery.warehouseType')"> <el-descriptions-item :label="$t('delivery.warehouseType')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.warehouseType') }}</span> ><span style="color: red">*</span>{{ $t("delivery.warehouseType") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -970,7 +978,7 @@ ...@@ -970,7 +978,7 @@
<el-descriptions-item :label="$t('delivery.harvestMethod')"> <el-descriptions-item :label="$t('delivery.harvestMethod')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.harvestMethod') }}</span> ><span style="color: red">*</span>{{ $t("delivery.harvestMethod") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -993,7 +1001,7 @@ ...@@ -993,7 +1001,7 @@
> >
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.deliveryaddress') }}</span> ><span style="color: red">*</span>{{ $t("delivery.deliveryaddress") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -1033,7 +1041,7 @@ ...@@ -1033,7 +1041,7 @@
<el-descriptions-item :label="$t('delivery.drawee')" :span="2"> <el-descriptions-item :label="$t('delivery.drawee')" :span="2">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t('delivery.drawee') }}</span> ><span style="color: red">*</span>{{ $t("delivery.drawee") }}</span>
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -1088,7 +1096,7 @@ ...@@ -1088,7 +1096,7 @@
line-height: 26px; line-height: 26px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $l(transport, 'label') }}</span> >{{ $l(transport, "label") }}</span>
</div> </div>
</div> </div>
<el-form-item :label="$t('delivery.number')"> <el-form-item :label="$t('delivery.number')">
...@@ -1100,7 +1108,7 @@ ...@@ -1100,7 +1108,7 @@
slot="append" slot="append"
type="primary" type="primary"
@click="getOrderCourierNumber" @click="getOrderCourierNumber"
>{{ $t('delivery.getNumber') }}</el-button> >{{ $t("delivery.getNumber") }}</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -1168,16 +1176,19 @@ ...@@ -1168,16 +1176,19 @@
fomatter="bool" fomatter="bool"
/> />
<span style="margin-left: 10px; color: red">{{ <span style="margin-left: 10px; color: red">{{
$t('delivery.notice') $t("delivery.notice")
}}</span> }}</span>
</el-form-item> </el-form-item>
<el-form-item :label="$t('delivery.packageType')"> <el-form-item :label="$t('delivery.packageType')">
<template #label> <template #label>
{{ $t('delivery.packageType') }} {{ $t("delivery.packageType") }}
</template> </template>
<el-tooltip :content="$t('delivery.packageTypeNotice')" placement="top" style="margin-right: 15px"> <el-tooltip
:content="$t('delivery.packageTypeNotice')"
placement="top"
style="margin-right: 15px"
>
<i class="el-icon-question" /> <i class="el-icon-question" />
</el-tooltip> </el-tooltip>
<dict-selector <dict-selector
...@@ -1197,18 +1208,18 @@ ...@@ -1197,18 +1208,18 @@
v-if="form.status == 0 || editFlag" v-if="form.status == 0 || editFlag"
type="primary" type="primary"
@click="submitForm(0, false)" @click="submitForm(0, false)"
>{{ $t('存草稿') }}</el-button> >{{ $t("存草稿") }}</el-button>
<el-button <el-button
v-if="editFlag || form.status == 0" v-if="editFlag || form.status == 0"
type="primary" type="primary"
@click="submitForm(2)" @click="submitForm(2)"
>{{ $t('提交') }}</el-button> >{{ $t("提交") }}</el-button>
<el-button <el-button
v-if="form.status == 2 && !editFlag" v-if="form.status == 2 && !editFlag"
type="primary" type="primary"
@click="submitForm(2, false)" @click="submitForm(2, false)"
>{{ $t('提交') }}</el-button> >{{ $t("提交") }}</el-button>
<el-button @click="$router.back()">{{ $t('common.cancel') }}</el-button> <el-button @click="$router.back()">{{ $t("common.cancel") }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 收货人列表弹窗 --> <!-- 收货人列表弹窗 -->
...@@ -1278,13 +1289,13 @@ ...@@ -1278,13 +1289,13 @@
size="mini" size="mini"
type="text" type="text"
@click="selectConsignee(scope.row)" @click="selectConsignee(scope.row)"
>{{ $t('delivery.select') }}</el-button> >{{ $t("delivery.select") }}</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="updateCustomer(scope.row)" @click="updateCustomer(scope.row)"
>{{ $t('common.update') }}</el-button> >{{ $t("common.update") }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -1381,10 +1392,10 @@ ...@@ -1381,10 +1392,10 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('customer.default')"> <el-form-item :label="$t('customer.default')">
<el-radio v-model="addCustomerForm.defaultContact" :label="true">{{ <el-radio v-model="addCustomerForm.defaultContact" :label="true">{{
$t('customer.yes') $t("customer.yes")
}}</el-radio> }}</el-radio>
<el-radio v-model="addCustomerForm.defaultContact" :label="false">{{ <el-radio v-model="addCustomerForm.defaultContact" :label="false">{{
$t('customer.no') $t("customer.no")
}}</el-radio> }}</el-radio>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -1393,21 +1404,21 @@ ...@@ -1393,21 +1404,21 @@
v-if="!addCustomerShow" v-if="!addCustomerShow"
type="primary" type="primary"
@click="addCustomerShow = true" @click="addCustomerShow = true"
>{{ $t('delivery.addCustomer') }}</el-button> >{{ $t("delivery.addCustomer") }}</el-button>
<el-button v-if="!addCustomerShow" @click="consigneeVisdle = false">{{ <el-button v-if="!addCustomerShow" @click="consigneeVisdle = false">{{
$t('common.cancel') $t("common.cancel")
}}</el-button> }}</el-button>
<el-button v-if="addCustomerShow" type="primary" @click="addCustomer">{{ <el-button v-if="addCustomerShow" type="primary" @click="addCustomer">{{
$t('common.confirm') $t("common.confirm")
}}</el-button> }}</el-button>
<el-button <el-button
v-if="addCustomerShow" v-if="addCustomerShow"
@click=" @click="
addCustomerShow = false addCustomerShow = false;
getCustomerList() getCustomerList();
addCustomerForm = { defaultContact: false } addCustomerForm = { defaultContact: false };
" "
>{{ $t('common.back') }}</el-button> >{{ $t("common.back") }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 批量添加商品 --> <!-- 批量添加商品 -->
...@@ -1437,7 +1448,7 @@ ...@@ -1437,7 +1448,7 @@
style="display: inline-block" style="display: inline-block"
> >
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('delivery.upload') $t("delivery.upload")
}}</el-button> }}</el-button>
</el-upload> </el-upload>
<el-button <el-button
...@@ -1445,7 +1456,7 @@ ...@@ -1445,7 +1456,7 @@
size="small" size="small"
:loading="exportLoading" :loading="exportLoading"
@click="downloadTpl" @click="downloadTpl"
>{{ $t('delivery.boxTpl') }}</el-button> >{{ $t("delivery.boxTpl") }}</el-button>
</div> </div>
<el-table :data="importList" class="mt-10" height="300"> <el-table :data="importList" class="mt-10" height="300">
<el-table-column :label="$t('delivery.index')"> <el-table-column :label="$t('delivery.index')">
...@@ -1471,31 +1482,56 @@ ...@@ -1471,31 +1482,56 @@
<div class="mt-10 center"> <div class="mt-10 center">
<el-button type="primary" @click="addToProductList">{{ <el-button type="primary" @click="addToProductList">{{
$t('delivery.next') $t("delivery.next")
}}</el-button> }}</el-button>
<el-button type="default" @click="showBatchImportDialog = false">{{ <el-button type="default" @click="showBatchImportDialog = false">{{
$t('common.cancel') $t("common.cancel")
}}</el-button> }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 实名登记提示弹窗 --> <!-- 实名登记提示弹窗 -->
<el-dialog :title="$t('sidebar.notice')" :visible.sync="noticeVisble" width="30%" append-to-body :close-on-click-modal="false"> <el-dialog
:title="$t('sidebar.notice')"
:visible.sync="noticeVisble"
width="30%"
append-to-body
:close-on-click-modal="false"
>
<el-card> <el-card>
{{ $t('sidebar.realNameNotice1') }} {{ $t("sidebar.realNameNotice1") }}
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="noticeVisble=false">{{ $t('sidebar.cancel') }}</el-button> <el-button type="primary" @click="noticeVisble = false">{{
<el-button @click="noticeVisble=false;$router.push('/jiedao/jd-idcard');">{{ $t('sidebar.determine') }}</el-button> $t("sidebar.cancel")
}}</el-button>
<el-button
@click="
noticeVisble = false;
$router.push('/jiedao/jd-idcard');
"
>{{ $t("sidebar.determine") }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 营业执照提示弹窗 --> <!-- 营业执照提示弹窗 -->
<el-dialog :title="$t('sidebar.notice')" :visible.sync="noticeVisble1" width="30%" append-to-body :close-on-click-modal="false"> <el-dialog
:title="$t('sidebar.notice')"
:visible.sync="noticeVisble1"
width="30%"
append-to-body
:close-on-click-modal="false"
>
<el-card> <el-card>
{{ $t('根据国家公安部、安监总局等部门所有入仓货物需要“实名制”登记，请联系客服上传营业执照认证') }} {{
$t(
"根据国家公安部、安监总局等部门所有入仓货物需要“实名制”登记，请联系客服上传营业执照认证"
)
}}
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="noticeVisble1=false">{{ $t('sidebar.cancel') }}</el-button> <el-button @click="noticeVisble1 = false">{{
<el-button type="primary">{{ $t('联系客服400-900-9962') }}</el-button> $t("sidebar.cancel")
}}</el-button>
<el-button type="primary">{{ $t("联系客服400-900-9962") }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -1554,7 +1590,9 @@ export default { ...@@ -1554,7 +1590,9 @@ export default {
if (!value) return callback(new Error(this.$t('请输入数字'))) if (!value) return callback(new Error(this.$t('请输入数字')))
if (!Number(value)) return callback(new Error(this.$t('请输入有效数字'))) if (!Number(value)) return callback(new Error(this.$t('请输入有效数字')))
const reg = /((^[1-9]\d*)|^0)(\.\d*){0,1}$/ const reg = /((^[1-9]\d*)|^0)(\.\d*){0,1}$/
if (!reg.test(value)) { return callback(new Error(this.$t('请输入有效数字'))) } if (!reg.test(value)) {
return callback(new Error(this.$t('请输入有效数字')))
}
callback() callback()
} }
return { return {
...@@ -1699,10 +1737,14 @@ export default { ...@@ -1699,10 +1737,14 @@ export default {
}, },
computed: { computed: {
exportCityList() { exportCityList() {
return this.tradeCityList.filter((item) => item.type == 2 || item.type == 3) return this.tradeCityList.filter(
(item) => item.type == 2 || item.type == 3
)
}, },
importCityList() { importCityList() {
return this.tradeCityList.filter((item) => item.type == 1 || item.type == 3) return this.tradeCityList.filter(
(item) => item.type == 1 || item.type == 3
)
}, },
exportCityIds() { exportCityIds() {
const ids = [] const ids = []
...@@ -1745,7 +1787,11 @@ export default { ...@@ -1745,7 +1787,11 @@ export default {
}, },
// 送货上门 // 送货上门
homeDeliveryService() { homeDeliveryService() {
return this.selectedRouter && this.selectedRouter.otherService && this.selectedRouter.otherService.indexOf('2') > -1 return (
this.selectedRouter &&
this.selectedRouter.otherService &&
this.selectedRouter.otherService.indexOf('2') > -1
)
}, },
// 代收货款 // 代收货款
collectionProxy() { collectionProxy() {
...@@ -1822,7 +1868,7 @@ export default { ...@@ -1822,7 +1868,7 @@ export default {
} }
}, },
watch: { watch: {
'$route'() { $route() {
location.reload() location.reload()
}, },
// 始发地 // 始发地
...@@ -1866,8 +1912,8 @@ export default { ...@@ -1866,8 +1912,8 @@ export default {
}, },
// 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择 // 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
selectedRouter(val) { selectedRouter(val) {
if (!val) return if (!val) return;
;['1', '4'].forEach((service) => { ['1', '4'].forEach((service) => {
if ( if (
this.routeOtherServices.indexOf(service) < 0 && this.routeOtherServices.indexOf(service) < 0 &&
this.form.type.indexOf(service) > -1 this.form.type.indexOf(service) > -1
...@@ -1901,7 +1947,11 @@ export default { ...@@ -1901,7 +1947,11 @@ export default {
this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone) this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode) this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company) this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company)
this.$set(this.form, 'consigneeCompanyEn', res.data.consigneeVO.companyEn) this.$set(
this.form,
'consigneeCompanyEn',
res.data.consigneeVO.companyEn
)
this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email) this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email)
this.$set(this.form, 'consigneeName', res.data.consigneeVO.name) this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn) this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
...@@ -1913,7 +1963,10 @@ export default { ...@@ -1913,7 +1963,10 @@ export default {
} }
this.$nextTick(() => { this.$nextTick(() => {
res.data.orderItemVOList.forEach((item) => { res.data.orderItemVOList.forEach((item) => {
item.prodAttrArr = item.prodAttrIds.split(',').filter(item => item != '').map(attrId => +attrId) item.prodAttrArr = item.prodAttrIds
.split(',')
.filter((item) => item != '')
.map((attrId) => +attrId)
this.form.orderItemVOList.push({ ...item }) this.form.orderItemVOList.push({ ...item })
}) })
}) })
...@@ -1956,7 +2009,10 @@ export default { ...@@ -1956,7 +2009,10 @@ export default {
}, },
async getIdCardData() { async getIdCardData() {
if (!this.form.isCargoControl || !this.form.lineId) return if (!this.form.isCargoControl || !this.form.lineId) return
var checkKyc = await checkKycStatus({ controlCargoStatus: this.form.isCargoControl, lineId: this.form.lineId }) var checkKyc = await checkKycStatus({
controlCargoStatus: this.form.isCargoControl,
lineId: this.form.lineId
})
switch (checkKyc.data.wareHouseStatus) { switch (checkKyc.data.wareHouseStatus) {
case 2: case 2:
if (checkKyc.data.memberKycStatus != 2) { if (checkKyc.data.memberKycStatus != 2) {
...@@ -1977,7 +2033,10 @@ export default { ...@@ -1977,7 +2033,10 @@ export default {
} }
break break
case 5: case 5:
if (checkKyc.data.memberKycStatus != 2 && checkKyc.data.companyKycStatus != 2) { if (
checkKyc.data.memberKycStatus != 2 &&
checkKyc.data.companyKycStatus != 2
) {
this.noticeVisble = true this.noticeVisble = true
} }
break break
...@@ -2196,6 +2255,7 @@ export default { ...@@ -2196,6 +2255,7 @@ export default {
}) })
.then((res) => { .then((res) => {
this.$set(this, 'fee', res.data.costDto) this.$set(this, 'fee', res.data.costDto)
// alert(res.data.costDto.insuranceCurrencyId);
this.form.orderItemVOList.map((item, index) => { this.form.orderItemVOList.map((item, index) => {
this.$set(item, 'fee', res.data.prodCostDtoList[index] || null) this.$set(item, 'fee', res.data.prodCostDtoList[index] || null)
}) })
...@@ -2233,16 +2293,14 @@ export default { ...@@ -2233,16 +2293,14 @@ export default {
params.channelId = this.form.channelId params.channelId = this.form.channelId
} }
await this.$nextTick() await this.$nextTick()
getOpenedRouterList(params).then( getOpenedRouterList(params).then((res) => {
(res) => {
this.routerList = res.data.filter((item) => { this.routerList = res.data.filter((item) => {
return ( return (
this.exportCityIds.indexOf(item.startCityId) > -1 && this.exportCityIds.indexOf(item.startCityId) > -1 &&
this.importCityIds.indexOf(item.destCityId) > -1 this.importCityIds.indexOf(item.destCityId) > -1
) )
}) })
} })
)
}, },
// 计算体积 // 计算体积
calcVolume(row) { calcVolume(row) {
...@@ -2288,7 +2346,10 @@ export default { ...@@ -2288,7 +2346,10 @@ export default {
}) })
if (!validatorArea.data) return if (!validatorArea.data) return
if (this.form.isCargoControl) { if (this.form.isCargoControl) {
var checkKyc = await checkKycStatus({ controlCargoStatus: this.form.isCargoControl, lineId: this.form.lineId }) var checkKyc = await checkKycStatus({
controlCargoStatus: this.form.isCargoControl,
lineId: this.form.lineId
})
switch (checkKyc.data.wareHouseStatus) { switch (checkKyc.data.wareHouseStatus) {
case 2: case 2:
if (checkKyc.data.memberKycStatus != 2) { if (checkKyc.data.memberKycStatus != 2) {
...@@ -2313,7 +2374,10 @@ export default { ...@@ -2313,7 +2374,10 @@ export default {
} }
break break
case 5: case 5:
if (checkKyc.data.memberKycStatus != 2 && checkKyc.data.companyKycStatus != 2) { if (
checkKyc.data.memberKycStatus != 2 &&
checkKyc.data.companyKycStatus != 2
) {
this.noticeVisble = true this.noticeVisble = true
return return
} }
...@@ -2321,7 +2385,7 @@ export default { ...@@ -2321,7 +2385,7 @@ export default {
} }
} }
let isInclude = false let isInclude = false
this.form.orderItemVOList.map(item => { this.form.orderItemVOList.map((item) => {
// 如果商品特性包含不接受货物，不能创建订单或修改订单 // 如果商品特性包含不接受货物，不能创建订单或修改订单
if (item.prodAttrArr.indexOf(4) != -1) { if (item.prodAttrArr.indexOf(4) != -1) {
isInclude = true isInclude = true
......
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