|
|
@@ -41,7 +41,7 @@
|
|
|
<el-tabs v-model="activeName">
|
|
|
<!-- 未接收 -->
|
|
|
<el-tab-pane label="未接收" name="third">
|
|
|
- <dilTable
|
|
|
+ <MergeRowTable
|
|
|
v-bind.sync="option3"
|
|
|
@selection-change="selectionChange"
|
|
|
ref="table2"
|
|
|
@@ -93,11 +93,11 @@
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- </dilTable>
|
|
|
+ </MergeRowTable>
|
|
|
</el-tab-pane>
|
|
|
<!-- 已接收 -->
|
|
|
<el-tab-pane label="已接收" name="first">
|
|
|
- <dilTable
|
|
|
+ <MergeRowTable
|
|
|
v-bind.sync="option1"
|
|
|
ref="table"
|
|
|
:isHeigth="isHeigth"
|
|
|
@@ -141,11 +141,11 @@
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- </dilTable>
|
|
|
+ </MergeRowTable>
|
|
|
</el-tab-pane>
|
|
|
<!-- 已拒绝 -->
|
|
|
<el-tab-pane label="已拒绝" name="second">
|
|
|
- <dilTable
|
|
|
+ <MergeRowTable
|
|
|
v-bind.sync="option2"
|
|
|
ref="table1"
|
|
|
:isHeigth="isHeigth"
|
|
|
@@ -182,7 +182,7 @@
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- </dilTable>
|
|
|
+ </MergeRowTable>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
@@ -203,12 +203,16 @@ export default {
|
|
|
requestUrl:
|
|
|
"/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
|
|
|
"",
|
|
|
+ comparison: "orderNumber",
|
|
|
+ columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
|
|
|
},
|
|
|
option2: {
|
|
|
// option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
|
|
|
requestUrl:
|
|
|
"/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
|
|
|
"",
|
|
|
+ comparison: "orderNumber",
|
|
|
+ columnIndexs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
|
|
|
},
|
|
|
option3: {
|
|
|
// option3请求数据的地址
|
|
|
@@ -217,10 +221,12 @@ export default {
|
|
|
"",
|
|
|
selectionType: "select",
|
|
|
mapList: [],
|
|
|
+ comparison: "orderNumber",
|
|
|
+ columnIndexs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
|
|
|
},
|
|
|
truck: {
|
|
|
requestUrl: "",
|
|
|
- selectionType: "radio",
|
|
|
+ selectionType: "radio"
|
|
|
},
|
|
|
activeName: "third",
|
|
|
//记录旧的row对象(已接收)
|
|
|
@@ -239,30 +245,30 @@ export default {
|
|
|
{
|
|
|
prop: "materialName",
|
|
|
label: "物资名称",
|
|
|
- width: 150,
|
|
|
+ width: 150
|
|
|
},
|
|
|
{
|
|
|
prop: "specificationModel",
|
|
|
label: "规格型号",
|
|
|
- width: 150,
|
|
|
+ width: 150
|
|
|
},
|
|
|
{
|
|
|
prop: "materialNumber",
|
|
|
label: "物资件数",
|
|
|
- width: 100,
|
|
|
+ width: 100
|
|
|
},
|
|
|
{
|
|
|
prop: "materialWeight",
|
|
|
label: "物资重量",
|
|
|
- width: 100,
|
|
|
- },
|
|
|
+ width: 100
|
|
|
+ }
|
|
|
],
|
|
|
tableData: [],
|
|
|
tableData1: [],
|
|
|
tableData2: [],
|
|
|
capacityId: null,
|
|
|
dialogTableVisible: false,
|
|
|
- orderId: null,
|
|
|
+ orderId: null
|
|
|
};
|
|
|
},
|
|
|
|
|
|
@@ -361,34 +367,34 @@ export default {
|
|
|
if (this.option3.mapList.length == 0) {
|
|
|
this.$message({
|
|
|
type: "warning",
|
|
|
- message: "请先选择要关闭的订单!",
|
|
|
+ message: "请先选择要关闭的订单!"
|
|
|
});
|
|
|
} else {
|
|
|
this.$confirm("是否关闭这些订单", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
|
|
- center: true,
|
|
|
+ center: true
|
|
|
})
|
|
|
.then(() => {
|
|
|
//初始化maplist
|
|
|
var mapList = [];
|
|
|
- this.option3.mapList.forEach((item) => {
|
|
|
+ this.option3.mapList.forEach(item => {
|
|
|
//初始化mapItem
|
|
|
var mapItem = {
|
|
|
//销售订单物资中间表id
|
|
|
- orderId: 0,
|
|
|
+ orderId: 0
|
|
|
};
|
|
|
mapItem.orderId = item.orderId;
|
|
|
mapList.push(mapItem);
|
|
|
});
|
|
|
this.$message({
|
|
|
type: "success",
|
|
|
- message: "关闭成功!",
|
|
|
+ message: "关闭成功!"
|
|
|
});
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/batchCloseOrder", mapList)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
if (res.data.code == "200") {
|
|
|
this.getRequestUrl();
|
|
|
}
|
|
|
@@ -397,7 +403,7 @@ export default {
|
|
|
.catch(() => {
|
|
|
this.$message({
|
|
|
type: "info",
|
|
|
- message: "取消关闭!",
|
|
|
+ message: "取消关闭!"
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
@@ -449,9 +455,9 @@ export default {
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/updateCapacityId", {
|
|
|
capacityId: this.capacityId,
|
|
|
- orderId: this.orderId,
|
|
|
+ orderId: this.orderId
|
|
|
})
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
if (res.data.code == "200") {
|
|
|
this.$message.success("修改运力成功");
|
|
|
this.getRequestUrl();
|
|
|
@@ -537,7 +543,7 @@ export default {
|
|
|
// 根据销售订单id查询物资信息
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
console.log("res.data.data", res.data.data);
|
|
|
this.tableData = res.data.data;
|
|
|
});
|
|
|
@@ -569,7 +575,7 @@ export default {
|
|
|
// 根据销售订单物资中间表id查询物资信息
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
console.log("res.data.data", res.data.data);
|
|
|
this.tableData1 = res.data.data;
|
|
|
});
|
|
|
@@ -601,7 +607,7 @@ export default {
|
|
|
// 根据销售订单物资中间表id查询物资信息
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
this.tableData2 = res.data.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -611,17 +617,17 @@ export default {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
|
|
- center: true,
|
|
|
+ center: true
|
|
|
})
|
|
|
.then(() => {
|
|
|
this.axios
|
|
|
.post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
if (res.data.code == "200") {
|
|
|
this.getRequestUrl();
|
|
|
this.$message({
|
|
|
type: "success",
|
|
|
- message: "关闭成功!",
|
|
|
+ message: "关闭成功!"
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
@@ -629,11 +635,11 @@ export default {
|
|
|
.catch(() => {
|
|
|
this.$message({
|
|
|
type: "info",
|
|
|
- message: "取消关闭!",
|
|
|
+ message: "取消关闭!"
|
|
|
});
|
|
|
});
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scode>
|
luobang