Skip to content

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

订单模块国际化

parent f3197757
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 276 deletions
src/views/ecw/customerContacts/index.vue
View file @ 84430fcc
...@@ -3,22 +3,22 @@ ...@@ -3,22 +3,22 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关联账户名" prop="username"> <el-form-item :label="$t('关联账户名')" prop="username">
<el-input v-model="queryParams.username" placeholder="请输入关联账户名" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.username" :placeholder="$t('请输入关联账户名')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="区号" prop="areaCode"> <el-form-item :label="$t('区号')" prop="areaCode">
<el-input v-model="queryParams.areaCode" placeholder="请输入区号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.areaCode" :placeholder="$t('请输入区号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="手机号码(不带任何区号)" prop="phoneNew"> <el-form-item :label="$t('手机号码(不带任何区号)')" prop="phoneNew">
<el-input v-model="queryParams.phoneNew" placeholder="请输入手机号码(不带任何区号)" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.phoneNew" :placeholder="$t('请输入手机号码(不带任何区号)')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -26,41 +26,41 @@ ...@@ -26,41 +26,41 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:customer-contacts:create']">新增</el-button> v-hasPermi="['ecw:customer-contacts:create']">{{$t('新增')}}</el-button>
</el-col> </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" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:customer-contacts:export']">导出</el-button> v-hasPermi="['ecw:customer-contacts:export']">{{$t('导出')}}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="客户id" align="center" prop="customerId" /> <el-table-column :label="$t('客户id')" align="center" prop="customerId" />
<el-table-column label="部门" align="center" prop="department" /> <el-table-column :label="$t('部门')" align="center" prop="department" />
<el-table-column label="职位" align="center" prop="position" /> <el-table-column :label="$t('职位')" align="center" prop="position" />
<el-table-column label="联系人" align="center" prop="name" /> <el-table-column :label="$t('联系人')" align="center" prop="name" />
<el-table-column label="联系方式" align="center" prop="phone" /> <el-table-column :label="$t('联系方式')" align="center" prop="phone" />
<el-table-column label="社交方式" align="center" prop="social" /> <el-table-column :label="$t('社交方式')" align="center" prop="social" />
<el-table-column label="社交软件号码" align="center" prop="socialNumber" /> <el-table-column :label="$t('社交软件号码')" align="center" prop="socialNumber" />
<el-table-column label="电子邮箱" align="center" prop="email" /> <el-table-column :label="$t('电子邮箱')" align="center" prop="email" />
<el-table-column label="默认联系人：1为默认" align="center" prop="default" /> <el-table-column :label="$t('默认联系人：1为默认')" align="center" prop="default" />
<el-table-column label="关联账户id" align="center" prop="userid" /> <el-table-column :label="$t('关联账户id')" align="center" prop="userid" />
<el-table-column label="关联账户名" align="center" prop="username" /> <el-table-column :label="$t('关联账户名')" align="center" prop="username" />
<el-table-column label="区号" align="center" prop="areaCode" /> <el-table-column :label="$t('区号')" align="center" prop="areaCode" />
<el-table-column label="手机号码(不带任何区号)" align="center" prop="phoneNew" /> <el-table-column :label="$t('手机号码(不带任何区号)')" align="center" prop="phoneNew" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:customer-contacts:update']">修改</el-button> v-hasPermi="['ecw:customer-contacts:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:customer-contacts:delete']">删除</el-button> v-hasPermi="['ecw:customer-contacts:delete']">{{$t('删除')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -71,49 +71,49 @@ ...@@ -71,49 +71,49 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="客户id" prop="customerId"> <el-form-item :label="$t('客户id')" prop="customerId">
<el-input v-model="form.customerId" placeholder="请输入客户id" /> <el-input v-model="form.customerId" :placeholder="$t('请输入客户id')" />
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="department"> <el-form-item :label="$t('部门')" prop="department">
<el-input v-model="form.department" placeholder="请输入部门" /> <el-input v-model="form.department" :placeholder="$t('请输入部门')" />
</el-form-item> </el-form-item>
<el-form-item label="职位" prop="position"> <el-form-item :label="$t('职位')" prop="position">
<el-input v-model="form.position" placeholder="请输入职位" /> <el-input v-model="form.position" :placeholder="$t('请输入职位')" />
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="name"> <el-form-item :label="$t('联系人')" prop="name">
<el-input v-model="form.name" placeholder="请输入联系人" /> <el-input v-model="form.name" :placeholder="$t('请输入联系人')" />
</el-form-item> </el-form-item>
<el-form-item label="联系方式" prop="phone"> <el-form-item :label="$t('联系方式')" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" /> <el-input v-model="form.phone" :placeholder="$t('请输入联系方式')" />
</el-form-item> </el-form-item>
<el-form-item label="社交方式" prop="social"> <el-form-item :label="$t('社交方式')" prop="social">
<el-input v-model="form.social" placeholder="请输入社交方式" /> <el-input v-model="form.social" :placeholder="$t('请输入社交方式')" />
</el-form-item> </el-form-item>
<el-form-item label="社交软件号码" prop="socialNumber"> <el-form-item :label="$t('社交软件号码')" prop="socialNumber">
<el-input v-model="form.socialNumber" placeholder="请输入社交软件号码" /> <el-input v-model="form.socialNumber" :placeholder="$t('请输入社交软件号码')" />
</el-form-item> </el-form-item>
<el-form-item label="电子邮箱" prop="email"> <el-form-item :label="$t('电子邮箱')" prop="email">
<el-input v-model="form.email" placeholder="请输入电子邮箱" /> <el-input v-model="form.email" :placeholder="$t('请输入电子邮箱')" />
</el-form-item> </el-form-item>
<el-form-item label="默认联系人：1为默认" prop="default"> <el-form-item :label="$t('默认联系人：1为默认')" prop="default">
<el-input v-model="form.default" placeholder="请输入默认联系人：1为默认" /> <el-input v-model="form.default" :placeholder="$t('请输入默认联系人：1为默认')" />
</el-form-item> </el-form-item>
<el-form-item label="关联账户id" prop="userid"> <el-form-item :label="$t('关联账户id')" prop="userid">
<el-input v-model="form.userid" placeholder="请输入关联账户id" /> <el-input v-model="form.userid" :placeholder="$t('请输入关联账户id')" />
</el-form-item> </el-form-item>
<el-form-item label="关联账户名" prop="username"> <el-form-item :label="$t('关联账户名')" prop="username">
<el-input v-model="form.username" placeholder="请输入关联账户名" /> <el-input v-model="form.username" :placeholder="$t('请输入关联账户名')" />
</el-form-item> </el-form-item>
<el-form-item label="区号" prop="areaCode"> <el-form-item :label="$t('区号')" prop="areaCode">
<el-input v-model="form.areaCode" placeholder="请输入区号" /> <el-input v-model="form.areaCode" :placeholder="$t('请输入区号')" />
</el-form-item> </el-form-item>
<el-form-item label="手机号码(不带任何区号)" prop="phoneNew"> <el-form-item :label="$t('手机号码(不带任何区号)')" prop="phoneNew">
<el-input v-model="form.phoneNew" placeholder="请输入手机号码(不带任何区号)" /> <el-input v-model="form.phoneNew" :placeholder="$t('请输入手机号码(不带任何区号)')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -155,8 +155,8 @@ export default { ...@@ -155,8 +155,8 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
areaCode: [{ required: true, message: "区号不能为空", trigger: "blur" }], areaCode: [{ required: true, message: this.$t('区号不能为空'), trigger: "blur" }],
phoneNew: [{ required: true, message: "手机号码(不带任何区号)不能为空", trigger: "blur" }], phoneNew: [{ required: true, message: this.$t('手机号码(不带任何区号)不能为空'), trigger: "blur" }],
} }
}; };
}, },
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加客户联系人"; this.title = this.$t('添加客户联系人');
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
getCustomerContacts(id).then(response => { getCustomerContacts(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改客户联系人"; this.title = this.$t('修改客户联系人');
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateCustomerContacts(this.form).then(response => { updateCustomerContacts(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -246,7 +246,7 @@ export default { ...@@ -246,7 +246,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createCustomerContacts(this.form).then(response => { createCustomerContacts(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -255,11 +255,11 @@ export default { ...@@ -255,11 +255,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除客户联系人编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除客户联系人编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCustomerContacts(id); return deleteCustomerContacts(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有客户联系人数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有客户联系人数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportCustomerContactsExcel(params); return exportCustomerContactsExcel(params);
}).then(response => { }).then(response => {
......
src/views/ecw/order/addAssociatedOrder.vue
View file @ 84430fcc
<template> <template>
<div class="add-associated-order"> <div class="add-associated-order">
<h1 class="title">订单号：{{ orderDetails.orderNo }} 选择订单</h1> <h1 class="title">{{$t('订单号')}}：{{ orderDetails.orderNo }} {{$t('选择订单')}}</h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-form inline label-width="85px" label-position="left"> <el-form inline label-width="85px" label-position="left">
<el-form-item label="订单号"> <el-form-item :label="$t('订单号')">
<div class="content"> <div class="content">
<el-input v-model.trim="params.relateOrderNo"></el-input> <el-input v-model.trim="params.relateOrderNo"></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getUnassociatedOrder">查询</el-button> <el-button @click="getUnassociatedOrder">{{$t('查询')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<h1 class="title"> <h1 class="title">
未加入关联订单列表 {{$t('未加入关联订单列表')}}
</h1> </h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-table :data="list" @selection-change="handleSelectionChange"> <el-table :data="list" @selection-change="handleSelectionChange">
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
type="selection" type="selection"
width="55" width="55"
></el-table-column> ></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column label="订单号" prop="orderNo"></el-table-column> <el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column> <el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column label="货物数据"> <el-table-column :label="$t('货物数据')">
<template v-slot="{row}"> <template v-slot="{row}">
<div v-if="row.costVO"> <div v-if="row.costVO">
箱数：{{row.costVO.totalNum}} 箱数：{{row.costVO.totalNum}}
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓时间" prop="rucangTime"> <el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.rucangTime)}} {{parseTime(row.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column :label="$t('状态')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag> <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<template v-slot:default="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
<el-col> <el-col>
<el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))" <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
:disabled="multipleSelection.length === 0"> :disabled="multipleSelection.length === 0">
批量加入关联 {{$t('批量加入关联')}}
</el-button> </el-button>
<el-button @click="$router.push('/order/associated-order/'+ orderId);"> <el-button @click="$router.push('/order/associated-order/'+ orderId);">
取消 {{$t('取消')}}
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
}, },
operation(r) { operation(r) {
if (r.code === 0) { if (r.code === 0) {
this.$message.success('操作成功') this.$message.success(this.$t('操作成功'))
this.getUnassociatedOrder(); this.getUnassociatedOrder();
} }
}, },
......
src/views/ecw/order/associatedOrder.vue
View file @ 84430fcc
<template> <template>
<div class="associated-order"> <div class="associated-order">
<h1 class="title"> <h1 class="title">
关联订单-{{orderDetails.orderNo}} {{$t('关联订单')}}-{{orderDetails.orderNo}}
</h1> </h1>
<el-divider></el-divider> <el-divider></el-divider>
<orde-details-form :details ="orderDetails" ></orde-details-form> <orde-details-form :details ="orderDetails" ></orde-details-form>
<el-divider></el-divider> <el-divider></el-divider>
<el-form inline label-width="100px"> <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> <el-input v-model.trim="params.relateOrderNo"></el-input>
</div></el-form-item> </div></el-form-item>
<el-form-item><div class="content"> <el-form-item><div class="content">
<el-button @click="getList">查询</el-button> <el-button @click="getList">{{$t('查询')}}</el-button>
</div></el-form-item> </div></el-form-item>
</el-form> </el-form>
<el-divider></el-divider> <el-divider></el-divider>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<h1 class="title"> <h1 class="title">
已加入关联订单列表 {{$t('已加入关联订单列表')}}
</h1> </h1>
<div style="flex: 1;margin-left: 20px;"> <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>
<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>
</div> </div>
<el-table :data="list" @selection-change="handleSelectionChange" > <el-table :data="list" @selection-change="handleSelectionChange" >
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" :label="$t('序号')"></el-table-column>
<el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column> <el-table-column :label="$t('订单号')" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column> <el-table-column :label="$t('唛头')" prop="orderBackVO.marks"></el-table-column>
<el-table-column label="货物数据"> <el-table-column :label="$t('货物数据')">
<template v-slot="{row}"> <template v-slot="{row}">
<div> <div>
{{row.orderBackVO.costVO.totalNum}}箱 {{row.orderBackVO.costVO.totalNum}}{{$t('箱')}}
</div> </div>
<div> <div>
{{row.orderBackVO.costVO.totalVolume}}m³ {{row.orderBackVO.costVO.totalVolume}}m³
...@@ -47,30 +47,30 @@ ...@@ -47,30 +47,30 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓时间" prop="orderBackVO.rucangTime"> <el-table-column :label="$t('入仓时间')" prop="orderBackVO.rucangTime">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.orderBackVO.rucangTime)}} {{parseTime(row.orderBackVO.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" > <el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope"> <template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="creator"> <el-table-column :label="$t('操作人')" prop="creator">
<template v-slot="{row}"> <template v-slot="{row}">
{{(userList.find( i => row.creator == i.id) || {}).nickname}} {{(userList.find( i => row.creator == i.id) || {}).nickname}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间"> <el-table-column :label="$t('操作时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<template v-slot:default='scope'> <template v-slot:default='scope'>
<el-button type="text" @click ="guanlianOrderByOrderId(scope.row.relateOrderId)"> <el-button type="text" @click ="guanlianOrderByOrderId(scope.row.relateOrderId)">
移出 {{$t('移出')}}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -151,14 +151,14 @@ export default { ...@@ -151,14 +151,14 @@ export default {
deleteGuanlianOrderByOrderId({orderId:this.orderId,relateOrderId:id}).then(r =>{ deleteGuanlianOrderByOrderId({orderId:this.orderId,relateOrderId:id}).then(r =>{
if(r.code === 0){ if(r.code === 0){
this.getList() this.getList()
this.$message.success('操作成功'); this.$message.success(this.$t('操作成功'));
} }
}) })
}, },
batchGuanlianOrderByOrderId(val){ batchGuanlianOrderByOrderId(val){
deleteBatchGuanlianOrderByOrderId(val).then(r => { deleteBatchGuanlianOrderByOrderId(val).then(r => {
this.getList() this.getList()
this.$message.success('操作成功'); this.$message.success(this.$t('操作成功'));
this.multipleSelection = [] this.multipleSelection = []
}) })
}, },
......
src/views/ecw/order/batchSingleApplication.vue
View file @ 84430fcc
...@@ -6,50 +6,50 @@ ...@@ -6,50 +6,50 @@
$emit('update:dialogVisible',false) $emit('update:dialogVisible',false)
}"> }">
<div class="batch-single-application"> <div class="batch-single-application">
<h1 class="title">调仓申请</h1> <h1 class="title">{{$t('调仓申请')}}</h1>
<el-table :data="list"> <el-table :data="list">
<el-table-column label="订单编号" prop="orderNo"></el-table-column> <el-table-column :label="$t('订单编号')" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column> <el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column label="已到箱数/总箱数"> <el-table-column :label="$t('已到箱数/总箱数')">
<template v-slot={row}> <template v-slot={row}>
{{ row.sumQuantity || 0 }}/{{ row.totalNum }} {{ row.sumQuantity || 0 }}/{{ row.totalNum }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下单统计"> <el-table-column :label="$t('下单统计')">
<template v-slot="{row}"> <template v-slot="{row}">
<div v-if="row.costVO"> <div v-if="row.costVO">
箱数：{{ row.costVO.totalNum }} {{$t('箱数')}}：{{ row.costVO.totalNum }}
{{ row.costVO.totalVolume }}m³ {{ row.costVO.totalVolume }}m³
{{ row.costVO.totalWeight }}kg {{ row.costVO.totalWeight }}kg
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓统计" width="150"> <el-table-column :label="$t('入仓统计')" width="150">
<template v-slot="{row}"> <template v-slot="{row}">
<div>总箱数：{{ row.sumNum || 0 }}</div> <div>{{$t('总箱数')}}：{{ row.sumNum || 0 }}</div>
<div>体积：{{ row.sumVolume || 0 }}CBM</div> <div>{{$t('体积')}}：{{ row.sumVolume || 0 }}CBM</div>
<div>重量：{{ row.sumWeight || 0 }}KG</div> <div>{{$t('重量')}}：{{ row.sumWeight || 0 }}KG</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓时间" prop="rucangTime"> <el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.rucangTime)}} {{parseTime(row.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="运输方式"> <el-table-column :label="$t('运输方式')">
<template v-slot={row}> <template v-slot={row}>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出货渠道"> <el-table-column :label="$t('出货渠道')">
<template v-slot="{row}"> <template v-slot="{row}">
{{row.channelName || '/'}}</template> {{row.channelName || '/'}}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="始发仓" prop="startWarehouseName"></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="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column label="始发仓" prop="startWarehouseName"> <el-table-column :label="$t('始发仓')" prop="startWarehouseName">
</el-table-column> </el-table-column>
<el-table-column label="发货人"> <el-table-column :label="$t('发货人')">
<template v-slot="{row}"> <template v-slot="{row}">
<div> <div>
<div> <div>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收货人"> <el-table-column :label="$t('收货人')">
<template v-slot="{row}"> <template v-slot="{row}">
<div> <div>
<p> <p>
...@@ -83,46 +83,46 @@ ...@@ -83,46 +83,46 @@
</div> </div>
</el-col> </el-col>
<el-col :span="3"><div style="text-align:center"> <el-col :span="3"><div style="text-align:center">
调至 {{$t('调至')}}
</div></el-col> </div></el-col>
<el-col :span="8"><el-select clearable v-model="params.warehouseInId"> <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" <el-option v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1" :value="item.id" :label="item.titleZh"
:key="index"></el-option> :key="index"></el-option>
</el-select></el-col> </el-select></el-col>
</el-row> </el-row>
<el-divider contentPosition="left">调仓明细</el-divider> <el-divider contentPosition="left">{{$t('调仓明细')}}</el-divider>
<el-card class="box-card"> <el-card class="box-card">
<el-table :data="warehouseList"> <el-table :data="warehouseList">
<el-table-column label="调仓编号" prop="id"></el-table-column> <el-table-column :label="$t('调仓编号')" prop="id"></el-table-column>
<el-table-column label="调出仓库" prop="warehouseOutName" ></el-table-column> <el-table-column :label="$t('调出仓库')" prop="warehouseOutName" ></el-table-column>
<el-table-column label="调入仓库" prop="warehouseInName"></el-table-column> <el-table-column :label="$t('调入仓库')" prop="warehouseInName"></el-table-column>
<el-table-column label="申请人" prop="creatorName"></el-table-column> <el-table-column :label="$t('申请人')" prop="creatorName"></el-table-column>
<el-table-column label="申请时间"> <el-table-column :label="$t('申请时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column :label="$t('状态')">
<template v-slot="{row}"> <template v-slot="{row}">
{{STATUS[row.status]}} {{STATUS[row.status]}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-divider contentPosition="left">审批流程</el-divider> <el-divider contentPosition="left">{{$t('审批流程')}}</el-divider>
<div style="padding: 20px"> <div style="padding: 20px">
<work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/> <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/>
</div> </div>
<div style="text-align: center" v-if="!adjustmentBol"> <div style="text-align: center" v-if="!adjustmentBol">
<el-button :disabled="!params.warehouseInId" style="margin-right: 50px" @click="submit">提交申请</el-button> <el-button :disabled="!params.warehouseInId" style="margin-right: 50px" @click="submit">{{$t('提交申请')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)">取消</el-button> <el-button @click="$emit('update:dialogVisible',false)">{{$t('取消')}}</el-button>
</div> </div>
<div style="text-align: center" v-else> <div style="text-align: center" v-else>
<el-button @click="()=>{ <el-button @click="()=>{
$router.push({path:'/bpm/process-instance/detail',query:{id:this.applyStatus.orderWarehouseApprovalBackVO.formId}}) $router.push({path:'/bpm/process-instance/detail',query:{id:this.applyStatus.orderWarehouseApprovalBackVO.formId}})
}">审核中</el-button> }">{{$t('审核中')}}</el-button>
<el-button @click="cancellationOfOrder" >取消审核</el-button> <el-button @click="cancellationOfOrder" >{{$t('取消审核')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)" >取消</el-button> <el-button @click="$emit('update:dialogVisible',false)" >{{$t('取消')}}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
}, },
data() { data() {
return { 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: [], list: [],
selectedUsers: [], selectedUsers: [],
availableWarehouse: [], availableWarehouse: [],
...@@ -238,18 +238,18 @@ export default { ...@@ -238,18 +238,18 @@ export default {
orderWarehouseInAdjustApply(this.params).then(r => { orderWarehouseInAdjustApply(this.params).then(r => {
if (r.code === 0) { if (r.code === 0) {
this.$emit('update:dialogVisible', false) this.$emit('update:dialogVisible', false)
this.$message.success('调仓申请提交成功，请耐心等待审核'); this.$message.success(this.$t('调仓申请提交成功，请耐心等待审核'));
} }
}) })
}, },
cancellationOfOrder(){ cancellationOfOrder(){
this.$prompt('请输入审核调仓原因', '提示', { this.$prompt(this.$t('请输入审核调仓原因'), this.$t('提示'), {
confirmButtonText: '确定', confirmButtonText: this.$t('确定'),
cancelButtonText: '取消', cancelButtonText: this.$t('取消'),
}).then(({ value }) => { }).then(({ value }) => {
warehouseApprovalCancel(this.applyStatus.orderWarehouseApprovalBackVO.id,value) .then(r => { warehouseApprovalCancel(this.applyStatus.orderWarehouseApprovalBackVO.id,value) .then(r => {
if(r.data){ if(r.data){
this.$message.success('取消调仓成功') this.$message.success(this.$t('取消调仓成功'))
this.$emit('update:dialogVisible',false) this.$emit('update:dialogVisible',false)
} }
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '取消成功' message: this.$t('取消成功')
}); });
}); });
}, },
......
src/views/ecw/order/feeApplication.vue
View file @ 84430fcc
...@@ -3,58 +3,58 @@ ...@@ -3,58 +3,58 @@
$emit('update:dialogVisible',false) $emit('update:dialogVisible',false)
}"> }">
<div class="fee-application"> <div class="fee-application">
<h1>费用申请-{{orderDetails.orderNo}} <h1>{{$t('费用申请')}}-{{orderDetails.orderNo}}
</h1> </h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-form label-width="100px" inline> <el-form label-width="100px" inline>
<el-form-item label="订单号:"><div class="content"> <el-form-item :label="$t('订单号')+':'"><div class="content">
{{orderDetails.orderNo}} {{orderDetails.orderNo}}
</div></el-form-item> </div></el-form-item>
<el-form-item label="发货人："><div class="content">{{orderDetails.consignorVO ? orderDetails.consignorVO.name :''}}</div></el-form-item> <el-form-item :label="$t('发货人')+'：'"><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 :label="$t('唛头')"><div class="content">{{orderDetails.marks}}</div></el-form-item>
<el-form-item> <el-button @click="addCost">添加申请</el-button></el-form-item> <el-form-item> <el-button @click="addCost">{{$t('添加申请')}}</el-button></el-form-item>
</el-form> </el-form>
<el-table :data="list"> <el-table :data="list">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column label="费用类型"> <el-table-column :label="$t('费用类型')">
<template v-slot:default = "scope"> <template v-slot:default = "scope">
<dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.FEE_TYPE" v-model="scope.row.feeType" /> <dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.FEE_TYPE" v-model="scope.row.feeType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额"> <el-table-column :label="$t('金额')">
<template v-slot:default = 'scope'> <template v-slot:default = 'scope'>
<el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.applicationFee" ></el-input> <el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.applicationFee" ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货币类型"> <el-table-column :label="$t('货币类型')">
<template v-slot:default = 'scope'> <template v-slot:default = 'scope'>
<dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" v-model="scope.row.applicationFeeCurrency" /> <dict-selector :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" v-model="scope.row.applicationFeeCurrency" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款类型"> <el-table-column :label="$t('付款类型')">
<template v-slot = {row}> <template v-slot = {row}>
<dict-selector :disabled="isModify[forbidden(row)]" :type="DICT_TYPE.PAYMENT_TYPE" v-model="row.payType" /> <dict-selector :disabled="isModify[forbidden(row)]" :type="DICT_TYPE.PAYMENT_TYPE" v-model="row.payType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注"> <el-table-column :label="$t('备注')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.remarks" type="textarea"></el-input> <el-input :disabled="isModify[forbidden(scope.row)]" v-model="scope.row.remarks" type="textarea"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="确认收款"> <el-table-column :label="$t('确认收款')">
<template v-slot:default ="scope"> <template v-slot:default ="scope">
<dict-tag :type="DICT_TYPE.RECEIVE_FLAG" :value="scope.row.receiveFlag" /> <dict-tag :type="DICT_TYPE.RECEIVE_FLAG" :value="scope.row.receiveFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请人"> <el-table-column :label="$t('申请人')">
<template v-slot:default ="scope"> <template v-slot:default ="scope">
{{scope.row.status === 0 ?'未提交': scope.row.applicationAuthor}} {{scope.row.status === 0 ? $t('未提交'): scope.row.applicationAuthor}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<template v-slot:default = 'scope'> <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 !== 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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
<work-flow xmlkey="free_apply" v-model="selectedUsers" /> <work-flow xmlkey="free_apply" v-model="selectedUsers" />
</div> </div>
<div style="text-align: center;margin-top: 20px;"> <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="submit">{{$t('提交')}}</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="examineFn">{{$t('审核中')}}</el-button>
<el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">取消审核</el-button> <el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">{{$t('取消审核')}}</el-button>
<el-button @click="$emit('update:dialogVisible',false)">返回</el-button> <el-button @click="$emit('update:dialogVisible',false)">{{$t('返回')}}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
methods:{ methods:{
addCost(){ addCost(){
if(this.list.some(e => e.status === 0 || e.status === 1)){ if(this.list.some(e => e.status === 0 || e.status === 1)){
return this.$message.success('当前有申请费用为审核中或未提交，请审核后在申请'); return this.$message.success(this.$t('当前有申请费用为审核中或未提交，请审核后在申请'));
} }
this.list.push( this.list.push(
{ {
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
applicationUpdate({...this.list[this.isModify.findIndex(e => e === false)],status:1}).then(r => { applicationUpdate({...this.list[this.isModify.findIndex(e => e === false)],status:1}).then(r => {
if(r.code === 0){ if(r.code === 0){
this.$emit('update:dialogVisible',false) this.$emit('update:dialogVisible',false)
this.$message.success('修改成功'); this.$message.success(this.$t('修改成功'));
} }
}) })
}else { }else {
...@@ -154,12 +154,12 @@ export default { ...@@ -154,12 +154,12 @@ export default {
feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers}).then(r=>{ feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers}).then(r=>{
if(r.code === 0){ if(r.code === 0){
this.$emit('update:dialogVisible',false) this.$emit('update:dialogVisible',false)
this.$message.success('添加成功'); this.$message.success(this.$t('添加成功'));
this.selectedUsers = []; this.selectedUsers = [];
} }
}) })
}else { }else {
this.$message.success('当前有申请费用为审核中或未提交，请审核后在申请'); this.$message.success(this.$t('当前有申请费用为审核中或未提交，请审核后在申请'));
} }
} }
}, },
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
}) })
}, },
modify(row){ 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.isModifyIf = true;
this.$set(this.isModify, this.list.findIndex(e => e.id === row.id), false ) this.$set(this.isModify, this.list.findIndex(e => e.id === row.id), false )
}, },
...@@ -182,15 +182,15 @@ export default { ...@@ -182,15 +182,15 @@ export default {
this.$router.push({path:'/bpm/process-instance/detail',query:{id:item.bpmProcessId}}) this.$router.push({path:'/bpm/process-instance/detail',query:{id:item.bpmProcessId}})
}, },
cancel(){ cancel(){
this.$prompt('请输入取消原因', '提示', { this.$prompt(this.$t('请输入取消原因'), this.$t('提示'), {
confirmButtonText: '确定', confirmButtonText: this.$t('确定'),
cancelButtonText: '取消', cancelButtonText: this.$t('取消'),
}).then(({ value }) => { }).then(({ value }) => {
let item = this.list.find(e => e.status === 1); let item = this.list.find(e => e.status === 1);
feeApplicationCancel({huifu:value,bpmProcessId:item.bpmProcessId}).then(r => { feeApplicationCancel({huifu:value,bpmProcessId:item.bpmProcessId}).then(r => {
this.$message({ this.$message({
type: 'success', type: 'success',
message:'取消成功' message:this.$t('取消成功')
}); });
this.$emit('update:dialogVisible',false) this.$emit('update:dialogVisible',false)
}) })
......
src/views/ecw/order/mutexOrder.vue
View file @ 84430fcc
<template> <template>
<div class="associated-order"> <div class="associated-order">
<h1 class="title"> <h1 class="title">
互斥订单-{{orderDetails.orderNo}} {{$t('互斥订单')}}-{{orderDetails.orderNo}}
</h1> </h1>
<el-divider></el-divider> <el-divider></el-divider>
<orde-details-form :details ="orderDetails" ></orde-details-form> <orde-details-form :details ="orderDetails" ></orde-details-form>
<el-divider></el-divider> <el-divider></el-divider>
<el-form inline label-width="100px"> <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> <el-input v-model.trim="params.mutualOrderNo"></el-input>
</div></el-form-item> </div></el-form-item>
<el-form-item><div class="content"> <el-form-item><div class="content">
<el-button @click="getList">查询</el-button> <el-button @click="getList">{{$t('查询')}}</el-button>
</div></el-form-item> </div></el-form-item>
</el-form> </el-form>
<el-divider></el-divider> <el-divider></el-divider>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<h1 class="title"> <h1 class="title">
已加入互斥订单列表 {{$t('已加入互斥订单列表')}}
</h1> </h1>
<div style="flex: 1;margin-left: 20px;"> <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>
<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>
</div> </div>
<el-table :data="list" @selection-change="handleSelectionChange" > <el-table :data="list" @selection-change="handleSelectionChange" >
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" :label="$t('序号')"></el-table-column>
<el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column> <el-table-column :label="$t('订单号')" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column> <el-table-column :label="$t('唛头')" prop="orderBackVO.marks"></el-table-column>
<el-table-column label="货物数据"> <el-table-column :label="$t('货物数据')">
<template v-slot="{row}"> <template v-slot="{row}">
<div> <div>
{{row.orderBackVO.costVO.totalNum}}箱 {{row.orderBackVO.costVO.totalNum}}{{$t('箱')}}
</div> </div>
<div> <div>
{{row.orderBackVO.costVO.totalVolume}}m³ {{row.orderBackVO.costVO.totalVolume}}m³
...@@ -47,30 +47,30 @@ ...@@ -47,30 +47,30 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓时间"> <el-table-column :label="$t('入仓时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.orderBackVO.rucangTime)}} {{parseTime(row.orderBackVO.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" > <el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope"> <template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人"> <el-table-column :label="$t('操作人')">
<template v-slot="{row}"> <template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}} {{userList.find( i => row.creator == i.id).nickname}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" prop="createTime"> <el-table-column :label="$t('操作时间')" prop="createTime">
<template v-slot="{row}">{{ <template v-slot="{row}">{{
parseTime(row.orderBackVO.createTime) parseTime(row.orderBackVO.createTime)
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<template v-slot='{row}'> <template v-slot='{row}'>
<el-button type="text" @click ="guanlianOrderByOrderId(row)"> <el-button type="text" @click ="guanlianOrderByOrderId(row)">
移出 {{$t('移出')}}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -140,14 +140,14 @@ export default { ...@@ -140,14 +140,14 @@ export default {
deleteGuanlianOrderByOrderId({orderId:this.orderId,mutualOrderId:row.mutualOrderId}).then(r =>{ deleteGuanlianOrderByOrderId({orderId:this.orderId,mutualOrderId:row.mutualOrderId}).then(r =>{
if(r.code === 0){ if(r.code === 0){
this.getList() this.getList()
this.$message.success('操作成功'); this.$message.success(this.$t('操作成功'));
} }
}) })
}, },
batchGuanlianOrderByOrderId(val){ batchGuanlianOrderByOrderId(val){
deleteBatchGuanlianOrderByOrderId(val).then(r => { deleteBatchGuanlianOrderByOrderId(val).then(r => {
this.getList() this.getList()
this.$message.success('操作成功'); this.$message.success(this.$t('操作成功'));
this.multipleSelection = [] this.multipleSelection = []
}) })
}, },
......
src/views/ecw/order/notMutexOrder.vue
View file @ 84430fcc
<template> <template>
<div class="add-associated-order"> <div class="add-associated-order">
<h1 class="title">订单号：{{ orderDetails.orderNo }} 选择订单</h1> <h1 class="title">{{$t('订单号')}}：{{ orderDetails.orderNo }} {{$t('选择订单')}}</h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-form inline label-width="85px" label-position="left"> <el-form inline label-width="85px" label-position="left">
<el-form-item label="订单号"> <el-form-item :label="$t('订单号')">
<div class="content"> <div class="content">
<el-input v-model.trim="params.mutualOrderNo"></el-input> <el-input v-model.trim="params.mutualOrderNo"></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getUnassociatedOrder">查询</el-button> <el-button @click="getUnassociatedOrder">{{$t('查询')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<h1 class="title"> <h1 class="title">
未加入互斥订单列表 {{$t('未加入互斥订单列表')}}
</h1> </h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-table :data="list" @selection-change="handleSelectionChange"> <el-table :data="list" @selection-change="handleSelectionChange">
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
type="selection" type="selection"
width="55" width="55"
></el-table-column> ></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column label="订单号" prop="orderNo"></el-table-column> <el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
<el-table-column label="唛头" prop="marks"></el-table-column> <el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
<el-table-column label="货物数据"> <el-table-column :label="$t('货物数据')">
<template v-slot="{row}"> <template v-slot="{row}">
<div> <div>
{{row.costVO.totalNum}}箱 {{row.costVO.totalNum}}{{$t('箱')}}
</div> </div>
<div> <div>
{{row.costVO.totalVolume}}m³ {{row.costVO.totalVolume}}m³
...@@ -37,19 +37,19 @@ ...@@ -37,19 +37,19 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓时间" prop="rucangTime"> <el-table-column :label="$t('入仓时间')" prop="rucangTime">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.rucangTime)}} {{parseTime(row.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column :label="$t('状态')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag> <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<template v-slot:default="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
<el-col> <el-col>
<el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))" <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
:disabled="multipleSelection.length === 0"> :disabled="multipleSelection.length === 0">
批量加入互斥 {{$t('批量加入互斥')}}
</el-button> </el-button>
<el-button @click="$router.push('/order/mutex-order/'+ orderId);"> <el-button @click="$router.push('/order/mutex-order/'+ orderId);">
取消 {{$t('取消')}}
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
}, },
operation(r) { operation(r) {
if (r.code === 0) { if (r.code === 0) {
this.$message.success('操作成功') this.$message.success(this.$t('操作成功'))
this.getUnassociatedOrder(); this.getUnassociatedOrder();
} }
}, },
......
src/views/ecw/order/transferWarehousing.vue
View file @ 84430fcc
<template> <template>
<div style="padding: 0 20px"> <div style="padding: 0 20px">
<h1>{{type == 1 ? '调拨出仓' :'调拨到仓'}}</h1> <h1>{{type == 1 ? $t('调拨出仓') :$t('调拨到仓')}}</h1>
<el-divider content-position="left"> <el-divider content-position="left">
订单信息 {{$t('订单信息')}}
</el-divider> </el-divider>
<ordeDetailsForm :details="orderDetails"></ordeDetailsForm> <ordeDetailsForm :details="orderDetails"></ordeDetailsForm>
<el-divider content-position="left"> <el-divider content-position="left">
货物信息 {{$t('货物信息')}}
</el-divider> </el-divider>
<el-table :show-summary="true" :summary-method="totalFn" :data="orderItemVOList"> <el-table :show-summary="true" :summary-method="totalFn" :data="orderItemVOList">
<el-table-column width="80" type="index" label="序号"></el-table-column> <el-table-column width="80" type="index" :label="$t('序号')"></el-table-column>
<el-table-column label="品名"> <el-table-column :label="$t('品名')">
<template v-slot="{row}"> <template v-slot="{row}">
<div>{{ row.prodTitleZh }}</div> <div>{{ row.prodTitleZh }}</div>
<div>{{ row.prodTitleEn }}</div> <div>{{ row.prodTitleEn }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="填单货物属性"> <el-table-column :label="$t('填单货物属性')">
<template v-slot="{row}"> <template v-slot="{row}">
<div>品牌：{{ row.brand }}</div><div>箱数：{{row.num}}</div><div>体积：{{ row.volume }}m³</div><div>重量{{row.weight}}Kg</div> <div>{{$t('品牌')}}：{{ row.brand }}</div><div>{{$t('箱数')}}：{{row.num}}</div><div>{{$t('体积')}}：{{ row.volume }}m³</div><div>{{$t('重量')}}{{row.weight}}Kg</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库货物属性"> <el-table-column :label="$t('入库货物属性')">
<template v-slot="{row}"> <template v-slot="{row}">
<div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index"> <div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index">
<div>规格：{{item.boxGauge}}</div> <div>{{$t('规格')}}：{{item.boxGauge}}</div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<div>品牌：{{row.brand}}</div> <div>{{$t('品牌')}}：{{row.brand}}</div>
<div>箱数：{{item.cartonsNum}}</div> <div>{{$t('箱数')}}：{{item.cartonsNum}}</div>
<div>体积：{{item.volume}} CMB</div> <div>{{$t('体积')}}：{{item.volume}} CMB</div>
<div>重量：{{item.weight}}KG</div> <div>{{$t('重量')}}：{{item.weight}}KG</div>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最后操作时间"> <el-table-column :label="$t('最后操作时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.updateTime)}} {{parseTime(row.updateTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column :label="$t('状态')">
<template v-slot="{row}"> <template v-slot="{row}">
{{calculationStatus(row.cartonsNumDiff)}} {{calculationStatus(row.cartonsNumDiff)}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-divider content-position="left" v-if="type == 2"> <el-divider content-position="left" v-if="type == 2">
调仓明细 {{$t('调仓明细')}}
</el-divider> </el-divider>
<el-table :data="warehouseList" v-if="type == 2"> <el-table :data="warehouseList" v-if="type == 2">
<el-table-column label="调仓编号" prop="id"></el-table-column> <el-table-column :label="$t('调仓编号')" prop="id"></el-table-column>
<el-table-column label="调出仓库" prop="warehouseOutName" ></el-table-column> <el-table-column :label="$t('调出仓库')" prop="warehouseOutName" ></el-table-column>
<el-table-column label="调入仓库" prop="warehouseInName"></el-table-column> <el-table-column :label="$t('调入仓库')" prop="warehouseInName"></el-table-column>
<el-table-column label="申请人" prop="creatorName"></el-table-column> <el-table-column :label="$t('申请人')" prop="creatorName"></el-table-column>
<el-table-column label="申请时间"> <el-table-column :label="$t('申请时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column :label="$t('状态')">
<template v-slot="{row}"> <template v-slot="{row}">
{{STATUS[row.status]}} {{STATUS[row.status]}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-descriptions style="margin-top: 20px" :column="4" border> <el-descriptions style="margin-top: 20px" :column="4" border>
<el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName ? warehouseDetails.warehouseOutName : '' }}</el-descriptions-item> <el-descriptions-item :label="$t('集运仓库')">{{ warehouseDetails && warehouseDetails.warehouseOutName ? warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
<el-descriptions-item label="储位"> <el-descriptions-item :label="$t('储位')">
<div v-for="item in storageSpaceList" style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div> <div>{{item.code}}</div></div> <div v-for="item in storageSpaceList" style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} {{$t('区')}}</div> <div>{{item.code}}</div></div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="type == 2" label="选择储位"> <el-descriptions-item v-if="type == 2" :label="$t('选择储位')">
<div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">选择储位</div> <div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">{{$t('选择储位')}}</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item> <el-descriptions-item :label="$t('调拨目标仓')">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item>
<el-descriptions-item label="物流公司"> <el-descriptions-item :label="$t('物流公司')">
<el-select :disabled="type == 2" v-model="params.logisticsCompany" > <el-select :disabled="type == 2" v-model="params.logisticsCompany" >
<el-option v-for="(item,index) in expressList " :key="index" :value="item.id" :label="item.companyZh"></el-option> <el-option v-for="(item,index) in expressList " :key="index" :value="item.id" :label="item.companyZh"></el-option>
</el-select> </el-select>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="物流单号"> <el-descriptions-item :label="$t('物流单号')">
<el-input :disabled="type == 2" v-model="params.logisticsNo"></el-input> <el-input :disabled="type == 2" v-model="params.logisticsNo"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="联系电话"> <el-descriptions-item :label="$t('联系电话')">
<el-input :disabled="type == 2" v-model="params.phone"></el-input> <el-input :disabled="type == 2" v-model="params.phone"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出仓日期" > <el-descriptions-item :label="$t('出仓日期')" >
<el-date-picker <el-date-picker
:disabled="type == 2" :disabled="type == 2"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
v-model="params.deliveryDate" v-model="params.deliveryDate"
type="date" type="date"
placeholder="选择日期"> :placeholder="$t('选择日期')">
</el-date-picker> </el-date-picker>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="到仓日期" v-if="type == 2"> <el-descriptions-item :label="$t('到仓日期')" v-if="type == 2">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
v-model="params.arrivalDate" v-model="params.arrivalDate"
type="date" type="date"
placeholder="选择日期"> :placeholder="$t('选择日期')">
</el-date-picker> </el-date-picker>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left"> <el-divider content-position="left">
出仓影像 {{$t('出仓影像')}}
</el-divider> </el-divider>
<image-and-video-upload :fileSize="50" :isShowTip="true" v-model="params.urls" ></image-and-video-upload> <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="params.urls" ></image-and-video-upload>
<el-form> <el-form>
<el-form-item label="备注"> <el-form-item :label="$t('备注')">
<el-input v-model="params.deliveryRemark" type="textarea"></el-input> <el-input v-model="params.deliveryRemark" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="margin-bottom: 30px; text-align: center;"> <div style="margin-bottom: 30px; text-align: center;">
<el-button v-if="type == 1" @click="submit" size="medium">确认出仓</el-button> <el-button v-if="type == 1" @click="submit" size="medium">{{$t('确认出仓')}}</el-button>
<el-button v-else @click="submit2(true)" size="medium" >确认到仓</el-button> <el-button v-else @click="submit2(true)" size="medium" >{{$t('确认到仓')}}</el-button>
<el-button v-if="type == 2" @click="escapeBol = true;">转异</el-button> <el-button v-if="type == 2" @click="escapeBol = true;">{{$t('转异')}}</el-button>
<el-button v-if="type == 1" size="medium" @click="cancellationOfOrder">取消调仓</el-button> <el-button v-if="type == 1" size="medium" @click="cancellationOfOrder">{{$t('取消调仓')}}</el-button>
<el-button size="medium" @click="$tab.closeOpenPage({path:'/order/order'})">返回</el-button> <el-button size="medium" @click="$tab.closeOpenPage({path:'/order/order'})">{{$t('返回')}}</el-button>
</div> </div>
<warehouse-location ref="area" :city-id="warehouseInShi" :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location> <warehouse-location ref="area" :city-id="warehouseInShi" :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
<el-dialog :title="'订单转异'" center :visible.sync="escapeBol"> <el-dialog :title="$t('订单转异')" center :visible.sync="escapeBol">
<el-form label-position="top" label-width="200"> <el-form label-position="top" label-width="200">
<el-form-item label="原因类型"> <el-form-item :label="$t('原因类型')">
<dict-selector v-model="params.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector> <dict-selector v-model="params.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
</el-form-item> </el-form-item>
<el-form-item required label="附件"> <el-form-item required :label="$t('附件')">
<image-upload v-model="params.exceptionUrls"></image-upload> <image-upload v-model="params.exceptionUrls"></image-upload>
</el-form-item> </el-form-item>
<el-form-item label="详细信息"> <el-form-item :label="$t('详细信息')">
<el-input v-model="params.descZh" type="textarea"></el-input> <el-input v-model="params.descZh" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit2(false)">确认并完成入仓</el-button> <el-button type="primary" @click="submit2(false)">{{$t('确认并完成入仓')}}</el-button>
<el-button @click="escapeBol = false">取消</el-button> <el-button @click="escapeBol = false">{{$t('取消')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -157,7 +157,6 @@ import {getByWarehouseId} from "@/api/ecw/warehouseArea"; ...@@ -157,7 +157,6 @@ import {getByWarehouseId} from "@/api/ecw/warehouseArea";
import {adjustLastWithStatus, warehouseApprovalCancel} from "@/api/ecw/batchSingleApplication"; import {adjustLastWithStatus, warehouseApprovalCancel} from "@/api/ecw/batchSingleApplication";
import warehouseLocation from "@/views/ecw/order/components/warehouseLocation"; import warehouseLocation from "@/views/ecw/order/components/warehouseLocation";
import imageUpload from "@/components/ImageUpload"; import imageUpload from "@/components/ImageUpload";
let STATUS = {1:'申请中', 2:'通过', 3:'不通过', 4:'已取消', 5:'已出仓',6:'已到仓'}
export default { export default {
name: "transferWarehousing", name: "transferWarehousing",
components: { components: {
...@@ -175,7 +174,7 @@ export default { ...@@ -175,7 +174,7 @@ export default {
return { return {
areaVisible:false, areaVisible:false,
escapeBol:false, escapeBol:false,
STATUS, STATUS :{1:this.$t('申请中'), 2:this.$t('通过'), 3:this.$t('不通过'), 4:this.$t('已取消'), 5:this.$t('已出仓'),6:this.$t('已到仓')},
orderDetails: {}, orderDetails: {},
DICT_TYPE, DICT_TYPE,
warehouseDetails: {}, warehouseDetails: {},
...@@ -239,11 +238,11 @@ export default { ...@@ -239,11 +238,11 @@ export default {
calculationStatus(){ calculationStatus(){
return (val)=>{ return (val)=>{
if(val > 0){ if(val > 0){
return `多${val}箱` return `${this.$t('多')}${val}${this.$t('箱')}`
}else if(val < 0){ }else if(val < 0){
return `少${Math.abs(val)}箱` return `${this.$t('少')}${Math.abs(val)}${this.$t('箱')}`
}else { }else {
return '准确到齐 ' return this.$t('准确到齐')
} }
} }
} }
...@@ -325,7 +324,7 @@ export default { ...@@ -325,7 +324,7 @@ export default {
warehouseAdjustSendOut(this.exWarehouse).then( warehouseAdjustSendOut(this.exWarehouse).then(
r => { r => {
if(r.code === 0){ if(r.code === 0){
this.$message.success('调拨出仓成功'); this.$message.success(this.$t('调拨出仓成功'));
this.$tab.closeOpenPage({path:'/order/order'}) this.$tab.closeOpenPage({path:'/order/order'})
} }
} }
...@@ -334,7 +333,7 @@ export default { ...@@ -334,7 +333,7 @@ export default {
submit2(val){ submit2(val){
warehouseAdjustArrived(val ? this.toWarehouse : this.toWarehouseAbnormal).then(r => { warehouseAdjustArrived(val ? this.toWarehouse : this.toWarehouseAbnormal).then(r => {
if(r.code === 0){ if(r.code === 0){
this.$message.success('调到仓成功'); this.$message.success(this.$t('调到仓成功'));
this.$tab.closeOpenPage({path:'/order/order'}) this.$tab.closeOpenPage({path:'/order/order'})
} }
}) })
...@@ -353,14 +352,14 @@ export default { ...@@ -353,14 +352,14 @@ export default {
Wweight += Number(m.weight || 0) Wweight += Number(m.weight || 0)
}) })
}) })
let text = `下单统计：${num}箱 ${volume}m³ ${weight}Kg` let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
let text2 =` 入仓统计：${Wnum}箱 ${Wvolume}m³ ${Wweight}Kg` let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
return ['合计：',text,text2] return ['合计：',text,text2]
}, },
cancellationOfOrder(){ cancellationOfOrder(){
this.$prompt('请输入取消调仓原因', '提示', { this.$prompt(this.$t('请输入取消调仓原因'), this.$t('提示'), {
confirmButtonText: '确定', confirmButtonText: this.$t('确定'),
cancelButtonText: '取消', cancelButtonText: this.$t('取消'),
}).then(({ value }) => { }).then(({ value }) => {
cancelAdjust({ cancelAdjust({
orderId: this.orderId, orderId: this.orderId,
...@@ -370,7 +369,7 @@ export default { ...@@ -370,7 +369,7 @@ export default {
if(r.code === 0){ if(r.code === 0){
this.$message({ this.$message({
type: 'info', type: 'info',
message: '取消调仓成功' message: this.$t('取消调仓成功')
}); });
this.$tab.closeOpenPage({path:'/order/order'}) this.$tab.closeOpenPage({path:'/order/order'})
} }
......
src/views/ecw/order/withdrawal.vue
View file @ 84430fcc
...@@ -7,23 +7,23 @@ ...@@ -7,23 +7,23 @@
}" }"
width="80%"> width="80%">
<div style="padding: 0 20px"> <div style="padding: 0 20px">
<h1>申请退仓-{{orderDetails.orderNo}}</h1> <h1>{{$t('申请退仓')}}-{{orderDetails.orderNo}}</h1>
<el-divider></el-divider> <el-divider></el-divider>
<el-form label-width="150px"> <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-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-divider></el-divider> <el-divider></el-divider>
<h2>审批流程</h2> <h2>{{$t('审批流程')}}</h2>
<div style="padding: 20px"> <div style="padding: 20px">
<work-flow xmlkey="retired_warehouse" v-model="params.copyUserId" /> <work-flow xmlkey="retired_warehouse" v-model="params.copyUserId" />
</div> </div>
<div> <div>
<el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">确定退仓</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;">审核中</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">取消审核</el-button> <el-button v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
<el-button @click="$parent.show = false;">不，再考虑考虑</el-button> <el-button @click="$parent.show = false;">{{$t('不，再考虑考虑')}}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -80,20 +80,20 @@ export default { ...@@ -80,20 +80,20 @@ export default {
this.params.orderNo =this.orderDetails.orderNo; this.params.orderNo =this.orderDetails.orderNo;
orderWarehouseInDelete(this.params).then(r => { orderWarehouseInDelete(this.params).then(r => {
if(r.code === 0){ if(r.code === 0){
this.$message.success('退仓成功'); this.$message.success(this.$t('退仓成功'));
this.params = {} this.params = {}
this.$parent.show = false this.$parent.show = false
} }
}) })
}, },
cancellationOfOrder(){ cancellationOfOrder(){
this.$prompt('请输入取消审核原因', '提示', { this.$prompt(this.$t('请输入取消审核原因'), this.$t('提示'), {
confirmButtonText: '确定', confirmButtonText: this.$t('确定'),
cancelButtonText: '取消', cancelButtonText: this.$t('取消'),
}).then(({ value }) => { }).then(({ value }) => {
warehouseApprovalCancel(this.details.id,value) .then(r => { warehouseApprovalCancel(this.details.id,value) .then(r => {
if(r.data){ if(r.data){
this.$message.success('取消成功') this.$message.success(this.$t('取消成功'))
this.params = {} this.params = {}
this.$parent.show = false this.$parent.show = false
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', 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