|
@@ -76,9 +76,7 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" @click="showDialog"
|
|
|
- >多拼派车</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="showDialog">多拼派车</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
@@ -88,17 +86,13 @@
|
|
|
:span-method="objectSpanMethod"
|
|
|
ref="tableRef"
|
|
|
border
|
|
|
- stripe
|
|
|
style="width: 100%; margin-top: 20px"
|
|
|
max-height="800px"
|
|
|
@cell-click="cellClik"
|
|
|
:row-style="{ height: '30px' }"
|
|
|
:cell-style="{ fontWeight: '700' }"
|
|
|
>
|
|
|
- <el-table-column
|
|
|
- type="selection"
|
|
|
- width="55">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column type="selection" width="55"> </el-table-column>
|
|
|
<el-table-column
|
|
|
width="50"
|
|
|
label="序号"
|
|
@@ -115,17 +109,17 @@
|
|
|
align="center"
|
|
|
fixed
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-autocomplete
|
|
|
- class="inline-input"
|
|
|
- v-model="scope.row.consigneeName"
|
|
|
- :fetch-suggestions="querySearchConsignee"
|
|
|
- placeholder="请输入收货客户名称"
|
|
|
- @select="handleSelectConsignee(scope.row, scope.$index)"
|
|
|
- style="width:300px"
|
|
|
- >
|
|
|
- </el-autocomplete>
|
|
|
- </template>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-autocomplete
|
|
|
+ class="inline-input"
|
|
|
+ v-model="scope.row.consigneeName"
|
|
|
+ :fetch-suggestions="querySearchConsignee"
|
|
|
+ placeholder="请输入收货客户名称"
|
|
|
+ @select="handleSelectConsignee(scope.row, scope.$index)"
|
|
|
+ style="width:300px"
|
|
|
+ >
|
|
|
+ </el-autocomplete>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="carrierName"
|
|
@@ -152,7 +146,7 @@
|
|
|
>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="sendStationName"
|
|
|
column-key="sendStationName"
|
|
@@ -163,9 +157,17 @@
|
|
|
>
|
|
|
<!-- 选择发站 -->
|
|
|
<template slot-scope="scope">
|
|
|
- <el-select filterable v-model="scope.row.sendStationId"
|
|
|
- @change="updateSendStation($event,scope.row)">
|
|
|
- <el-option v-for="item in sendStations" :value="item.sendStationId" :key="item.sendStationId" :label="item.sendStation"></el-option>
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ v-model="scope.row.sendStationId"
|
|
|
+ @change="updateSendStation($event, scope.row)"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in sendStations"
|
|
|
+ :value="item.sendStationId"
|
|
|
+ :key="item.sendStationId"
|
|
|
+ :label="item.sendStation"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
<!-- <el-button
|
|
|
@click="updateStation(scope.row)"
|
|
@@ -183,8 +185,8 @@
|
|
|
width="250px"
|
|
|
fixed
|
|
|
> -->
|
|
|
- <!-- 选择路线 -->
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
+ <!-- 选择路线 -->
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
<el-autocomplete
|
|
|
style="width: 120px"
|
|
|
v-model="scope.row.lineName"
|
|
@@ -402,8 +404,8 @@
|
|
|
@click="deleteEasEntryId(scope.row)"
|
|
|
v-if="
|
|
|
scope.row.carStatus == 4 ||
|
|
|
- scope.row.carStatus == 5 ||
|
|
|
- scope.row.carStatus == null
|
|
|
+ scope.row.carStatus == 5 ||
|
|
|
+ scope.row.carStatus == null
|
|
|
"
|
|
|
>关闭车辆</el-button
|
|
|
>
|
|
@@ -503,7 +505,11 @@
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
<!-- 多拼弹出层-->
|
|
|
- <el-dialog title="生成多拼" :visible.sync="dialogTableVisible" style="width:500px">
|
|
|
+ <el-dialog
|
|
|
+ title="生成多拼"
|
|
|
+ :visible.sync="dialogTableVisible"
|
|
|
+ style="width:500px"
|
|
|
+ >
|
|
|
<el-form :inline="true">
|
|
|
<el-form-item>
|
|
|
<el-autocomplete
|
|
@@ -513,51 +519,47 @@
|
|
|
placeholder="请输入车牌号"
|
|
|
@select="handleMulSelect"
|
|
|
></el-autocomplete>
|
|
|
- <el-button
|
|
|
- @click="updateMulCapacity"
|
|
|
- type="primary"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
+ <el-button @click="updateMulCapacity" type="primary">提交</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { sjTime, isVehicleNumber } from "@/utils/sharedJsFile";
|
|
|
-import { getCookie } from "@/utils/util.js";
|
|
|
+import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
|
|
|
+import { getCookie } from '@/utils/util.js'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
// 线路名称
|
|
|
- lineName: "",
|
|
|
+ lineName: '',
|
|
|
//线路id
|
|
|
lineId: null,
|
|
|
drawer: false,
|
|
|
clickIndex: null,
|
|
|
input: null,
|
|
|
- screen: "",
|
|
|
- dialogTableVisible:false,
|
|
|
- newsCapacityId:null,
|
|
|
- capacityNo:null,
|
|
|
- selection:[],
|
|
|
+ screen: '',
|
|
|
+ dialogTableVisible: false,
|
|
|
+ newsCapacityId: null,
|
|
|
+ capacityNo: null,
|
|
|
+ selection: [],
|
|
|
options: [
|
|
|
{
|
|
|
- value: "下单客户",
|
|
|
- lable: "下单客户",
|
|
|
+ value: '下单客户',
|
|
|
+ lable: '下单客户'
|
|
|
},
|
|
|
{
|
|
|
- value: "承运商",
|
|
|
- lable: "承运商",
|
|
|
+ value: '承运商',
|
|
|
+ lable: '承运商'
|
|
|
},
|
|
|
{
|
|
|
- value: "车牌号",
|
|
|
- lable: "车牌号",
|
|
|
+ value: '车牌号',
|
|
|
+ lable: '车牌号'
|
|
|
},
|
|
|
{
|
|
|
- value: "路线",
|
|
|
- lable: "路线",
|
|
|
- },
|
|
|
+ value: '路线',
|
|
|
+ lable: '路线'
|
|
|
+ }
|
|
|
],
|
|
|
startTime: null,
|
|
|
endTime: null,
|
|
@@ -565,7 +567,7 @@ export default {
|
|
|
totalNumber: 0,
|
|
|
//合计车数
|
|
|
totalCapacity: 0,
|
|
|
- tableTitle: "销售统计报表",
|
|
|
+ tableTitle: '销售统计报表',
|
|
|
capacityList: [],
|
|
|
carrierList: [],
|
|
|
// 线路
|
|
@@ -576,8 +578,27 @@ export default {
|
|
|
a: 1,
|
|
|
isCellClick: 0,
|
|
|
columnIndexs: [
|
|
|
- 1, 2, 3,4, 7, 8, 14, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
|
|
|
- 29, 31,
|
|
|
+ 1,
|
|
|
+ 2,
|
|
|
+ 3,
|
|
|
+ 4,
|
|
|
+ 7,
|
|
|
+ 8,
|
|
|
+ 14,
|
|
|
+ 16,
|
|
|
+ 17,
|
|
|
+ 18,
|
|
|
+ 19,
|
|
|
+ 20,
|
|
|
+ 21,
|
|
|
+ 22,
|
|
|
+ 23,
|
|
|
+ 24,
|
|
|
+ 25,
|
|
|
+ 26,
|
|
|
+ 27,
|
|
|
+ 29,
|
|
|
+ 31
|
|
|
],
|
|
|
//钢材多拼车辆线路ID
|
|
|
//索引从1-10为1-10拼路线ID
|
|
@@ -595,40 +616,26 @@ export default {
|
|
|
// 110010
|
|
|
// ],
|
|
|
//达州站内转多拼车辆线路ID,从1-5为1-5拼线路id
|
|
|
- lineDazhou:[
|
|
|
- 0,
|
|
|
- 189982,
|
|
|
- 189983,
|
|
|
- 189984,
|
|
|
- 189985,
|
|
|
- 189986
|
|
|
- ],
|
|
|
+ lineDazhou: [0, 189982, 189983, 189984, 189985, 189986],
|
|
|
//专用线内转多拼车辆线路ID,从1-5为1-5拼线路id
|
|
|
- lineZhuanxian:[
|
|
|
- 0,
|
|
|
- 189987,
|
|
|
- 189988,
|
|
|
- 189989,
|
|
|
- 189990,
|
|
|
- 189991
|
|
|
- ],
|
|
|
- sendStationId:null,
|
|
|
- sendStations:[],
|
|
|
- tableTitle: "销售钢材统计报表",
|
|
|
+ lineZhuanxian: [0, 189987, 189988, 189989, 189990, 189991],
|
|
|
+ sendStationId: null,
|
|
|
+ sendStations: [],
|
|
|
+ tableTitle: '销售钢材统计报表',
|
|
|
//所有省
|
|
|
provinceList: [],
|
|
|
//选中的省
|
|
|
- province: "",
|
|
|
+ province: '',
|
|
|
//所有市
|
|
|
cityList: [],
|
|
|
//选中的市
|
|
|
- city: "",
|
|
|
+ city: '',
|
|
|
//所有的县(区)
|
|
|
countyList: [],
|
|
|
//选中的县
|
|
|
- county: "",
|
|
|
+ county: '',
|
|
|
//地址输入框的值
|
|
|
- addresText: "",
|
|
|
+ addresText: '',
|
|
|
//已选中省市县
|
|
|
address: null,
|
|
|
//具体地址
|
|
@@ -637,154 +644,154 @@ export default {
|
|
|
place1: null,
|
|
|
//省市县Id
|
|
|
addressId: null,
|
|
|
- direction: "rtl",
|
|
|
+ direction: 'rtl',
|
|
|
addressRow: {},
|
|
|
- consigneeDisable: false,
|
|
|
- };
|
|
|
+ consigneeDisable: false
|
|
|
+ }
|
|
|
},
|
|
|
created() {},
|
|
|
mounted() {
|
|
|
- this.getSteelReport();
|
|
|
- this.getSendStations();
|
|
|
+ this.getSteelReport()
|
|
|
+ this.getSendStations()
|
|
|
},
|
|
|
methods: {
|
|
|
//反关闭整条分录
|
|
|
adverseCloseSaleMaterial(row) {
|
|
|
- console.log(row.saleMaterialId);
|
|
|
- this.$confirm("确定反关闭该条分录?", "提示", {
|
|
|
- cancelButtonText: "确定",
|
|
|
- confirmButtonText: "取消",
|
|
|
- center: true,
|
|
|
+ console.log(row.saleMaterialId)
|
|
|
+ this.$confirm('确定反关闭该条分录?', '提示', {
|
|
|
+ cancelButtonText: '确定',
|
|
|
+ confirmButtonText: '取消',
|
|
|
+ center: true
|
|
|
}).then(() => {
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/ams/adverseCloseSaleMaterial?saleMaterialId=" +
|
|
|
+ '/api/v1/ams/adverseCloseSaleMaterial?saleMaterialId=' +
|
|
|
row.saleMaterialId
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("反关闭成功");
|
|
|
- this.getSteelReport();
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('反关闭成功')
|
|
|
+ this.getSteelReport()
|
|
|
} else {
|
|
|
- this.$message.error("反关闭失败");
|
|
|
- this.getSteelReport();
|
|
|
+ this.$message.error('反关闭失败')
|
|
|
+ this.getSteelReport()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("反关闭失败");
|
|
|
- this.getSteelReport();
|
|
|
- });
|
|
|
- });
|
|
|
+ this.$message.error('反关闭失败')
|
|
|
+ this.getSteelReport()
|
|
|
+ })
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
//销售钢材报表导出excel
|
|
|
exportAllReportToExcel() {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在导出Excel",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
- var title = this.tableTitle;
|
|
|
- let tHeader = [];
|
|
|
- let filterVal = [];
|
|
|
- console.log(this.$refs.tableRef);
|
|
|
- this.$refs.tableRef.$children.forEach((item) => {
|
|
|
+ text: '正在导出Excel',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
+ var title = this.tableTitle
|
|
|
+ let tHeader = []
|
|
|
+ let filterVal = []
|
|
|
+ console.log(this.$refs.tableRef)
|
|
|
+ this.$refs.tableRef.$children.forEach(item => {
|
|
|
if (item.label != undefined && item.prop != undefined) {
|
|
|
if (tHeader.indexOf(item.label) === -1) {
|
|
|
- tHeader.push(item.label);
|
|
|
+ tHeader.push(item.label)
|
|
|
}
|
|
|
if (filterVal.indexOf(item.prop) === -1) {
|
|
|
- filterVal.push(item.prop);
|
|
|
+ filterVal.push(item.prop)
|
|
|
}
|
|
|
}
|
|
|
- });
|
|
|
- this.downloadLoading = true;
|
|
|
+ })
|
|
|
+ this.downloadLoading = true
|
|
|
require.ensure([], () => {
|
|
|
const {
|
|
|
- export_json_to_excel,
|
|
|
- } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径,使用@/+存放export2Excel的路径
|
|
|
- let data = this.tableData.map((v) => filterVal.map((j) => v[j])); //3.formatJson格式转换
|
|
|
- export_json_to_excel(tHeader, data, title); // (title)导出的表格名称
|
|
|
- });
|
|
|
- loading.close();
|
|
|
+ export_json_to_excel
|
|
|
+ } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径,使用@/+存放export2Excel的路径
|
|
|
+ let data = this.tableData.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
|
|
|
+ export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
|
|
|
+ })
|
|
|
+ loading.close()
|
|
|
},
|
|
|
changeScreen() {
|
|
|
- console.log(this.screen);
|
|
|
+ console.log(this.screen)
|
|
|
},
|
|
|
cellClik(row, column, cell, event) {
|
|
|
if (row.group != this.clickIndex) {
|
|
|
// this.getSteelReport();
|
|
|
- this.tableData.forEach((item) => {
|
|
|
+ this.tableData.forEach(item => {
|
|
|
if (item.group == this.clickIndex) {
|
|
|
- this.$set(item, "isCapacityShow", 0);
|
|
|
- this.$set(item, "isCarrierShow", 0);
|
|
|
- this.$set(item, "isTelShow", 0);
|
|
|
- this.$set(item, "isAddressShow", 0);
|
|
|
- this.$set(item, "isNumShow", 0);
|
|
|
- this.$set(item, "isLineName", 0);
|
|
|
- this.$set(item, "isSendStationName", 0);
|
|
|
+ this.$set(item, 'isCapacityShow', 0)
|
|
|
+ this.$set(item, 'isCarrierShow', 0)
|
|
|
+ this.$set(item, 'isTelShow', 0)
|
|
|
+ this.$set(item, 'isAddressShow', 0)
|
|
|
+ this.$set(item, 'isNumShow', 0)
|
|
|
+ this.$set(item, 'isLineName', 0)
|
|
|
+ this.$set(item, 'isSendStationName', 0)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
- if (column.property == "capacityNo") {
|
|
|
- this.$set(row, "isCapacityShow", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'capacityNo') {
|
|
|
+ this.$set(row, 'isCapacityShow', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "lineName") {
|
|
|
- this.$set(row, "isLineName", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'lineName') {
|
|
|
+ this.$set(row, 'isLineName', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "sendStationName") {
|
|
|
- this.$set(row, "isSendStationName", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'sendStationName') {
|
|
|
+ this.$set(row, 'isSendStationName', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "carrierName") {
|
|
|
- this.$set(row, "isCarrierShow", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'carrierName') {
|
|
|
+ this.$set(row, 'isCarrierShow', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "capacityTel") {
|
|
|
- this.$set(row, "isTelShow", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'capacityTel') {
|
|
|
+ this.$set(row, 'isTelShow', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "addressPlace") {
|
|
|
- this.$set(row, "isAddressShow", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'addressPlace') {
|
|
|
+ this.$set(row, 'isAddressShow', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
- if (column.property == "materialNum") {
|
|
|
- this.$set(row, "isNumShow", 1);
|
|
|
- this.clickIndex = row.group;
|
|
|
+ if (column.property == 'materialNum') {
|
|
|
+ this.$set(row, 'isNumShow', 1)
|
|
|
+ this.clickIndex = row.group
|
|
|
}
|
|
|
},
|
|
|
//承运商弹出层
|
|
|
handleSelectCarrier(row, index, item) {
|
|
|
- this.carrierList.forEach((item) => {
|
|
|
+ this.carrierList.forEach(item => {
|
|
|
if (item.carrierName == row.carrierName) {
|
|
|
- row.newCarrierId = item.carrierId;
|
|
|
- row.carrierId = item.carrierId;
|
|
|
+ row.newCarrierId = item.carrierId
|
|
|
+ row.carrierId = item.carrierId
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
//承运商边输边查
|
|
|
querySearchCarrier(queryString, cb) {
|
|
|
if (queryString.length > 1) {
|
|
|
this.axios
|
|
|
- .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.carrierList = [];
|
|
|
+ .post('/api/v1/uc/getCarrierMesByLike?index=' + queryString)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.carrierList = []
|
|
|
if (res.data.data.length == 0) {
|
|
|
- this.$message.info("承运商不存在,请前往注册");
|
|
|
- return;
|
|
|
+ this.$message.info('承运商不存在,请前往注册')
|
|
|
+ return
|
|
|
}
|
|
|
- var restaurants = res.data.data;
|
|
|
- this.carrierList = res.data.data;
|
|
|
+ var restaurants = res.data.data
|
|
|
+ this.carrierList = res.data.data
|
|
|
var results = queryString
|
|
|
? restaurants.filter(this.createFilterCarrier(queryString))
|
|
|
- : restaurants;
|
|
|
- cb(results);
|
|
|
+ : restaurants
|
|
|
+ cb(results)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -792,133 +799,131 @@ export default {
|
|
|
if (queryString.length > 1) {
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + queryString
|
|
|
+ '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=' + queryString
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- console.log(res.data.data.list.length);
|
|
|
- console.log(res.data.data);
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.LineList = [];
|
|
|
+ .then(res => {
|
|
|
+ console.log(res.data.data.list.length)
|
|
|
+ console.log(res.data.data)
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.LineList = []
|
|
|
if (res.data.data.list.length == 0) {
|
|
|
- this.$message.info("线路不存在,请前往注册");
|
|
|
- return;
|
|
|
+ this.$message.info('线路不存在,请前往注册')
|
|
|
+ return
|
|
|
}
|
|
|
- var restaurants = res.data.data.list;
|
|
|
- this.LineList = res.data.data.list;
|
|
|
- console.log(this.LineList);
|
|
|
+ var restaurants = res.data.data.list
|
|
|
+ this.LineList = res.data.data.list
|
|
|
+ console.log(this.LineList)
|
|
|
var results = queryString
|
|
|
? restaurants.filter(this.createFilterLine(queryString))
|
|
|
- : restaurants;
|
|
|
- cb(results);
|
|
|
+ : restaurants
|
|
|
+ cb(results)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
//获取发站
|
|
|
- getSendStations() {
|
|
|
- this.axios
|
|
|
- .get(
|
|
|
- "/api/v1/uc/getInwardSendStation"
|
|
|
- )
|
|
|
- .then((res) => {
|
|
|
- console.log(res.data.data);
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.sendStations = res.data.data;
|
|
|
- }
|
|
|
- });
|
|
|
+ getSendStations() {
|
|
|
+ this.axios.get('/api/v1/uc/getInwardSendStation').then(res => {
|
|
|
+ console.log(res.data.data)
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.sendStations = res.data.data
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 过滤器
|
|
|
createFilterLine(queryString) {
|
|
|
- return (restaurants) => {
|
|
|
+ return restaurants => {
|
|
|
return (
|
|
|
restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
|
|
|
-1
|
|
|
- );
|
|
|
- };
|
|
|
+ )
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
createFilterCarrier(queryString) {
|
|
|
- return (restaurants) => {
|
|
|
+ return restaurants => {
|
|
|
return (
|
|
|
restaurants.value1.toLowerCase().indexOf(queryString.toLowerCase()) >
|
|
|
-1
|
|
|
- );
|
|
|
- };
|
|
|
+ )
|
|
|
+ }
|
|
|
},
|
|
|
//以下是车牌号边输边查搜索
|
|
|
querySearch(queryString, cb) {
|
|
|
if (queryString.length > 3) {
|
|
|
this.axios
|
|
|
- .post("/api/v1/uc/getCapacityByLike?index=" + queryString)
|
|
|
- .then((res) => {
|
|
|
- this.capacityList = [];
|
|
|
- if (res.data.code == "200") {
|
|
|
+ .post('/api/v1/uc/getCapacityByLike?index=' + queryString)
|
|
|
+ .then(res => {
|
|
|
+ this.capacityList = []
|
|
|
+ if (res.data.code == '200') {
|
|
|
if (res.data.data.length == 0) {
|
|
|
- this.$message.info("车牌号不存在,请前往注册");
|
|
|
- return;
|
|
|
+ this.$message.info('车牌号不存在,请前往注册')
|
|
|
+ return
|
|
|
}
|
|
|
- var restaurants = res.data.data;
|
|
|
- this.capacityList = res.data.data;
|
|
|
+ var restaurants = res.data.data
|
|
|
+ this.capacityList = res.data.data
|
|
|
var results = queryString
|
|
|
? restaurants.filter(this.createFilter(queryString))
|
|
|
- : restaurants;
|
|
|
+ : restaurants
|
|
|
// console.log("res",+results);
|
|
|
// 调用 callback 返回建议列表的数据
|
|
|
- cb(results);
|
|
|
+ cb(results)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
createFilter(queryString) {
|
|
|
- return (restaurants) => {
|
|
|
+ return restaurants => {
|
|
|
return (
|
|
|
restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
|
|
|
-1
|
|
|
- );
|
|
|
- };
|
|
|
+ )
|
|
|
+ }
|
|
|
},
|
|
|
//车牌号弹出层
|
|
|
handleSelect(row, index) {
|
|
|
- this.capacityList.forEach((item) => {
|
|
|
+ this.capacityList.forEach(item => {
|
|
|
if (item.capacityNumber === row.capacityNo) {
|
|
|
- row.newsCapacityId = item.capacityId;
|
|
|
+ row.newsCapacityId = item.capacityId
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
- //多拼弹出层绑定车牌号
|
|
|
+ //多拼弹出层绑定车牌号
|
|
|
handleMulSelect(row, index) {
|
|
|
- this.capacityList.forEach((item) => {
|
|
|
+ this.capacityList.forEach(item => {
|
|
|
if (item.capacityNumber === row.capacityNo) {
|
|
|
- this.selection.forEach((selected)=>{
|
|
|
- selected.newsCapacityId = item.capacityId;
|
|
|
- selected.capacityNo=row.capacityNo;
|
|
|
- });
|
|
|
- this.newsCapacityId=item.capacityId;
|
|
|
- this.capacityNo=row.capacityNo;
|
|
|
- console.log("newCapacityId:",this.newsCapacityId);
|
|
|
+ this.selection.forEach(selected => {
|
|
|
+ selected.newsCapacityId = item.capacityId
|
|
|
+ selected.capacityNo = row.capacityNo
|
|
|
+ })
|
|
|
+ this.newsCapacityId = item.capacityId
|
|
|
+ this.capacityNo = row.capacityNo
|
|
|
+ console.log('newCapacityId:', this.newsCapacityId)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 线路弹出层
|
|
|
handleSelectLine(row, index) {
|
|
|
- this.capacityList.forEach((item) => {
|
|
|
+ this.capacityList.forEach(item => {
|
|
|
if (item.lineName === row.lineName) {
|
|
|
- row.newLineId = item.lineId;
|
|
|
+ row.newLineId = item.lineId
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 更新线路
|
|
|
updateLine(row) {
|
|
|
- row.lineId = this.lineId;
|
|
|
- console.log("this.lineId" +this.lineId);
|
|
|
+ row.lineId = this.lineId
|
|
|
+ console.log('this.lineId' + this.lineId)
|
|
|
},
|
|
|
|
|
|
- updateSendStation(selection,row){
|
|
|
- let sendStation=this.sendStations.find(item=>item.sendStationId==row.sendStationId);
|
|
|
- row.sendStation=sendStation.sendStation;
|
|
|
- console.log("sendStation",sendStation);
|
|
|
+ updateSendStation(selection, row) {
|
|
|
+ let sendStation = this.sendStations.find(
|
|
|
+ item => item.sendStationId == row.sendStationId
|
|
|
+ )
|
|
|
+ row.sendStation = sendStation.sendStation
|
|
|
+ console.log('sendStation', sendStation)
|
|
|
//绑定线路id
|
|
|
// let i = 0;
|
|
|
// this.tableData.forEach((e) => {
|
|
@@ -933,790 +938,792 @@ export default {
|
|
|
// }else{
|
|
|
// console.log("没有该发站的线路");
|
|
|
// }
|
|
|
- console.log("row:",row);
|
|
|
+ console.log('row:', row)
|
|
|
},
|
|
|
|
|
|
updateCapacity(row) {
|
|
|
- row.isIwardSteel=4;
|
|
|
- row.saleOrderMaterialId=row.saleOrderId;
|
|
|
+ row.isIwardSteel = 4
|
|
|
+ row.saleOrderMaterialId = row.saleOrderId
|
|
|
if (row.newsCapacityId == null) {
|
|
|
- this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
|
|
|
- return;
|
|
|
+ this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
|
|
|
+ return
|
|
|
}
|
|
|
if (!isVehicleNumber(row.capacityNo)) {
|
|
|
- this.$message.error("请输入正确格式的车牌号!");
|
|
|
- return;
|
|
|
+ this.$message.error('请输入正确格式的车牌号!')
|
|
|
+ return
|
|
|
}
|
|
|
if (row.capacityIds != 0) {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在变更车牌号",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在变更车牌号',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/updateCapacityNumberInFactory", row)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("变更车牌号成功!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/updateCapacityNumberInFactory', row)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('变更车牌号成功!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.success("变更失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.success('变更失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.success("变更失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.success('变更失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
} else {
|
|
|
if (row.carrierIds == 0) {
|
|
|
- this.$message.error("请先选择承运商!");
|
|
|
- return;
|
|
|
+ this.$message.error('请先选择承运商!')
|
|
|
+ return
|
|
|
}
|
|
|
- row.driverTel = row.capacityTel;
|
|
|
- row.capacityNumber = row.capacityNo;
|
|
|
- let arr = [];
|
|
|
- arr.push(row);
|
|
|
+ row.driverTel = row.capacityTel
|
|
|
+ row.capacityNumber = row.capacityNo
|
|
|
+ let arr = []
|
|
|
+ arr.push(row)
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在变更车牌号",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在变更车牌号',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/dispatchSteelOrder", arr)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("派车成功!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/dispatchSteelOrder', arr)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('派车成功!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("派车失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('派车失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("派车失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('派车失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
//多拼修改
|
|
|
updateMulCapacity() {
|
|
|
- this.selection.forEach((item)=>{
|
|
|
- item.isIwardSteel=4;
|
|
|
- item.saleOrderMaterialId=item.saleOrderId;
|
|
|
- item.capacityId=this.capacityId;
|
|
|
- item.capacityNumber=this.capacityNo;
|
|
|
- });
|
|
|
- if(this.selection[0].sendStation=="达州站"){
|
|
|
- this.selection.forEach((item)=>{
|
|
|
- item.lineId=this.lineDazhou[this.selection.length];
|
|
|
- item.lineName="达州站";
|
|
|
- });
|
|
|
- }else if(this.selection[0].sendStation=="专用线"){
|
|
|
- this.selection.forEach((item)=>{
|
|
|
- item.lineId=this.lineZhuanxian[this.selection.length];
|
|
|
- item.lineName="专用线";
|
|
|
- });
|
|
|
- }else{
|
|
|
- console.log("没有该发站的线路");
|
|
|
+ this.selection.forEach(item => {
|
|
|
+ item.isIwardSteel = 4
|
|
|
+ item.saleOrderMaterialId = item.saleOrderId
|
|
|
+ item.capacityId = this.capacityId
|
|
|
+ item.capacityNumber = this.capacityNo
|
|
|
+ })
|
|
|
+ if (this.selection[0].sendStation == '达州站') {
|
|
|
+ this.selection.forEach(item => {
|
|
|
+ item.lineId = this.lineDazhou[this.selection.length]
|
|
|
+ item.lineName = '达州站'
|
|
|
+ })
|
|
|
+ } else if (this.selection[0].sendStation == '专用线') {
|
|
|
+ this.selection.forEach(item => {
|
|
|
+ item.lineId = this.lineZhuanxian[this.selection.length]
|
|
|
+ item.lineName = '专用线'
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ console.log('没有该发站的线路')
|
|
|
}
|
|
|
- console.log("selection:",this.selection);
|
|
|
- return;
|
|
|
+ console.log('selection:', this.selection)
|
|
|
+ return
|
|
|
if (row.newsCapacityId == null) {
|
|
|
- this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
|
|
|
- return;
|
|
|
+ this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
|
|
|
+ return
|
|
|
}
|
|
|
if (!isVehicleNumber(row.capacityNo)) {
|
|
|
- this.$message.error("请输入正确格式的车牌号!");
|
|
|
- return;
|
|
|
+ this.$message.error('请输入正确格式的车牌号!')
|
|
|
+ return
|
|
|
}
|
|
|
if (row.capacityIds != 0) {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在变更车牌号",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在变更车牌号',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/updateCapacityNumberInFactory", row)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("变更车牌号成功!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/updateCapacityNumberInFactory', row)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('变更车牌号成功!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.success("变更失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.success('变更失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.success("变更失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.success('变更失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
} else {
|
|
|
if (row.carrierIds == 0) {
|
|
|
- this.$message.error("请先选择承运商!");
|
|
|
- return;
|
|
|
+ this.$message.error('请先选择承运商!')
|
|
|
+ return
|
|
|
}
|
|
|
- row.driverTel = row.capacityTel;
|
|
|
- row.capacityNumber = row.capacityNo;
|
|
|
- let arr = [];
|
|
|
- arr.push(row);
|
|
|
+ row.driverTel = row.capacityTel
|
|
|
+ row.capacityNumber = row.capacityNo
|
|
|
+ let arr = []
|
|
|
+ arr.push(row)
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在变更车牌号",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在变更车牌号',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/dispatchSteelOrder", arr)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("派车成功!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/dispatchSteelOrder', arr)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('派车成功!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("派车失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('派车失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("派车失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('派车失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
//修改司机电话号码
|
|
|
updateDriverTel(row) {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "修改电话号码中",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
- if (row.capacityTel == null || row.capacityTel == "") {
|
|
|
- this.$message.error("电话号码不能为空");
|
|
|
- return;
|
|
|
+ text: '修改电话号码中',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
+ if (row.capacityTel == null || row.capacityTel == '') {
|
|
|
+ this.$message.error('电话号码不能为空')
|
|
|
+ return
|
|
|
}
|
|
|
this.axios
|
|
|
- .post("/api/v1/uc/updateDriverTel", {
|
|
|
+ .post('/api/v1/uc/updateDriverTel', {
|
|
|
orderId: parseInt(row.orderId),
|
|
|
- driverTel: row.capacityTel,
|
|
|
+ driverTel: row.capacityTel
|
|
|
})
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("修改成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('修改成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("修改失败");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('修改失败')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("修改失败");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('修改失败')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
},
|
|
|
//关闭车辆金蝶分录
|
|
|
deleteEasEntryId(row) {
|
|
|
- this.$confirm("确定关闭该车金蝶分录吗?", "提示", {
|
|
|
- confirmButtonText: "是",
|
|
|
- cancelButtonText: "否",
|
|
|
+ this.$confirm('确定关闭该车金蝶分录吗?', '提示', {
|
|
|
+ confirmButtonText: '是',
|
|
|
+ cancelButtonText: '否',
|
|
|
center: true,
|
|
|
- type: "warning",
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
.then(() => {
|
|
|
- let map = row;
|
|
|
- map.isCloseEas = Number(0);
|
|
|
+ let map = row
|
|
|
+ map.isCloseEas = Number(0)
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在关闭车辆",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在关闭车辆',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/updateCarAddress", map)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("关闭车辆成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/updateCarAddress', map)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('关闭车辆成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("关闭车辆失败");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('关闭车辆失败')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("关闭车辆失败");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('关闭车辆失败')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.info("取消关闭");
|
|
|
- });
|
|
|
+ this.$message.info('取消关闭')
|
|
|
+ })
|
|
|
},
|
|
|
//修改承运商授权
|
|
|
updateTruckCarrier(row) {
|
|
|
- if(!row.saleOrderMaterialId){
|
|
|
- row.saleOrderMaterialId=row.saleOrderId;
|
|
|
+ if (!row.saleOrderMaterialId) {
|
|
|
+ row.saleOrderMaterialId = row.saleOrderId
|
|
|
}
|
|
|
if (row.newCarrierId == null) {
|
|
|
- this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
|
|
|
- this.getSteelReport();
|
|
|
- return;
|
|
|
+ this.$message.warning('请注册承运商或者选中弹出层之后再提交!')
|
|
|
+ this.getSteelReport()
|
|
|
+ return
|
|
|
}
|
|
|
if (row.carrierIds != 0) {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在修改承运商授权",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在修改承运商授权',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/updateTruckNoCarrier", row)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("修改承运商授权成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/updateTruckNoCarrier', row)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('修改承运商授权成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("修改失败,请联系管理员!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('修改失败,请联系管理员!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("修改失败,请联系管理员!");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('修改失败,请联系管理员!')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
} else {
|
|
|
//授权承运商
|
|
|
- let arr = [];
|
|
|
- arr.push(row);
|
|
|
+ let arr = []
|
|
|
+ arr.push(row)
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在授权承运商",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在授权承运商',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/dispatchToCarrier", arr)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "0") {
|
|
|
- this.$message.success("授权承运商成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/dispatchToCarrier', arr)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '0') {
|
|
|
+ this.$message.success('授权承运商成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("授权失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('授权失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("授权失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('授权失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
updateAddress(row) {
|
|
|
- this.drawer = true;
|
|
|
- this.addressRow = row;
|
|
|
- this.province = row.addressProvince;
|
|
|
- this.city = row.addressDistrict;
|
|
|
- this.county = row.addressTown;
|
|
|
- this.addressId = row.shipperAddressId;
|
|
|
- this.getAllProvince();
|
|
|
- this.onchangeProvince();
|
|
|
- this.onchangeCity();
|
|
|
+ this.drawer = true
|
|
|
+ this.addressRow = row
|
|
|
+ this.province = row.addressProvince
|
|
|
+ this.city = row.addressDistrict
|
|
|
+ this.county = row.addressTown
|
|
|
+ this.addressId = row.shipperAddressId
|
|
|
+ this.getAllProvince()
|
|
|
+ this.onchangeProvince()
|
|
|
+ this.onchangeCity()
|
|
|
},
|
|
|
//获取所有省数据
|
|
|
getAllProvince() {
|
|
|
- this.axios.post("/api/v1/uc/getAllProvince").then((res) => {
|
|
|
- this.provinceList = res.data.data;
|
|
|
- });
|
|
|
+ this.axios.post('/api/v1/uc/getAllProvince').then(res => {
|
|
|
+ this.provinceList = res.data.data
|
|
|
+ })
|
|
|
},
|
|
|
//省改变
|
|
|
onchangeProvince() {
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/uc/getDistrictByProvince?addressProvince=" +
|
|
|
+ '/api/v1/uc/getDistrictByProvince?addressProvince=' +
|
|
|
this.province +
|
|
|
- "&i=" +
|
|
|
+ '&i=' +
|
|
|
new Date()
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- this.cityList = res.data.data;
|
|
|
+ .then(res => {
|
|
|
+ this.cityList = res.data.data
|
|
|
// this.city = "";
|
|
|
// this.county = "";
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
//市改变
|
|
|
onchangeCity() {
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/uc/getTownByDistrict?addressDistrict=" +
|
|
|
+ '/api/v1/uc/getTownByDistrict?addressDistrict=' +
|
|
|
this.city +
|
|
|
- "&i=" +
|
|
|
+ '&i=' +
|
|
|
new Date()
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- this.countyList = res.data.data;
|
|
|
- });
|
|
|
+ .then(res => {
|
|
|
+ this.countyList = res.data.data
|
|
|
+ })
|
|
|
},
|
|
|
//县(区)改变
|
|
|
onchangeCounty() {
|
|
|
let mapValue = {
|
|
|
addressProvince: this.province,
|
|
|
addressDistrict: this.city,
|
|
|
- addressTown: this.county,
|
|
|
- };
|
|
|
- this.axios
|
|
|
- .post("/api/v1/uc/getPlaceByAllAddress", mapValue)
|
|
|
- .then((res) => {
|
|
|
- this.addressId = res.data.data[0].addressId;
|
|
|
- });
|
|
|
+ addressTown: this.county
|
|
|
+ }
|
|
|
+ this.axios.post('/api/v1/uc/getPlaceByAllAddress', mapValue).then(res => {
|
|
|
+ this.addressId = res.data.data[0].addressId
|
|
|
+ })
|
|
|
},
|
|
|
//收货地址弹出层
|
|
|
handleSelect1(item) {
|
|
|
- console.log("获取所有下拉值!");
|
|
|
+ console.log('获取所有下拉值!')
|
|
|
},
|
|
|
//以下是收货地址边输边查搜索
|
|
|
querySearch1(queryString, cb) {
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/ams/getRealAddressByLike?addressId=" +
|
|
|
+ '/api/v1/ams/getRealAddressByLike?addressId=' +
|
|
|
this.addressId +
|
|
|
- "&index=" +
|
|
|
+ '&index=' +
|
|
|
queryString
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- var restaurants = res.data.data;
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ var restaurants = res.data.data
|
|
|
var results = queryString
|
|
|
? restaurants.filter(this.createFilter1(queryString))
|
|
|
- : restaurants;
|
|
|
+ : restaurants
|
|
|
// 调用 callback 返回建议列表的数据
|
|
|
- cb(results);
|
|
|
+ cb(results)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
createFilter1(queryString) {
|
|
|
- return (restaurants) => {
|
|
|
+ return restaurants => {
|
|
|
return (
|
|
|
restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
|
|
|
-1
|
|
|
- );
|
|
|
- };
|
|
|
+ )
|
|
|
+ }
|
|
|
},
|
|
|
//修改收货地址
|
|
|
addAddressClick() {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在修改收货地址",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
- let map = this.addressRow;
|
|
|
- map.isCloseEas = Number(1);
|
|
|
- map.isNewCar = Number(1);
|
|
|
- map.place = this.place;
|
|
|
- map.shipperAddressId = this.addressId;
|
|
|
+ text: '正在修改收货地址',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
+ let map = this.addressRow
|
|
|
+ map.isCloseEas = Number(1)
|
|
|
+ map.isNewCar = Number(1)
|
|
|
+ map.place = this.place
|
|
|
+ map.shipperAddressId = this.addressId
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/updateCarAddress", map)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("修改收货地址成功!");
|
|
|
- this.getSteelReport();
|
|
|
- this.drawer = false;
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/updateCarAddress', map)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('修改收货地址成功!')
|
|
|
+ this.getSteelReport()
|
|
|
+ this.drawer = false
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("修改失败,请联系管理员!");
|
|
|
- this.getSteelReport();
|
|
|
- this.drawer = false;
|
|
|
- loading.close();
|
|
|
+ this.$message.error('修改失败,请联系管理员!')
|
|
|
+ this.getSteelReport()
|
|
|
+ this.drawer = false
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("修改失败,请联系管理员!");
|
|
|
- this.getSteelReport();
|
|
|
- this.drawer = false;
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('修改失败,请联系管理员!')
|
|
|
+ this.getSteelReport()
|
|
|
+ this.drawer = false
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
},
|
|
|
//记录每一行的合并数
|
|
|
getSpanArr(data) {
|
|
|
//每次调用方法初始化
|
|
|
- this.spanArr = [];
|
|
|
+ this.spanArr = []
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
if (i === 0) {
|
|
|
- this.spanArr.push(1);
|
|
|
- data[i].group = i;
|
|
|
- this.pos = 0;
|
|
|
+ this.spanArr.push(1)
|
|
|
+ data[i].group = i
|
|
|
+ this.pos = 0
|
|
|
} else {
|
|
|
// 判断当前元素与上一个元素是否相同
|
|
|
if (data[i].saleOrderId === data[i - 1].saleOrderMaterialId) {
|
|
|
- this.spanArr[this.pos] += 1;
|
|
|
- data[i].group = data[i - 1].group;
|
|
|
- this.spanArr.push(0);
|
|
|
+ this.spanArr[this.pos] += 1
|
|
|
+ data[i].group = data[i - 1].group
|
|
|
+ this.spanArr.push(0)
|
|
|
} else {
|
|
|
- this.spanArr.push(1);
|
|
|
- this.pos = i;
|
|
|
- data[i].group = data[i - 1].group + 1;
|
|
|
+ this.spanArr.push(1)
|
|
|
+ this.pos = i
|
|
|
+ data[i].group = data[i - 1].group + 1
|
|
|
}
|
|
|
}
|
|
|
- this.totalCapacity = data[data.length - 1].group + 1;
|
|
|
- this.totalNumber = data.reduce(function (prev, item) {
|
|
|
- return prev + item.materialNum;
|
|
|
- }, 0);
|
|
|
+ this.totalCapacity = data[data.length - 1].group + 1
|
|
|
+ this.totalNumber = data.reduce(function(prev, item) {
|
|
|
+ return prev + item.materialNum
|
|
|
+ }, 0)
|
|
|
}
|
|
|
},
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
if (this.columnIndexs.indexOf(columnIndex) != -1) {
|
|
|
- const _row = this.spanArr[rowIndex];
|
|
|
- const _col = _row > 0 ? 1 : 0;
|
|
|
+ const _row = this.spanArr[rowIndex]
|
|
|
+ const _col = _row > 0 ? 1 : 0
|
|
|
return {
|
|
|
rowspan: _row,
|
|
|
- colspan: _col,
|
|
|
- };
|
|
|
+ colspan: _col
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
//减少物资件数
|
|
|
updateBillOrder(row) {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "修改物资件数中",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '修改物资件数中',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
let map = {
|
|
|
materialId: row.materialId,
|
|
|
- materialNum: row.materialNum,
|
|
|
- };
|
|
|
- let arr = [];
|
|
|
- arr.push(map);
|
|
|
+ materialNum: row.materialNum
|
|
|
+ }
|
|
|
+ let arr = []
|
|
|
+ arr.push(map)
|
|
|
let updateMap = {
|
|
|
orderId: row.orderId,
|
|
|
saleOrderId: row.saleOrderId,
|
|
|
saleOrderMaterialId: row.saleOrderMaterialId,
|
|
|
- mapList: arr,
|
|
|
- };
|
|
|
+ mapList: arr
|
|
|
+ }
|
|
|
this.axios
|
|
|
- .post("/api/v1/oms/updateMaterialMes", updateMap)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("修改物资数量成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/oms/updateMaterialMes', updateMap)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('修改物资数量成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("修改物资数量失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('修改物资数量失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("修改物资数量失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('修改物资数量失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
},
|
|
|
//关闭单条分录
|
|
|
closeEasEntryId(row) {
|
|
|
- console.log(row);
|
|
|
- this.$prompt("确定关闭该条分录吗?", "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
+ console.log(row)
|
|
|
+ this.$prompt('确定关闭该条分录吗?', '警告', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
center: true,
|
|
|
- inputPlaceholder: "请输入关闭理由",
|
|
|
+ inputPlaceholder: '请输入关闭理由'
|
|
|
})
|
|
|
.then(({ value }) => {
|
|
|
- if (value != null || value != "") {
|
|
|
+ if (value != null || value != '') {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
- text: "正在关闭该条分录",
|
|
|
- spinner: "el-icon-loading",
|
|
|
- background: "rgba(0, 0, 0, 0.7)",
|
|
|
- });
|
|
|
+ text: '正在关闭该条分录',
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ })
|
|
|
let map = {
|
|
|
orderId: row.orderId,
|
|
|
saleOrderMaterialId: row.saleOrderMaterialId,
|
|
|
saleMaterialId: row.saleMaterialId,
|
|
|
reason: value,
|
|
|
number: row.saleOrderNo,
|
|
|
- closeEntryId: row.closeEntryId,
|
|
|
- };
|
|
|
+ closeEntryId: row.closeEntryId
|
|
|
+ }
|
|
|
this.axios
|
|
|
- .post("/api/v1/ams/closeSteelMaterialId", map)
|
|
|
- .then((res) => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.$message.success("关闭成功");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ .post('/api/v1/ams/closeSteelMaterialId', map)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.$message.success('关闭成功')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
} else {
|
|
|
- this.$message.error("关闭失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
+ this.$message.error('关闭失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.error("关闭失败,请联系管理员");
|
|
|
- this.getSteelReport();
|
|
|
- loading.close();
|
|
|
- });
|
|
|
+ this.$message.error('关闭失败,请联系管理员')
|
|
|
+ this.getSteelReport()
|
|
|
+ loading.close()
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.$message.info("取消输入");
|
|
|
- });
|
|
|
+ this.$message.info('取消输入')
|
|
|
+ })
|
|
|
},
|
|
|
//查询,输入查询条件
|
|
|
onclick() {
|
|
|
- let startTime = null;
|
|
|
- let endTime = null;
|
|
|
- let carrierSsoId = null;
|
|
|
- let carrierName = null;
|
|
|
- let consigneeName = null;
|
|
|
- let capacityNo = null;
|
|
|
- let remark = null;
|
|
|
- let saler = null;
|
|
|
+ let startTime = null
|
|
|
+ let endTime = null
|
|
|
+ let carrierSsoId = null
|
|
|
+ let carrierName = null
|
|
|
+ let consigneeName = null
|
|
|
+ let capacityNo = null
|
|
|
+ let remark = null
|
|
|
+ let saler = null
|
|
|
if (this.startTime && this.endTime) {
|
|
|
- startTime = sjTime(this.startTime);
|
|
|
- endTime = sjTime(this.endTime);
|
|
|
+ startTime = sjTime(this.startTime)
|
|
|
+ endTime = sjTime(this.endTime)
|
|
|
}
|
|
|
- if (getCookie("orgCode") == "chengyunshang") {
|
|
|
- carrierSsoId = getCookie("userId");
|
|
|
+ if (getCookie('orgCode') == 'chengyunshang') {
|
|
|
+ carrierSsoId = getCookie('userId')
|
|
|
}
|
|
|
- if (getCookie("orgCode") == "xiaoshouyewuyuan") {
|
|
|
- saler = getCookie("loginName");
|
|
|
+ if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
+ saler = getCookie('loginName')
|
|
|
}
|
|
|
- if (this.screen == "下单客户") {
|
|
|
- consigneeName = this.input;
|
|
|
- } else if (this.screen == "承运商") {
|
|
|
- carrierName = this.input;
|
|
|
- } else if (this.screen == "车牌号") {
|
|
|
- capacityNo = this.input;
|
|
|
+ if (this.screen == '下单客户') {
|
|
|
+ consigneeName = this.input
|
|
|
+ } else if (this.screen == '承运商') {
|
|
|
+ carrierName = this.input
|
|
|
+ } else if (this.screen == '车牌号') {
|
|
|
+ capacityNo = this.input
|
|
|
} else {
|
|
|
- remark = this.input;
|
|
|
+ remark = this.input
|
|
|
}
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/tms/getInwardSaleSteelReport?startTime=" +
|
|
|
+ '/api/v1/tms/getInwardSaleSteelReport?startTime=' +
|
|
|
startTime +
|
|
|
- "&endTime=" +
|
|
|
+ '&endTime=' +
|
|
|
endTime +
|
|
|
- "&carrierSsoId=" +
|
|
|
+ '&carrierSsoId=' +
|
|
|
carrierSsoId +
|
|
|
- "&i=" +
|
|
|
+ '&i=' +
|
|
|
new Date() +
|
|
|
- "&remark=" +
|
|
|
+ '&remark=' +
|
|
|
remark +
|
|
|
- "&consigneeName=" +
|
|
|
+ '&consigneeName=' +
|
|
|
consigneeName +
|
|
|
- "&carrierName=" +
|
|
|
+ '&carrierName=' +
|
|
|
carrierName +
|
|
|
- "&capacityNo=" +
|
|
|
+ '&capacityNo=' +
|
|
|
capacityNo +
|
|
|
- "&saler=" +
|
|
|
+ '&saler=' +
|
|
|
saler
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- this.tableData = res.data.data;
|
|
|
- this.getSpanArr(res.data.data);
|
|
|
- });
|
|
|
+ .then(res => {
|
|
|
+ this.tableData = res.data.data
|
|
|
+ this.getSpanArr(res.data.data)
|
|
|
+ })
|
|
|
},
|
|
|
//重新获取表格数据
|
|
|
refresh() {
|
|
|
- this.getSteelReport();
|
|
|
+ this.getSteelReport()
|
|
|
},
|
|
|
//获取钢材统计报表
|
|
|
getSteelReport() {
|
|
|
- let carrierSsoId = null;
|
|
|
- let saler = null;
|
|
|
- if (getCookie("orgCode") == "chengyunshang") {
|
|
|
- carrierSsoId = getCookie("userId");
|
|
|
+ let carrierSsoId = null
|
|
|
+ let saler = null
|
|
|
+ if (getCookie('orgCode') == 'chengyunshang') {
|
|
|
+ carrierSsoId = getCookie('userId')
|
|
|
}
|
|
|
- if (getCookie("orgCode") == "xiaoshouyewuyuan") {
|
|
|
- saler = getCookie("loginName");
|
|
|
+ if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
+ saler = getCookie('loginName')
|
|
|
}
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/tms/getInwardSaleSteelReport?startTime=" +
|
|
|
+ '/api/v1/tms/getInwardSaleSteelReport?startTime=' +
|
|
|
null +
|
|
|
- "&endTime=" +
|
|
|
+ '&endTime=' +
|
|
|
null +
|
|
|
- "&carrierSsoId=" +
|
|
|
+ '&carrierSsoId=' +
|
|
|
carrierSsoId +
|
|
|
- "&saler=" +
|
|
|
+ '&saler=' +
|
|
|
saler +
|
|
|
- "&i=" +
|
|
|
+ '&i=' +
|
|
|
new Date()
|
|
|
)
|
|
|
- .then((res) => {
|
|
|
- this.tableData = res.data.data;
|
|
|
- this.getSpanArr(res.data.data);
|
|
|
- });
|
|
|
+ .then(res => {
|
|
|
+ this.tableData = res.data.data
|
|
|
+ this.getSpanArr(res.data.data)
|
|
|
+ })
|
|
|
},
|
|
|
//控制列自动撑开
|
|
|
flexColumnWidth(str, tableData, flag) {
|
|
|
// str为该列的字段名(传字符串);tableData为该表格的数据源(传变量);
|
|
|
// flag为可选值,可不传该参数,传参时可选'max'或'equal',默认为'max'
|
|
|
// flag为'max'则设置列宽适配该列中最长的内容,flag为'equal'则设置列宽适配该列中第一行内容的长度。
|
|
|
- str = str + "";
|
|
|
- let columnContent = "";
|
|
|
+ str = str + ''
|
|
|
+ let columnContent = ''
|
|
|
if (
|
|
|
!tableData ||
|
|
|
!tableData.length ||
|
|
|
tableData.length === 0 ||
|
|
|
tableData === undefined
|
|
|
) {
|
|
|
- return;
|
|
|
+ return
|
|
|
}
|
|
|
if (!str || !str.length || str.length === 0 || str === undefined) {
|
|
|
- return;
|
|
|
+ return
|
|
|
}
|
|
|
- if (flag === "equal") {
|
|
|
+ if (flag === 'equal') {
|
|
|
// 获取该列中第一个不为空的数据(内容)
|
|
|
for (let i = 0; i < tableData.length; i++) {
|
|
|
if (tableData[i][str].length > 0) {
|
|
|
- columnContent = tableData[i][str] + "";
|
|
|
- break;
|
|
|
+ columnContent = tableData[i][str] + ''
|
|
|
+ break
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
// 获取该列中最长的数据(内容)
|
|
|
- let index = 0;
|
|
|
+ let index = 0
|
|
|
for (let i = 0; i < tableData.length; i++) {
|
|
|
if (tableData[i][str] === null) {
|
|
|
// 当数据为空时跳过本次循环获取下一条数据长度
|
|
|
- continue;
|
|
|
+ continue
|
|
|
}
|
|
|
- const now_temp = tableData[i][str] + "";
|
|
|
- const max_temp = tableData[index][str] + "";
|
|
|
+ const now_temp = tableData[i][str] + ''
|
|
|
+ const max_temp = tableData[index][str] + ''
|
|
|
if (now_temp.length > max_temp.length) {
|
|
|
- index = i;
|
|
|
+ index = i
|
|
|
}
|
|
|
}
|
|
|
- columnContent = tableData[index][str] + "";
|
|
|
+ columnContent = tableData[index][str] + ''
|
|
|
} // 以下分配的单位长度可根据实际需求进行调整
|
|
|
- let flexWidth = 0;
|
|
|
+ let flexWidth = 0
|
|
|
if (columnContent != undefined) {
|
|
|
for (const char of columnContent) {
|
|
|
- if ((char >= "A" && char <= "Z") || (char >= "a" && char <= "z")) {
|
|
|
+ if ((char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z')) {
|
|
|
// 如果是英文字符,为字符分配10个单位宽度
|
|
|
- flexWidth += 10;
|
|
|
- } else if (char >= "\u4e00" && char <= "\u9fa5") {
|
|
|
+ flexWidth += 10
|
|
|
+ } else if (char >= '\u4e00' && char <= '\u9fa5') {
|
|
|
// 如果是中文字符,为字符分配16个单位宽度
|
|
|
- flexWidth += 14;
|
|
|
+ flexWidth += 14
|
|
|
} else {
|
|
|
// 其他种类字符,为字符分配10个单位宽度
|
|
|
- flexWidth += 10;
|
|
|
+ flexWidth += 10
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (flexWidth < 80) {
|
|
|
// 设置最小宽度
|
|
|
- flexWidth = 80;
|
|
|
+ flexWidth = 80
|
|
|
}
|
|
|
if (flexWidth > 500) {
|
|
|
// 设置最大宽度
|
|
|
- flexWidth = 500;
|
|
|
+ flexWidth = 500
|
|
|
}
|
|
|
- return flexWidth + "px";
|
|
|
+ return flexWidth + 'px'
|
|
|
},
|
|
|
//多拼弹出层
|
|
|
- showDialog(){
|
|
|
- let selection=this.$refs.tableRef.selection;
|
|
|
- console.log("selection",selection);
|
|
|
- if(selection && selection.length>0){
|
|
|
- if(selection.find(item=>item.lineId != selection[0].lineId || item.saleOrderId!=selection[0].saleOrderId)){
|
|
|
- this.$message({
|
|
|
- message:"无法生成多拼,订单或者线路不一致",
|
|
|
- type:"warning"
|
|
|
- });
|
|
|
- return;
|
|
|
+ showDialog() {
|
|
|
+ let selection = this.$refs.tableRef.selection
|
|
|
+ console.log('selection', selection)
|
|
|
+ if (selection && selection.length > 0) {
|
|
|
+ if (
|
|
|
+ selection.find(
|
|
|
+ item =>
|
|
|
+ item.lineId != selection[0].lineId ||
|
|
|
+ item.saleOrderId != selection[0].saleOrderId
|
|
|
+ )
|
|
|
+ ) {
|
|
|
+ this.$message({
|
|
|
+ message: '无法生成多拼,订单或者线路不一致',
|
|
|
+ type: 'warning'
|
|
|
+ })
|
|
|
+ return
|
|
|
}
|
|
|
- this.dialogTableVisible=true;
|
|
|
- this.selection=selection;
|
|
|
- this.capacityNo=selection[0].capacityNo;
|
|
|
- }else{
|
|
|
+ this.dialogTableVisible = true
|
|
|
+ this.selection = selection
|
|
|
+ this.capacityNo = selection[0].capacityNo
|
|
|
+ } else {
|
|
|
this.$message({
|
|
|
- message:"请先勾选再生成多拼",
|
|
|
- type:"warning"
|
|
|
- });
|
|
|
+ message: '请先勾选再生成多拼',
|
|
|
+ type: 'warning'
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
- handleSelectConsignee(item) {
|
|
|
- this.consigneeName = item.consigneeCompanyName;
|
|
|
- this.consigneeId = item.consigneeId;
|
|
|
- this.isReceiveHaveArea(this.consigneeId);
|
|
|
+ handleSelectConsignee(item) {
|
|
|
+ this.consigneeName = item.consigneeCompanyName
|
|
|
+ this.consigneeId = item.consigneeId
|
|
|
+ this.isReceiveHaveArea(this.consigneeId)
|
|
|
//带出摘要
|
|
|
this.axios
|
|
|
- .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
|
|
|
+ .post('/api/v1/uc/getSaleArea?receiveId=' + this.consigneeId)
|
|
|
.then(res => {
|
|
|
- this.remarks = res.data.data;
|
|
|
- });
|
|
|
+ this.remarks = res.data.data
|
|
|
+ })
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/ams/matchingAddressRecently?receiveId=" + this.consigneeId
|
|
|
+ '/api/v1/ams/matchingAddressRecently?receiveId=' + this.consigneeId
|
|
|
)
|
|
|
.then(res => {
|
|
|
- const place = res.data.data;
|
|
|
- console.log(place);
|
|
|
+ const place = res.data.data
|
|
|
+ console.log(place)
|
|
|
this.saleShipperAddressName =
|
|
|
place[0].addressProvince +
|
|
|
place[0].addressDistrict +
|
|
|
place[0].addressTown +
|
|
|
- place[0].place;
|
|
|
- this.saleShipperAddressId = place[0].shipperAddressId;
|
|
|
- this.addressId = place[0].shipperAddressId;
|
|
|
- this.place1 = place[0].place;
|
|
|
- this.saleMan = place[0].salerId;
|
|
|
- this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
|
|
|
- this.province = place[0].addressProvince;
|
|
|
- this.city = place[0].addressDistrict;
|
|
|
- this.county = place[0].addressTown;
|
|
|
- });
|
|
|
+ place[0].place
|
|
|
+ this.saleShipperAddressId = place[0].shipperAddressId
|
|
|
+ this.addressId = place[0].shipperAddressId
|
|
|
+ this.place1 = place[0].place
|
|
|
+ this.saleMan = place[0].salerId
|
|
|
+ this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel
|
|
|
+ this.province = place[0].addressProvince
|
|
|
+ this.city = place[0].addressDistrict
|
|
|
+ this.county = place[0].addressTown
|
|
|
+ })
|
|
|
},
|
|
|
- //以下是下单客户边输边查搜索
|
|
|
+ //以下是下单客户边输边查搜索
|
|
|
querySearchConsignee(queryString, cb) {
|
|
|
this.axios
|
|
|
- .post("/api/v1/uc/getConsigneeByLike?index=" + queryString)
|
|
|
+ .post('/api/v1/uc/getConsigneeByLike?index=' + queryString)
|
|
|
.then(res => {
|
|
|
- if (res.data.code == "200") {
|
|
|
- this.consignee = res.data.data;
|
|
|
- var restaurantsConsignee = res.data.data;
|
|
|
+ if (res.data.code == '200') {
|
|
|
+ this.consignee = res.data.data
|
|
|
+ var restaurantsConsignee = res.data.data
|
|
|
var results = queryString
|
|
|
- ? restaurantsConsignee.filter(
|
|
|
- this.createFilter1(queryString)
|
|
|
- )
|
|
|
- : restaurantsConsignee;
|
|
|
+ ? restaurantsConsignee.filter(this.createFilter1(queryString))
|
|
|
+ : restaurantsConsignee
|
|
|
// 调用 callback 返回建议列表的数据
|
|
|
- cb(results);
|
|
|
+ cb(results)
|
|
|
}
|
|
|
- });
|
|
|
- },
|
|
|
- },
|
|
|
-};
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|