Skip to content

J
jiedao-app-operator-master
Commit b51a3386 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

修复bug

parent 36ca75cd
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 17 deletions
src/api/ecw/box.js
View file @ b51a3386
......@@ -227,4 +227,13 @@ export function getBoxApproval(params) {
method: "get",
params,
});
}
// 获得制作提货单（审核中调用）
export function getBillOfLandingInProcessing(params){
return request({
url: "/shipment/make-bill-of-lading/getInProcessing",
method: "get",
params,
});
}
\ No newline at end of file
src/api/ecw/order.js
View file @ b51a3386
......@@ -430,4 +430,13 @@ export function orderSpecialNeedGet(params){
method:'delete',
data
})
}
\ No newline at end of file
}
// 获得订单修改申请详情
export function getUpdateInfo(id){
return request({
url:'/ecw/order/update/info/' + id,
method:'get'
})
}
\ No newline at end of file
src/components/Breadcrumb/index.vue
View file @ b51a3386
......@@ -49,6 +49,7 @@ export default {
return name.trim() === '首页' // 修复 Index 重复的问题
},
handleLink(item) {
return
const { redirect, path } = item
if (redirect) {
this.$router.push(redirect)
......
src/views/bpm/processInstance/detail.vue
View file @ b51a3386
......@@ -301,7 +301,7 @@ export default {
},
// 提单审核
order_landing_bill:{
component: () => import('@/views/ecw/order/components/ApprovalDetail'),
component: () => import('@/views/ecw/order/components/LandingBillDetail'),
id: this.processInstance.businessKey,
path: this.processInstance.processDefinition?.formCustomViewPath
}
......
src/views/ecw/box/indexFutureBox.vue
View file @ b51a3386
......@@ -33,10 +33,10 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:future-box:create']">新建计划</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:future-box:export']">导出</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......
src/views/ecw/order/components/ApprovalDetail.vue
View file @ b51a3386
......@@ -22,7 +22,7 @@
<!-- 提单审核 -->
<el-descriptions-item v-if="path == 'order_landing_bill'">
<el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
<el-button type="primary" @click="getBillOfLandingInProcessing">查看提单</el-button>
</el-descriptions-item>
</el-descriptions>
......@@ -32,6 +32,7 @@
<script>
import {getOrder, getApproval} from '@/api/ecw/order'
import {getChannel} from '@/api/ecw/channel'
import {getBillOfLandingInProcessing, getBillService} from '@/api/ecw/box'
/*
优惠申请 1
管理优惠 2
......@@ -85,6 +86,7 @@ export default {
created(){
if(this.id){
this.getData()
getBillService({id: this.id})
}
},
methods:{
......@@ -103,6 +105,14 @@ export default {
this.channel = res.data
})
},
getBillService(){
},
getBillOfLandingInProcessing(){
getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => {
console.log(res)
})
}
}
}
</script>
......
src/views/ecw/order/components/LandingBillDetail.vue 0 → 100644
View file @ b51a3386
<!--拆单审核中的申请信息部分-->
<template>
<div v-if="order">
<el-descriptions :column="4" v-if="order" :colon="false">
<el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
<el-descriptions-item :label="$t('出货方式')">
{{channel ? channel.nameZh : '/'}}
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
{{order.statusMsg}}
</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">
{{order.logisticsInfoDto.startTitleZh}}
</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')" :span="2">
{{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item>
<!-- 提单审核 -->
<el-descriptions-item>
<el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
</el-descriptions-item>
</el-descriptions>
<el-dialog title="查看提单" :visible.sync="ShowLandingBill">
<div style="text-align:center; width: 600px; margin: auto" v-html="billContent" />
</el-dialog>
</div>
</template>
<script>
import {getOrder} from '@/api/ecw/order'
import {getChannel} from '@/api/ecw/channel'
import {getBillService} from '@/api/ecw/box'
export default {
name: 'OrderLandingBill',
props:{
id: [String, Number],
path: String
},
data(){
return {
order: null,
channel: null,
ShowLandingBill: false,
billContent: null
}
},
watch:{
order(){
if(this.order.channelId){
this.getChannel()
}
}
},
created(){
if(this.id){
getBillService({id: this.id}).then(res => {
this.billContent = res.data.billContent
return getOrder(res.data.orderId)
}).then(res => {
this.order = res.data
})
}
},
methods:{
getChannel(){
getChannel(this.order.channelId).then(res => {
this.channel = res.data
})
}
}
}
</script>
<style scoped lang="scss">
.title{
padding: 10px 0;
span{
font-size: 14px;
font-weight: bold;
}
}
</style>
\ No newline at end of file
src/views/ecw/order/edit.vue
View file @ b51a3386
......@@ -447,7 +447,7 @@
</template>
<script>
import { createOrder, updateOrder, getOrderDetail, getOrderCourierNumber, orderImport, exportPackingList } from "@/api/ecw/order";
import { createOrder, updateOrder, getOrderDetail, getOrderCourierNumber, orderImport, exportPackingList, getUpdateInfo } from "@/api/ecw/order";
import ProductSelector from '@/components/ProductSelector'
import {getProductAttrList} from '@/api/ecw/productAttr'
import {getChannelList} from '@/api/ecw/channel'
......@@ -623,7 +623,7 @@ export default {
sum.totalNum = sum.totalNum.plus(item.num || 0)
sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
sum.totalWeight = sum.totalWeight.plus(item.weight || 0)
sum.totaltotalWorthNum = sum.totalWorth.plus(item.worth || 0)
sum.totalWorth = sum.totalWorth.plus(item.worth || 0)
sum.totalQuatity = sum.totalQuatity.plus(item.quantity || 0)
})
return sum
......@@ -729,7 +729,7 @@ export default {
},
methods: {
getOrder(){
getOrderDetail(this.$route.query.id).then(res => {
getUpdateInfo(this.$route.query.id).then(res => {
this.form = res.data
this.form.orderItemVOList.forEach(item => {
......@@ -832,6 +832,7 @@ export default {
console.log(product)
// row.goodsType = product ? product.typeId : null
row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
this.calculationPrice()
},
onAreaChange(type, val){
this.$set(this.form, type, val)
......
src/views/ecw/order/index.vue
View file @ b51a3386
......@@ -138,7 +138,12 @@
<template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template>
</template>
</el-table-column>
<el-table-column :label="$t('始发仓')" align="center" prop="departureName" />
<el-table-column :label="$t('始发仓')" align="center" prop="departureName">
<template slot-scope="{row}">
{{row.departureName}}
<template v-if="row.isExternalWarehouse">({{$t('外部仓')}})</template>
</template>
</el-table-column>
<el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.objectiveName}}
......@@ -253,12 +258,12 @@
<el-button type="text">{{$t('仓库')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 入仓操作 -->
<template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1])">
<template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓操作')}}</el-dropdown-item>
</template>
<!-- 入仓补充 -->
<template v-if="
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
scope.row.abnormalState != 1 &&
include(scope.row.status, [2,3,5,10,9,8])
">
......@@ -266,14 +271,14 @@
</template>
<!-- 入仓修改 -->
<template v-if="
include(scope.row.inWarehouseState, [202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
</template>
<!-- 退仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216]) &&
include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216]) &&
exclude(scope.row.abnormalState, [1])
">
<el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
......@@ -282,7 +287,7 @@
<!-- 调仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 208, 202, 210, 202, 211, 202, 213, 215, 216])
include(scope.row.inWarehouseState, [201, 202, 202, 210, 202, 211, 202, 213, 215, 216])
">
<el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
</template>
......
src/views/ecw/productPrice/edit.vue
View file @ b51a3386
......@@ -63,14 +63,14 @@
<div slot="header" style="font-size:20px;">
{{$t('价格设置')}}
<span>
<el-checkbox label="" @change="form.needPay=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
<el-checkbox label="" v-model="needPay">{{$t('预付')}}</el-checkbox>
<el-checkbox label="" v-model="stepPrice">{{$t('阶梯定价')}}</el-checkbox>
</span>
</div>
<el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable />
</el-form-item>
<!--阶梯订单-->
<!--阶梯定价-->
<template v-if="form.stepPrice==1" >
<div v-for="(item, index) in priceStepList" :key="index">
<div style="font-size:14px; margin:10px 0">
......@@ -224,6 +224,8 @@ export default {
validateEndDate: undefined,
validateStartDate: undefined
},
needPay: false, // 是否需要预付
stepPrice: false, // 是否阶梯订单
specialProducts: [],
priceStepList: [{},{}], // 阶梯价格
// specialList:[], // 特殊需求,默认四个
......@@ -314,6 +316,12 @@ export default {
if(val) this.$set(this.form, 'dayLimit', 10000)
else delete this.form.dayLimit
},
needPay(val){
this.$set(this.form, 'needPay', val ? 1 : 0)
},
stepPrice(val){
this.$set(this.form, 'stepPrice', val ? 1 : 0)
},
selectedRoutes(routers) {
let transportIds = []
routers.forEach(item => {
......@@ -339,6 +347,9 @@ export default {
if(this.$route.query.action == 'update'){
getProductPrice(this.$route.query.id).then(res => {
this.$set(this, 'form', res.data)
if(this.form.needPay){
this.needPay = true
}
this.lineList = [res.data]
})
}
......
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