|
|
@@ -46,6 +46,28 @@
|
|
|
clearable
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-select
|
|
|
+ v-model="screen1"
|
|
|
+ placeholder="请选择需筛选的内容"
|
|
|
+ clearable
|
|
|
+ style="width:150px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in options1"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-input
|
|
|
+ style="width:200px"
|
|
|
+ v-model="input1"
|
|
|
+ placeholder="请输入查询条件"
|
|
|
+ clearable
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" @click="exportAllReportToExcel"
|
|
|
><i class="el-icon-download"></i>Excel</el-button
|
|
|
@@ -98,30 +120,6 @@
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="sendStation"
|
|
|
- label="发站"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- column-key="sendStation"
|
|
|
- :filters="[
|
|
|
- { text: '专用线', value: '专用线' },
|
|
|
- { text: '达州站', value: '达州站' }
|
|
|
- ]"
|
|
|
- :filter-method="filterSend"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select size="mini" v-model="scope.row.sendStationId">
|
|
|
- <el-option
|
|
|
- v-for="item in sendStationList"
|
|
|
- :key="item.sendStationId"
|
|
|
- :label="item.sendStation"
|
|
|
- :value="item.sendStationId"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="toTheStation"
|
|
|
label="到站"
|
|
|
@@ -203,6 +201,30 @@
|
|
|
width="150px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="sendStation"
|
|
|
+ label="发站"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ column-key="sendStation"
|
|
|
+ :filters="[
|
|
|
+ { text: '专用线', value: '专用线' },
|
|
|
+ { text: '达州站', value: '达州站' }
|
|
|
+ ]"
|
|
|
+ :filter-method="filterSend"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select size="mini" v-model="scope.row.sendStationId">
|
|
|
+ <el-option
|
|
|
+ v-for="item in sendStationList"
|
|
|
+ :key="item.sendStationId"
|
|
|
+ :label="item.sendStation"
|
|
|
+ :value="item.sendStationId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="operate"
|
|
|
label="操作"
|
|
|
@@ -230,26 +252,46 @@ export default {
|
|
|
endTime: null,
|
|
|
options: [
|
|
|
{
|
|
|
- value: "发站",
|
|
|
- lable: "发站"
|
|
|
+ value: "到站",
|
|
|
+ lable: "到站"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "收货单位",
|
|
|
+ lable: "收货单位"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "调入部门",
|
|
|
+ lable: "调入部门"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ options1: [
|
|
|
+ {
|
|
|
+ value: "到站",
|
|
|
+ lable: "到站"
|
|
|
},
|
|
|
{
|
|
|
value: "收货单位",
|
|
|
lable: "收货单位"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "调入部门",
|
|
|
+ lable: "调入部门"
|
|
|
}
|
|
|
],
|
|
|
input: null,
|
|
|
+ input1: null,
|
|
|
tableData: [],
|
|
|
screen: null,
|
|
|
+ screen1: null,
|
|
|
//需要合并的列集合
|
|
|
mergeList: [
|
|
|
"saleNo",
|
|
|
"saleRemark",
|
|
|
- "sendStation",
|
|
|
- "toTheStation",
|
|
|
"receiveName",
|
|
|
"index",
|
|
|
- "operate"
|
|
|
+ "operate",
|
|
|
+ "transInDep",
|
|
|
+ "transOutDep"
|
|
|
],
|
|
|
spanArr: [],
|
|
|
pos: null,
|
|
|
@@ -364,16 +406,46 @@ export default {
|
|
|
onclick() {
|
|
|
let startTime = null;
|
|
|
let endTime = null;
|
|
|
+ let totheStation = null;
|
|
|
+ let consigneeName = null;
|
|
|
+ let transferIndep = null;
|
|
|
+ let remark = null;
|
|
|
if (this.startTime && this.endTime) {
|
|
|
startTime = sjTime(this.startTime);
|
|
|
endTime = sjTime(this.endTime);
|
|
|
}
|
|
|
+ if (this.screen == "到站") {
|
|
|
+ totheStation = this.input;
|
|
|
+ } else if (this.screen == "收货单位") {
|
|
|
+ consigneeName = this.input;
|
|
|
+ } else if (this.screen == "调入部门") {
|
|
|
+ transferIndep = this.input;
|
|
|
+ } else {
|
|
|
+ remark = this.input;
|
|
|
+ }
|
|
|
+ if (this.screen1 == "到站") {
|
|
|
+ totheStation = this.input1;
|
|
|
+ } else if (this.screen1 == "收货单位") {
|
|
|
+ consigneeName = this.input1;
|
|
|
+ } else if (this.screen1 == "调入部门") {
|
|
|
+ transferIndep = this.input1;
|
|
|
+ } else {
|
|
|
+ remark = this.input1;
|
|
|
+ }
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/oms/getKucunList?startTime=" +
|
|
|
+ "/api/v1/ams/getKucunList?startTime=" +
|
|
|
startTime +
|
|
|
"&endTime=" +
|
|
|
- endTime
|
|
|
+ endTime +
|
|
|
+ "&totheStation=" +
|
|
|
+ totheStation +
|
|
|
+ "&consigneeName=" +
|
|
|
+ consigneeName +
|
|
|
+ "&transferIndep=" +
|
|
|
+ transferIndep +
|
|
|
+ "&remark=" +
|
|
|
+ remark
|
|
|
)
|
|
|
.then(res => {
|
|
|
this.tableData = res.data.data;
|
luobang