Commit 01b78ce4 authored by dragondean@qq.com's avatar dragondean@qq.com

提交i18n插件漏掉的dist目录

parent 7d95c36b
import Vue from 'vue'
import VueI18n from './vue-i18n/dist/vue-i18n.common'
import VueI18n from './vue-i18n/vue-i18n.common'
import {getLocale} from '@/utils/db'
Vue.use(VueI18n)
......
{
"登录": "Login",
"个人中心": "User Center",
"布局设置": "Layout"
"布局设置": "Layout",
"编号": "No",
"新增": "Create",
"搜索": "Search",
"重置": "Reset"
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<template>
<div class="app-container" v-if="detail">
<div class="page-title">控货订单</div>
<div class="page-title">{{$t('控货订单')}}</div>
<el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" >
<el-row>
<el-col :span="6">
<el-form-item label="订单号">
<el-form-item :label="$t('订单号')">
{{detail.orderNo}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总控货数">
<el-form-item :label="$t('总控货数')">
{{detail.sumNum}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="体积">
<el-form-item :label="$t('体积')">
{{detail.sumVolume}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-form-item :label="$t('重量')">
{{detail.sumWeight}} kg
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="可放货箱数">
<el-form-item :label="$t('可放货箱数')">
{{detail.sumNum - detail.releaseNum}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="已放货箱数">
<el-form-item :label="$t('已放货箱数')">
{{detail.releaseNum}}
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="page-title">放货详情</div>
<div class="page-title">{{$t('放货详情')}}</div>
<el-table :data="detail.cargoControlPickBackVOList || []" border>
<el-table-column label="序号" width="50px">
<el-table-column :label="$t('序号')" width="50px">
<template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column>
<el-table-column label="收货人" prop="consigneeName" />
<el-table-column label="收货人电话" prop="consigneePhone" />
<el-table-column label="控货箱数" prop="controlNum"></el-table-column>
<el-table-column label="放货箱数" prop="pickNum"></el-table-column>
<el-table-column label="体积(m³)" prop="pickVolume"></el-table-column>
<el-table-column label="提单号" prop="tidanNo"></el-table-column>
<el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作人" prop="name"></el-table-column>
<el-table-column label="日期" prop="createTime">
<el-table-column :label="$t('收货人')" prop="consigneeName" />
<el-table-column :label="$t('收货人电话')" prop="consigneePhone" />
<el-table-column :label="$t('控货箱数')" prop="controlNum"></el-table-column>
<el-table-column :label="$t('放货箱数')" prop="pickNum"></el-table-column>
<el-table-column :label="$t('体积') + '(m³)'" prop="pickVolume"></el-table-column>
<el-table-column :label="$t('提单号')" prop="tidanNo"></el-table-column>
<el-table-column :label="$t('备注')" prop="remarks"></el-table-column>
<el-table-column :label="$t('操作人')" prop="name"></el-table-column>
<el-table-column :label="$t('日期')" prop="createTime">
<template slot-scope="{row}">
{{row.createTime|parseTime}}
</template>
</el-table-column>
<el-table-column label="状态" prop="status">
<el-table-column :label="$t('状态')" prop="status">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_RELEASE_STATUS" :value="row.status" />
</template>
</el-table-column>
<el-table-column label="操作" width="300px">
<el-table-column :label="$t('操作')" width="300px">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 1" type="primary" size="mini" @click="editIndex=scope.$index">修改</el-button>
<el-button v-if="scope.row.status == 1" type="danger" size="mini" @click="cancel(scope.row.id)">取消</el-button>
<el-button v-if="scope.row.status == 1" type="success" size="mini" @click="review(scope.row.id)">放货复核</el-button>
<el-button v-if="scope.row.status == 3" type="danger" size="mini" @click="fallbackIndex=scope.$index">反复核</el-button>
<el-button v-if="scope.row.status == 3" type="success" size="mini" @click="cargoControlPickId=scope.row.id">调货</el-button>
<el-button v-if="scope.row.status == 1" type="primary" size="mini" @click="editIndex=scope.$index">{{$t('修改')}}</el-button>
<el-button v-if="scope.row.status == 1" type="danger" size="mini" @click="cancel(scope.row.id)">{{$t('取消')}}</el-button>
<el-button v-if="scope.row.status == 1" type="success" size="mini" @click="review(scope.row.id)">{{$t('放货复核')}}</el-button>
<el-button v-if="scope.row.status == 3" type="danger" size="mini" @click="fallbackIndex=scope.$index">{{$t('反复核')}}</el-button>
<el-button v-if="scope.row.status == 3" type="success" size="mini" @click="cargoControlPickId=scope.row.id">{{$t('调货')}}</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">审核详情</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">取消审核</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">{{$t('审核详情')}}</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">{{$t('取消审核')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -142,12 +142,12 @@ export default {
getPickRleaseInfo(this.$route.query.id).then(res => this.detail = res.data)
},
review(id){
this.$confirm('已核实放货信息,确认放货?')
this.$confirm(this.$t('已核实放货信息,确认放货?'))
.then(res => {
return review(id)
})
.then(res => {
this.$message.success('操作成功')
this.$message.success(this.$t('操作成功'))
this.loadData()
})
},
......@@ -155,12 +155,12 @@ export default {
},
cancel(id){
this.$confirm('确定取消这条放货么?')
this.$confirm(this.$t('确定取消这条放货么?'))
.then(res => {
return cancel(id)
})
.then(res => {
this.$message.success('操作成功')
this.$message.success(this.$t('操作成功'))
this.loadData()
})
},
......@@ -179,21 +179,21 @@ export default {
},
// 取消审核
cancelApproval(id){
this.$confirm('确定取消此申请么?')
this.$confirm(this.$t('确定取消此申请么?'))
.then(res => {
let approvalId = this.getApproval(id)
return cancelApproval(approvalId, {reason: ''})
})
.then(res => {
this.$message.success('操作成功')
this.$message.success(this.$t('操作成功'))
this.loadData()
})
},
// 根据id查找审核id
getApproval(id, field = 'orderApprovalId'){
if(!this.detail.orderApprovalBackVOList || !this.detail.orderApprovalBackVOList.length){
this.$message.error('未找到审批ID')
Promise.reject('未找到审批ID')
this.$message.error(this.$t('未找到审批ID'))
Promise.reject(this.$t('未找到审批ID'))
}
let item = this.detail.orderApprovalBackVOList.find(item => {
let details = JSON.parse(item.details)
......
<template>
<el-dialog title="批量提货" visible :before-close="closeDialog" :close-on-click-modal="false">
<el-dialog :title="$t('批量提货')" visible :before-close="closeDialog" :close-on-click-modal="false">
<el-form :model="form">
<el-tabs v-model="current" type="card">
<el-tab-pane label="全部提货" name="createOrderPickupBatch">
<el-form-item label="订单号/提单号" required>
<el-input v-model="form.orderId" placeholder="例:NA2200001L"></el-input>
<div>注:单号之间使用逗号或空格隔开</div>
<el-tab-pane :label="$t('全部提货')" name="createOrderPickupBatch">
<el-form-item :label="$t('订单号') + '/' + this.$t('提单号')" required>
<el-input v-model="form.orderId" :placeholder="$t('例:NA2200001L')"></el-input>
<div>{{$t('注:单号之间使用逗号或空格隔开')}}</div>
</el-form-item>
<el-form-item label="提货时间">
<el-form-item :label="$t('提货时间')">
<el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-tab-pane>
<el-tab-pane label="分批提货" name="createOrderPickupSplitBatch">
<el-tab-pane :label="$t('分批提货')" name="createOrderPickupSplitBatch">
// TODO
</el-tab-pane>
</el-tabs>
<el-form-item label="">
<el-button type="primary" @click="submit">提交</el-button>
<el-button type="primary" @click="submit">{{$t('提交')}}</el-button>
</el-form-item>
</el-form>
</el-dialog>
......@@ -47,7 +47,7 @@ export default {
methods:{
submit(){
if(this.form.orderId == '' || this.form.pickTime==''){
return this.$message.error('请填写订单号和提货时间')
return this.$message.error(this.$t('请填写订单号和提货时间'))
}
let orderIdArr = this.form.orderId.replace(/,/g, ' ').split(' ').filter(item => item !='')
let data = []
......@@ -60,7 +60,7 @@ export default {
}
({createOrderPickupBatch, createOrderPickupSplitBatch}[this.current])(data).then(res => {
this.$message.success("操作成功");
this.$message.success(this.$t("操作成功"));
this.form.orderId = ''
})
},
......
<template>
<el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false">
<el-form v-if="agreement" ref="elForm" :model="formData" size="small" label-width="100px" >
<el-form-item label="订单号" prop="field101">
<el-form-item :label="$t('订单号')" prop="field101">
{{order.orderNo}}
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="收货人" prop="field104">
<el-form-item :label="$t('收货人')" prop="field104">
{{info.consigneeName}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="收货人电话" prop="field103">
<el-form-item :label="$t('收货人电话')" prop="field103">
{{info.consigneePhone}}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="总控货箱数" prop="field105">
<el-form-item :label="$t('总控货箱数')" prop="field105">
{{order.sumNum}}
</el-form-item>
<el-form-item label="原放货箱数" prop="field106">
<el-form-item :label="$t('原放货箱数')" prop="field106">
{{info.pickNum}}
</el-form-item>
<el-form-item label="现放货箱数" prop="field106">
<el-form-item :label="$t('现放货箱数')" prop="field106">
<el-input v-model="formData.currentPickNum" placeholder=""></el-input>
</el-form-item>
<el-form-item label="备注" prop="field106">
<el-form-item :label="$t('备注')" prop="field106">
<el-input v-model="formData.remarks" placeholder=""></el-input>
</el-form-item>
<el-form-item label="控货手机号" prop="field106">
<el-form-item :label="$t('控货手机号')" prop="field106">
{{info.phone}}
</el-form-item>
<el-form-item label="手机验证码" prop="field106">
<el-form-item :label="$t('手机验证码')" prop="field106">
<el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
<send-sms-code :order-id="order.orderId" :scene="5" />
</el-form-item>
<div class="title">审批流程</div>
<div class="title">{{$t('审批流程')}}</div>
<work-flow xmlkey="release_goods" v-model="ccIdArr" />
<el-form-item label="">
<el-button type="primary" @click="submit">提交申请</el-button>
<el-button @click="closeDialog">关闭</el-button>
<el-button type="primary" @click="submit">{{$t('提交申请')}}</el-button>
<el-button @click="closeDialog">{{$t('关闭')}}</el-button>
</el-form-item>
</el-form>
<div v-else>
<need-know keyname="control" />
<div style="margin-top:30px">
<el-button type="primary" @click="agreement=true">我同意</el-button>
<el-button @click="closeDialog">关闭</el-button>
<el-button type="primary" @click="agreement=true">{{$t('我同意')}}</el-button>
<el-button @click="closeDialog">{{$t('关闭')}}</el-button>
</div>
</div>
</el-dialog>
......@@ -114,7 +114,7 @@ export default {
orderNo: this.order.orderNo
})
updateApply(data).then(res => {
this.$message.success('修改成功')
this.$message.success(this.$t('修改成功'))
this.show = false
this.$emit('success')
})
......
This diff is collapsed.
......@@ -14,7 +14,7 @@
</el-collapse-item>
</template>
<div class="empty-placeholder" v-if="status == 'finished' && !list.length">
暂无数据
{{$t('暂无数据')}}
</div>
</el-collapse>
</el-dialog>
......@@ -37,7 +37,7 @@ export default {
filters: {parseTime},
computed:{
title(){
return '合单日志 - ' + this.orderNo
return this.$t('合单日志') + ' - ' + this.orderNo
}
},
created(){
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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