|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
- <!-- 国产矿计量委托 -->
|
|
|
- <div class="homeworkPath">
|
|
|
+ <!-- 万州港-达州计量委托界面 -->
|
|
|
+ <div class="trainTransport">
|
|
|
<div class="top">
|
|
|
<el-input
|
|
|
class="el-input"
|
|
|
@@ -9,93 +9,144 @@
|
|
|
clearable
|
|
|
>
|
|
|
</el-input>
|
|
|
+ <el-date-picker
|
|
|
+ v-model="startTime"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ <span>至</span>
|
|
|
+ <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
|
<i class="el-icon-search"></i>查询
|
|
|
</el-button>
|
|
|
- <!-- <el-button type="primary" class="btn1" @click="btnclick(0)">
|
|
|
- <i class="el-icon-success"></i>发送
|
|
|
- </el-button> -->
|
|
|
+ <el-button type="primary" @click="exportData()"
|
|
|
+ ><i class="el-icon-download"></i>导出(Excel)</el-button
|
|
|
+ >
|
|
|
</div>
|
|
|
- <dilTable v-bind.sync="option" @selection-change="selectionChange">
|
|
|
- </dilTable>
|
|
|
+
|
|
|
+ <el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
+ <el-tab-pane label="待计量" name="first">
|
|
|
+ <dilTable ref="excelDom" v-bind.sync="option" @selection-change="selectionChange">
|
|
|
+ </dilTable>
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane label="已计量" name="second">
|
|
|
+ <dilTable ref="excelDom" v-bind.sync="option2" @selection-change="selectionChange2">
|
|
|
+ </dilTable>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
|
|
|
<script>
|
|
|
+import { sjTime } from "@/utils/sharedJsFile";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ activeName: "first",
|
|
|
+ time: [],
|
|
|
input: "",
|
|
|
option: {
|
|
|
// 表格请求数据的地址
|
|
|
- requestUrl: "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=3",
|
|
|
+ requestUrl: "/api/v1/tms/getLoadResultToSendMC?apiId=491&resultType=3",
|
|
|
+ // 控制显示多选列
|
|
|
+ selectionType: "select",
|
|
|
+ },
|
|
|
+ option2: {
|
|
|
+ // 表格请求数据的地址
|
|
|
+ requestUrl: "/api/v1/tms/getWeightResult?apiId=491&resultType=3",
|
|
|
// 控制显示多选列
|
|
|
selectionType: "select",
|
|
|
},
|
|
|
selectionListMap: [],
|
|
|
+ selectionListMap2: [],
|
|
|
+ resultIdList: [],
|
|
|
+ startTime: null,
|
|
|
+ endTime: null,
|
|
|
+ tableTitle: "国产矿计量表",
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
- onclick() {
|
|
|
- this.option.requestUrl =
|
|
|
- "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3&con=" +
|
|
|
- this.input;
|
|
|
+ handleClick(tag, event) {
|
|
|
+ console.log(tag, event);
|
|
|
},
|
|
|
|
|
|
- btnclick() {
|
|
|
- let map = {
|
|
|
- resultIdList: this.selectionListMap,
|
|
|
- };
|
|
|
- // console.log("map" + map);
|
|
|
- if (this.selectionListMap.length == 0) {
|
|
|
- this.$message({
|
|
|
- message: "请勾选要发送计量委托的实绩!",
|
|
|
- type: "warning",
|
|
|
- });
|
|
|
+ onclick() {
|
|
|
+ let startTime = null;
|
|
|
+ let endTime = null;
|
|
|
+ if (this.startTime) {
|
|
|
+ startTime = sjTime(this.startTime);
|
|
|
+ }
|
|
|
+ if (this.endTime) {
|
|
|
+ endTime = sjTime(this.endTime);
|
|
|
+ }
|
|
|
+ if (startTime && endTime) {
|
|
|
+ if (startTime < endTime) {
|
|
|
+ //判断是否是承运商
|
|
|
+ if (this.activeName == "first") {
|
|
|
+ this.option.requestUrl =
|
|
|
+ "/api/v1/tms/getLoadResultToSendMC?apiId=491&resultType=3" +
|
|
|
+ "&con=" +
|
|
|
+ this.input +
|
|
|
+ "&startTime=" +
|
|
|
+ startTime +
|
|
|
+ "&endTime=" +
|
|
|
+ endTime +
|
|
|
+ "&i=" +
|
|
|
+ new Date();
|
|
|
+ } else {
|
|
|
+ this.option2.requestUrl =
|
|
|
+ "/api/v1/tms/getWeightResult?apiId=491&resultType=3" +
|
|
|
+ "&con=" +
|
|
|
+ this.input +
|
|
|
+ "&startTime=" +
|
|
|
+ startTime +
|
|
|
+ "&endTime=" +
|
|
|
+ endTime +
|
|
|
+ "&i=" +
|
|
|
+ new Date();
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
- this.axios
|
|
|
- .post("/api/v1/tms/batchSendMeasureCommission", map)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.data == "发送成功") {
|
|
|
- this.$message({
|
|
|
- type: "success",
|
|
|
- message: res.data.data,
|
|
|
- });
|
|
|
- this.option.requestUrl =
|
|
|
- "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3&i"+new Date();
|
|
|
- }else {
|
|
|
- this.$message({
|
|
|
- type: "warning",
|
|
|
- message: res.data.data,
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ if (this.activeName == "first") {
|
|
|
+ this.option.requestUrl =
|
|
|
+ "/api/v1/tms/getLoadResultToSendMC?apiId=491&resultType=3" +
|
|
|
+ "&con=" +
|
|
|
+ this.input +
|
|
|
+ "&i=" +
|
|
|
+ new Date();
|
|
|
+ } else {
|
|
|
+ this.option2.requestUrl =
|
|
|
+ "/api/v1/tms/getWeightResult?apiId=491&resultType=3" +
|
|
|
+ "&con=" +
|
|
|
+ this.input +
|
|
|
+ "&i=" +
|
|
|
+ new Date();
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
selectionChange(selection) {
|
|
|
this.selectionListMap = [];
|
|
|
- // console.log(selection);
|
|
|
+ console.log(selection);
|
|
|
this.selectionListMap = selection;
|
|
|
},
|
|
|
+ selectionChange2(selection) {
|
|
|
+ this.selectionListMap2 = [];
|
|
|
+ console.log(selection);
|
|
|
+ this.selectionListMap2 = selection;
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
<style lang='scss'>
|
|
|
-.homeworkPath {
|
|
|
+.trainTransport {
|
|
|
.top {
|
|
|
padding: 1.25rem 0.375rem;
|
|
|
.el-input {
|
|
|
width: 20%;
|
|
|
- margin-right: 40rpx;
|
|
|
- }
|
|
|
- .btn {
|
|
|
- width: 5.5%;
|
|
|
- margin-left: 0.25rem;
|
|
|
- }
|
|
|
- .btn1 {
|
|
|
- width: 7%;
|
|
|
- margin-left: 00.375rem;
|
|
|
+ margin-right: 1.25rem;
|
|
|
}
|
|
|
}
|
|
|
}
|
zx