Skip to content

J
jiedao-app-operator-master
Commit 3304b861 authored by 黄卓's avatar 黄卓
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 4c3d683f b11d3795
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 169 deletions
src/views/ecw/box/index.vue
View file @ 3304b861
......@@ -13,34 +13,35 @@
<el-input v-model="queryParams.cubNo" placeholder="请输入柜号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="柜型" prop="boxType">
<el-select v-model="queryParams.boxType" placeholder="请选择柜型" clearable size="small">
<el-option label="请选择字典生成" value="" />
<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="发货状态:见字典" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择发货状态:见字典" clearable size="small">
<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="始发地" prop="departureId">
<el-select v-model="queryParams.departureId" placeholder="请选择始发地" clearable size="small">
<el-option label="请选择字典生成" value="" />
<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="目的地" prop="objectiveId">
<el-select v-model="queryParams.objectiveId" placeholder="请选择目的地" clearable size="small">
<el-option label="请选择字典生成" value="" />
<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="transportId">
<el-select v-model="queryParams.transportId" placeholder="请选择运输id" clearable size="small">
<el-option label="请选择字典生成" value="" />
<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>
......@@ -52,29 +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="['shipment: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="['shipment: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="orderNo" />
<el-table-column label="柜号" align="center" prop="cubNo" />
<el-table-column label="柜型" align="center" prop="boxType" />
<el-table-column label="发货状态:见字典" align="center" prop="status">
<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="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPMENT_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<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">
<dict-tag :type="DICT_TYPE.BOX_SHIPMENT_STATUS" :value="scope.row.status" />
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId"/>
</template>
</el-table-column>
<el-table-column label="始发地" align="center" prop="departureId" />
<el-table-column label="目的地" align="center" prop="objectiveId" />
<el-table-column label="运输id" align="center" prop="transportId" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......@@ -98,22 +110,23 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="柜型" prop="boxType">
<el-select v-model="form.boxType" placeholder="请选择柜型">
<el-option label="请选择字典生成" value="" />
<el-option label="请选择字典生成" value=""/>
</el-select>
</el-form-item>
<el-form-item label="始发地" prop="departureId">
<el-select v-model="form.departureId" placeholder="请选择始发地">
<el-option label="请选择字典生成" value="" />
<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="目的地" prop="objectiveId">
<el-select v-model="form.objectiveId" placeholder="请选择目的地">
<el-option label="请选择字典生成" value="" />
<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="transportId">
<el-select v-model="form.transportId" placeholder="请选择运输id">
<el-option label="请选择字典生成" value="" />
<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>
......@@ -126,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 {
export default {
name: "box",
components: {
},
components: {},
data() {
return {
// 遮罩层
......@@ -162,14 +176,27 @@ export default {
objectiveId: null,
transportId: 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: {
......@@ -255,12 +282,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除出货编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除出货编号为"' + id + '"的数据项?').then(function () {
return deletebox(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
......@@ -276,8 +304,9 @@ export default {
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}).catch(() => {
});
}
}
};
};
</script>
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