|
@@ -602,6 +602,7 @@
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ {{ vehicleList }}
|
|
|
<el-table :data="vehicleList">
|
|
|
<el-table-column
|
|
|
label="箱型"
|
|
@@ -732,6 +733,12 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="运单号"
|
|
|
+ align="center"
|
|
|
+ prop="orderNo"
|
|
|
+ width="100"
|
|
|
+ />
|
|
|
<el-table-column label="备注" align="center" prop="remarks">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
@@ -815,7 +822,7 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
- icon="el-icon-document-delete"
|
|
|
+ icon="el-icon-document-checked"
|
|
|
@click.native.prevent="selectStowage(scope.row)"
|
|
|
v-if="schedulingList[0].transProp == '1'"
|
|
|
:disabled="scope.row.mBillNo"
|
|
@@ -826,7 +833,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-document-delete"
|
|
|
- @click.native.prevent="changescarsRow(scope.row)"
|
|
|
+ @click.native.prevent="changeStowageRow(scope.row)"
|
|
|
v-if="schedulingList[0].transProp == '1'"
|
|
|
:disabled="!scope.row.mBillNo"
|
|
|
v-hasPermi="['fleet:ftmsorderbillscars:edit']"
|
|
@@ -1371,6 +1378,32 @@
|
|
|
<!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
|
|
|
<el-button @click="showDialog = false">取 消</el-button>
|
|
|
</span>
|
|
|
+ <el-dialog
|
|
|
+ width="70%"
|
|
|
+ title="配载表"
|
|
|
+ :visible.sync="stowageDialog"
|
|
|
+ append-to-body
|
|
|
+ >
|
|
|
+ <span>
|
|
|
+ <el-table
|
|
|
+ :data="stowageList"
|
|
|
+ style="width: 100%"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ ref="multipleTable"
|
|
|
+ @row-click="handleRowClick"
|
|
|
+ >
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
+ <el-table-column prop="mblno" label="提单号" />
|
|
|
+ <el-table-column prop="orderNo" label="运单号" />
|
|
|
+ <el-table-column prop="loadAddr" label="提箱地点" />
|
|
|
+ <el-table-column prop="loadDate" label="提箱时间" />
|
|
|
+ </el-table>
|
|
|
+ </span>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="stowageForm">确认</el-button>
|
|
|
+ <el-button @click="stowageDialog = false">取 消</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
|
|
@@ -1389,7 +1422,9 @@ import {
|
|
|
changeFtmsorderbillscars,
|
|
|
addFtmsorderbillscars,
|
|
|
singleChangeFtmsorderbillscars,
|
|
|
- selectStowage
|
|
|
+ selectStowage,
|
|
|
+ addStowage,
|
|
|
+ revokeStowage,
|
|
|
} from "@/api/fleet/ftmsorderbillscars";
|
|
|
import { getBasicInformation } from "@/api/kaihe/basicdata/container";
|
|
|
import { company } from "@/api/fleet/carManage";
|
|
@@ -1447,6 +1482,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ multipleSelection: [],
|
|
|
companyList: [],
|
|
|
lbStatus: {},
|
|
|
dcList: [
|
|
@@ -1522,10 +1558,12 @@ export default {
|
|
|
polList: [],
|
|
|
podList: [],
|
|
|
collapses2: [],
|
|
|
+ stowageSelection: [],
|
|
|
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
|
|
|
headers: {
|
|
|
Authorization: "Bearer " + getToken(),
|
|
|
},
|
|
|
+ addStowagData: "",
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -1579,6 +1617,48 @@ export default {
|
|
|
this.username = Cookies.get("userName");
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeStowageRow(row) {
|
|
|
+ revokeStowage(row.id).then((response) => {
|
|
|
+ if (response.code == 200) {
|
|
|
+ this.msgSuccess("配载撤销成功");
|
|
|
+ this.$set(row, "mBillNo", response.data.mBillNo);
|
|
|
+ this.$set(row, "billKind", response.data.billKind);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ handleSelectionChange(val) {
|
|
|
+ if (val.length > 1) {
|
|
|
+ this.$refs.multipleTable.clearSelection();
|
|
|
+ this.$refs.multipleTable.toggleRowSelection(val.pop());
|
|
|
+ } else {
|
|
|
+ this.addStowagData = val[0];
|
|
|
+ }
|
|
|
+ },
|
|
|
+ handleRowClick(row) {
|
|
|
+ this.$refs.multipleTable.toggleRowSelection(row);
|
|
|
+ },
|
|
|
+ stowageForm() {
|
|
|
+ if (this.addStowagData) {
|
|
|
+ addStowage({
|
|
|
+ mBillNo: this.addStowagData.orderNo,
|
|
|
+ id: this.addStowagData.id,
|
|
|
+ }).then((response) => {
|
|
|
+ if (response.code == 200) {
|
|
|
+ this.msgSuccess("配载成功");
|
|
|
+ this.stowageDialog = false;
|
|
|
+ let row = response.data;
|
|
|
+ this.vehicleList.map((e) => {
|
|
|
+ if (e.id == row.id) {
|
|
|
+ e.mBillNo = row.mBillNo;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.addStowagData = "";
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择一条配载信息");
|
|
|
+ }
|
|
|
+ },
|
|
|
carChange(row) {
|
|
|
let arr = [];
|
|
|
arr = this.carManages.filter((e) => e.carNum == row.carregNo);
|
|
@@ -1656,7 +1736,7 @@ export default {
|
|
|
addRow2(tableData, event) {
|
|
|
tableData.push({
|
|
|
cntrId: this.schedulingList[0].cntrId,
|
|
|
- pid: this.schedulingList[0].id,
|
|
|
+ pId: this.schedulingList[0].id,
|
|
|
carcorPid: this.schedulingList[0].carcorPid,
|
|
|
freightPriceDr: this.schedulingList[0].freightPriceDr,
|
|
|
freightPriceCr: this.schedulingList[0].freightPriceCr,
|