Commit ee394db4 authored by 我在何方's avatar 我在何方
parents dfc09c9d 311e6ff2
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
header: [], header: [],
hr: [], hr: [],
i: ['class', 'style'], i: ['class', 'style'],
img: ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex'], img: ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex', 'style'],
ins: ['datetime'], ins: ['datetime'],
li: ['class', 'style'], li: ['class', 'style'],
mark: [], mark: [],
......
...@@ -667,6 +667,21 @@ export function externalLoad(data) { ...@@ -667,6 +667,21 @@ export function externalLoad(data) {
}); });
} }
/**
* 获取拆单列表
*
* @param {*} params
* @returns
*/
export function splitList(data) {
return request({
url: "/shipment/box/splitList",
method: "post",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
data: jsonToFormData(data),
});
}
/***************************** 装柜 end **********************************/ /***************************** 装柜 end **********************************/
/***************************** 卸柜 start **********************************/ /***************************** 卸柜 start **********************************/
...@@ -708,7 +723,7 @@ export function batchUnload(data) { ...@@ -708,7 +723,7 @@ export function batchUnload(data) {
* @param {*} data * @param {*} data
* @return {*} * @return {*}
*/ */
export function singleUnload(data) { export function singleUnload(data) {
return request({ return request({
url: "/ecw/box-load-info/singleUnload", url: "/ecw/box-load-info/singleUnload",
method: "post", method: "post",
......
...@@ -109,7 +109,7 @@ export function getReceivableItemDetail(query) { ...@@ -109,7 +109,7 @@ export function getReceivableItemDetail(query) {
// 获取收款单明细 // 获取收款单明细
export function getInvoicingItem(query) { export function getInvoicingItem(query) {
return request({ return request({
url: '/ecw/receipt/getInvoicingItem', url: '/ecw/receipt/getReceivableItemDetail',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -189,6 +189,15 @@ export function getWarehouseUpdateApprovalInfo(id) { ...@@ -189,6 +189,15 @@ export function getWarehouseUpdateApprovalInfo(id) {
}) })
} }
// 获取最近的入仓修改审批单详情-修改页面使用
export function getWarehouseLastUpdateApprovalInfo(params) {
return request({
url: '/order/order-warehouse-in/get-last-update-approval-info',
method: 'get',
params
})
}
// 入仓完成 // 入仓完成
export function orderWarehouseInFinish(data){ export function orderWarehouseInFinish(data){
return request({ return request({
...@@ -457,4 +466,4 @@ export function updateApply(data){ ...@@ -457,4 +466,4 @@ export function updateApply(data){
method:'put', method:'put',
data data
}) })
} }
\ No newline at end of file
...@@ -10,7 +10,7 @@ const pdfViewerPath = '/static/plugins/pdfviewer/' ...@@ -10,7 +10,7 @@ const pdfViewerPath = '/static/plugins/pdfviewer/'
const ID_Prefix = 'pdfviewer-canvas' const ID_Prefix = 'pdfviewer-canvas'
export default { export default {
props:{ props:{
url: [String, Object] url: [String, Object, ArrayBuffer]
}, },
data(){ data(){
return { return {
...@@ -48,12 +48,17 @@ export default { ...@@ -48,12 +48,17 @@ export default {
// The workerSrc property shall be specified. // The workerSrc property shall be specified.
// //
let pdfjsLib = window.pdfjsLib let pdfjsLib = window.pdfjsLib
pdfjsLib.GlobalWorkerOptions.workerSrc = pdfViewerPath + '/js/pdf.worker.js'; pdfjsLib.GlobalWorkerOptions.workerSrc = pdfViewerPath + 'js/pdf.worker.js';
/* pdfjsLib.GlobalWorkerOptions.useWorkerFetch = true
pdfjsLib.GlobalWorkerOptions.cMapUrl = pdfViewerPath + 'cmaps/' */
// //
// Asynchronous download PDF // Asynchronous download PDF
// //
const loadingTask = pdfjsLib.getDocument(this.url); const loadingTask = pdfjsLib.getDocument({
data: this.url,
useWorkerFetch: true,
cMapUrl: pdfViewerPath + 'cmaps/'
});
(async () => { (async () => {
const pdf = await loadingTask.promise; const pdf = await loadingTask.promise;
window.pdf2 = pdf window.pdf2 = pdf
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
pages: 1, pages: 1,
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 100000, pageSize: 500,
attrId: null, attrId: null,
titleZh: null, titleZh: null,
typeId: null typeId: null
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
<el-row class="" :gutter="10"> <el-row class="" :gutter="10">
<template v-for="item in filteredRouterList"> <template v-for="(item, index) in filteredRouterList">
<el-col :span="12" :key="item.value"> <el-col :span="12" :key="item.value">
<el-card class="mb-10"> <el-card class="mb-10">
<div slot="header"> <div slot="header">
...@@ -51,6 +51,9 @@ ...@@ -51,6 +51,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" prop=""> <el-table-column :label="$t('操作')" prop="">
<template slot="header">
<el-checkbox @change="toggleGroupChecker(index, $event)" v-model="groupChecker[item.value]"></el-checkbox>
</template>
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-checkbox :checked="getSelectedIndex(row) > -1" @change="toggleChecker(row, $event)"></el-checkbox> <el-checkbox :checked="getSelectedIndex(row) > -1" @change="toggleChecker(row, $event)"></el-checkbox>
</template> </template>
...@@ -85,6 +88,7 @@ export default { ...@@ -85,6 +88,7 @@ export default {
selectedRoutes: [], // 勾选的路线渠道 selectedRoutes: [], // 勾选的路线渠道
hideMap: {}, // 折叠状态 hideMap: {}, // 折叠状态
checkAll: null, checkAll: null,
groupChecker: {}, // 分组全选记录
} }
}, },
...@@ -197,6 +201,14 @@ export default { ...@@ -197,6 +201,14 @@ export default {
}, },
methods:{ methods:{
// 全选、全不选 某个运输方式所有线路
toggleGroupChecker(index, selected){
let routerList = this.filteredRouterList[index].routerList
console.log(routerList.length, selected)
routerList.forEach(router => {
this.toggleChecker(router, selected)
})
},
getOpenedRouterList(){ getOpenedRouterList(){
let params = {} let params = {}
if(this.exportCity){ if(this.exportCity){
......
...@@ -33,8 +33,8 @@ export default { ...@@ -33,8 +33,8 @@ export default {
}, },
watch:{ watch:{
index(val){ index(val){
this.$emit('input', val !== null ? this.list[val].id : null) this.$emit('input', val !== null && val !== undefined && val != '' ? this.list[val].id : null)
this.$emit('change', val !== null ? this.list[val]: null) this.$emit('change', val !== null && val !== undefined && val != '' ? this.list[val]: null)
}, },
value(val){ value(val){
this.resetIndex() this.resetIndex()
......
...@@ -285,8 +285,10 @@ export default { ...@@ -285,8 +285,10 @@ export default {
box-shadow: #8f8f8f 7px 5px 14px 0; box-shadow: #8f8f8f 7px 5px 14px 0;
} }
.warehouse-block-active{ .warehouse-block-active{
box-shadow: #7e9dbd 7px 5px 14px 0; box-shadow: #b1a4cb 7px 5px 14px 0;
transform: scale(1.04); transform: scale(1.04);
background-color: #9ab7e1;
color: #ffffff;
} }
.warehouse-block-selected{ .warehouse-block-selected{
color: #ffffff; color: #ffffff;
......
...@@ -141,11 +141,11 @@ ...@@ -141,11 +141,11 @@
} }
} }
pre { pre {
margin: 0; /* margin: 0;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
max-height: calc(80vh - 32px); max-height: calc(80vh - 32px);
overflow-y: auto; overflow-y: auto; */
} }
.hljs { .hljs {
word-break: break-word; word-break: break-word;
......
...@@ -5,13 +5,7 @@ ...@@ -5,13 +5,7 @@
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" 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="客户名称" prop="customerId"> <el-form-item label="客户名称" prop="customerId">
<el-select v-model="form.customerId" placeholder="请选择客户名称" :disabled="!!customerId"> <customer-select v-model="form.customerId" ></customer-select>
<el-option
v-for="item in customerSelect"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="投诉类型" prop="type"> <el-form-item label="投诉类型" prop="type">
<el-select v-model="form.type" placeholder="请选择投诉类型"> <el-select v-model="form.type" placeholder="请选择投诉类型">
...@@ -113,6 +107,7 @@ import {getCustomerSelect} from '@/api/ecw/customer' ...@@ -113,6 +107,7 @@ import {getCustomerSelect} from '@/api/ecw/customer'
import DictSelector from '@/components/DictSelector' import DictSelector from '@/components/DictSelector'
import { DICT_TYPE, getDictDatas, getDictDataLabel } from '@/utils/dict' import { DICT_TYPE, getDictDatas, getDictDataLabel } from '@/utils/dict'
import {getBillNoSearch, getOrderNoSearch} from "@/api/ecw/order" import {getBillNoSearch, getOrderNoSearch} from "@/api/ecw/order"
import customerSelect from "@/views/ecw/customer/customerSelect";
export default { export default {
name: "customerComplaints", name: "customerComplaints",
...@@ -124,7 +119,8 @@ export default { ...@@ -124,7 +119,8 @@ export default {
customerId: Number customerId: Number
}, },
components: { components: {
DictSelector DictSelector,
customerSelect
}, },
data() { data() {
return { return {
......
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
"新增": "Create", "新增": "Create",
"搜索": "Search", "搜索": "Search",
"重置": "Reset", "重置": "Reset",
"新建订单": "New Order" "新建订单": "New Order",
"订舱": "Book space"
} }
\ No newline at end of file
...@@ -198,6 +198,7 @@ export const DICT_TYPE = { ...@@ -198,6 +198,7 @@ export const DICT_TYPE = {
BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程 BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型 BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型 BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型
BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state'
} }
/** /**
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column label="当前审批任务" align="center" prop="tasks"> <el-table-column label="当前审批任务" align="center" prop="tasks">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-for="task in scope.row.tasks" type="text" @click="handleFormDetail(task.id)"> <el-button v-for="(task, taskIndex) in scope.row.tasks" type="text" @click="handleFormDetail(task.id)" :key="taskIndex">
<span>{{ task.name }}</span> <span>{{ task.name }}</span>
</el-button> </el-button>
</template> </template>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<span>{{ parseTime(scope.row.endTime) }}</span> <span>{{ parseTime(scope.row.endTime) }}</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="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" icon="el-icon-delete" v-if="scope.row.result === 1" <el-button type="text" size="small" icon="el-icon-delete" v-if="scope.row.result === 1"
v-hasPermi="['bpm:process-instance:cancel']" @click="handleCancel(scope.row)">取消</el-button> v-hasPermi="['bpm:process-instance:cancel']" @click="handleCancel(scope.row)">取消</el-button>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" fixed="right" 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="handleAudit(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:query']">详情 v-hasPermi="['bpm:task:query']">详情
......
...@@ -2,52 +2,56 @@ ...@@ -2,52 +2,56 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<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="processInstanceId">
<el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('任务名称')" prop="name"> <el-form-item :label="$t('任务名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('流程编号')" prop="name"> <el-form-item :label="$t('流程分类')" prop="category">
<!--// TODO 缺少查询字段--> <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
<!-- <el-input v-model="queryParams.no" :placeholder="$t('请输入流程编号')" clearable @keyup.enter.native="handleQuery"/>--> <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
缺少字段 :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('流程分类')" prop="name"> <el-form-item :label="$t('业务编号')" prop="businessNo">
<!--// TODO 缺少查询字段--> <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
<!-- <el-input v-model="queryParams.no" :placeholder="$t('请输入流程编号')" clearable @keyup.enter.native="handleQuery"/>--> @keyup.enter.native="handleQuery"/>
缺少字段
</el-form-item> </el-form-item>
<el-form-item :label="$t('提交时间')"> <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="$t('开始日期')" :end-placeholder="$t('结束日期')" /> type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
</el-form-item> :end-placeholder="$t('结束日期')"/>
<el-form-item :label="$t('业务编号')" prop="name">
缺少字段
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed /> <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed/>
<el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200" /> <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200"/>
<el-table-column :label="$t('业务编号')" align="center" prop="" width="200" > <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
缺少字段 <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('流程分类')" align="center" prop="category" width="200" /> <el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200"/>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200" /> <!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
<el-table-column :label="$t('状态')" align="center" prop="" width="200" >
缺少字段 缺少字段
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120" /> <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120"/>
<el-table-column :label="$t('结果')" align="center" prop="result"> <el-table-column :label="$t('结果')" align="center" prop="result">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/> <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column :label="$t('审批意见')" align="center" prop="comment" width="200" />-->
<el-table-column :label="$t('提交时间')" 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>
...@@ -58,15 +62,11 @@ ...@@ -58,15 +62,11 @@
<span>{{ parseTime(scope.row.endTime) }}</span> <span>{{ parseTime(scope.row.endTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column :label="$t('耗时')" align="center" prop="durationInMillis" width="180">
<template slot-scope="scope">
<span>{{ getDateStar(scope.row.durationInMillis) }}</span>
</template>
</el-table-column>-->
<el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" fixed="right" 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="handleAudit(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:query']">{{$t('详情')}}</el-button> v-hasPermi="['bpm:task:query']">{{ $t('详情') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -83,8 +83,7 @@ import {getDate} from "@/utils/dateUtils"; ...@@ -83,8 +83,7 @@ import {getDate} from "@/utils/dateUtils";
export default { export default {
name: "Done", name: "Done",
components: { components: {},
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -136,7 +135,7 @@ export default { ...@@ -136,7 +135,7 @@ export default {
}, },
/** 处理审批按钮 */ /** 处理审批按钮 */
handleAudit(row) { handleAudit(row) {
this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}}); this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
}, },
} }
}; };
......
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<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="$t('流程名')" prop="name"> <el-form-item label="流程编号" prop="processInstanceId">
<el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="编号" prop="name"> <el-form-item :label="$t('任务名称')" prop="name">
缺少字段 <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('流程分类')" prop="category"> <el-form-item :label="$t('流程分类')" prop="category">
<el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable> <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
...@@ -15,42 +16,48 @@ ...@@ -15,42 +16,48 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('提交时间')"> <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="$t('开始日期')" :end-placeholder="$t('结束日期')"/> type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column :label="$t('编号')" align="center" prop="id" width="320"/> <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320"/>
<el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/> <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="320"/>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('流程分类')" align="center" prop="category"> <el-table-column :label="$t('流程分类')" align="center" prop="category">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/> <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name"/> <el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
<el-table-column :label="$t('状态')" align="center" prop="version" width="80"> <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="success" v-if="scope.row.suspensionState === 1">{{$t('激活')}}</el-tag> <el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
<el-tag type="warning" v-if="scope.row.suspensionState === 2">{{$t('挂起')}}</el-tag> <el-tag type="warning" v-if="scope.row.suspensionState === 2">{{ $t('挂起') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname"> <el-table-column :label="$t('结果')" align="center" prop="result">
缺少字段 <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('提交时间')" 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">
...@@ -59,13 +66,13 @@ ...@@ -59,13 +66,13 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('结束时间')" 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.endTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" fixed="right" 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="handleAudit(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:update']">{{$t('审批')}} v-hasPermi="['bpm:task:update']">{{ $t('审批') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -52,6 +52,19 @@ ...@@ -52,6 +52,19 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="$router.push('/member/member/under-review')">
<div class="card-panel-icon-wrapper icon-shopping">
<svg-icon icon-class="time-range" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
{{$t('待审核注册会员')}}
</div>
<count-to :start-val="0" :end-val="data.reviewMemberCount" :duration="3600" class="card-panel-num" />
</div>
</div>
</el-col>
</el-row> </el-row>
</template> </template>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<span>{{ formatTime(scope.row.validateStart) }}~{{ formatTime(scope.row.validateEnd) }}</span> <span>{{ formatTime(scope.row.validateStart) }}~{{ formatTime(scope.row.validateEnd) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ statusName(scope.row.status) }}</span> <span>{{ statusName(scope.row.status) }}</span>
...@@ -73,11 +73,11 @@ ...@@ -73,11 +73,11 @@
<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="操作" 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:banner-pop:update']">修改</el-button> v-hasPermi="['ecw:banner-pop:update']">修改</el-button>
<el-button size="mini" type="text" @click="handleStatus(scope.row)" <el-button size="mini" type="text" @click="handleStatus(scope.row)"
v-hasPermi="['ecw:banner-pop:update']">{{scope.row.status == CommonStatusEnum.ENABLE ? '禁用' : '启用'}}</el-button> v-hasPermi="['ecw:banner-pop:update']">{{scope.row.status == CommonStatusEnum.ENABLE ? '禁用' : '启用'}}</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)"
...@@ -101,16 +101,16 @@ ...@@ -101,16 +101,16 @@
<el-form-item label="有效期" prop="validateStart"> <el-form-item label="有效期" prop="validateStart">
<el-date-picker v-model="form.validateStart" @change="startChange" <el-date-picker v-model="form.validateStart" @change="startChange"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
~ ~
<el-date-picker v-model="form.validateEnd" <el-date-picker v-model="form.validateEnd"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
<span style="color:red;font-size:14px;">注意:留空则表示永久有效</span> <span style="color:red;font-size:14px;">注意:留空则表示永久有效</span>
</el-form-item> </el-form-item>
<el-form-item label="网页中文" prop="htmlWebZh"> <el-form-item label="网页中文" prop="htmlWebZh">
<editor v-model="form.htmlWebZh" :min-height="150"/> <editor v-model="form.htmlWebZh" :min-height="150"/>
</el-form-item> </el-form-item>
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
} }
} }
}, },
}, },
computed: { computed: {
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
/**开始日期变了 */ /**开始日期变了 */
startChange(val) { startChange(val) {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
...@@ -2,43 +2,43 @@ ...@@ -2,43 +2,43 @@
<div class="app-costForm shippingSea-dialog"> <div class="app-costForm shippingSea-dialog">
<el-form ref="costForm" :model="costObj" :rules="rules" label-width="80px"> <el-form ref="costForm" :model="costObj" :rules="rules" label-width="80px">
<el-form-item label="操作步骤" prop="opStepType"> <el-form-item :label="$t('操作步骤')" prop="opStepType">
<el-select v-model="costObj.opStepType" placeholder="请选择操作步骤"> <el-select v-model="costObj.opStepType" :placeholder="$t('请选择操作步骤')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用类型" prop="costType"> <el-form-item :label="$t('费用类型')" prop="costType">
<el-select v-model="costObj.costType" placeholder="请选择费用类型"> <el-select v-model="costObj.costType" :placeholder="$t('请选择费用类型')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.FEE_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.FEE_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商" prop="supplierId"> <el-form-item :label="$t('供应商')" prop="supplierId">
<el-select v-model="costObj.supplierId" placeholder="请选择供应商"> <el-select v-model="costObj.supplierId" :placeholder="$t('请选择供应商')">
<el-option v-for="supplier in allSupplier" :key="supplier.id" :label="supplier.companyZh" :value="supplier.id"></el-option> <el-option v-for="supplier in allSupplier" :key="supplier.id" :label="$l(supplier, 'company')" :value="supplier.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-row class="two-element-formItem"> <el-row class="two-element-formItem">
<el-form-item label="金额" prop="price"> <el-form-item :label="$t('金额')" prop="price">
<el-input-number v-model="costObj.price" controls-position="right" :min="1"></el-input-number> <el-input-number v-model="costObj.price" controls-position="right" :min="1"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="" label-width="0px" prop="priceUnit"> <el-form-item label="" label-width="0px" prop="priceUnit">
<el-select v-model="costObj.priceUnit" placeholder="请选择单位"> <el-select v-model="costObj.priceUnit" :placeholder="$t('请选择单位')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-form-item label="备注"> <el-form-item :label="$t('备注')">
<el-input v-model="costObj.remarks" type="textarea" rows="2" placeholder="请输入备注"></el-input> <el-input v-model="costObj.remarks" type="textarea" rows="2" :placeholder="$t('请输入备注')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="operate-button"> <div class="operate-button">
<el-button type="primary" @click="submit">确定</el-button> <el-button type="primary" @click="submit">{{$t('确定')}}</el-button>
<el-button @click="$emit('closeDialog')">取消</el-button> <el-button @click="$emit('closeDialog')">{{$t('取消')}}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -59,11 +59,11 @@ export default { ...@@ -59,11 +59,11 @@ export default {
allSupplier: [], allSupplier: [],
rules: { rules: {
opStepType: [{ required: true, message: "操作步骤不能为空", trigger: "change" }], opStepType: [{ required: true, message: this.$t("操作步骤不能为空"), trigger: "change" }],
costType: [{ required: true, message: "费用类型不能为空", trigger: "change" }], costType: [{ required: true, message: this.$t("费用类型不能为空"), trigger: "change" }],
supplierId: [{ required: true, message: "供应商不能为空", trigger: "blur" }], supplierId: [{ required: true, message: this.$t("供应商不能为空"), trigger: "blur" }],
price: [{ required: true, message: "金额不能为空", trigger: "blur" }], price: [{ required: true, message: this.$t("金额不能为空"), trigger: "blur" }],
priceUnit: [{ required: true, message: "金额单位不能为空", trigger: "blur" }] priceUnit: [{ required: true, message: this.$t("金额单位不能为空"), trigger: "blur" }]
}, },
}; };
}, },
......
<template> <template>
<div class="shippingSea-dialog"> <div class="shippingSea-dialog">
<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="运输方式" prop="transportType"> <el-form-item :label="$t('运输方式')" prop="transportType">
<el-radio-group v-model="form.transportType"> <el-radio-group v-model="form.transportType">
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio> <el-radio v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'value')">{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="柜型" prop="cabinetId"> <el-form-item :label="$t('柜型')" prop="cabinetId">
<el-select v-model="form.cabinetId" placeholder="请选择柜型"> <el-select v-model="form.cabinetId" :placeholder="$t('请选择柜型')">
<el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="始发地" prop="startWarehouseId"> <el-form-item :label="$t('始发地')" prop="startWarehouseId">
<el-select v-model="form.startWarehouseId" placeholder="请选择始发地"> <el-select v-model="form.startWarehouseId" :placeholder="$t('请选择始发地')">
<el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的地" prop="destWarehouseId"> <el-form-item :label="$t('目的地')" prop="destWarehouseId">
<el-select v-model="form.destWarehouseId" placeholder="请选择目的地"> <el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的地')">
<el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="operate-button"> <div class="operate-button">
<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-form> </el-form>
</div> </div>
...@@ -55,16 +55,16 @@ export default { ...@@ -55,16 +55,16 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
transportType: [ transportType: [
{ required: true, message: "运输方式不能为空", trigger: "blur" }, { required: true, message: this.$t("运输方式不能为空"), trigger: "blur" },
], ],
cabinetId: [ cabinetId: [
{ required: true, message: "柜型不能为空", trigger: "blur" }, { required: true, message: this.$t("柜型不能为空"), trigger: "blur" },
], ],
startWarehouseId: [ startWarehouseId: [
{ required: true, message: "始发地不能为空", trigger: "blur" }, { required: true, message: this.$t("始发地不能为空"), trigger: "blur" },
], ],
destWarehouseId: [ destWarehouseId: [
{ required: true, message: "目的地不能为空", trigger: "blur" }, { required: true, message: this.$t("目的地不能为空"), trigger: "blur" },
], ],
}, },
}; };
...@@ -80,14 +80,14 @@ export default { ...@@ -80,14 +80,14 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updatebox(this.form).then((response) => { updatebox(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t("修改成功"));
this.$emit("closeDialog", "edit"); this.$emit("closeDialog", "edit");
}); });
return; return;
} }
// 添加的提交 // 添加的提交
createbox(this.form).then((response) => { createbox(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.$emit("closeDialog", "add"); this.$emit("closeDialog", "add");
}); });
}); });
......
...@@ -2,40 +2,40 @@ ...@@ -2,40 +2,40 @@
<div class="shippingSea-dialog"> <div class="shippingSea-dialog">
<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="运输方式" prop="transportType"> <el-form-item :label="$t('运输方式')" prop="transportType">
<el-radio-group v-model="form.transportType"> <el-radio-group v-model="form.transportType">
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio> <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{$l(dict, 'label')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="出货渠道" prop="shippingChannelId"> <el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
<el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道"> <el-select v-model="form.shippingChannelId" :placeholder="$t('请选择出货渠道')">
<el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option> <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="柜型" prop="cabinetId"> <el-form-item :label="$t('柜型')" prop="cabinetId">
<el-select v-model="form.cabinetId" placeholder="请选择柜型"> <el-select v-model="form.cabinetId" :placeholder="$t('请选择柜型')">
<el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="始发地" prop="startWarehouseId"> <el-form-item :label="$t('始发地')" prop="startWarehouseId">
<el-select v-model="form.startWarehouseId" placeholder="请选择始发地"> <el-select v-model="form.startWarehouseId" :placeholder="$t('请选择始发地')">
<el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的地" prop="destWarehouseId"> <el-form-item :label="$t('目的地')" prop="destWarehouseId">
<el-select v-model="form.destWarehouseId" placeholder="请选择目的地"> <el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的地')">
<el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</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>
</div> </div>
</template> </template>
...@@ -65,16 +65,16 @@ export default { ...@@ -65,16 +65,16 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
shippingChannelId: [ shippingChannelId: [
{ required: true, message: '出货渠道不能为空', trigger: 'blur' } { required: true, message: this.$t('出货渠道不能为空'), trigger: 'blur' }
], ],
cabinetId: [ cabinetId: [
{ required: true, message: '柜型不能为空', trigger: 'blur' } { required: true, message: this.$t('柜型不能为空'), trigger: 'blur' }
], ],
startWarehouseId: [ startWarehouseId: [
{ required: true, message: '始发地不能为空', trigger: 'blur' } { required: true, message: this.$t('始发地不能为空'), trigger: 'blur' }
], ],
destWarehouseId: [ destWarehouseId: [
{ required: true, message: '目的地不能为空', trigger: 'blur' } { required: true, message: this.$t('目的地不能为空'), trigger: 'blur' }
] ]
} }
}; };
...@@ -95,14 +95,14 @@ export default { ...@@ -95,14 +95,14 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updatebox(this.form).then((response) => { updatebox(this.form).then((response) => {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess(this.$t('修改成功'))
this.$emit("closeDialog", "edit"); this.$emit("closeDialog", "edit");
}) })
return return
} }
// 添加的提交 // 添加的提交
createbox(this.form).then((response) => { createbox(this.form).then((response) => {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess(this.$t('新增成功'))
this.$emit("closeDialog", "edit"); this.$emit("closeDialog", "edit");
}) })
}) })
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<template> <template>
<el-row class="shipping-ladingBill"> <el-row class="shipping-ladingBill">
<el-row class="oper-button"> <el-row class="oper-button">
<el-button type="primary" @click="clickZipDownload">打包下载</el-button> <el-button type="primary" @click="clickZipDownload">{{$t('打包下载')}}</el-button>
<el-button type="primary" @click="handleCommand('downloadReceivableList')">应收汇总表</el-button> <el-button type="primary" @click="handleCommand('downloadReceivableList')">{{$t('应收汇总表')}}</el-button>
<el-button type="primary" @click="handleCommand('downloadLoadGoodsList')">下载已装单</el-button> <el-button type="primary" @click="handleCommand('downloadLoadGoodsList')">{{$t('下载已装单')}}</el-button>
</el-row> </el-row>
<el-row style="margin-top:15px"> <el-row style="margin-top:15px">
<el-table :data="billData.list" border max-height="500px"> <el-table :data="billData.list" border max-height="500px">
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column :label="$t('序号')" type="index" align="center" width="50" />
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column label="货物信息" align="center" prop=""> <el-table-column :label="$t('货物信息')" align="center" prop="">
<template slot-scope="scope"> <template slot-scope="scope">
<section class="table-goodList"> <section class="table-goodList">
<div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div"> <div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
<p>品名{{item.prodTitleZh}}</p> <p>{{$t('品名')}}{{item.prodTitleZh}}</p>
<p>品牌:【 <p>{{$t('品牌')}}:【
<dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.productRecord" /> <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.productRecord" />
</p> </p>
<p>其他{{getTotlContent(item)}}</p> <p>{{$t('其他')}}{{getTotlContent(item)}}</p>
</div> </div>
</section> </section>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="控货" align="center" prop=""> <el-table-column :label="$t('控货')" align="center" prop="">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.isCargoControl}} {{scope.row.isCargoControl}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划箱数" align="center" prop="loadNum"> <el-table-column :label="$t('计划箱数')" align="center" prop="loadNum">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.loadNum }} {{ scope.row.loadNum }}{{$t('')}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实装箱数" align="center" prop="num"> <el-table-column :label="$t('实装箱数')" align="center" prop="num">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.num }} {{ scope.row.num }}{{$t('')}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提货点" align="center" prop="destWarehouse" /> <el-table-column :label="$t('提货点')" align="center" prop="destWarehouse" />
<el-table-column label="体积" align="center" prop="loadVolume"> <el-table-column :label="$t('体积')" align="center" prop="loadVolume">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.loadVolume }} {{ scope.row.loadVolume }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量" align="center" prop="loadWeight"> <el-table-column :label="$t('重量')" align="center" prop="loadWeight">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.loadWeight }}kg {{ scope.row.loadWeight }}kg
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="跟进客服" align="center" prop="" /> <el-table-column :label="$t('跟进客服')" align="center" prop="" />
<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">
<!-- 0 (未制作提货单) 1(审核中) 2(审核通过) 3(审核拒绝) --> <!-- 0 (未制作提货单) 1(审核中) 2(审核通过) 3(审核拒绝) -->
<el-button v-if="scope.row.status === 0" type="text" size="small" @click="handleCommand('makeBill',scope.row)">提单制作</el-button> <el-button v-if="scope.row.status === 0" type="text" size="small" @click="handleCommand('makeBill',scope.row)">{{$t('提单制作')}}</el-button>
<el-button v-if="scope.row.status === 1" type="text" size="small" @click="handleCommand('queryBill',scope.row)">审核中</el-button> <el-button v-if="scope.row.status === 1" type="text" size="small" @click="handleCommand('queryBill',scope.row)">{{$t('审核中')}}</el-button>
<template v-if="scope.row.status === 2"> <template v-if="scope.row.status === 2">
<el-button type="text" size="small" @click="handleCommand('previewBill',scope.row)" style="color:green">已审核通过</el-button> <el-button type="text" size="small" @click="handleCommand('previewBill',scope.row)" style="color:green">{{$t('已审核通过')}}</el-button>
<el-button type="text" size="small" @click="handleCommand('queryBill',scope.row)">重新制作</el-button> <el-button type="text" size="small" @click="handleCommand('queryBill',scope.row)">{{$t('重新制作')}}</el-button>
<el-button type="text" size="small" @click="handleCommand('resetBill',scope.row)" style="color:#333333">重置</el-button> <el-button type="text" size="small" @click="handleCommand('resetBill',scope.row)" style="color:#333333">{{$t('重置')}}</el-button>
</template> </template>
<template v-if="scope.row.status === 3"> <template v-if="scope.row.status === 3">
审核拒绝 {{$t('审核拒绝')}}
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -142,9 +142,14 @@ export default { ...@@ -142,9 +142,14 @@ export default {
}, },
buildTitle() { buildTitle() {
const cabinetLabel = this.getCabinetName(this.shipmentObj.cabinetId); const cabinetLabel = this.getCabinetName(this.shipmentObj.cabinetId);
const title = `查看提单 ${this.shipmentObj.selfNo ?? ""} 柜号:${ /* const title = `查看提单 ${this.shipmentObj.selfNo ?? ""} 柜号:${
this.shipmentObj.cubNo ?? "" this.shipmentObj.cubNo ?? ""
} 柜型:${cabinetLabel}`; } 柜型:${cabinetLabel}`; */
const title = this.$t('查看提单 {selfNo} 柜号:{cubNo} 柜型:{cabinetLabel}', {
selfNo: this.shipmentObj.selfNo,
cubNo: this.shipmentObj.cubNo,
cabinetLabel
})
this.$set(this.dialogCfg, "title", title); this.$set(this.dialogCfg, "title", title);
}, },
closeDialog(type) { closeDialog(type) {
...@@ -177,7 +182,7 @@ export default { ...@@ -177,7 +182,7 @@ export default {
downloadFile( downloadFile(
type, type,
{ shipmentId: this.shipmentObj.id }, { shipmentId: this.shipmentObj.id },
`已装单(${this.shipmentObj.selfNo}).xlsx`, this.$t('已装单') + `(${this.shipmentObj.selfNo}).xlsx`,
"xlsx" "xlsx"
); );
return; return;
...@@ -185,7 +190,7 @@ export default { ...@@ -185,7 +190,7 @@ export default {
downloadFile( downloadFile(
type, type,
{ shipmentId: this.shipmentObj.id }, { shipmentId: this.shipmentObj.id },
`应收汇总表(${this.shipmentObj.selfNo}).xlsx`, this.$t('应收汇总表') + `(${this.shipmentObj.selfNo}).xlsx`,
"xlsx" "xlsx"
); );
return; return;
...@@ -221,7 +226,7 @@ export default { ...@@ -221,7 +226,7 @@ export default {
clickZipDownload() { clickZipDownload() {
zipDownload({ shipmentId: this.shipmentObj.id }).then((res) => { zipDownload({ shipmentId: this.shipmentObj.id }).then((res) => {
let blob = new Blob([res], { type: "application/zip" }); let blob = new Blob([res], { type: "application/zip" });
FileSaver.saveAs(blob, "打包文件.zip"); FileSaver.saveAs(blob, this.$t('打包文件') + ".zip");
}); });
}, },
}, },
......
<template> <template>
<el-row class="shipping-makeLadingBill"> <el-row class="shipping-makeLadingBill">
<el-row> <el-row>
<div class="title-orderNo">订单号{{orderNo}}</div> <div class="title-orderNo">{{$t('订单号')}}{{orderNo}}</div>
</el-row> </el-row>
<el-row class="ueditor-row"> <el-row class="ueditor-row">
<vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" style="max-width: 690px;" /> <vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" style="max-width: 690px;" />
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
<!-- 审核流程 --> <!-- 审核流程 -->
<el-row class="process-area"> <el-row class="process-area">
<div class="process"> <div class="process">
<div>审批流程</div> <div>{{$t('审批流程')}}</div>
<work-flow xmlkey="bill_lading" v-model="selectedUsers"></work-flow> <work-flow xmlkey="bill_lading" v-model="selectedUsers"></work-flow>
</div> </div>
<div v-if="currRow.status === 1"> <div v-if="currRow.status === 1">
<el-button type="primary" disabled>审核中</el-button> <el-button type="primary" disabled>{{$t('审核中')}}</el-button>
<el-button plain type="primary" @click="canclAudit">取消审核</el-button> <el-button plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
<el-button plain type="primary" @click="showLoaingTemplate">提单预览</el-button> <el-button plain type="primary" @click="showLoaingTemplate">{{$t('提单预览')}}</el-button>
</div> </div>
<div v-if="currRow.status !== 1"> <div v-if="currRow.status !== 1">
<el-button type="primary" @click="submit">提交审核</el-button> <el-button type="primary" @click="submit">{{$t('提交审核')}}</el-button>
<el-button type="primary" @click="showLoaingTemplate">提单预览</el-button> <el-button type="primary" @click="showLoaingTemplate">{{$t('提单预览')}}</el-button>
</div> </div>
</el-row> </el-row>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<el-row> <el-row>
<div v-html="contentHtml" class="contentHtml"></div> <div v-html="contentHtml" class="contentHtml"></div>
<el-row v-if="currRow.status === 2 && type === 'previewBill'" style="text-align: center;"> <el-row v-if="currRow.status === 2 && type === 'previewBill'" style="text-align: center;">
<el-button type="primary" @click="download">下载</el-button> <el-button type="primary" @click="download">{{$t('下载')}}</el-button>
<el-button type="primary" @click="print">打印</el-button> <el-button type="primary" @click="print">{{$t('打印')}}</el-button>
</el-row> </el-row>
</el-row> </el-row>
</template> </template>
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
}) })
.catch((err) => { .catch((err) => {
console.error("lodop异常", err); console.error("lodop异常", err);
alert("请检查LODOP打印控件是否安装并启动"); alert(this.$t("请检查LODOP打印控件是否安装并启动"));
}); });
}, },
}, },
......
This diff is collapsed.
<template> <template>
<div class="shippingSea-dialog"> <div class="shippingSea-dialog">
<el-form ref="errorForm" :model="errorObj" label-width="140px"> <el-form ref="errorForm" :model="errorObj" label-width="140px">
<el-form-item label="操作步骤"> <el-form-item :label="$t('操作步骤')">
<el-select v-model="errorObj.opStep" placeholder="请选择操作步骤"> <el-select v-model="errorObj.opStep" :placeholder="$t('请选择操作步骤')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="票异常"> <el-form-item :label="$t('票异常')">
<el-select v-model="errorObj.billAbnId" placeholder="请选择票异常"> <el-select v-model="errorObj.billAbnId" :placeholder="$t('请选择票异常')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="异常情况"> <el-form-item :label="$t('异常情况')">
<el-input v-model="errorObj.abnDetail" type="textarea" rows="2" placeholder="请输入异常情况"></el-input> <el-input v-model="errorObj.abnDetail" type="textarea" rows="2" :placeholder="$t('请输入异常情况')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="异常时间" prop="arrivalTime" class="two-element"> <el-form-item :label="$t('异常时间')" prop="arrivalTime" class="two-element">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetime" placeholder="请选择日期" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="是否更新订单状态"> <el-form-item :label="$t('是否更新订单状态')">
<el-radio-group v-model="errorObj.orderStatus"> <el-radio-group v-model="errorObj.orderStatus">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio> <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="中文内容"> <el-form-item :label="$t('中文内容')">
<el-input v-model="errorObj.contentZh" type="textarea" rows="2" placeholder="请输入中文内容"></el-input> <el-input v-model="errorObj.contentZh" type="textarea" rows="2" :placeholder="$t('请输入中文内容')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="英文内容"> <el-form-item :label="$t('英文内容')">
<el-input v-model="errorObj.contentEn" type="textarea" rows="2" placeholder="请输入英文内容"></el-input> <el-input v-model="errorObj.contentEn" type="textarea" rows="2" :placeholder="$t('请输入英文内容')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="success" @click="onSubmit">提交</el-button> <el-button type="success" @click="onSubmit">{{$t('提交')}}</el-button>
<el-button @click="$emit('closeDialog')">关闭</el-button> <el-button @click="$emit('closeDialog')">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -56,11 +56,11 @@ export default { ...@@ -56,11 +56,11 @@ export default {
status: [ status: [
{ {
value: "1", value: "1",
label: "", label: this.$t(""),
}, },
{ {
value: "2", value: "2",
label: "", label: this.$t(""),
}, },
], ],
}; };
......
<template> <template>
<div class="app-approvalShipping"> <div class="app-approvalShipping">
<h1>申请信息【出货信息</h1> <h1>{{$t('申请信息')}}{{$t('出货信息')}}</h1>
<el-descriptions :column="6" border> <el-descriptions :column="6" border>
<el-descriptions-item label="自编号">{{boxBackVO.selfNo}}</el-descriptions-item> <el-descriptions-item :label="$t('自编号')">{{boxBackVO.selfNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="boxBackVO.transportType" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="boxBackVO.transportType" />
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="出货渠道"> <!-- <el-descriptions-item :label="$t('出货渠道')">
{{getShipChannelName(boxBackVO.shippingChannelId)}} {{getShipChannelName(boxBackVO.shippingChannelId)}}
</el-descriptions-item> --> </el-descriptions-item> -->
<el-descriptions-item label="柜型"> <el-descriptions-item :label="$t('柜型')">
{{cabinetLabel}} {{cabinetLabel}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="体积/重量"> <el-descriptions-item label="体积/重量">
{{getVolumeWeight(loadDetail.totalStatistics)}} {{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="货柜状态"> <el-descriptions-item :label="$t('货柜状态')">
{{boxBackVO.shipmentStatusText}} {{boxBackVO.shipmentStatusText}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-row style="marginTop:15px"> <el-row style="marginTop:15px">
<el-button type="primary" @click="showOrder">订单列表</el-button> <el-button type="primary" @click="showOrder">{{$t('订单列表')}}</el-button>
</el-row> </el-row>
<div v-if="approvalInfo.applyReason"> <div v-if="approvalInfo.applyReason">
<h1>申请原因</h1> <h1>{{$t('申请原因')}}</h1>
<div> <div>
{{approvalInfo.applyReason}} {{approvalInfo.applyReason}}
</div> </div>
...@@ -33,33 +33,33 @@ ...@@ -33,33 +33,33 @@
<el-dialog :title="dialogConfig.title" :visible.sync="dialogConfig.visible" fullscreen :modal-append-to-body=false append-to-body> <el-dialog :title="dialogConfig.title" :visible.sync="dialogConfig.visible" fullscreen :modal-append-to-body=false append-to-body>
<el-descriptions :column="6" border> <el-descriptions :column="6" border>
<el-descriptions-item label="自编号">{{boxBackVO.selfNo}}</el-descriptions-item> <el-descriptions-item :label="$t('自编号')">{{boxBackVO.selfNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="boxBackVO.transportType" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="boxBackVO.transportType" />
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="出货渠道"> <!-- <el-descriptions-item :label="$t('出货渠道')">
{{getShipChannelName(boxBackVO.shippingChannelId)}} {{getShipChannelName(boxBackVO.shippingChannelId)}}
</el-descriptions-item> --> </el-descriptions-item> -->
<el-descriptions-item label="柜型"> <el-descriptions-item :label="$t('柜型')">
{{cabinetLabel}} {{cabinetLabel}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="体积/重量"> <el-descriptions-item :label="$t('体积') + '/' + $t('重量')">
{{getVolumeWeight(loadDetail.totalStatistics)}} {{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="货柜状态"> <el-descriptions-item :label="$t('货柜状态')">
{{boxBackVO.shipmentStatusText}} {{boxBackVO.shipmentStatusText}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-row style="marginTop:15px"> <el-row style="marginTop:15px">
<el-table :data="loadDetail.sectionOrderList" border> <el-table :data="loadDetail.sectionOrderList" border>
<el-table-column prop="sectionName" label="部分" align="center"></el-table-column> <el-table-column prop="sectionName" :label="$t('部分')" align="center"></el-table-column>
<el-table-column prop="orderNo" label="订单号" align="center"> <el-table-column prop="orderNo" :label="$t('订单号')" align="center">
<template v-slot="{row}"> <template v-slot="{row}">
<el-button type="text" @click="jumpOrderDetail(row)">{{row.orderNo}}</el-button> <el-button type="text" @click="jumpOrderDetail(row)">{{row.orderNo}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货物信息" align="center" width="500px"> <el-table-column :label="$t('货物信息')" align="center" width="500px">
<template v-slot="{row}"> <template v-slot="{row}">
<section> <section>
<div v-for="(item, index) in row.goodsList" :key="index"> <div v-for="(item, index) in row.goodsList" :key="index">
...@@ -69,20 +69,20 @@ ...@@ -69,20 +69,20 @@
</section> </section>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入仓货物属性" align="center"> <el-table-column :label="$t('入仓货物属性')" align="center">
<template v-slot="{row}"> <template v-slot="{row}">
<section> <section>
<div>合计:{{calcSum(row.goodsList)}}</div> <div>{{$t('合计')}}{{calcSum(row.goodsList)}}{{$t('')}}</div>
<div v-for="(item, index) in row.goodsList" :key="index"> <div v-for="(item, index) in row.goodsList" :key="index">
{{getTotlContent(item,['volume','weight'])}} {{getTotlContent(item,['volume','weight'])}}
</div> </div>
</section> </section>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="installNum" label="实装箱数" align="center"></el-table-column> <el-table-column prop="installNum" :label="$t('实装箱数')" align="center"></el-table-column>
<el-table-column prop="volume" label="体积m³" align="center"></el-table-column> <el-table-column prop="volume" label="体积m³" align="center"></el-table-column>
<el-table-column prop="weight" label="重量" align="center"></el-table-column> <el-table-column prop="weight" :label="$t('重量')" align="center"></el-table-column>
<el-table-column prop="unloadNum" label="卸柜箱数" align="center" v-if="isShowColumn(boxBackVO)"></el-table-column> <el-table-column prop="unloadNum" :label="$t('卸柜箱数')" align="center" v-if="isShowColumn(boxBackVO)"></el-table-column>
</el-table> </el-table>
</el-row> </el-row>
</el-dialog> </el-dialog>
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
this.$set( this.$set(
this.dialogConfig, this.dialogConfig,
"title", "title",
`${this.boxBackVO.selfNo} 订单列表` `${this.boxBackVO.selfNo} ` + this.$t('订单列表')
); );
this.$set(this.dialogConfig, "visible", true); this.$set(this.dialogConfig, "visible", true);
}, },
...@@ -191,7 +191,7 @@ export default { ...@@ -191,7 +191,7 @@ export default {
return (shippingChannelId) => { return (shippingChannelId) => {
for (const channelItem of this.channelList) { for (const channelItem of this.channelList) {
if (channelItem.channelId == shippingChannelId) { if (channelItem.channelId == shippingChannelId) {
return channelItem.nameZh; return this.$l(channelItem, 'name');
} }
} }
}; };
......
<template> <template>
<div> <div>
<el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px"> <el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
<el-form-item label="代理商Agent" prop="agentId"> <el-form-item :label="$t('代理商Agent')" prop="agentId">
<supplierSelect v-model="agentObj.agentId" :companyType="'1'" placeholder="请选择代理商" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="agentObj.agentId" :companyType="'1'" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="success" @click="onSubmit">提交</el-button> <el-button type="success" @click="onSubmit">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
agentObj: {}, agentObj: {},
// 校验 // 校验
rules: { rules: {
agentId: [{ required: true, message: "必填", trigger: "change" }], agentId: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
......
<template> <template>
<div> <div>
<el-form ref="arrivalForm" :rules="rules" :model="arrivalObj" label-width="120px"> <el-form ref="arrivalForm" :rules="rules" :model="arrivalObj" label-width="120px">
<el-form-item label="预计到港时间">{{getExpectedTime()}}</el-form-item> <el-form-item :label="$t('预计到港时间')">{{getExpectedTime()}}</el-form-item>
<el-form-item label="实际到港时间" prop="apRealTime"> <el-form-item :label="$t('实际到港时间')" prop="apRealTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.apRealTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="arrivalObj.apRealTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="确认到港"> <el-form-item :label="$t('确认到港')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.apConfirmTime" value-format="yyyy-MM-dd HH:mm:ss"> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="arrivalObj.apConfirmTime" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> </el-date-picker>
<p class="message-area" v-show="showMsg">请确认是否有异常,如有异常请进行异常登记</p> <p class="message-area" v-show="showMsg">{{$t('请确认是否有异常,如有异常请进行异常登记')}}</p>
</el-form-item> </el-form-item>
<el-form-item label="卸港时间"> <el-form-item :label="$t('卸港时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.apUnloadPortTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="arrivalObj.apUnloadPortTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button> <el-button type="primary" @click="exceptionReg" :disabled="!showMsg">{{$t('异常登记')}}</el-button>
</el-row> </el-row>
<!-- 对话框 --> <!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close> <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" v-bind="$attrs" /> <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
</el-dialog> </el-dialog>
</div> </div>
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
arrivalObj: {}, arrivalObj: {},
// 校验 // 校验
rules: { rules: {
apRealTime: [{ required: true, message: "必填", trigger: "change" }], apRealTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
// 弹窗配置 // 弹窗配置
dialogVisible: false, dialogVisible: false,
......
<template> <template>
<div> <div>
<el-form ref="bargeForm" :model="bargeObj" :rules="rules" label-width="80px"> <el-form ref="bargeForm" :model="bargeObj" :rules="rules" label-width="80px">
<el-form-item label="驳船" prop="bgExmtStatus"> <el-form-item :label="$t('驳船')" prop="bgExmtStatus">
<el-radio-group v-model="bargeObj.bgExmtStatus"> <el-radio-group v-model="bargeObj.bgExmtStatus">
<el-radio v-for="item in bargeStatus" :key="item.value" :label="item.value">{{item.label}}</el-radio> <el-radio v-for="item in bargeStatus" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
...@@ -10,26 +10,26 @@ ...@@ -10,26 +10,26 @@
<div v-show="bargeObj.bgExmtStatus === '2'"> <div v-show="bargeObj.bgExmtStatus === '2'">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="驳船预计开船时间" label-width="130px"> <el-form-item :label="$t('驳船预计开船时间')" label-width="130px">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="bargeObj.bgEstShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="bargeObj.bgEstShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知人" label-width="80px"> <el-form-item :label="$t('通知人')" label-width="80px">
<userSelect v-model="bargeObj.notifyUser" placeholder="请选择通知人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="bargeObj.notifyUser" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="驳船实际开船时间" label-width="130px"> <el-form-item :label="$t('驳船实际开船时间')" label-width="130px">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="bargeObj.bgRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="bargeObj.bgRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
bargeStatus: constantDict.bgExmtStatus, bargeStatus: constantDict.bgExmtStatus,
// 校验 // 校验
rules: { rules: {
bgExmtStatus: [{ required: true, message: "必填", trigger: "change" }], bgExmtStatus: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
......
<template> <template>
<div> <div>
<el-form ref="blCopyForm" :model="blCopyObj" label-width="120px"> <el-form ref="blCopyForm" :model="blCopyObj" label-width="120px">
<el-form-item label="提单Copy"> <el-form-item :label="$t('提单Copy')">
<FileUpload :limit="1" :isShowTip=false v-model="blCopyObj.copyUrl" :fileType="fileType" /> <FileUpload :limit="1" :isShowTip=false v-model="blCopyObj.copyUrl" :fileType="fileType" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
...@@ -2,83 +2,83 @@ ...@@ -2,83 +2,83 @@
<div> <div>
<el-form ref="bookingForm" :rules="rules" :model="bookingObj" label-width="140px"> <el-form ref="bookingForm" :rules="rules" :model="bookingObj" label-width="140px">
<el-form-item label="SO NO."> <el-form-item label="SO NO.">
<el-input v-model="bookingObj.sono" placeholder="请输入SO NO."></el-input> <el-input v-model="bookingObj.sono" :placeholder="$t('请输入SO NO.')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="船公司类型"> <el-form-item :label="$t('船公司类型')">
<supplierSelect v-model="bookingObj.shipCompanyType" :companyType="'9'" placeholder="请选择船公司类型" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="bookingObj.shipCompanyType" :companyType="'9'" :placeholder="$t('请选择船公司类型')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
<el-form-item label="驳船港"> <el-form-item :label="$t('驳船港')">
<dockSelect v-model="bookingObj.bargePortId" placeholder="请选择驳船港" :allDocks="this.$attrs.allDocks" /> <dockSelect v-model="bookingObj.bargePortId" :placeholder="$t('请选择驳船港')" :allDocks="this.$attrs.allDocks" />
</el-form-item> </el-form-item>
<el-form-item label="大船港"> <el-form-item :label="$t('大船港')">
<dockSelect v-model="bookingObj.bigPortId" placeholder="请选择大船港" :allDocks="this.$attrs.allDocks" /> <dockSelect v-model="bookingObj.bigPortId" :placeholder="$t('请选择大船港')" :allDocks="this.$attrs.allDocks" />
</el-form-item> </el-form-item>
<el-form-item label="目的港"> <el-form-item :label="$t('目的港')">
<dockSelect v-model="bookingObj.destPortId" placeholder="请选择目的港" :allDocks="this.$attrs.allDocks" /> <dockSelect v-model="bookingObj.destPortId" :placeholder="$t('请选择目的港')" :allDocks="this.$attrs.allDocks" />
</el-form-item> </el-form-item>
<el-form-item label="订舱公司"> <el-form-item :label="$t('订舱公司')">
<supplierSelect v-model="bookingObj.spaceCompanyId" :companyType="'1'" placeholder="请选择订舱公司" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="bookingObj.spaceCompanyId" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
<el-form-item label="预计驳船时间"> <el-form-item :label="$t('预计驳船时间')">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.bargeTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.bargeTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计开船时间" prop="sailTime"> <el-form-item :label="$t('预计开船时间')" prop="sailTime">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.sailTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.sailTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知人" label-width="80px"> <el-form-item :label="$t('通知人')" label-width="80px">
<userSelect v-model="bookingObj.sailNotifyUser" placeholder="请选择通知人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="bookingObj.sailNotifyUser" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计提单补料时间"> <el-form-item :label="$t('预计提单补料时间')">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.ladingBillTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.ladingBillTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知人" label-width="80px"> <el-form-item :label="$t('通知人')" label-width="80px">
<userSelect v-model="bookingObj.ladingBillNotifyUser" placeholder="请选择通知人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="bookingObj.ladingBillNotifyUser" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计报关时间"> <el-form-item :label="$t('预计报关时间')">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.customsTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.customsTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知人" label-width="80px"> <el-form-item :label="$t('通知人')" label-width="80px">
<userSelect v-model="bookingObj.customsNotifyUser" placeholder="请选择通知人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="bookingObj.customsNotifyUser" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计截关时间"> <el-form-item :label="$t('预计截关时间')">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.cutOffTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.cutOffTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知人" label-width="80px"> <el-form-item :label="$t('通知人')" label-width="80px">
<userSelect v-model="bookingObj.cutOffNotifyUser" placeholder="请选择通知人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="bookingObj.cutOffNotifyUser" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button> <el-button type="primary" @click="onSubmit">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
bookingObj: {}, bookingObj: {},
// 校验 // 校验
rules: { rules: {
sailTime: [{ required: true, message: "必填", trigger: "change" }], sailTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
......
<template> <template>
<div> <div>
<el-form ref="cabinetForm" :rules="rules" :model="cabinetObj" label-width="80px"> <el-form ref="cabinetForm" :rules="rules" :model="cabinetObj" label-width="80px">
<el-form-item label="到仓时间"> <el-form-item :label="$t('到仓时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item :label="$t('仓库')">
<el-select v-model="cabinetObj.ldWarehouseType" placeholder="请选择仓库" filterable> <el-select v-model="cabinetObj.ldWarehouseType" :placeholder="$t('请选择仓库')" filterable>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option> <el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="装柜时间" prop="ldBoxTime"> <el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="出仓时间"> <el-form-item :label="$t('出仓时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="装柜图片"> <el-form-item :label="$t('装柜图片')">
<ImageUpload :limit="1" :isShowTip=false v-model="cabinetObj.ldPictures" /> <ImageUpload :limit="1" :isShowTip=false v-model="cabinetObj.ldPictures" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 开始装柜 --> <!-- 开始装柜 -->
<el-dialog title="开始装柜" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body> <el-dialog :title="$t('开始装柜')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
<startPacking v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" /> <startPacking v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" />
</el-dialog> </el-dialog>
<!-- 操作 --> <!-- 操作 -->
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)" :disabled="isSeal">封柜</el-button> <el-button type="success" @click="onSubmit(2)" :disabled="isSeal">{{$t('封柜')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="danger" @click="startCabinet" :disabled="isStartCabinet">开始装柜</el-button> <el-button type="danger" @click="startCabinet" :disabled="isStartCabinet">{{$t('开始装柜')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
cabinetObj: {}, cabinetObj: {},
// 校验 // 校验
rules: { rules: {
ldBoxTime: [{ required: true, message: "必填", trigger: "change" }], ldBoxTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
const { currNode, shipmentObj } = this.$attrs; const { currNode, shipmentObj } = this.$attrs;
const status = shipmentObj[currNode.keyName]; const status = shipmentObj[currNode.keyName];
if (status !== 46) { if (status !== 46) {
this.$message.error("请先进行装柜->审批->确认封柜"); this.$message.error(this.$t("请先进行装柜->审批->确认封柜"));
return; return;
} }
} }
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<!-- 左侧 --> <!-- 左侧 -->
<el-col :span="6" class="left-area"> <el-col :span="6" class="left-area">
<el-row> <el-row>
<el-button type="primary" @click="addPart">新增</el-button> <el-button type="primary" @click="addPart">{{$t('新增')}}</el-button>
<el-button type="danger" @click="deletePart">删除</el-button> <el-button type="danger" @click="deletePart">{{$t('删除')}}</el-button>
</el-row> </el-row>
<el-scrollbar style="height:calc(100% - 40px)"> <el-scrollbar style="height:calc(100% - 40px)">
<el-row v-for="item in partList" :key="item.id" class="title-info" :class="item.id === partData.id ? 'selected' : ''"> <el-row v-for="item in partList" :key="item.id" class="title-info" :class="item.id === partData.id ? 'selected' : ''">
...@@ -39,28 +39,28 @@ ...@@ -39,28 +39,28 @@
<el-col :span="18" class="right-area"> <el-col :span="18" class="right-area">
<el-row class="right-title"> <el-row class="right-title">
<div>货物筛选</div> <div>{{$t('货物筛选')}}</div>
<div>当前装柜:{{partData.title}}</div> <div>{{$t('当前装柜')}}:{{partData.title}}</div>
<div>可预装方数:{{unloadStatistics.volume}}m³,重量:{{unloadStatistics.weight}}Kg</div> <div>{{$t('可预装方数')}}:{{unloadStatistics.volume}}m³,{{$t('重量')}}:{{unloadStatistics.weight}}Kg</div>
</el-row> </el-row>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-row> <el-row>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="始发地"> <el-form-item :label="$t('始发地')">
<p>{{importCityName(queryParams.startWarehouseId)}}</p> <p>{{importCityName(queryParams.startWarehouseId)}}</p>
</el-form-item> </el-form-item>
<el-form-item label="目的地" prop="destination"> <el-form-item :label="$t('目的地')" prop="destination">
<el-select v-model="queryParams.destWarehouseIdList" placeholder="请选择目的地" multiple> <el-select v-model="queryParams.destWarehouseIdList" :placeholder="$t('请选择目的地')" multiple>
<el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderNo"> <el-form-item :label="$t('订单号')" prop="orderNo">
<el-input v-model="queryParams.orderNo" placeholder="请输入订单号" clearable /> <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="queryAllData">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="queryAllData">{{$t('搜索')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </el-row>
...@@ -70,46 +70,46 @@ ...@@ -70,46 +70,46 @@
<el-row v-for="(item, index) in toBePreList" :key="index" class="toBePre-table"> <el-row v-for="(item, index) in toBePreList" :key="index" class="toBePre-table">
<el-row class="table-title"> <el-row class="table-title">
<div>{{item.orderNo}}</div> <div>{{item.orderNo}}</div>
<div>发往:{{item.destWarehouseName}}</div> <div>{{$t('发往')}}:{{item.destWarehouseName}}</div>
<div> <div>
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
</div> </div>
<div>入仓时间:{{formatDate(item.rucangTime)}}</div> <div>{{$t('入仓时间')}}:{{formatDate(item.rucangTime)}}</div>
<div> <div>
<el-button type="text" @click="handleGoods('all', item)">[全部预装]</el-button> <el-button type="text" @click="handleGoods('all', item)">[{{$t('全部预装')}}]</el-button>
<el-button type="text" @click="foldTable(index, item)">[{{item.fold ? '展开' : '收起'}}]</el-button> <el-button type="text" @click="foldTable(index, item)">[{{item.fold ? $t('展开') : $t('收起')}}]</el-button>
</div> </div>
</el-row> </el-row>
<el-collapse-transition> <el-collapse-transition>
<div v-show="!item.fold"> <div v-show="!item.fold">
<el-table v-loading="loading" :data="item.boxOrderItemList" border> <el-table v-loading="loading" :data="item.boxOrderItemList" border>
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column :label="$t('序号')" type="index" align="center" width="50" />
<el-table-column label="品名" align="center" prop="prodTitleZh" min-width="500" /> <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" />
<el-table-column label="品牌" align="center" prop="brandType" width="120"> <el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" width="120" /> <el-table-column :label="$t('箱数')" align="center" prop="num" width="120" />
<el-table-column label="体积" align="center" prop="volume" width="120"> <el-table-column :label="$t('体积')" align="center" prop="volume" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p> <p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量" align="center" prop="weight" width="120"> <el-table-column :label="$t('重量')" align="center" prop="weight" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p> <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="预装柜" <!-- <el-table-column :label="$t('预装柜')"
align="center" align="center"
prop="" prop=""
width="120"> width="120">
无返回 无返回
</el-table-column> --> </el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="handleGoods('singele',scope.row)">预装</el-button> <el-button type="text" size="small" @click="handleGoods('singele',scope.row)">{{$t('预装')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -127,17 +127,17 @@ ...@@ -127,17 +127,17 @@
<el-row> <el-row>
<el-col :span="6" class="totle-info"> <el-col :span="6" class="totle-info">
<div> <div>
<p>总计</p> <p>{{$t('总计')}}</p>
<p>{{sumStatistics(partList)}}</p> <p>{{sumStatistics(partList)}}</p>
</div> </div>
<div> <div>
<p>容量</p> <p>{{$t('容量')}}</p>
<p>{{calcCapacity}}</p> <p>{{calcCapacity}}</p>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="button-area"> <el-row class="button-area">
<el-button type="primary" @click="handlerFinish">完成</el-button> <el-button type="primary" @click="handlerFinish">{{$t('完成')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
} }
return { return {
...item, ...item,
title: `第${++index}部分`, title: this.$t('第{index}部分', {index: index + 1}),
}; };
}); });
...@@ -278,7 +278,7 @@ export default { ...@@ -278,7 +278,7 @@ export default {
}, },
/* 删除部分 */ /* 删除部分 */
deletePart() { deletePart() {
this.$confirm("确认删除该部分及其已预装订单?", "提示", { this.$confirm(this.$t("确认删除该部分及其已预装订单?"), this.$t("提示"), {
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
...@@ -308,7 +308,7 @@ export default { ...@@ -308,7 +308,7 @@ export default {
/* 获取城市 */ /* 获取城市 */
importCityName(id) { importCityName(id) {
var arr = this.$attrs.warehouseList.filter((item) => item.id == id); var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? arr[0].titleZh : ""; return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("");
}, },
/* 待预装订单分页 */ /* 待预装订单分页 */
pageChange(page) { pageChange(page) {
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
}, },
/* 完成 */ /* 完成 */
handlerFinish() { handlerFinish() {
this.$confirm("确定执行操作?", "提示", { this.$confirm(this.$t("确定执行操作?"), this.$t("提示"), {
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
......
<template> <template>
<div> <div>
<el-form ref="cDocForm" :model="cDocObj" label-width="100px"> <el-form ref="cDocForm" :model="cDocObj" label-width="100px">
<el-form-item label="出单方式"> <el-form-item :label="$t('出单方式')">
<el-select v-model="cDocObj.cdOutBillType" placeholder="请选择出单方式"> <el-select v-model="cDocObj.cdOutBillType" :placeholder="$t('请选择出单方式')">
<el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<template v-if="cDocObj.cdOutBillType === '1'"> <template v-if="cDocObj.cdOutBillType === '1'">
<el-form-item label="电放时间"> <el-form-item :label="$t('电放时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdElectricTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cDocObj.cdElectricTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="电放凭证附件"> <el-form-item :label="$t('电放凭证附件')">
<FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdElectricVoucher" :fileType="fileType" /> <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdElectricVoucher" :fileType="fileType" />
</el-form-item> </el-form-item>
</template> </template>
<template v-if="cDocObj.cdOutBillType === '2'"> <template v-if="cDocObj.cdOutBillType === '2'">
<el-form-item label="寄送时间"> <el-form-item :label="$t('寄送时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdSendTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cDocObj.cdSendTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="快递单号"> <el-form-item :label="$t('快递单号')">
<el-input v-model="cDocObj.cdBillNo" placeholder="请输入快递单号"></el-input> <el-input v-model="cDocObj.cdBillNo" :placeholder="$t('请输入快递单号')"></el-input>
</el-form-item> </el-form-item>
</template> </template>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdAgentlistTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cDocObj.cdAgentlistTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAgentlistFile" :fileType="fileType" /> <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAgentlistFile" :fileType="fileType" />
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cDocObj.cdSoncapTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cDocObj.cdSoncapTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdSoncapFile" :fileType="fileType" /> <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdSoncapFile" :fileType="fileType" />
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
<template> <template>
<el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable> <el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable>
<el-option v-for="dock in getDock" :key="dock.id" :label="dock.titleZh" :value="dock.id"></el-option> <el-option v-for="dock in getDock" :key="dock.id" :label="$l(dock, 'title')" :value="dock.id"></el-option>
</el-select> </el-select>
</template> </template>
......
<template> <template>
<el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable> <el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable>
<el-option v-for="supplier in getSuppliers" :key="supplier.id" :label="supplier.companyZh" :value="supplier.id"></el-option> <el-option v-for="supplier in getSuppliers" :key="supplier.id" :label="$l(supplier, 'company')" :value="supplier.id"></el-option>
</el-select> </el-select>
</template> </template>
......
<template> <template>
<div> <div>
<el-form ref="cusClearanceForm" :rules="rules" :model="cusClearanceObj" label-width="120px"> <el-form ref="cusClearanceForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
<el-form-item label="清关代理">{{getClAgent('label')}}</el-form-item> <el-form-item :label="$t('清关代理')">{{getClAgent('label')}}</el-form-item>
<el-form-item label="预计清关时间" prop="clEstTime"> <el-form-item :label="$t('预计清关时间')" prop="clEstTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cusClearanceObj.clEstTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusClearanceObj.clEstTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="清关时间" prop="clClearTime"> <el-form-item :label="$t('清关时间')" prop="clClearTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cusClearanceObj.clClearTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusClearanceObj.clClearTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<p class="message-area" v-show="showMsg">清关时间与预计时间不符,如有异常请登记</p> <p class="message-area" v-show="showMsg">{{$t('清关时间与预计时间不符,如有异常请登记')}}</p>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button> <el-button type="primary" @click="exceptionReg" :disabled="!showMsg">{{$t('异常登记')}}</el-button>
</el-row> </el-row>
<!-- 对话框 --> <!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close> <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" v-bind="$attrs" /> <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
</el-dialog> </el-dialog>
</div> </div>
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
cusClearanceObj: {}, cusClearanceObj: {},
// 校验 // 校验
rules: { rules: {
clEstTime: [{ required: true, message: "必填", trigger: "change" }], clEstTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
clClearTime: [{ required: true, message: "必填", trigger: "change" }], clClearTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
// 弹窗配置 // 弹窗配置
dialogVisible: false, dialogVisible: false,
......
<template> <template>
<div class="app-departure"> <div class="app-departure">
<el-form ref="departureForm" :rules="rules" :model="departureObj" label-width="120px"> <el-form ref="departureForm" :rules="rules" :model="departureObj" label-width="120px">
<el-form-item label="预计开船时间"> <el-form-item :label="$t('预计开船时间')">
{{getSailingTime()}} {{getSailingTime()}}
</el-form-item> </el-form-item>
<el-form-item label="实际开船时间"> <el-form-item :label="$t('实际开船时间')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="departureObj.dtRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="departureObj.dtRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<p class="message-area">订单状态与短信通知,将到指定时间更新与发送</p> <p class="message-area">{{$t('订单状态与短信通知,将到指定时间更新与发送')}}</p>
<p class="message-area" v-show="showMsg">实际开船实际与预计时间不符</p> <p class="message-area" v-show="showMsg">{{$t('实际开船实际与预计时间不符')}}</p>
</el-form-item> </el-form-item>
<el-form-item label="预期到港时间" prop="dtEstArrivalTime"> <el-form-item :label="$t('预期到港时间')" prop="dtEstArrivalTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="departureObj.dtEstArrivalTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="departureObj.dtEstArrivalTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button> <el-button type="primary" @click="exceptionReg" :disabled="!showMsg">{{$t('异常登记')}}</el-button>
</el-row> </el-row>
<!-- 对话框 --> <!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close> <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" v-bind="$attrs" /> <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
</el-dialog> </el-dialog>
</div> </div>
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
// 校验 // 校验
rules: { rules: {
dtEstArrivalTime: [ dtEstArrivalTime: [
{ required: true, message: "必填", trigger: "change" }, { required: true, message: this.$t("必填"), trigger: "change" },
], ],
}, },
// 弹窗配置 // 弹窗配置
......
<template> <template>
<div> <div>
<el-form ref="reviewForm" :model="reviewObj" label-width="120px"> <el-form ref="reviewForm" :model="reviewObj" label-width="120px">
<el-form-item label="申请理由"> <el-form-item :label="$t('申请理由')">
<el-input v-model="reviewObj.applyReason" type="textarea" rows="2" placeholder="请输入申请理由" :disabled="isReview"></el-input> <el-input v-model="reviewObj.applyReason" type="textarea" rows="2" :placeholder="$t('请输入申请理由')" :disabled="isReview"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="success" @click="onSubmit" v-show="!isReview">发起申请</el-button> <el-button type="success" @click="onSubmit" v-show="!isReview">{{$t('发起申请')}}</el-button>
<el-button type="primary" @click="jumpReviewDetail" v-show="isReview">审核中</el-button> <el-button type="primary" @click="jumpReviewDetail" v-show="isReview">{{$t('审核中')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
<template> <template>
<div> <div>
<el-form ref="settlementForm" :model="settlementObj" label-width="80px"> <el-form ref="settlementForm" :model="settlementObj" label-width="80px">
<el-form-item label="可结算"> <el-form-item :label="$t('可结算')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="settlementObj.slSettlementTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="settlementObj.slSettlementTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="已结算"> <el-form-item :label="$t('已结算')">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="settlementObj.slSettledTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="settlementObj.slSettledTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
<template> <template>
<div> <div>
<el-form ref="shipForm" :model="shipObj" :rules="rules" label-width="80px"> <el-form ref="shipForm" :model="shipObj" :rules="rules" label-width="80px">
<el-form-item label="状态" prop="saExmtStatus"> <el-form-item :label="$t('状态')" prop="saExmtStatus">
<el-radio-group v-model="shipObj.saExmtStatus"> <el-radio-group v-model="shipObj.saExmtStatus">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio> <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="配船时间" v-show="shipObj.saExmtStatus === '2'"> <el-form-item :label="$t('配船时间')" v-show="shipObj.saExmtStatus === '2'">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="shipObj.configTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="shipObj.configTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
status: constantDict.saExmtStatus, status: constantDict.saExmtStatus,
// 校验 // 校验
rules: { rules: {
saExmtStatus: [{ required: true, message: "必填", trigger: "change" }], saExmtStatus: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
......
<template> <template>
<div> <div>
<el-form ref="subMaterialForm" :model="subMaterialObj" label-width="140px"> <el-form ref="subMaterialForm" :model="subMaterialObj" label-width="140px">
<el-form-item label="代理商AGENT"> <el-form-item :label="$t('代理商AGENT')">
<supplierSelect v-model="subMaterialObj.agentId" :companyType="'1'" placeholder="请选择供应商" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="subMaterialObj.agentId" :companyType="'1'" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
<el-form-item label="提单号M/BL NO." class="two-element"> <el-form-item label="提单号M/BL NO." class="two-element">
<el-input v-model="subMaterialObj.blMblNo" placeholder="请输入提单号"></el-input> <el-input v-model="subMaterialObj.blMblNo" :placeholder="$t('请输入提单号')"></el-input>
<el-button type="primary">提单确认件</el-button> <el-button type="primary">{{$t('提单确认件')}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="SO NO."> <el-form-item label="SO NO.">
<el-input v-model="subMaterialObj.soNo" placeholder="请输入SO NO"></el-input> <el-input v-model="subMaterialObj.soNo" :placeholder="$t('请输入SO NO')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="装货港"> <el-form-item :label="$t('装货港')">
<dockSelect v-model="subMaterialObj.startPortId" placeholder="请选择装货港" :allDocks="this.$attrs.allDocks" /> <dockSelect v-model="subMaterialObj.startPortId" :placeholder="$t('请选择装货港')" :allDocks="this.$attrs.allDocks" />
</el-form-item> </el-form-item>
<el-form-item label="目的港"> <el-form-item :label="$t('目的港')">
<dockSelect v-model="subMaterialObj.destPortId" placeholder="请选择目的港" :allDocks="this.$attrs.allDocks" /> <dockSelect v-model="subMaterialObj.destPortId" :placeholder="$t('请选择目的港')" :allDocks="this.$attrs.allDocks" />
</el-form-item> </el-form-item>
<el-form-item label="船公司"> <el-form-item :label="$t('船公司')">
<supplierSelect v-model="subMaterialObj.shipCompanyId" :companyType="'9'" placeholder="请选择船公司" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="subMaterialObj.shipCompanyId" :companyType="'9'" :placeholder="$t('请选择船公司')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
<el-form-item label="托运人"> <el-form-item :label="$t('托运人')">
<userSelect v-model="subMaterialObj.shipperId" placeholder="请选择托运人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="subMaterialObj.shipperId" :placeholder="$t('请选择托运人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
<el-form-item label="收货人"> <el-form-item :label="$t('收货人')">
<userSelect v-model="subMaterialObj.consigneeId" placeholder="请选择收货人" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="subMaterialObj.consigneeId" :placeholder="$t('请选择收货人')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
<el-form-item label="通知方"> <el-form-item :label="$t('通知方')">
<userSelect v-model="subMaterialObj.notifyingId" placeholder="请选择通知方" :allUsers="this.$attrs.allUsers" /> <userSelect v-model="subMaterialObj.notifyingId" :placeholder="$t('请选择通知方')" :allUsers="this.$attrs.allUsers" />
</el-form-item> </el-form-item>
<el-form-item label="Mark & No."> <el-form-item label="Mark & No.">
<el-input v-model="subMaterialObj.markNo" placeholder="请输入Mark & No."></el-input> <el-input v-model="subMaterialObj.markNo" placeholder="请输入Mark & No."></el-input>
</el-form-item> </el-form-item>
<el-form-item label="包装数量与单位" class="two-element"> <el-form-item :label="$t('包装数量与单位')" class="two-element">
<el-input v-model="subMaterialObj.packageNum" placeholder="请输入包装数量"></el-input> <el-input v-model="subMaterialObj.packageNum" :placeholder="$t('请输入包装数量')"></el-input>
<el-select v-model="subMaterialObj.packageUnit" placeholder="请选择单位"> <el-select v-model="subMaterialObj.packageUnit" :placeholder="$t('请选择单位')">
<el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="unit.titleZh"></el-option> <el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="$l(unit, 'title')"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="毛重(KGS)"> <el-form-item label="毛重(KGS)">
<el-input v-model="subMaterialObj.kgs" placeholder="请输入毛重(KGS)"></el-input> <el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入毛重') + '(KGS)'"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="立方数(CBM)"> <el-form-item label="立方数(CBM)">
<el-input v-model="subMaterialObj.cbm" placeholder="请输入立方数(CBM)"></el-input> <el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="货物描述"> <el-form-item :label="$t('货物描述')">
<el-input v-model="subMaterialObj.goodsDesc" placeholder="请输入货物描述"></el-input> <el-input v-model="subMaterialObj.goodsDesc" :placeholder="$t('请输入货物描述')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="柜号/封条"> <el-form-item :label="$t('柜号') + '/' + $t('封条')">
<el-input v-model="subMaterialObj.containerSealNo" placeholder="请输入柜号/封条"></el-input> <el-input v-model="subMaterialObj.containerSealNo" :placeholder="$t('请输入柜号') + '/' + $t('封条')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="柜型"> <el-form-item :label="$t('柜型')">
{{cabinetType}} {{cabinetType}}
</el-form-item> </el-form-item>
<el-form-item label="出单方式"> <el-form-item :label="$t('出单方式')">
<el-radio-group v-model="subMaterialObj.issueType"> <el-radio-group v-model="subMaterialObj.issueType">
<el-radio v-for="item in method" :key="item.value" :label="item.value">{{item.label}}</el-radio> <el-radio v-for="item in method" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item :label="$t('备注')">
<el-input v-model="subMaterialObj.remarks" type="textarea" rows="2" placeholder="请输入备注"></el-input> <el-input v-model="subMaterialObj.remarks" type="textarea" rows="2" :placeholder="$t('请输入备注')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
<template> <template>
<div class="shipping-batchTally"> <div class="shipping-batchTally">
<el-row v-if="$attrs.type === 'batchTally'"> <el-row v-if="$attrs.type === 'batchTally'">
<el-button type="text" size="small" @click="()=>openStorage('all')">批量修改储位</el-button> <el-button type="text" size="small" @click="()=>openStorage('all')">{{$t('批量修改储位')}}</el-button>
</el-row> </el-row>
<el-scrollbar viewClass="tally-list"> <el-scrollbar viewClass="tally-list">
<el-row class="tally-detail" v-for="(item, index) in storageList" :key="item.id"> <el-row class="tally-detail" v-for="(item, index) in storageList" :key="item.id">
<div class="status-number">{{++index}}</div> <div class="status-number">{{++index}}</div>
<div class="detail-info"> <div class="detail-info">
<div>入仓单号{{item.orderNo}}</div> <div>{{$t('入仓单号')}}{{item.orderNo}}</div>
<div>入仓统计{{getTotlContent(item)}}</div> <div>{{$t('入仓统计')}}{{getTotlContent(item)}}</div>
<div class="detail-modify"> <div class="detail-modify">
<el-tooltip effect="dark" :content="item.positionNo" placement="top"> <el-tooltip effect="dark" :content="item.positionNo" placement="top">
<div>储位{{item.positionNo}}</div> <div>{{$t('储位')}}{{item.positionNo}}</div>
</el-tooltip> </el-tooltip>
<el-button type="text" size="small" @click="()=>openStorage('single', item)">修改</el-button> <el-button type="text" size="small" @click="()=>openStorage('single', item)">{{$t('修改')}}</el-button>
</div> </div>
</div> </div>
</el-row> </el-row>
</el-scrollbar> </el-scrollbar>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button size="small" type="primary" @click="tallyModify">确定</el-button> <el-button size="small" type="primary" @click="tallyModify">{{$t('确定')}}</el-button>
<el-button size="small" @click="$emit('closeDialog')">关闭</el-button> <el-button size="small" @click="$emit('closeDialog')">{{$t('关闭')}}</el-button>
</el-row> </el-row>
<warehouse-area-dialog ref="area" :visible.sync="visible" v-model="storageSpaces" :order-id="orderId" :warehouseId="warehouseId" :modal-append-to-body=false append-to-body /> <warehouse-area-dialog ref="area" :visible.sync="visible" v-model="storageSpaces" :order-id="orderId" :warehouseId="warehouseId" :modal-append-to-body=false append-to-body />
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
}); });
if (orderLocationList.length === 0) { if (orderLocationList.length === 0) {
this.$message.error("没有需要修改储位的订单"); this.$message.error(this.$t("没有需要修改储位的订单"));
return; return;
} }
......
<template> <template>
<div> <div>
<el-form ref="trailerForm" :rules="rules" :model="trailerObj" label-width="120px"> <el-form ref="trailerForm" :rules="rules" :model="trailerObj" label-width="120px">
<el-form-item label="状态"> <el-form-item :label="$t('状态')">
<el-select v-model="trailerObj.tlContainerStatus" placeholder="请选择状态"> <el-select v-model="trailerObj.tlContainerStatus" :placeholder="$t('请选择状态')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="type.label" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="type.label" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="拖车公司"> <el-form-item :label="$t('拖车公司')">
<supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" placeholder="请选择拖车公司" :allSupplier="this.$attrs.allSupplier" /> <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" :placeholder="$t('请选择拖车公司')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item> </el-form-item>
<el-form-item label="拖车时间" prop="tlTime"> <el-form-item :label="$t('拖车时间')" prop="tlTime">
<el-date-picker type="datetime" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="trailerObj.tlTime"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="trailerObj.tlTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="车牌"> <el-form-item :label="$t('车牌')">
<el-input v-model="trailerObj.tlLicensePlate " placeholder="请输入车牌"></el-input> <el-input v-model="trailerObj.tlLicensePlate " :placeholder="$t('请输入车牌')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="司机"> <el-form-item :label="$t('司机')">
<el-input v-model="trailerObj.tlDriver" placeholder="请输入司机"></el-input> <el-input v-model="trailerObj.tlDriver" :placeholder="$t('请输入司机')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="司机联系方式"> <el-form-item :label="$t('司机联系方式')">
<el-input v-model="trailerObj.tlDriverContact" placeholder="请输入司机联系方式"></el-input> <el-input v-model="trailerObj.tlDriverContact" :placeholder="$t('请输入司机联系方式')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="货柜号"> <el-form-item :label="$t('货柜号')">
<el-input v-model="trailerObj.tlContainerNo" placeholder="请输入货柜号"></el-input> <el-input v-model="trailerObj.tlContainerNo" :placeholder="$t('请输入货柜号')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="封条"> <el-form-item :label="$t('封条')">
<el-input v-model="trailerObj.tlStripSeal" placeholder="请输入封条"></el-input> <el-input v-model="trailerObj.tlStripSeal" :placeholder="$t('请输入封条')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
trailerObj: {}, trailerObj: {},
// 校验 // 校验
rules: { rules: {
tlTime: [{ required: true, message: "必填", trigger: "change" }], tlTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
}, },
}; };
}, },
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -638,9 +638,7 @@ export default { ...@@ -638,9 +638,7 @@ export default {
// this.getList(); // this.getList();
const obj = { path: "/customer/customer" }; const obj = { path: "/customer/customer" };
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
}).catch(e => { })
this.$modal.msgError(e.msg || this.$t('添加客户失败,请联系管理员'))
});
return; return;
} }
// 添加的提交 // 添加的提交
...@@ -650,9 +648,7 @@ export default { ...@@ -650,9 +648,7 @@ export default {
// this.getList(); // this.getList();
const obj = { path: "/customer/customer" }; const obj = { path: "/customer/customer" };
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
}).catch(e => { })
this.$modal.msgError(e.msg || this.$t('添加客户失败,请联系管理员'))
});
}); });
}) })
}, },
......
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.
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.
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.
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