Skip to content

J
jiedao-app-operator-master
Commit 84430fcc authored by dcy's avatar dcy
Browse files
Options

订单模块国际化

parent f3197757
Expand all Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 276 deletions
src/views/ecw/customerContacts/index.vue
View file @ 84430fcc
This diff is collapsed.
src/views/ecw/order/addAssociatedOrder.vue
View file @ 84430fcc
<template>
<div class="add-associated-order">
<h1 class="title">订单号：{{ orderDetails.orderNo }} 选择订单</h1>
<h1 class="title">{{$t('订单号')}}：{{ orderDetails.orderNo }} {{$t('选择订单')}}</h1>
<el-divider></el-divider>
<el-form inline label-width="85px" label-position="left">
<el-form-item label="订单号">
<el-form-item :label="$t('订单号')">
<div class="content">
<el-input v-model.trim="params.relateOrderNo"></el-input>
</div>
</el-form-item>
<el-form-item>
<el-button @click="getUnassociatedOrder">查询</el-button>
<el-button @click="getUnassociatedOrder">{{$t('查询')}}</el-button>
</el-form-item>
</el-form>
<h1 class="title">
未加入关联订单列表
{{$t('未加入关联订单列表')}}
</h1>
<el-divider></el-divider>
<el-table :data="list" @selection-change="handleSelectionChange">
......@@ -21,10 +21,10 @@
type="selection"
width="55"
></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="订单号" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column>
<el-table-column label="货物数据">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column :label="$t('货物数据')">
<template v-slot="{row}">
<div v-if="row.costVO">
箱数：{{row.costVO.totalNum}}
......@@ -33,19 +33,19 @@
</div>
</template>
</el-table-column>
<el-table-column label="入仓时间" prop="rucangTime">
<el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}">
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column label="状态">
<el-table-column :label="$t('状态')">
<template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column :label="$t('操作')">
<template v-slot:default="scope">
<el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">加入关联</el-button>
<el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">{{$t('加入关联')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -55,10 +55,10 @@
<el-col>
<el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
:disabled="multipleSelection.length === 0">
批量加入关联
{{$t('批量加入关联')}}
</el-button>
<el-button @click="$router.push('/order/associated-order/'+ orderId);">
取消
{{$t('取消')}}
</el-button>
</el-col>
</el-row>
......@@ -120,7 +120,7 @@ export default {
},
operation(r) {
if (r.code === 0) {
this.$message.success('操作成功')
this.$message.success(this.$t('操作成功'))
this.getUnassociatedOrder();
}
},
......
src/views/ecw/order/associatedOrder.vue
View file @ 84430fcc
<template>
<div class="associated-order">
<h1 class="title">
关联订单-{{orderDetails.orderNo}}
{{$t('关联订单')}}-{{orderDetails.orderNo}}
</h1>
<el-divider></el-divider>
<orde-details-form :details ="orderDetails" ></orde-details-form>
<el-divider></el-divider>
<el-form inline label-width="100px">
<el-form-item label="订单号"><div class="content">
<el-form-item :label="$t('订单号')"><div class="content">
<el-input v-model.trim="params.relateOrderNo"></el-input>
</div></el-form-item>
<el-form-item><div class="content">
<el-button @click="getList">查询</el-button>
<el-button @click="getList">{{$t('查询')}}</el-button>
</div></el-form-item>
</el-form>
<el-divider></el-divider>
<div style="display: flex;align-items: center;">
<h1 class="title">
已加入关联订单列表
{{$t('已加入关联订单列表')}}
</h1>
<div style="flex: 1;margin-left: 20px;">
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.orderId})))" >批量移出</el-button>
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button>
</div>
<div>
<el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">添加关联订单</el-button>
<el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">{{$t('添加关联订单')}}</el-button>
</div>
</div>
<el-table :data="list" @selection-change="handleSelectionChange" >
......@@ -31,13 +31,13 @@
type="selection"
width="55">
</el-table-column>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column>
<el-table-column label="货物数据">
<el-table-column type="index" :label="$t('序号')"></el-table-column>
<el-table-column :label="$t('订单号')" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="orderBackVO.marks"></el-table-column>
<el-table-column :label="$t('货物数据')">
<template v-slot="{row}">
<div>
{{row.orderBackVO.costVO.totalNum}}箱
{{row.orderBackVO.costVO.totalNum}}{{$t('箱')}}
</div>
<div>
{{row.orderBackVO.costVO.totalVolume}}m³
......@@ -47,30 +47,30 @@
</div>
</template>
</el-table-column>
<el-table-column label="入仓时间" prop="orderBackVO.rucangTime">
<el-table-column :label="$t('入仓时间')" prop="orderBackVO.rucangTime">
<template v-slot="{row}">
{{parseTime(row.orderBackVO.rucangTime)}}
</template>
</el-table-column>
<el-table-column label="状态" prop="status" >
<el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作人" prop="creator">
<el-table-column :label="$t('操作人')" prop="creator">
<template v-slot="{row}">
{{(userList.find( i => row.creator == i.id) || {}).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间">
<el-table-column :label="$t('操作时间')">
<template v-slot="{row}">
{{parseTime(row.createTime)}}
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column :label="$t('操作')">
<template v-slot:default='scope'>
<el-button type="text" @click ="guanlianOrderByOrderId(scope.row.relateOrderId)">
移出
{{$t('移出')}}
</el-button>
</template>
</el-table-column>
......@@ -151,14 +151,14 @@ export default {
deleteGuanlianOrderByOrderId({orderId:this.orderId,relateOrderId:id}).then(r =>{
if(r.code === 0){
this.getList()
this.$message.success('操作成功');
this.$message.success(this.$t('操作成功'));
}
})
},
batchGuanlianOrderByOrderId(val){
deleteBatchGuanlianOrderByOrderId(val).then(r => {
this.getList()
this.$message.success('操作成功');
this.$message.success(this.$t('操作成功'));
this.multipleSelection = []
})
},
......
src/views/ecw/order/batchSingleApplication.vue
View file @ 84430fcc
......@@ -6,50 +6,50 @@
$emit('update:dialogVisible',false)
}">
<div class="batch-single-application">
<h1 class="title">调仓申请</h1>
<h1 class="title">{{$t('调仓申请')}}</h1>
<el-table :data="list">
<el-table-column label="订单编号" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column>
<el-table-column label="已到箱数/总箱数">
<el-table-column :label="$t('订单编号')" prop="orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column :label="$t('已到箱数/总箱数')">
<template v-slot={row}>
{{ row.sumQuantity || 0 }}/{{ row.totalNum }}
</template>
</el-table-column>
<el-table-column label="下单统计">
<el-table-column :label="$t('下单统计')">
<template v-slot="{row}">
<div v-if="row.costVO">
箱数：{{ row.costVO.totalNum }}
{{$t('箱数')}}：{{ row.costVO.totalNum }}
{{ row.costVO.totalVolume }}m³
{{ row.costVO.totalWeight }}kg
</div>
</template>
</el-table-column>
<el-table-column label="入仓统计" width="150">
<el-table-column :label="$t('入仓统计')" width="150">
<template v-slot="{row}">
<div>总箱数：{{ row.sumNum || 0 }}</div>
<div>体积：{{ row.sumVolume || 0 }}CBM</div>
<div>重量：{{ row.sumWeight || 0 }}KG</div>
<div>{{$t('总箱数')}}：{{ row.sumNum || 0 }}</div>
<div>{{$t('体积')}}：{{ row.sumVolume || 0 }}CBM</div>
<div>{{$t('重量')}}：{{ row.sumWeight || 0 }}KG</div>
</template>
</el-table-column>
<el-table-column label="入仓时间" prop="rucangTime">
<el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}">
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column label="运输方式">
<el-table-column :label="$t('运输方式')">
<template v-slot={row}>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
</template>
</el-table-column>
<el-table-column label="出货渠道">
<el-table-column :label="$t('出货渠道')">
<template v-slot="{row}">
{{row.channelName || '/'}}</template>
</el-table-column>
<!-- <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>-->
<el-table-column label="目的地" prop="objectiveName"></el-table-column>
<el-table-column label="始发仓" prop="startWarehouseName">
<el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column :label="$t('始发仓')" prop="startWarehouseName">
</el-table-column>
<el-table-column label="发货人">
<el-table-column :label="$t('发货人')">
<template v-slot="{row}">
<div>
<div>
......@@ -63,7 +63,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="收货人">
<el-table-column :label="$t('收货人')">
<template v-slot="{row}">
<div>
<p>
......@@ -83,46 +83,46 @@
</div>
</el-col>
<el-col :span="3"><div style="text-align:center">
调至
{{$t('调至')}}
</div></el-col>
<el-col :span="8"><el-select clearable v-model="params.warehouseInId">
<el-option v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1" :value="item.id" :label="item.titleZh"
:key="index"></el-option>
</el-select></el-col>
</el-row>
<el-divider contentPosition="left">调仓明细</el-divider>
<el-divider contentPosition="left">{{$t('调仓明细')}}</el-divider>
<el-card class="box-card">
<el-table :data="warehouseList">
<el-table-column label="调仓编号" prop="id"></el-table-column>
<el-table-column label="调出仓库" prop="warehouseOutName" ></el-table-column>
<el-table-column label="调入仓库" prop="warehouseInName"></el-table-column>
<el-table-column label="申请人" prop="creatorName"></el-table-column>
<el-table-column label="申请时间">
<el-table-column :label="$t('调仓编号')" prop="id"></el-table-column>
<el-table-column :label="$t('调出仓库')" prop="warehouseOutName" ></el-table-column>
<el-table-column :label="$t('调入仓库')" prop="warehouseInName"></el-table-column>
<el-table-column :label="$t('申请人')" prop="creatorName"></el-table-column>
<el-table-column :label="$t('申请时间')">
<template v-slot="{row}">
{{parseTime(row.createTime)}}
</template>
</el-table-column>
<el-table-column label="状态">
<el-table-column :label="$t('状态')">
<template v-slot="{row}">
{{STATUS[row.status]}}
</template>
</el-table-column>
</el-table>
</el-card>
<el-divider contentPosition="left">审批流程</el-divider>
<el-divider contentPosition="left">{{$t('审批流程')}}</el-divider>
<div style="padding: 20px">
<work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/>
</div>
<div style="text-align: center" v-if="!adjustmentBol">
<el-button :disabled="!params.warehouseInId" style="margin-right: 50px" @click="submit">提交申请</el-button>
<el-button @click="$emit('update:dialogVisible',false)">取消</el-button>
<el-button :disabled="!params.warehouseInId" style="margin-right: 50px" @click="submit">{{$t('提交申请')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)">{{$t('取消')}}</el-button>
</div>
<div style="text-align: center" v-else>
<el-button @click="()=>{
$router.push({path:'/bpm/process-instance/detail',query:{id:this.applyStatus.orderWarehouseApprovalBackVO.formId}})
}">审核中</el-button>
<el-button @click="cancellationOfOrder" >取消审核</el-button>
<el-button @click="$emit('update:dialogVisible',false)" >取消</el-button>
}">{{$t('审核中')}}</el-button>
<el-button @click="cancellationOfOrder" >{{$t('取消审核')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)" >{{$t('取消')}}</el-button>
</div>
</div>
</el-dialog>
......@@ -198,7 +198,7 @@ export default {
},
data() {
return {
STATUS : {1:'申请中', 2:'通过', 3:'不通过', 4:'已取消', 5:'已出仓',6:'已到仓'},
STATUS : {1:this.$t('申请中'), 2:this.$t('通过'), 3:this.$t('不通过'), 4:this.$t('已取消'), 5:this.$t('已出仓'),6:this.$t('已到仓')},
list: [],
selectedUsers: [],
availableWarehouse: [],
......@@ -238,18 +238,18 @@ export default {
orderWarehouseInAdjustApply(this.params).then(r => {
if (r.code === 0) {
this.$emit('update:dialogVisible', false)
this.$message.success('调仓申请提交成功，请耐心等待审核');
this.$message.success(this.$t('调仓申请提交成功，请耐心等待审核'));
}
})
},
cancellationOfOrder(){
this.$prompt('请输入审核调仓原因', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$prompt(this.$t('请输入审核调仓原因'), this.$t('提示'), {
confirmButtonText: this.$t('确定'),
cancelButtonText: this.$t('取消'),
}).then(({ value }) => {
warehouseApprovalCancel(this.applyStatus.orderWarehouseApprovalBackVO.id,value) .then(r => {
if(r.data){
this.$message.success('取消调仓成功')
this.$message.success(this.$t('取消调仓成功'))
this.$emit('update:dialogVisible',false)
}
......@@ -257,7 +257,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消成功'
message: this.$t('取消成功')
});
});
},
......
src/views/ecw/order/feeApplication.vue
View file @ 84430fcc
......@@ -3,58 +3,58 @@
$emit('update:dialogVisible',false)
}">
<div class="fee-application">
<h1>费用申请-{{orderDetails.orderNo}}
<h1>{{$t('费用申请')}}-{{orderDetails.orderNo}}
</h1>
<el-divider></el-divider>
<el-form label-width="100px" inline>
<el-form-item label="订单号:"><div class="content">
<el-form-item :label="$t('订单号')+':'"><div class="content">
{{orderDetails.orderNo}}
</div></el-form-item>
<el-form-item label="发货人："><div class="content">{{orderDetails.consignorVO ? orderDetails.consignorVO.name :''}}</div></el-form-item>
<el-form-item label="唛头"><div class="content">{{orderDetails.marks}}</div></el-form-item>
<el-form-item> <el-button @click="addCost">添加申请</el-button></el-form-item>
<el-form-item :label="$t('发货人')+'：'"><div class="content">{{orderDetails.consignorVO ? orderDetails.consignorVO.name :''}}</div></el-form-item>
<el-form-item :label="$t('唛头')"><div class="content">{{orderDetails.marks}}</div></el-form-item>
<el-form-item> <el-button @click="addCost">{{$t('添加申请')}}</el-button></el-form-item>
</el-form>
<el-table :data="list">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="费用类型">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('费用类型')">
<template v-slot:default = "scope">
<dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.FEE_TYPE" v-model="scope.row.feeType" />
</template>
</el-table-column>
<el-table-column label="金额">
<el-table-column :label="$t('金额')">
<template v-slot:default = 'scope'>
<el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.applicationFee" ></el-input>
</template>
</el-table-column>
<el-table-column label="货币类型">
<el-table-column :label="$t('货币类型')">
<template v-slot:default = 'scope'>
<dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" v-model="scope.row.applicationFeeCurrency" />
</template>
</el-table-column>
<el-table-column label="付款类型">
<el-table-column :label="$t('付款类型')">
<template v-slot = {row}>
<dict-selector :disabled="isModify[forbidden(row)]" :type="DICT_TYPE.PAYMENT_TYPE" v-model="row.payType" />
</template>
</el-table-column>
<el-table-column label="备注">
<el-table-column :label="$t('备注')">
<template v-slot:default="scope">
<el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.remarks" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="确认收款">
<el-table-column :label="$t('确认收款')">
<template v-slot:default ="scope">
<dict-tag :type="DICT_TYPE.RECEIVE_FLAG" :value="scope.row.receiveFlag" />
</template>
</el-table-column>
<el-table-column label="申请人">
<el-table-column :label="$t('申请人')">
<template v-slot:default ="scope">
{{scope.row.status === 0 ?'未提交': scope.row.applicationAuthor}}
{{scope.row.status === 0 ? $t('未提交'): scope.row.applicationAuthor}}
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column :label="$t('操作')">
<template v-slot:default = 'scope'>
<el-button type="text" v-if="scope.row.status !== 0">{{STATUS[scope.row.status]}}</el-button>
<el-button type="text" v-if="scope.row.status === 2" @click="modify(scope.row)">修改</el-button>
<el-button type="text" v-if="scope.row.status === 2" @click="modify(scope.row)">{{$t('修改')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -62,10 +62,10 @@
<work-flow xmlkey="free_apply" v-model="selectedUsers" />
</div>
<div style="text-align: center;margin-top: 20px;">
<el-button v-if="!IsExamine" style="margin-right: 30px;" @click="submit">提交</el-button>
<el-button v-if="IsExamine" style="margin-right: 30px;" @click="examineFn">审核中</el-button>
<el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">取消审核</el-button>
<el-button @click="$emit('update:dialogVisible',false)">返回</el-button>
<el-button v-if="!IsExamine" style="margin-right: 30px;" @click="submit">{{$t('提交')}}</el-button>
<el-button v-if="IsExamine" style="margin-right: 30px;" @click="examineFn">{{$t('审核中')}}</el-button>
<el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">{{$t('取消审核')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)">{{$t('返回')}}</el-button>
</div>
</div>
</el-dialog>
......@@ -124,7 +124,7 @@ export default {
methods:{
addCost(){
if(this.list.some(e => e.status === 0 || e.status === 1)){
return this.$message.success('当前有申请费用为审核中或未提交，请审核后在申请');
return this.$message.success(this.$t('当前有申请费用为审核中或未提交，请审核后在申请'));
}
this.list.push(
{
......@@ -146,7 +146,7 @@ export default {
applicationUpdate({...this.list[this.isModify.findIndex(e => e === false)],status:1}).then(r => {
if(r.code === 0){
this.$emit('update:dialogVisible',false)
this.$message.success('修改成功');
this.$message.success(this.$t('修改成功'));
}
})
}else {
......@@ -154,12 +154,12 @@ export default {
feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers}).then(r=>{
if(r.code === 0){
this.$emit('update:dialogVisible',false)
this.$message.success('添加成功');
this.$message.success(this.$t('添加成功'));
this.selectedUsers = [];
}
})
}else {
this.$message.success('当前有申请费用为审核中或未提交，请审核后在申请');
this.$message.success(this.$t('当前有申请费用为审核中或未提交，请审核后在申请'));
}
}
},
......@@ -173,7 +173,7 @@ export default {
})
},
modify(row){
if(this.list.some(i => i.status === 0 || i.status === 1))return this.$message.warning('当前有未提交的数据或审核中的数据不能修改')
if(this.list.some(i => i.status === 0 || i.status === 1))return this.$message.warning(this.$t('当前有未提交的数据或审核中的数据不能修改'))
this.isModifyIf = true;
this.$set(this.isModify, this.list.findIndex(e => e.id === row.id), false )
},
......@@ -182,15 +182,15 @@ export default {
this.$router.push({path:'/bpm/process-instance/detail',query:{id:item.bpmProcessId}})
},
cancel(){
this.$prompt('请输入取消原因', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$prompt(this.$t('请输入取消原因'), this.$t('提示'), {
confirmButtonText: this.$t('确定'),
cancelButtonText: this.$t('取消'),
}).then(({ value }) => {
let item = this.list.find(e => e.status === 1);
feeApplicationCancel({huifu:value,bpmProcessId:item.bpmProcessId}).then(r => {
this.$message({
type: 'success',
message:'取消成功'
message:this.$t('取消成功')
});
this.$emit('update:dialogVisible',false)
})
......
src/views/ecw/order/mutexOrder.vue
View file @ 84430fcc
<template>
<div class="associated-order">
<h1 class="title">
互斥订单-{{orderDetails.orderNo}}
{{$t('互斥订单')}}-{{orderDetails.orderNo}}
</h1>
<el-divider></el-divider>
<orde-details-form :details ="orderDetails" ></orde-details-form>
<el-divider></el-divider>
<el-form inline label-width="100px">
<el-form-item label="订单号"><div class="content">
<el-form-item :label="$t('订单号')"><div class="content">
<el-input v-model.trim="params.mutualOrderNo"></el-input>
</div></el-form-item>
<el-form-item><div class="content">
<el-button @click="getList">查询</el-button>
<el-button @click="getList">{{$t('查询')}}</el-button>
</div></el-form-item>
</el-form>
<el-divider></el-divider>
<div style="display: flex;align-items: center;">
<h1 class="title">
已加入互斥订单列表
{{$t('已加入互斥订单列表')}}
</h1>
<div style="flex: 1;margin-left: 20px;">
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,mutualOrderId:e.orderId})))" >批量移出</el-button>
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,mutualOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button>
</div>
<div>
<el-button type="primary" @click="$router.push('/order/not-mutex-order/'+ orderId)" >添加互斥订单</el-button>
<el-button type="primary" @click="$router.push('/order/not-mutex-order/'+ orderId)" >{{$t('添加互斥订单')}}</el-button>
</div>
</div>
<el-table :data="list" @selection-change="handleSelectionChange" >
......@@ -31,13 +31,13 @@
type="selection"
width="55">
</el-table-column>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column>
<el-table-column label="货物数据">
<el-table-column type="index" :label="$t('序号')"></el-table-column>
<el-table-column :label="$t('订单号')" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="orderBackVO.marks"></el-table-column>
<el-table-column :label="$t('货物数据')">
<template v-slot="{row}">
<div>
{{row.orderBackVO.costVO.totalNum}}箱
{{row.orderBackVO.costVO.totalNum}}{{$t('箱')}}
</div>
<div>
{{row.orderBackVO.costVO.totalVolume}}m³
......@@ -47,30 +47,30 @@
</div>
</template>
</el-table-column>
<el-table-column label="入仓时间">
<el-table-column :label="$t('入仓时间')">
<template v-slot="{row}">
{{parseTime(row.orderBackVO.rucangTime)}}
</template>
</el-table-column>
<el-table-column label="状态" prop="status" >
<el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作人">
<el-table-column :label="$t('操作人')">
<template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="createTime">
<el-table-column :label="$t('操作时间')" prop="createTime">
<template v-slot="{row}">{{
parseTime(row.orderBackVO.createTime)
}}</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column :label="$t('操作')">
<template v-slot='{row}'>
<el-button type="text" @click ="guanlianOrderByOrderId(row)">
移出
{{$t('移出')}}
</el-button>
</template>
</el-table-column>
......@@ -140,14 +140,14 @@ export default {
deleteGuanlianOrderByOrderId({orderId:this.orderId,mutualOrderId:row.mutualOrderId}).then(r =>{
if(r.code === 0){
this.getList()
this.$message.success('操作成功');
this.$message.success(this.$t('操作成功'));
}
})
},
batchGuanlianOrderByOrderId(val){
deleteBatchGuanlianOrderByOrderId(val).then(r => {
this.getList()
this.$message.success('操作成功');
this.$message.success(this.$t('操作成功'));
this.multipleSelection = []
})
},
......
src/views/ecw/order/notMutexOrder.vue
View file @ 84430fcc
<template>
<div class="add-associated-order">
<h1 class="title">订单号：{{ orderDetails.orderNo }} 选择订单</h1>
<h1 class="title">{{$t('订单号')}}：{{ orderDetails.orderNo }} {{$t('选择订单')}}</h1>
<el-divider></el-divider>
<el-form inline label-width="85px" label-position="left">
<el-form-item label="订单号">
<el-form-item :label="$t('订单号')">
<div class="content">
<el-input v-model.trim="params.mutualOrderNo"></el-input>
</div>
</el-form-item>
<el-form-item>
<el-button @click="getUnassociatedOrder">查询</el-button>
<el-button @click="getUnassociatedOrder">{{$t('查询')}}</el-button>
</el-form-item>
</el-form>
<h1 class="title">
未加入互斥订单列表
{{$t('未加入互斥订单列表')}}
</h1>
<el-divider></el-divider>
<el-table :data="list" @selection-change="handleSelectionChange">
......@@ -21,13 +21,13 @@
type="selection"
width="55"
></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="订单号" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column>
<el-table-column label="货物数据">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column :label="$t('货物数据')">
<template v-slot="{row}">
<div>
{{row.costVO.totalNum}}箱
{{row.costVO.totalNum}}{{$t('箱')}}
</div>
<div>
{{row.costVO.totalVolume}}m³
......@@ -37,19 +37,19 @@
</div>
</template>
</el-table-column>
<el-table-column label="入仓时间" prop="rucangTime">
<el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}">
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column label="状态">
<el-table-column :label="$t('状态')">
<template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column :label="$t('操作')">
<template v-slot:default="scope">
<el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">加入互斥</el-button>
<el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">{{$t('加入互斥')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -59,10 +59,10 @@
<el-col>
<el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
:disabled="multipleSelection.length === 0">
批量加入互斥
{{$t('批量加入互斥')}}
</el-button>
<el-button @click="$router.push('/order/mutex-order/'+ orderId);">
取消
{{$t('取消')}}
</el-button>
</el-col>
</el-row>
......@@ -125,7 +125,7 @@ export default {
},
operation(r) {
if (r.code === 0) {
this.$message.success('操作成功')
this.$message.success(this.$t('操作成功'))
this.getUnassociatedOrder();
}
},
......
src/views/ecw/order/transferWarehousing.vue
View file @ 84430fcc
This diff is collapsed.
src/views/ecw/order/withdrawal.vue
View file @ 84430fcc
......@@ -7,23 +7,23 @@
}"
width="80%">
<div style="padding: 0 20px">
<h1>申请退仓-{{orderDetails.orderNo}}</h1>
<h1>{{$t('申请退仓')}}-{{orderDetails.orderNo}}</h1>
<el-divider></el-divider>
<el-form label-width="150px">
<el-form-item label="退仓原因">
<el-form-item :label="$t('退仓原因')">
<el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
</el-form-item>
</el-form>
<el-divider></el-divider>
<h2>审批流程</h2>
<h2>{{$t('审批流程')}}</h2>
<div style="padding: 20px">
<work-flow xmlkey="retired_warehouse" v-model="params.copyUserId" />
</div>
<div>
<el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
<el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">审核中</el-button>
<el-button v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">取消审核</el-button>
<el-button @click="$parent.show = false;">不，再考虑考虑</el-button>
<el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button>
<el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
<el-button v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
<el-button @click="$parent.show = false;">{{$t('不，再考虑考虑')}}</el-button>
</div>
</div>
</el-dialog>
......@@ -80,20 +80,20 @@ export default {
this.params.orderNo =this.orderDetails.orderNo;
orderWarehouseInDelete(this.params).then(r => {
if(r.code === 0){
this.$message.success('退仓成功');
this.$message.success(this.$t('退仓成功'));
this.params = {}
this.$parent.show = false
}
})
},
cancellationOfOrder(){
this.$prompt('请输入取消审核原因', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$prompt(this.$t('请输入取消审核原因'), this.$t('提示'), {
confirmButtonText: this.$t('确定'),
cancelButtonText: this.$t('取消'),
}).then(({ value }) => {
warehouseApprovalCancel(this.details.id,value) .then(r => {
if(r.data){
this.$message.success('取消成功')
this.$message.success(this.$t('取消成功'))
this.params = {}
this.$parent.show = false
......@@ -102,7 +102,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消成功'
message: this.$t('取消成功')
});
});
}
......
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