Skip to content

J
jiedao-app-operator-master
Commit d820c7e9 authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'dev' into zhengyi_dev

parents 83ab2074 bf87e336
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 99 deletions
src/api/ecw/order.js
View file @ d820c7e9
...@@ -45,6 +45,14 @@ export function getOrderDetail(orderId) { ...@@ -45,6 +45,14 @@ export function getOrderDetail(orderId) {
}) })
} }
// 获得订单编辑详情
export function getFeeDraweeByFeeType(feeType) {
return request({
url: "/ecw/order/fee/drawee/" + feeType,
method: "get"
})
}
// 获得订单分页 // 获得订单分页
export function getOrderPage(query) { export function getOrderPage(query) {
return request({ return request({
......
src/layout/components/TagsView/index.vue
View file @ d820c7e9
<template> <template>
<div id="tags-view-container" class="tags-view-container"> <div id="tags-view-container" class="tags-view-container">
<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
<router-link <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''" :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" :style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" @contextmenu.prevent.native="openMenu(tag, $event)">
v-for="tag in visitedViews" {{ $l(tag.meta, "title") }}
ref="tag"
:key="tag.path"
:class="isActive(tag)?'active':''"
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
:style="activeStyle(tag)"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
{{ $l(tag.meta, 'title') }}
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link> </router-link>
</scroll-pane> </scroll-pane>
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li> <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li> <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
<li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li> <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
...@@ -29,8 +18,8 @@ ...@@ -29,8 +18,8 @@
</template> </template>
<script> <script>
import ScrollPane from './ScrollPane' import ScrollPane from "./ScrollPane"
import path from 'path' import path from "path"
export default { export default {
components: { ScrollPane }, components: { ScrollPane },
...@@ -51,7 +40,7 @@ export default { ...@@ -51,7 +40,7 @@ export default {
return this.$store.state.permission.routes return this.$store.state.permission.routes
}, },
theme() { theme() {
return this.$store.state.settings.theme; return this.$store.state.settings.theme
} }
}, },
watch: { watch: {
...@@ -62,9 +51,9 @@ export default { ...@@ -62,9 +51,9 @@ export default {
}, },
visible(value) { visible(value) {
if (value) { if (value) {
document.body.addEventListener('click', this.closeMenu) document.body.addEventListener("click", this.closeMenu)
} else { } else {
document.body.removeEventListener('click', this.closeMenu) document.body.removeEventListener("click", this.closeMenu)
} }
} }
}, },
...@@ -77,18 +66,18 @@ export default { ...@@ -77,18 +66,18 @@ export default {
return route.path === this.$route.path return route.path === this.$route.path
}, },
activeStyle(tag) { activeStyle(tag) {
if (!this.isActive(tag)) return {}; if (!this.isActive(tag)) return {}
return { return {
"background-color": this.theme, "background-color": this.theme,
"border-color": this.theme "border-color": this.theme
}; }
}, },
isAffix(tag) { isAffix(tag) {
return tag.meta && tag.meta.affix return tag.meta && tag.meta.affix
}, },
isFirstView() { isFirstView() {
try { try {
return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index' return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === "/index"
} catch (err) { } catch (err) {
return false return false
} }
...@@ -100,9 +89,9 @@ export default { ...@@ -100,9 +89,9 @@ export default {
return false return false
} }
}, },
filterAffixTags(routes, basePath = '/') { filterAffixTags(routes, basePath = "/") {
let tags = [] let tags = []
routes.forEach(route => { routes.forEach((route) => {
if (route.meta && route.meta.affix) { if (route.meta && route.meta.affix) {
const tagPath = path.resolve(basePath, route.path) const tagPath = path.resolve(basePath, route.path)
tags.push({ tags.push({
...@@ -122,18 +111,18 @@ export default { ...@@ -122,18 +111,18 @@ export default {
return tags return tags
}, },
initTags() { initTags() {
const affixTags = this.affixTags = this.filterAffixTags(this.routes) const affixTags = (this.affixTags = this.filterAffixTags(this.routes))
for (const tag of affixTags) { for (const tag of affixTags) {
// Must have tag name // Must have tag name
if (tag.name) { if (tag.name) {
this.$store.dispatch('tagsView/addVisitedView', tag) this.$store.dispatch("tagsView/addVisitedView", tag)
} }
} }
}, },
addTags() { addTags() {
const { name } = this.$route const { name } = this.$route
if (name) { if (name) {
this.$store.dispatch('tagsView/addView', this.$route) this.$store.dispatch("tagsView/addView", this.$route)
} }
return false return false
}, },
...@@ -145,7 +134,7 @@ export default { ...@@ -145,7 +134,7 @@ export default {
this.$refs.scrollPane.moveToTarget(tag) this.$refs.scrollPane.moveToTarget(tag)
// when query is different then update // when query is different then update
if (tag.to.fullPath !== this.$route.fullPath) { if (tag.to.fullPath !== this.$route.fullPath) {
this.$store.dispatch('tagsView/updateVisitedView', this.$route) this.$store.dispatch("tagsView/updateVisitedView", this.$route)
} }
break break
} }
...@@ -153,45 +142,45 @@ export default { ...@@ -153,45 +142,45 @@ export default {
}) })
}, },
refreshSelectedTag(view) { refreshSelectedTag(view) {
this.$store.dispatch('tagsView/delCachedView', view).then(() => { this.$store.dispatch("tagsView/delCachedView", view).then(() => {
const { fullPath } = view const { fullPath } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath path: "/redirect" + fullPath
}) })
}) })
}) })
}, },
closeSelectedTag(view) { closeSelectedTag(view) {
this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { this.$store.dispatch("tagsView/delView", view).then(({ visitedViews }) => {
if (this.isActive(view)) { if (this.isActive(view)) {
this.toLastView(visitedViews, view) this.toLastView(visitedViews, view)
} }
}) })
}, },
closeRightTags() { closeRightTags() {
this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => { this.$store.dispatch("tagsView/delRightTags", this.selectedTag).then((visitedViews) => {
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) { if (!visitedViews.find((i) => i.fullPath === this.$route.fullPath)) {
this.toLastView(visitedViews) this.toLastView(visitedViews)
} }
}) })
}, },
closeLeftTags() { closeLeftTags() {
this.$store.dispatch('tagsView/delLeftTags', this.selectedTag).then(visitedViews => { this.$store.dispatch("tagsView/delLeftTags", this.selectedTag).then((visitedViews) => {
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) { if (!visitedViews.find((i) => i.fullPath === this.$route.fullPath)) {
this.toLastView(visitedViews) this.toLastView(visitedViews)
} }
}) })
}, },
closeOthersTags() { closeOthersTags() {
this.$router.push(this.selectedTag).catch(()=>{}); this.$router.push(this.selectedTag).catch(() => {})
this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => { this.$store.dispatch("tagsView/delOthersViews", this.selectedTag).then(() => {
this.moveToCurrentTag() this.moveToCurrentTag()
}) })
}, },
closeAllTags(view) { closeAllTags(view) {
this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => { this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
if (this.affixTags.some(tag => tag.path === this.$route.path)) { if (this.affixTags.some((tag) => tag.path === this.$route.path)) {
return return
} }
this.toLastView(visitedViews, view) this.toLastView(visitedViews, view)
...@@ -204,11 +193,11 @@ export default { ...@@ -204,11 +193,11 @@ export default {
} else { } else {
// now the default is to redirect to the home page if there is no tags-view, // now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs. // you can adjust it according to your needs.
if (view.name === 'Dashboard') { if (view.name === "Dashboard") {
// to reload home page // to reload home page
this.$router.replace({ path: '/redirect' + view.fullPath }) this.$router.replace({ path: "/redirect" + view.fullPath })
} else { } else {
this.$router.push('/') this.$router.push("/")
} }
} }
}, },
...@@ -245,7 +234,7 @@ export default { ...@@ -245,7 +234,7 @@ export default {
width: 100%; width: 100%;
background: #fff; background: #fff;
border-bottom: 1px solid #d8dce5; border-bottom: 1px solid #d8dce5;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
.tags-view-wrapper { .tags-view-wrapper {
.tags-view-item { .tags-view-item {
display: inline-block; display: inline-block;
...@@ -271,7 +260,7 @@ export default { ...@@ -271,7 +260,7 @@ export default {
color: #fff; color: #fff;
border-color: #42b983; border-color: #42b983;
&::before { &::before {
content: ''; content: "";
background: #fff; background: #fff;
display: inline-block; display: inline-block;
width: 8px; width: 8px;
...@@ -294,7 +283,7 @@ export default { ...@@ -294,7 +283,7 @@ export default {
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #333; color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
li { li {
margin: 0; margin: 0;
padding: 7px 16px; padding: 7px 16px;
...@@ -317,10 +306,10 @@ export default { ...@@ -317,10 +306,10 @@ export default {
vertical-align: 2px; vertical-align: 2px;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
transition: all .3s cubic-bezier(.645, .045, .355, 1); transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
transform-origin: 100% 50%; transform-origin: 100% 50%;
&:before { &:before {
transform: scale(.6); transform: scale(0.6);
display: inline-block; display: inline-block;
vertical-align: -3px; vertical-align: -3px;
} }
......
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ d820c7e9
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<div class="btns"> <div class="btns">
<el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button> <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
<el-button v-if="pageData.boxCustomsBackVO && pageData.boxCustomsBackVO.overMachineStatus == 2 && pageData.boxCustomsBackVO.overMachineAbnormalStatus == 2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id=' + scope.row.orderId)">{{ $t("入仓修改 ") }}</el-button> <el-button v-if="pageData.boxCustomsBackVO && pageData.boxCustomsBackVO.overMachineStatus == 2 && pageData.boxCustomsBackVO.overMachineAbnormalStatus == 2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id=' + scope.row.orderId)">{{ $t("入仓修改 ") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && !isSuccessReview && !isUnderReview">{{ $t("撤销到仓") }}</el-button> <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && !isSuccessReview && !isUnderReview" v-hasPermi="['order:warehouse:check:revoke']">{{ $t("撤销到仓") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button> <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum" v-hasPermi="['order:warehouse:check:force']">{{ $t("强制到仓") }}</el-button>
<el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button> <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
</div> </div>
</template> </template>
...@@ -317,14 +317,11 @@ export default { ...@@ -317,14 +317,11 @@ export default {
params.orderId = orderId params.orderId = orderId
params.unloadTime = this.ulWarehouseTime params.unloadTime = this.ulWarehouseTime
await order_warehouse_check_force(params).then((res) => { await order_warehouse_check_force(params).then((res) => {
if (res.data){ if (res.data) {
this.$router.push('/order/warehousingTo-update?id=' + orderId) this.$router.push("/order/warehousingTo-update?id=" + orderId)
} }
}) })
}) })
}, },
getTotlContent, getTotlContent,
getOrders(id) { getOrders(id) {
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ d820c7e9
...@@ -135,8 +135,8 @@ ...@@ -135,8 +135,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btns"> <div class="btns">
<el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button> <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && !isSuccessReview && !isUnderReview">{{ $t("撤销到仓") }}</el-button> <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && !isSuccessReview && !isUnderReview" v-hasPermi="['order:warehouse:check:revoke']">{{ $t("撤销到仓") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button> <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum" v-hasPermi="['order:warehouse:check:force']">{{ $t("强制到仓") }}</el-button>
<el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button> <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
</div> </div>
</template> </template>
......
src/views/ecw/customer/index.vue
View file @ d820c7e9
...@@ -228,14 +228,14 @@ ...@@ -228,14 +228,14 @@
--> -->
<el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column> <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
<!-- <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">--> <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
<!-- <template v-slot="{ row }">--> <template v-slot="{ row }">
<!-- +{{ row.defaultContactPhone }} <br />--> +{{ row.defaultContactPhone }} <br />
<!-- <contacts :id="row.id">--> <contacts :id="row.id">
<!-- <el-button type="text">更多</el-button>--> <el-button type="text">更多</el-button>
<!-- </contacts>--> </contacts>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column :label="$t('最新跟进时间')" width="120"> <el-table-column :label="$t('最新跟进时间')" width="120">
<template slot-scope="scope" v-if="scope.row.followupBackVO"> <template slot-scope="scope" v-if="scope.row.followupBackVO">
{{ parseTime(scope.row.followupBackVO.followTime) }} {{ parseTime(scope.row.followupBackVO.followTime) }}
......
src/views/ecw/customerConfirm/index.vue
View file @ d820c7e9
...@@ -205,14 +205,14 @@ ...@@ -205,14 +205,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column> <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
<!-- <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">--> <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
<!-- <template v-slot="{row}">--> <template v-slot="{row}">
<!-- +{{row.defaultContactPhone}} <br/>--> +{{row.defaultContactPhone}} <br/>
<!-- <contacts :id="row.id" >--> <contacts :id="row.id" >
<!-- <el-button type="text">更多</el-button>--> <el-button type="text">更多</el-button>
<!-- </contacts>--> </contacts>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column :label="$t('最新跟进时间')" width="120"> <el-table-column :label="$t('最新跟进时间')" width="120">
<template slot-scope="scope" v-if="scope.row.followupBackVO"> <template slot-scope="scope" v-if="scope.row.followupBackVO">
{{ parseTime(scope.row.followupBackVO.followTime) }} {{ parseTime(scope.row.followupBackVO.followTime) }}
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ d820c7e9
...@@ -200,14 +200,14 @@ ...@@ -200,14 +200,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column> <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
<!-- <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">--> <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
<!-- <template v-slot="{row}">--> <template v-slot="{row}">
<!-- +{{row.defaultContactPhone}} <br/>--> +{{row.defaultContactPhone}} <br/>
<!-- <contacts :id="row.id" >--> <contacts :id="row.id" >
<!-- <el-button type="text">更多</el-button>--> <el-button type="text">更多</el-button>
<!-- </contacts>--> </contacts>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column :label="$t('最新跟进时间')" width="120"> <el-table-column :label="$t('最新跟进时间')" width="120">
<template slot-scope="scope" v-if="scope.row.followupBackVO"> <template slot-scope="scope" v-if="scope.row.followupBackVO">
{{ parseTime(scope.row.followupBackVO.followTime) }} {{ parseTime(scope.row.followupBackVO.followTime) }}
......
src/views/ecw/myCustomerService/index.vue
View file @ d820c7e9
...@@ -222,14 +222,14 @@ ...@@ -222,14 +222,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column> <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
<!-- <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">--> <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
<!-- <template v-slot="{ row }">--> <template v-slot="{ row }">
<!-- +{{ row.defaultContactPhone }} <br />--> +{{ row.defaultContactPhone }} <br />
<!-- <contacts :id="row.id">--> <contacts :id="row.id">
<!-- <el-button type="text">更多</el-button>--> <el-button type="text">更多</el-button>
<!-- </contacts>--> </contacts>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column :label="$t('最新跟进时间')" width="120"> <el-table-column :label="$t('最新跟进时间')" width="120">
<template slot-scope="scope" v-if="scope.row.followupBackVO"> <template slot-scope="scope" v-if="scope.row.followupBackVO">
{{ parseTime(scope.row.followupBackVO.followTime) }} {{ parseTime(scope.row.followupBackVO.followTime) }}
......
src/views/ecw/order/components/BatchFeeApplication.vue
View file @ d820c7e9
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
<div v-for="(item, index) in feeList" :key="item.id"> <div v-for="(item, index) in feeList" :key="item.id">
{{index + 1}}、【<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />】， {{index + 1}}、【<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />】，
<dict-tag :value="item.payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>， <dict-tag :value="item.payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>，
{{ item.applicationFee }}{{ currencyName(item.applicationFeeCurrency) }} {{$t('金额')}}：{{ item.applicationFee }}{{ currencyName(item.applicationFeeCurrency) }}，
<dict-tag :value="item.payer" :type="DICT_TYPE.DRAWEE" ></dict-tag>{{$t('付款')}}，
{{$t('备注')}}：{{ item.remarks || $t('无')}} {{$t('备注')}}：{{ item.remarks || $t('无')}}
</div> </div>
</div> </div>
...@@ -61,6 +62,7 @@ export default { ...@@ -61,6 +62,7 @@ export default {
name: "BatchFeeApplicationDetail", name: "BatchFeeApplicationDetail",
data(){ data(){
return{ return{
DICT_TYPE,
order: null, order: null,
feeList: [], feeList: [],
currencyList:[] currencyList:[]
......
src/views/ecw/order/components/warehouseDetails.vue
View file @ d820c7e9
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
<!-- <dict-tag :type="DICT_TYPE.COMMISSION_ CURRENCY_TYPE" :value="FeeDetails.applicationFeeCurrency" />， --> <!-- <dict-tag :type="DICT_TYPE.COMMISSION_ CURRENCY_TYPE" :value="FeeDetails.applicationFeeCurrency" />， -->
{{currencyName(FeeDetails.applicationFeeCurrency)}} {{currencyName(FeeDetails.applicationFeeCurrency)}}
<dict-tag :value="FeeDetails.payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>， <dict-tag :value="FeeDetails.payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>，
<dict-tag :value="FeeDetails.payer" :type="DICT_TYPE.DRAWEE" ></dict-tag>{{ $t('付款') }}，
【{{FeeDetails.remarks}}】 【{{FeeDetails.remarks}}】
</div> </div>
</div> </div>
......
src/views/ecw/order/edit.vue
View file @ d820c7e9
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
{{ $t('件数') }} <span class="red">*</span> {{ $t('件数') }} <span class="red">*</span>
</template> </template>
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input-number :min="1" :controls="false" style="width: 65px" v-model.number="row.num" <el-input-number :min="1" :step="1" :controls="false" style="width: 65px" v-model="row.num"
:disabled="!canAddProduct || !productEditable"/> :disabled="!canAddProduct || !productEditable"/>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1624,7 +1624,7 @@ export default { ...@@ -1624,7 +1624,7 @@ export default {
worth: '', worth: '',
volume: '', volume: '',
weight: '', weight: '',
num: 1 num: undefined
}) })
}, },
// 更新路线并打印来源 // 更新路线并打印来源
......
src/views/ecw/order/feeApplication.vue
View file @ d820c7e9
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
:disabled="!scope.row.editMode && !!scope.row.status" :disabled="!scope.row.editMode && !!scope.row.status"
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
v-model="scope.row.feeType" v-model="scope.row.feeType"
@change="updatePayer(scope.row)"
/> />
</template> </template>
</el-table-column> </el-table-column>
...@@ -84,6 +85,16 @@ ...@@ -84,6 +85,16 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('付款人')">
<template v-slot="{ row }">
<dict-selector
:disabled="!row.editMode && !!row.status"
:type="DICT_TYPE.DRAWEE"
:filter="payerDictFilter"
v-model="row.payer"
/>
</template>
</el-table-column>
<el-table-column :label="$t('备注')"> <el-table-column :label="$t('备注')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-input <el-input
...@@ -152,8 +163,7 @@ ...@@ -152,8 +163,7 @@
:disabled="!feeList.length && !editMode" :disabled="!feeList.length && !editMode"
@click="submit" @click="submit"
>{{ $t("提交") }} >{{ $t("提交") }}
</el-button </el-button>
>
<el-button <el-button
type="primary" type="primary"
v-if="processInstanceId" v-if="processInstanceId"
...@@ -190,7 +200,7 @@ import { ...@@ -190,7 +200,7 @@ import {
getFeeApplicationApproveByOrderId, getFeeApplicationApproveByOrderId,
getBatchFeeByProcessId, getBatchFeeByProcessId,
qetBatchFeeByBusinessId, qetBatchFeeByBusinessId,
getBatchFeeByBusinessId, feeApplicationDelete, getBatchFeeByBusinessId, feeApplicationDelete, getFeeDraweeByFeeType,
} from "@/api/ecw/order"; } from "@/api/ecw/order";
import {getDictDatas, DICT_TYPE} from "@/utils/dict"; import {getDictDatas, DICT_TYPE} from "@/utils/dict";
import workFlow from "@/components/WorkFlow"; import workFlow from "@/components/WorkFlow";
...@@ -278,16 +288,53 @@ export default { ...@@ -278,16 +288,53 @@ export default {
this.list.splice(index, 1); this.list.splice(index, 1);
}); });
}, },
// 过滤订单状态筛选字典内容
payerDictFilter(item) {
if (item.value && item.value == 3) {
return false
}
return true
},
// 修改 // 修改
modify(item) { modify(item) {
this.$set(item, "editMode", true); this.$set(item, "editMode", true);
}, },
updatePayer(item) {
console.log("变动的费用记录:", item);
this.$nextTick(() => {
// 根据新费用类型和索引更新payer付款人信息
this.orderDetails.drawee ? (this.orderDetails.drawee != 3 ? this.$set(item, "payer", this.orderDetails.drawee) : this.getDraweePayer(item)) : undefined; // 费用申请付款人
console.log("变动的费用记录:", item);
})
},
getDraweePayer(item) {
let feeType = item.feeType
if (feeType) {
getFeeDraweeByFeeType(feeType).then(res => {
console.log(res.data)
let drawee = res.data
console.log("自定义费用枚举值：", drawee)
if (drawee) {
if (this.orderDetails.customDraweeVOList && this.orderDetails.customDraweeVOList.length > 0) {
let customDrawee = this.orderDetails.customDraweeVOList.find(item => item.name == drawee)
console.log("自定义费用类型值：", customDrawee)
if (customDrawee) {
console.log("返回值：", customDrawee.value)
this.$set(item, "payer", customDrawee.value)
}
}
}
});
}
},
addCost() { addCost() {
this.list.push({ this.list.push({
orderId: this.orderId, orderId: this.orderId,
feeType: undefined, //费用申请类型 feeType: undefined, //费用申请类型
applicationFee: undefined, //金额 applicationFee: undefined, //金额
applicationFeeCurrency: undefined, // 费用申请货币类型 applicationFeeCurrency: undefined, // 费用申请货币类型
payer: this.orderDetails.drawee && this.orderDetails.drawee != 3 ? this.orderDetails.drawee : undefined, // 费用申请付款人
remarks: undefined, remarks: undefined,
receiveFlag: 0, receiveFlag: 0,
applicationAuthor: undefined, applicationAuthor: undefined,
......
src/views/ecw/order/index.vue
View file @ d820c7e9
...@@ -289,11 +289,11 @@ ...@@ -289,11 +289,11 @@
<el-table-column v-if="dept" :label="$t('客户经理')" align="center" prop="salesmanName" /> <el-table-column v-if="dept" :label="$t('客户经理')" align="center" prop="salesmanName" />
<el-table-column :label="$t('发货人客服')" align="center" prop="consignorFollowCustomerService" /> <el-table-column :label="$t('发货人客服')" align="center" prop="consignorFollowCustomerService" />
<el-table-column :label="$t('收货人客服')" align="center" prop="consigneeFollowCustomerService" /> <el-table-column :label="$t('收货人客服')" align="center" prop="consigneeFollowCustomerService" />
<el-table-column :label="$t('到仓箱数/方数/重量')" align="center" prop="status"> <!-- <el-table-column :label="$t('到仓箱数/方数/重量')" align="center" prop="status">-->
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">-->
{{ row.checkNum }}{{ $t("箱") }} / {{ row.checkVolume }}m³ /{{ row.checkWeight }}Kg <!-- {{ row.checkNum }}{{ $t("箱") }} / {{ row.checkVolume }}m³ /{{ row.checkWeight }}Kg-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column :label="$t('提货率')" align="center" prop="pickRatio" /> <el-table-column :label="$t('提货率')" align="center" prop="pickRatio" />
<el-table-column :label="$t('动态')" align="center" prop="statusMsg" /> <el-table-column :label="$t('动态')" align="center" prop="statusMsg" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="180px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="180px">
......
src/views/ecw/order/warehousingTo/components/Warehouse.vue
View file @ d820c7e9
...@@ -588,6 +588,7 @@ export default { ...@@ -588,6 +588,7 @@ export default {
this.submitting = false this.submitting = false
if (r.data) { if (r.data) {
this.$message.success(r.msg || "到仓修改发起成功") this.$message.success(r.msg || "到仓修改发起成功")
this.closeSelectedTag()
this.handleClose() this.handleClose()
} else { } else {
this.$message.success(r.msg || "到仓修改发起失败") this.$message.success(r.msg || "到仓修改发起失败")
...@@ -600,6 +601,32 @@ export default { ...@@ -600,6 +601,32 @@ export default {
}) })
}) })
}, },
isActive(route) {
return route.path === this.$route.path
},
closeSelectedTag() {
let view = this.$route
this.$store.dispatch("tagsView/delView", view).then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view)
}
})
},
toLastView(visitedViews, view) {
const latestView = visitedViews.slice(-1)[0]
if (latestView) {
this.$router.push(latestView.fullPath)
} else {
// now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs.
if (view.name === "Dashboard") {
// to reload home page
this.$router.replace({ path: "/redirect" + view.fullPath })
} else {
this.$router.push("/")
}
}
},
handleCancelProcessInstance() { handleCancelProcessInstance() {
this.$prompt("请输入取消原因？", this.$t("取消流程"), { this.$prompt("请输入取消原因？", this.$t("取消流程"), {
type: "warning", type: "warning",
......
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