Skip to content

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

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents ba3d1434 6653bd1e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 620 additions and 542 deletions
src/views/ecw/offer/detail.vue
View file @ dc4dfb23
This diff is collapsed.
src/views/ecw/order/exception/index.vue
View file @ dc4dfb23
This diff is collapsed.
src/views/ecw/order/pending.vue
View file @ dc4dfb23
...@@ -2,96 +2,95 @@ ...@@ -2,96 +2,95 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-card> <el-card>
<div slot="header" class="card-title">查看</div> <div slot="header" class="card-title">{{$t('查看')}}</div>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="唛头"> <el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:'无'}} {{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数"> <el-descriptions-item :label="$t('已到箱数/总箱数')">
{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}} {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" /> <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="送货日期"> <el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate||'无'}} {{orderData.deliveryDate||$t('无')}}
<!-- <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?parseTime(orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime):'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span> -->
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发地" :span="2"> <el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}} {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="目的地"> <el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}} {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="发货人"> <el-descriptions-item :label="$t('发货人')">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发货公司"> <el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发货电话"> <el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="收货人"> <el-descriptions-item :label="$t('收货人')">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货公司"> <el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货电话"> <el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<!-- 列表 --> <!-- 列表 -->
<div slot="header" class="card-title">问题详情</div> <div slot="header" class="card-title">{{$t('问题详情')}}</div>
<el-table v-loading="loading" border :data="list"> <el-table v-loading="loading" border :data="list">
<el-table-column label="序号" align="center" prop="id" type="index"> <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常类型" align="center" > <el-table-column :label="$t('异常类型')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="scope.row.orderExceptionType" /> <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="scope.row.orderExceptionType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常描述" align="center"> <el-table-column :label="$t('异常描述')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.orderExceptionDescVO.descZh}}</span> <span>{{scope.row.orderExceptionDescVO.descZh}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" align="center" scope="orderExceptionAmount" /> <el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" />
<el-table-column label="状态" align="center"> <el-table-column :label="$t('状态')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" /> <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" align="center"> <el-table-column :label="$t('附件')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="filelist"> <div class="filelist">
<span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{item}}</span> <span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{'附件'+(index+1)}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理人" align="center" prop="userName" /> <el-table-column :label="$t('处理人')" align="center" prop="userName" />
<el-table-column label="处理时间" align="center"> <el-table-column :label="$t('处理时间')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{parseTime(scope.row.handlerTime)}}</span> <span>{{parseTime(scope.row.handlerTime)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.orderExceptionStatus>0">已完成</el-tag> <el-tag v-if="scope.row.orderExceptionStatus>0">{{$t('已完成')}}</el-tag>
<el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">处理</el-button> <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -141,6 +140,13 @@ export default { ...@@ -141,6 +140,13 @@ export default {
// 执行查询 // 执行查询
getExceptionListByOrderId(this.orderId).then(response => { getExceptionListByOrderId(this.orderId).then(response => {
this.list = response.data; this.list = response.data;
this.list.forEach((item)=>{
if(item.orderExceptionAttr){
item.orderExceptionAttr = item.orderExceptionAttr.split(',')
}else{
item.orderExceptionAttr = []
}
})
this.loading = false; this.loading = false;
}); });
}, },
...@@ -189,10 +195,7 @@ export default { ...@@ -189,10 +195,7 @@ export default {
url: val, // 预览地址 url: val, // 预览地址
downUrl:"", // 下载地址 downUrl:"", // 下载地址
} // 目标对象 } // 目标对象
if(this.list[index].orderExceptionAttr.indexOf(',')==-1){ var fileArr = this.list[index].orderExceptionAttr
this.FilePreAll.push(this.TragetPic)
}else{
var fileArr = this.list[index].orderExceptionAttr.split(',')
fileArr.forEach(item =>{ // 需要预览的文件数组（可以传空数组就是单张预览） fileArr.forEach(item =>{ // 需要预览的文件数组（可以传空数组就是单张预览）
let obj = { let obj = {
FileName: this.getFileName(item), FileName: this.getFileName(item),
...@@ -203,7 +206,6 @@ export default { ...@@ -203,7 +206,6 @@ export default {
} }
this.FilePreAll.push(obj) this.FilePreAll.push(obj)
}) })
}
this.IsPreview = true // 打开预览弹窗 this.IsPreview = true // 打开预览弹窗
this.timers = new Date().getTime() // 刷新预览地址 this.timers = new Date().getTime() // 刷新预览地址
}, },
...@@ -219,10 +221,9 @@ export default { ...@@ -219,10 +221,9 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
flex-direction: column
} }
.filelist span{ .filelist span{
width: 48%;
margin-right: 2%;
color: #1E98D7; color: #1E98D7;
} }
.card-title{ .card-title{
......
src/views/ecw/order/prepayDeal.vue
View file @ dc4dfb23
This diff is collapsed.
src/views/ecw/order/singleApply.vue
View file @ dc4dfb23
This diff is collapsed.
src/views/ecw/order/special/commission.vue
View file @ dc4dfb23
...@@ -2,76 +2,76 @@ ...@@ -2,76 +2,76 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-card> <el-card>
<div slot="header" class="card-title">修改佣金规则-{{form.orderNo||''}}</div> <div slot="header" class="card-title">{{$t('修改佣金规则')}}-{{form.orderNo||''}}</div>
<el-form :model="form" ref="queryForms" label-width="120px" class="card"> <el-form :model="form" ref="queryForms" label-width="120px" class="card">
<el-form-item label="商品类型:"> <el-form-item :label="$t('商品类型:')">
<span>{{getProductAttrNameById(form.prodType) }}</span> <span>{{getProductAttrNameById(form.prodType) }}</span>
</el-form-item> </el-form-item>
<el-form-item label="商品名称:"> <el-form-item :label="$t('商品名称:')">
<span>{{ form.prodTitleZh }}</span> <span>{{ form.prodTitleZh }}</span>
</el-form-item> </el-form-item>
<el-form-item label="英文名称:"> <el-form-item :label="$t('英文名称:')">
<span>{{ form.prodTitleEn }}</span> <span>{{ form.prodTitleEn }}</span>
</el-form-item> </el-form-item>
<el-form-item label="线路:"> <el-form-item :label="$t('线路:')">
{{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${startTitleZh}】发往【${destTitleZh}】`}} {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${startTitleZh}】发往【${destTitleZh}】`}}
</el-form-item> </el-form-item>
<el-form-item label="运费:" > <el-form-item :label="$t('运费:')" >
<span>{{ form.subtotalFreight }} {{ currentMap[form.freightCurrency] }}</span> <span>{{ form.subtotalFreight }} {{ currentMap[form.freightCurrency] }}</span>
</el-form-item> </el-form-item>
<el-form-item label="清关费:"> <el-form-item :label="$t('清关费:')">
<span>{{ form.subtotalClearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}</span> <span>{{ form.subtotalClearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}</span>
</el-form-item> </el-form-item>
<el-form-item label="佣金类型:"> <el-form-item :label="$t('佣金类型:')">
<el-radio-group v-model="form.commissionType" > <el-radio-group v-model="form.commissionType" >
<el-radio :label="dict.value" v-for="dict in getDictDatas('commission_type')">{{dict.label}}</el-radio> <el-radio :label="dict.value" v-for="dict in getDictDatas('commission_type')">{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.commissionType==3" label="暗佣佣金:"> <el-form-item v-if="form.commissionType==3" :label="$t('暗佣佣金:')">
<el-input style="width: 100px;" type="number" v-model="shadeCommissionAmount" /> <el-input style="width: 100px;" type="number" v-model="shadeCommissionAmount" />
<span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span> <span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
<span>/{{ volumeMap[form.freightVolume] }}</span> <span>/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item > </el-form-item >
<el-form-item v-if="form.commissionType==1||form.commissionType==3" label="明佣佣金:"> <el-form-item v-if="form.commissionType==1||form.commissionType==3" :label="$t('明佣佣金:')">
<el-input style="width: 100px;" type="number" v-model="lightCommissionAmount" /> <el-input style="width: 100px;" type="number" v-model="lightCommissionAmount" />
<span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span> <span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
<span>/{{ volumeMap[form.freightVolume] }}</span> <span>/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item > </el-form-item >
<el-form-item v-if="form.commissionType!=0" label="商品:"> <el-form-item v-if="form.commissionType!=0" :label="$t('商品:')">
<span>{{form.prodTitleZh }}</span> <span>{{form.prodTitleZh }}</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">成本价：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span> <span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('成本价')}}：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;"> 销售价：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span> <span style="margin-left: 10px;"> {{$t('销售价')}}：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">去设置</span> <span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">{{$t('去设置')}}</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">实际佣金返点：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span> <span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('实际佣金返点')}}：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item> </el-form-item>
<el-form-item label="审核状态:"> <el-form-item :label="$t('审核状态:')">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus"></dict-tag> <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus"></dict-tag>
<span>{{form.applyResult?('('+form.applyResult+')'):''}}</span> <span>{{form.applyResult?('('+form.applyResult+')'):''}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div slot="header" class="card-title">审批流程</div> <div slot="header" class="card-title">{{$t('审批流程')}}</div>
<work-flow xmlkey="commission_config" v-model="selectedUsers" style="margin-top: 20px;"></work-flow> <work-flow xmlkey="commission_config" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn"> <div slot="footer" class="card footer_btn">
<el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">提交</el-button> <el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button> <el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">审核中</el-button> <el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button> <el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button> <el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div> </div>
<el-dialog <el-dialog
title="提示" :title="$t('提示')"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%"> width="30%">
<span class="cancel_notice">特价申请正在审核中，你确定取消特价申请吗？</span> <span class="cancel_notice">{{$t('特价申请正在审核中，你确定取消特价申请吗？')}}</span>
<div class="cancel_content"> <div class="cancel_content">
<span>取消原因：</span> <span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input> <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button> <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -203,18 +203,18 @@ export default { ...@@ -203,18 +203,18 @@ export default {
} }
this.form.ccIds = this.selectedUsers.join(',') this.form.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.form).then(r => { createOrderSpecial(this.form).then(r => {
this.$message.success(r.msg || '提交成功') this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView') this.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
cancelSplit(){ cancelSplit(){
let that = this let that = this
if(!that.reason){ if(!that.reason){
that.$message.error("请输入取消原因"); that.$message.error(this.$t("请输入取消原因"));
return return
} }
cancelOrderSpecial(that.form.orderApprovalId,{reason:that.reason}).then(res=>{ cancelOrderSpecial(that.form.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功"); that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView') that.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
......
src/views/ecw/order/special/light.vue
View file @ dc4dfb23
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-card> <el-card>
<div slot="header" class="card-title">申请泡货优惠-{{queryParams.orderNo||''}}</div> <div slot="header" class="card-title">{{$t('申请泡货优惠')}}-{{queryParams.orderNo||''}}</div>
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card"> <el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row > <el-row >
<el-form-item label="原泡货标准:" label-width="150px"> <el-form-item :label="$t('原泡货标准:')" label-width="150px">
<span>{{queryParams.orgVWeight}}kg/cbm</span> <span>{{queryParams.orgVWeight}}kg/cbm</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :span="8" > <el-row :span="8" >
<el-form-item label="* 现泡货申请标准:" size="medium" label-width="150px"> <el-form-item :label="$t('*现泡货申请标准:')" size="medium" label-width="150px">
<el-input style="width: 100px;" type="text" v-model="queryParams.vweight" /> <el-input style="width: 100px;" type="text" v-model="queryParams.vweight" />
<span style="margin-left: 10px;">kg/cbm</span> <span style="margin-left: 10px;">kg/cbm</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :span="8"> <el-row :span="8">
<el-form-item label="备注:" size="medium" label-width="150px"> <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" /> <el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -24,25 +24,25 @@ ...@@ -24,25 +24,25 @@
</el-card> </el-card>
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow> <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn"> <div slot="footer" class="card footer_btn">
<el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">提交</el-button> <el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button> <el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button> <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button> <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button> <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div> </div>
<el-dialog <el-dialog
title="提示" :title="$t('提示')"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%"> width="30%">
<span class="cancel_notice">申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？</span> <span class="cancel_notice">{{$t('申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？')}}</span>
<div class="cancel_content"> <div class="cancel_content">
<span>取消原因：</span> <span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input> <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button> <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -99,18 +99,18 @@ export default { ...@@ -99,18 +99,18 @@ export default {
this.queryParams.applyType = 5 this.queryParams.applyType = 5
this.queryParams.ccIds = this.selectedUsers.join(',') this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => { createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功') this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView') this.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
cancelSplit(){ cancelSplit(){
let that = this let that = this
if(!that.reason){ if(!that.reason){
that.$message.error("请输入取消原因"); that.$message.error(this.$t("请输入取消原因"));
return return
} }
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{ cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功"); that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView') that.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
......
src/views/ecw/order/special/weight.vue
View file @ dc4dfb23
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-card> <el-card>
<div slot="header" class="card-title">申请重货优惠-{{queryParams.orderNo||''}}</div> <div slot="header" class="card-title">{{$t('申请重货优惠')}}-{{queryParams.orderNo||''}}</div>
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card"> <el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row > <el-row >
<el-form-item label="原重货标准:" label-width="150px"> <el-form-item :label="$t('原重货标准:')" label-width="150px">
<span>{{queryParams.orgWVolume}}kg/cbm</span> <span>{{queryParams.orgWVolume}}kg/cbm</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :span="8" > <el-row :span="8" >
<el-form-item label="* 现重货申请标准:" size="medium" label-width="150px"> <el-form-item :label="$t('*现重货申请标准:')" size="medium" label-width="150px">
<el-input style="width: 100px;" type="text" v-model="queryParams.wvolume" /> <el-input style="width: 100px;" type="text" v-model="queryParams.wvolume" />
<span style="margin-left: 10px;">kg/cbm</span> <span style="margin-left: 10px;">kg/cbm</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :span="8"> <el-row :span="8">
<el-form-item label="备注:" size="medium" label-width="150px"> <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" /> <el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -24,25 +24,25 @@ ...@@ -24,25 +24,25 @@
</el-card> </el-card>
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow> <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn"> <div slot="footer" class="card footer_btn">
<el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">提交</el-button> <el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button> <el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button> <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button> <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button> <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div> </div>
<el-dialog <el-dialog
title="提示" :title="$t('提示')"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%"> width="30%">
<span class="cancel_notice">申请重货优惠正在审核中，你确定取消申请重货优惠吗？</span> <span class="cancel_notice">{{$t('申请重货优惠正在审核中，你确定取消申请重货优惠吗？')}}</span>
<div class="cancel_content"> <div class="cancel_content">
<span>取消原因：</span> <span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input> <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button> <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -100,18 +100,18 @@ export default { ...@@ -100,18 +100,18 @@ export default {
this.queryParams.applyType = 4 this.queryParams.applyType = 4
this.queryParams.ccIds = this.selectedUsers.join(',') this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => { createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功') this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView') this.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
cancelSplit(){ cancelSplit(){
let that = this let that = this
if(!that.reason){ if(!that.reason){
that.$message.error("请输入取消原因"); that.$message.error(this.$t("请输入取消原因"));
return return
} }
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{ cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功"); that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView') that.$store.dispatch('tagsView/delCurrentView')
}) })
}, },
......
src/views/ecw/order/splitApply.vue
View file @ dc4dfb23
This diff is collapsed.
src/views/ecw/order/weightDeal.vue
View file @ dc4dfb23
...@@ -2,106 +2,106 @@ ...@@ -2,106 +2,106 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-card> <el-card>
<div slot="header" class="card-title">查看</div> <div slot="header" class="card-title">{{$t('查看')}}</div>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="唛头"> <el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:'无'}} {{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数"> <el-descriptions-item :label="$t('已到箱数/总箱数')">
{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}} {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" /> <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="送货日期"> <el-descriptions-item :label="$t('送货日期')">
<span>{{orderData.deliveryDate||'无'}}</span> <span>{{orderData.deliveryDate||$t('无')}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发地" :span="2"> <el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}} {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="目的地"> <el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}} {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="发货人"> <el-descriptions-item :label="$t('发货人')">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发货公司"> <el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发货电话"> <el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}} {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item label="收货人"> <el-descriptions-item :label="$t('收货人')">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货公司"> <el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货电话"> <el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}} {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<!-- 列表 --> <!-- 列表 -->
<div slot="header" class="card-title">货物信息</div> <div slot="header" class="card-title">{{$t('货物信息')}}</div>
<el-table v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary> <el-table v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary>
<el-table-column label="序号" align="center" prop="id" type="index"> <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="品名" align="center" > <el-table-column :label="$t('品名')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.prodTitleEn||''}}</p> <p>{{scope.row.prodTitleEn||''}}</p>
<p>{{scope.row.prodTitleZh||''}}</p> <p>{{scope.row.prodTitleZh||''}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="填单货物信息"> <el-table-column :label="$t('填单货物信息')">
<template slot-scope="scope"> <template slot-scope="scope">
<p>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p> <p>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
<p>箱数：{{scope.row.num||0}}</p> <p>{{$t('箱数')}}：{{scope.row.num||0}}</p>
<p>体积：{{scope.row.volume||0}}CBM</p> <p>{{$t('体积')}}：{{scope.row.volume||0}}CBM</p>
<p>重量：{{scope.row.weight||0}}KG</p> <p>{{$t('重量')}}：{{scope.row.weight||0}}KG</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库货物属性" align="center" > <el-table-column :label="$t('入库货物属性')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>规格：{{scope.row.boxGauge||0}}</span> <span>{{$t('品牌')}}：{{scope.row.boxGauge||0}}</span>
<p> <p>
<span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span> <span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
<span>箱数：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span> <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
<span>体积：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span> <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
<span>重量：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span> <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重货方数" align="center" v-if="type=='order_heavy_cargo_exception'"> <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span> <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="泡货方数" align="center" v-else > <el-table-column :label="$t('泡货方数')" align="center" v-else >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span> <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最后操作时间" scope="handlerTime" /> <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
</el-table> </el-table>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<div> <div>
<el-button type="primary" @click="submit('general_cargo')">设为普货</el-button> <el-button type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
<el-button plain type="primary" @click="submit('process')">设为已处理</el-button> <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
if(!this.orderData || !this.orderData.list ||ths.orderData.length==0){ if(!this.orderData || !this.orderData.list ||ths.orderData.length==0){
return sums return sums
} }
sums[0] = '小计' sums[0] = this.$t('小计')
var orderSum = 0 var orderSum = 0
var orderV = 0 var orderV = 0
var orderW = 0 var orderW = 0
...@@ -173,15 +173,15 @@ export default { ...@@ -173,15 +173,15 @@ export default {
leviteW += column.weight leviteW += column.weight
}); });
sums[1] = '' sums[1] = ''
sums[2] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg' sums[2] = this.$t('下单统计：')+ orderSum+this.$t(' 箱 ')+ orderV +' m³ ' + orderW + ' kg'
sums[3] = '入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg' sums[3] = this.$t('入仓统计：')+ leviteSum+this.$t(' 箱 ')+ leviteV +' m³ ' + leviteW + ' kg'
sums[4] = '' sums[4] = ''
sums[5] = '' sums[5] = ''
return sums; return sums;
}, },
submit(result){ submit(result){
handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{ handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{
this.$modal.msgSuccess("提交成功"); this.$modal.msgSuccess(this.$t("提交成功"));
this.$router.back() this.$router.back()
}) })
} }
......
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