Skip to content

J
jiedao-app-operator-master
Commit 717da4a1 authored by ylpmty's avatar ylpmty
Browse files
Options

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

parents f95ed18f 3304b861
Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 393 deletions
package.json
View file @ 717da4a1
......@@ -9,6 +9,7 @@
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"build:demo1024": "vue-cli-service build --mode demo1024",
"dev:demo1024": "vue-cli-service serve --mode demo1024",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src"
},
......
src/api/ecw/box.js
View file @ 717da4a1
import request from '@/utils/request'
// 创建出货管理
export function createBox(data) {
// 创建出货
export function createbox(data) {
return request({
url: '/ecw/box/create',
url: '/shipment/box/create',
method: 'post',
data: data
})
}
// 更新出货管理
export function updateBox(data) {
// 更新出货
export function updatebox(data) {
return request({
url: '/ecw/box/update',
url: '/shipment/box/update',
method: 'put',
data: data
})
}
// 删除出货管理
export function deleteBox(id) {
// 删除出货
export function deletebox(id) {
return request({
url: '/ecw/box/delete?id=' + id,
url: '/shipment/box/delete?id=' + id,
method: 'delete'
})
}
// 获得出货管理
export function getBox(id) {
// 获得出货
export function getbox(id) {
return request({
url: '/ecw/box/get?id=' + id,
url: '/shipment/box/get?id=' + id,
method: 'get'
})
}
// 获得出货管理分页
export function getBoxPage(query) {
// 获得出货分页
export function getboxPage(query) {
return request({
url: '/ecw/box/page',
url: '/shipment/box/page',
method: 'get',
params: query
})
}
// 导出出货管理 Excel
export function exportBoxExcel(query) {
// 导出出货 Excel
export function exportboxExcel(query) {
return request({
url: '/ecw/box/export-excel',
url: '/shipment/box/export-excel',
method: 'get',
params: query,
responseType: 'blob'
......
src/utils/ruoyi.js
View file @ 717da4a1
......@@ -11,7 +11,7 @@ const baseURL = process.env.VUE_APP_BASE_API
* @param pattern {String} '{y}-{m}-{d} {h}:{i}:{s}'
* @returns {string|null}
*/
export function parseTime(time, pattern) {
export function parseTime(time, pattern = undefined) {
if (arguments.length === 0 || !time) {
return null
}
......
src/views/ecw/box/index.vue
View file @ 717da4a1
......@@ -3,87 +3,45 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="自编号" prop="number">
<el-input v-model="queryParams.number" placeholder="请输入自编号" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="主键ID" prop="id">
<el-input v-model="queryParams.id" placeholder="请输入主键ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="柜型" prop="numbers">
<el-input v-model="queryParams.numbers" placeholder="请输入柜型" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="自编号" prop="orderNo">
<el-input v-model="queryParams.orderNo" placeholder="请输入自编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
<el-form-item label="柜号" prop="cubNo">
<el-input v-model="queryParams.cubNo" placeholder="请输入柜号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态：0预装；1已装（封柜）；2已开船；3已到港；4已清关；5已卸货" prop="statics">
<el-select v-model="queryParams.statics" placeholder="请选择状态：0预装；1已装（封柜）；2已开船；3已到港；4已清关；5已卸货" clearable size="small">
<el-option label="请选择字典生成" value="" />
<el-form-item label="柜型" prop="boxType">
<el-select v-model="queryParams.boxType" placeholder="请选择柜型">
<el-option v-for="item in CabinetPage" :label="item.name" :value="item.name" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起运港id" prop="qiyun">
<el-input v-model="queryParams.qiyun" placeholder="请输入起运港id" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="起运港详情" prop="qiyuns">
<el-input v-model="queryParams.qiyuns" placeholder="请输入起运港详情" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="目前的港id" prop="mudi">
<el-input v-model="queryParams.mudi" placeholder="请输入目前的港id" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="目的港详情" prop="mudis">
<el-input v-model="queryParams.mudis" placeholder="请输入目的港详情" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="预装时间">
<el-date-picker v-model="dateRangeYzDate" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="" prop="chuandong">
<el-input v-model="queryParams.chuandong" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="代理" prop="daili">
<el-input v-model="queryParams.daili" placeholder="请输入代理" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="柜类型" prop="gx">
<el-input v-model="queryParams.gx" placeholder="请输入柜类型" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="柜类型详情" prop="gxs">
<el-input v-model="queryParams.gxs" placeholder="请输入柜类型详情" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="装柜部分" prop="products">
<el-input v-model="queryParams.products" placeholder="请输入装柜部分" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="" prop="wenti">
<el-input v-model="queryParams.wenti" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="0未提交；1审核中；2通过；3驳回" prop="pass">
<el-input v-model="queryParams.pass" placeholder="请输入0未提交；1审核中；2通过；3驳回" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="封柜时间">
<el-date-picker v-model="dateRangeFengtime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="出仓时间">
<el-date-picker v-model="dateRangeChutime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="到港时间">
<el-date-picker v-model="dateRangeDaotime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="清关时间">
<el-date-picker v-model="dateRangeQgtime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-form-item label="发货状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择发货状态" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="0未锁定，1已锁定" prop="isSock">
<el-input v-model="queryParams.isSock" placeholder="请输入0未锁定，1已锁定" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="始发地" prop="departureId">
<el-select v-model="queryParams.departureId" placeholder="请选择始发地">
<el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="运输id" prop="transportId">
<el-input v-model="queryParams.transportId" placeholder="请输入运输id" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="目的地" prop="objectiveId">
<el-select v-model="queryParams.objectiveId" placeholder="请选择始发地">
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="管理员id" prop="adminId">
<el-input v-model="queryParams.adminId" placeholder="请输入管理员id" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="运输方式" prop="transportId">
<el-select v-model="queryParams.transportId" placeholder="请选择运输方式" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
......@@ -95,61 +53,40 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:box:create']">新增</el-button>
v-hasPermi="['shipment:box:create']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:box:export']">导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
:loading="exportLoading"
v-hasPermi="['shipment:box:export']">导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键ID" align="center" prop="id" />
<el-table-column label="自编号" align="center" prop="number" />
<el-table-column label="柜型" align="center" prop="numbers" />
<el-table-column label="类型" align="center" prop="type" />
<el-table-column label="状态：0预装；1已装（封柜）；2已开船；3已到港；4已清关；5已卸货" align="center" prop="statics" />
<el-table-column label="起运港id" align="center" prop="qiyun" />
<el-table-column label="起运港详情" align="center" prop="qiyuns" />
<el-table-column label="目前的港id" align="center" prop="mudi" />
<el-table-column label="目的港详情" align="center" prop="mudis" />
<el-table-column label="预装时间" align="center" prop="yzDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.yzDate) }}</span>
</template>
</el-table-column>
<el-table-column label="" align="center" prop="chuandong" />
<el-table-column label="代理" align="center" prop="daili" />
<el-table-column label="柜类型" align="center" prop="gx" />
<el-table-column label="柜类型详情" align="center" prop="gxs" />
<el-table-column label="装柜部分" align="center" prop="products" />
<el-table-column label="" align="center" prop="wenti" />
<el-table-column label="0未提交；1审核中；2通过；3驳回" align="center" prop="pass" />
<el-table-column label="封柜时间" align="center" prop="fengtime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fengtime) }}</span>
<el-table-column label="主键ID" align="center" prop="id"/>
<el-table-column label="自编号" align="center" prop="orderNo"/>
<el-table-column label="柜号" align="center" prop="cubNo"/>
<el-table-column label="柜型" align="center" prop="boxType">
<template v-model="queryParams.boxType">
<el-option v-for="item in CabinetPage" :label="item.name" :value="item.name" :key="item.id"></el-option>
</template>
</el-table-column>
<el-table-column label="出仓时间" align="center" prop="chutime" width="180">
<el-table-column label="发货状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.chutime) }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPMENT_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="到港时间" align="center" prop="daotime" width="180">
<el-table-column label="始发地" align="center" prop="departureId"/>
<el-table-column label="目的地" align="center" prop="objectiveId"/>
<el-table-column label="运输方式" align="center" prop="transportId">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.daotime) }}</span>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId"/>
</template>
</el-table-column>
<el-table-column label="清关时间" align="center" prop="qgtime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.qgtime) }}</span>
</template>
</el-table-column>
<el-table-column label="0未锁定，1已锁定" align="center" prop="isSock" />
<el-table-column label="运输id" align="center" prop="transportId" />
<el-table-column label="管理员id" align="center" prop="adminId" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......@@ -158,9 +95,9 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:box:update']">修改</el-button>
v-hasPermi="['shipment:box:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:box:delete']">删除</el-button>
v-hasPermi="['shipment:box:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -171,78 +108,26 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="自编号" prop="number">
<el-input v-model="form.number" placeholder="请输入自编号" />
</el-form-item>
<el-form-item label="柜型" prop="numbers">
<el-input v-model="form.numbers" placeholder="请输入柜型" />
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" placeholder="请选择类型">
<el-option label="请选择字典生成" value="" />
<el-form-item label="柜型" prop="boxType">
<el-select v-model="form.boxType" placeholder="请选择柜型">
<el-option label="请选择字典生成" value=""/>
</el-select>
</el-form-item>
<el-form-item label="状态：0预装；1已装（封柜）；2已开船；3已到港；4已清关；5已卸货" prop="statics">
<el-select v-model="form.statics" placeholder="请选择状态：0预装；1已装（封柜）；2已开船；3已到港；4已清关；5已卸货">
<el-option label="请选择字典生成" value="" />
<el-form-item label="始发地" prop="departureId">
<el-select v-model="form.departureId" placeholder="请选择始发地">
<el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起运港id" prop="qiyun">
<el-input v-model="form.qiyun" placeholder="请输入起运港id" />
</el-form-item>
<el-form-item label="起运港详情" prop="qiyuns">
<el-input v-model="form.qiyuns" placeholder="请输入起运港详情" />
</el-form-item>
<el-form-item label="目前的港id" prop="mudi">
<el-input v-model="form.mudi" placeholder="请输入目前的港id" />
</el-form-item>
<el-form-item label="目的港详情" prop="mudis">
<el-input v-model="form.mudis" placeholder="请输入目的港详情" />
</el-form-item>
<el-form-item label="预装时间" prop="yzDate">
<el-date-picker clearable v-model="form.yzDate" type="date" value-format="yyyy-MM-dd" placeholder="选择预装时间" />
</el-form-item>
<el-form-item label="" prop="chuandong">
<el-input v-model="form.chuandong" placeholder="请输入" />
</el-form-item>
<el-form-item label="代理" prop="daili">
<el-input v-model="form.daili" placeholder="请输入代理" />
</el-form-item>
<el-form-item label="柜类型" prop="gx">
<el-input v-model="form.gx" placeholder="请输入柜类型" />
</el-form-item>
<el-form-item label="柜类型详情" prop="gxs">
<el-input v-model="form.gxs" placeholder="请输入柜类型详情" />
</el-form-item>
<el-form-item label="装柜部分" prop="products">
<el-input v-model="form.products" placeholder="请输入装柜部分" />
</el-form-item>
<el-form-item label="" prop="wenti">
<el-input v-model="form.wenti" placeholder="请输入" />
</el-form-item>
<el-form-item label="0未提交；1审核中；2通过；3驳回" prop="pass">
<el-input v-model="form.pass" placeholder="请输入0未提交；1审核中；2通过；3驳回" />
</el-form-item>
<el-form-item label="封柜时间" prop="fengtime">
<el-date-picker clearable v-model="form.fengtime" type="date" value-format="yyyy-MM-dd" placeholder="选择封柜时间" />
</el-form-item>
<el-form-item label="出仓时间" prop="chutime">
<el-date-picker clearable v-model="form.chutime" type="date" value-format="yyyy-MM-dd" placeholder="选择出仓时间" />
</el-form-item>
<el-form-item label="到港时间" prop="daotime">
<el-date-picker clearable v-model="form.daotime" type="date" value-format="yyyy-MM-dd" placeholder="选择到港时间" />
</el-form-item>
<el-form-item label="清关时间" prop="qgtime">
<el-date-picker clearable v-model="form.qgtime" type="date" value-format="yyyy-MM-dd" placeholder="选择清关时间" />
</el-form-item>
<el-form-item label="0未锁定，1已锁定" prop="isSock">
<el-input v-model="form.isSock" placeholder="请输入0未锁定，1已锁定" />
</el-form-item>
<el-form-item label="运输id" prop="transportId">
<el-input v-model="form.transportId" placeholder="请输入运输id" />
<el-form-item label="目的地" prop="objectiveId">
<el-select v-model="form.objectiveId" placeholder="请选择始发地">
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="管理员id" prop="adminId">
<el-input v-model="form.adminId" placeholder="请输入管理员id" />
<el-form-item label="运输类型" prop="transportId">
<el-select v-model="queryParams.transportId" placeholder="请选择运输方式" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -254,12 +139,13 @@
</template>
<script>
import { createBox, updateBox, deleteBox, getBox, getBoxPage, exportBoxExcel } from "@/api/ecw/box";
import {createbox, updatebox, deletebox, getbox, getboxPage, exportboxExcel} from "@/api/ecw/box";
import {getTradeCityList} from '@/api/ecw/region';
import {getCabinetPage} from "@/api/ecw/cabinet";
export default {
name: "Box",
components: {
},
export default {
name: "box",
components: {},
data() {
return {
// 遮罩层
......@@ -270,49 +156,47 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 出货管理列表
// 出货列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeYzDate: [],
dateRangeFengtime: [],
dateRangeChutime: [],
dateRangeDaotime: [],
dateRangeQgtime: [],
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
number: null,
numbers: null,
type: null,
statics: null,
qiyun: null,
qiyuns: null,
mudi: null,
mudis: null,
chuandong: null,
daili: null,
gx: null,
gxs: null,
products: null,
wenti: null,
pass: null,
isSock: null,
id: null,
orderNo: null,
cubNo: null,
boxType: null,
status: null,
departureId: null,
objectiveId: null,
transportId: null,
adminId: null,
},
tradeCityList: [],
CabinetPage:[],
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {}
};
},
computed: {
expoerCityList() {
return this.tradeCityList.filter(item => item.type == 2)
},
importCityList() {
return this.tradeCityList.filter(item => item.type == 1)
},
},
created() {
getTradeCityList().then(res => this.tradeCityList = res.data);
getCabinetPage(null).then(response => {
this.CabinetPage = response.data.list;
});
this.getList();
},
methods: {
......@@ -321,14 +205,9 @@ export default {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeYzDate, 'yzDate');
this.addBeginAndEndTime(params, this.dateRangeFengtime, 'fengtime');
this.addBeginAndEndTime(params, this.dateRangeChutime, 'chutime');
this.addBeginAndEndTime(params, this.dateRangeDaotime, 'daotime');
this.addBeginAndEndTime(params, this.dateRangeQgtime, 'qgtime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getBoxPage(params).then(response => {
getboxPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
......@@ -343,29 +222,10 @@ export default {
reset() {
this.form = {
id: undefined,
number: undefined,
numbers: undefined,
type: undefined,
statics: undefined,
qiyun: undefined,
qiyuns: undefined,
mudi: undefined,
mudis: undefined,
yzDate: undefined,
chuandong: undefined,
daili: undefined,
gx: undefined,
gxs: undefined,
products: undefined,
wenti: undefined,
pass: undefined,
fengtime: undefined,
chutime: undefined,
daotime: undefined,
qgtime: undefined,
isSock: undefined,
boxType: undefined,
departureId: undefined,
objectiveId: undefined,
transportId: undefined,
adminId: undefined,
};
this.resetForm("form");
},
......@@ -376,11 +236,6 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeYzDate = [];
this.dateRangeFengtime = [];
this.dateRangeChutime = [];
this.dateRangeDaotime = [];
this.dateRangeQgtime = [];
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
......@@ -389,16 +244,16 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加出货管理";
this.title = "添加出货";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getBox(id).then(response => {
getbox(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改出货管理";
this.title = "修改出货";
});
},
/** 提交按钮 */
......@@ -409,7 +264,7 @@ export default {
}
// 修改的提交
if (this.form.id != null) {
updateBox(this.form).then(response => {
updatebox(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
......@@ -417,7 +272,7 @@ export default {
return;
}
// 添加的提交
createBox(this.form).then(response => {
createbox(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -427,12 +282,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除出货管理编号为"' + id + '"的数据项?').then(function() {
return deleteBox(id);
this.$modal.confirm('是否确认删除出货编号为"' + id + '"的数据项?').then(function () {
return deletebox(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
......@@ -440,21 +296,17 @@ export default {
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeYzDate, 'yzDate');
this.addBeginAndEndTime(params, this.dateRangeFengtime, 'fengtime');
this.addBeginAndEndTime(params, this.dateRangeChutime, 'chutime');
this.addBeginAndEndTime(params, this.dateRangeDaotime, 'daotime');
this.addBeginAndEndTime(params, this.dateRangeQgtime, 'qgtime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有出货管理数据项?').then(() => {
this.$modal.confirm('是否确认导出所有出货数据项?').then(() => {
this.exportLoading = true;
return exportBoxExcel(params);
return exportboxExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}).catch(() => {
});
}
}
};
};
</script>
src/views/ecw/offer/special.vue
View file @ 717da4a1
......@@ -34,9 +34,9 @@
</template>
</el-table-column>
<el-table-column
prop="address"
prop="updateTime"
:formatter="(_, __, v) => parseTime(v)"
label="最后操作时间">
<!-- todo -->
</el-table-column>
<el-table-column
label="原价">
......@@ -96,6 +96,7 @@ import {getOffer} from '@/api/ecw/offer'
import {getUnitList} from "@/api/ecw/unit"
import {getCurrencyList} from "@/api/ecw/currency"
import {getProductAttrList} from "@/api/ecw/productAttr"
import { parseTime } from '@/utils/ruoyi'
export default {
name: "OfferSpecial",
components: {
......@@ -105,6 +106,7 @@ export default {
},
data() {
return {
parseTime,
DICT_TYPE,
getDictDataLabel,
// 遮罩层
......
src/views/ecw/offer/specialDiscount.vue
View file @ 717da4a1
......@@ -64,14 +64,15 @@
</el-input>
</el-form-item>
<el-form-item label="新运费" required>
<el-input v-model.number="form.seaFreight">
<el-input v-model.number="form.seaFreight" :readonly="readonly">
<dict-selector
slot="prepend"
v-model="form.seaFreightCurrency"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
style="width: 100px"
:disabled="readonly"
></dict-selector>
<el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
<el-option
v-for="item in unitList"
:key="item.id"
......@@ -82,14 +83,15 @@
</el-input>
</el-form-item>
<el-form-item label="新清关费" required>
<el-input v-model.number="form.clearanceFreight">
<el-input v-model.number="form.clearanceFreight" :readonly="readonly">
<dict-selector
slot="prepend"
v-model="form.clearanceFreightCurrency"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
style="width: 100px"
:disabled="readonly"
></dict-selector>
<el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
<el-option
v-for="item in unitList"
:key="item.id"
......
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