|
@@ -3,39 +3,35 @@
|
|
|
<div id="contractDetails">
|
|
|
<page-title>运输预约</page-title>
|
|
|
|
|
|
- <div class="main">
|
|
|
- <el-divider content-position="left">新增运输预约</el-divider>
|
|
|
- </div>
|
|
|
-
|
|
|
<div class="material from">
|
|
|
<span class="text">物资:</span>
|
|
|
- <el-input v-model="materialName" disabled> </el-input>
|
|
|
+ <el-input class="input" v-model="materialName" disabled> </el-input>
|
|
|
<el-button type="primary" @click="ondrawer(1)">浏览</el-button>
|
|
|
</div>
|
|
|
|
|
|
<div class="forwardingUnit from">
|
|
|
<span class="text">发货单位:</span>
|
|
|
- <el-input v-model="supplierName" disabled> </el-input>
|
|
|
+ <el-input class="input" v-model="supplierName" disabled> </el-input>
|
|
|
<el-button type="primary" @click="ondrawer(2)">浏览</el-button>
|
|
|
</div>
|
|
|
<div class="remark from">
|
|
|
<span class="text">船名:</span>
|
|
|
- <el-input v-model="remark" @blur="onBlur"> </el-input>
|
|
|
+ <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
|
|
|
<span class="span"></span>
|
|
|
</div>
|
|
|
<div class="forwardingUnit from">
|
|
|
<span class="text">卸货点:</span>
|
|
|
- <el-input v-model="unloadPointName" disabled> </el-input>
|
|
|
+ <el-input class="input" v-model="unloadPointName" disabled> </el-input>
|
|
|
<el-button type="primary" @click="ondrawer(4)">浏览</el-button>
|
|
|
</div>
|
|
|
<div class="lineId from">
|
|
|
<span class="text">选择路线:</span>
|
|
|
- <el-input v-model="lineName" disabled> </el-input>
|
|
|
+ <el-input class="input" v-model="lineName" disabled> </el-input>
|
|
|
<el-button type="primary" @click="ondrawer(5)">浏览</el-button>
|
|
|
</div>
|
|
|
<div class="orderType from">
|
|
|
<span class="text">订单类别:</span>
|
|
|
- <el-select v-model="orderType" placeholder="请选择">
|
|
|
+ <el-select v-model="orderType" placeholder="请选择" disabled>
|
|
|
<el-option
|
|
|
v-for="item in orderTypeList"
|
|
|
:key="item.value"
|
|
@@ -44,6 +40,7 @@
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
+ <span class="span"></span>
|
|
|
</div>
|
|
|
<div class="contractTitle from">
|
|
|
<dil-form :formId="219" v-model="form1"></dil-form>
|
|
@@ -56,26 +53,6 @@
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- 车辆表格 -->
|
|
|
- <div class="switch" v-if="selectionList.length > 0">
|
|
|
- <el-tooltip placement="top">
|
|
|
- <div slot="content">下面表格已有数据,不能进行更改!!!</div>
|
|
|
- <el-switch
|
|
|
- v-model="value"
|
|
|
- active-text="重量"
|
|
|
- inactive-text="件数"
|
|
|
- disabled
|
|
|
- >
|
|
|
- </el-switch>
|
|
|
- </el-tooltip>
|
|
|
- </div>
|
|
|
- <div class="switch" v-else>
|
|
|
- <el-tooltip placement="top">
|
|
|
- <div slot="content">当下面表格有数据之后,将不能进行更改!!!</div>
|
|
|
- <el-switch v-model="value" active-text="重量" inactive-text="件数">
|
|
|
- </el-switch>
|
|
|
- </el-tooltip>
|
|
|
- </div>
|
|
|
<div class="truckListTable">
|
|
|
<el-table
|
|
|
:data="selectionList"
|
|
@@ -93,20 +70,12 @@
|
|
|
align="center"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
- <template slot="scope" v-if="item.th_name !== '件数'">
|
|
|
- <span>{{ item.label }}</span>
|
|
|
- </template>
|
|
|
<template slot="scope" v-if="item.th_name !== '重量'">
|
|
|
<span>{{ item.label }}</span>
|
|
|
</template>
|
|
|
<!-- 插入输入框 -->
|
|
|
<template slot-scope="scope">
|
|
|
<template v-if="item.slot">
|
|
|
- <template v-if="item.prop == 'orderMaterialNumber'">
|
|
|
- <el-input
|
|
|
- v-model.number="scope.row.orderMaterialNumber"
|
|
|
- ></el-input>
|
|
|
- </template>
|
|
|
<template v-if="item.prop == 'orderMaterialWeight'">
|
|
|
<el-input
|
|
|
v-model.number="scope.row.orderMaterialWeight"
|
|
@@ -133,7 +102,7 @@
|
|
|
<el-input
|
|
|
placeholder="请输入内容"
|
|
|
v-model="input"
|
|
|
- style="margin-top: 0.625rem; margin-left: 1.25rem"
|
|
|
+ style="margin-top: 0.625rem; margin-left: 1.25rem;width:10rem"
|
|
|
clearable
|
|
|
></el-input>
|
|
|
<el-button
|
|
@@ -183,7 +152,7 @@
|
|
|
</template>
|
|
|
<script>
|
|
|
import PageTitle from "@/components/Page/Title";
|
|
|
-
|
|
|
+import { sjTime,isNumber,isIntegerNumber } from '@/js/sharedJsFile'
|
|
|
export default {
|
|
|
components: { PageTitle },
|
|
|
data() {
|
|
@@ -219,8 +188,8 @@ export default {
|
|
|
width: "140",
|
|
|
},
|
|
|
{
|
|
|
- prop: "orderMaterialNumber",
|
|
|
- label: "件数",
|
|
|
+ prop: "orderMaterialWeight",
|
|
|
+ label: "重量",
|
|
|
slot: true,
|
|
|
},
|
|
|
],
|
|
@@ -245,7 +214,7 @@ export default {
|
|
|
//卸货点名称
|
|
|
unloadPointName: "",
|
|
|
//订单类别
|
|
|
- orderType:6,
|
|
|
+ orderType:null,
|
|
|
a: 1,
|
|
|
direction: "rtl",
|
|
|
input: "",
|
|
@@ -275,25 +244,6 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
- watch: {
|
|
|
- value() {
|
|
|
- if (this.value) {
|
|
|
- this.tableTop.splice(this.tableTop.length - 1, 1);
|
|
|
- this.tableTop.push({
|
|
|
- prop: "orderMaterialWeight",
|
|
|
- label: "重量",
|
|
|
- slot: true,
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.tableTop.splice(this.tableTop.length - 1, 1);
|
|
|
- this.tableTop.push({
|
|
|
- prop: "orderMaterialNumber",
|
|
|
- label: "件数",
|
|
|
- slot: true,
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- },
|
|
|
methods: {
|
|
|
onClick(index) {
|
|
|
this.selectionList.splice(index, 1);
|
|
@@ -321,9 +271,15 @@ export default {
|
|
|
});
|
|
|
this.form1 = [];
|
|
|
} else {
|
|
|
+ console.log()
|
|
|
this.remark = res.data.data.remark;
|
|
|
this.purchaseOrderId = res.data.data.purchaseOrderId;
|
|
|
this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
|
|
|
+ if(res.data.data.receiveUnitId == 1){
|
|
|
+ this.orderType = 6
|
|
|
+ }else{
|
|
|
+ this.orderType = 7
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
this.$message.error("请求失败");
|
|
@@ -347,7 +303,7 @@ export default {
|
|
|
"/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
|
|
|
this.input;
|
|
|
} else if (a == 4) {
|
|
|
- this.third.requestUrl =
|
|
|
+ this.unloadPoint.requestUrl =
|
|
|
"/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
|
|
|
} else if (a == 5) {
|
|
|
this.option.requestUrl =
|
|
@@ -442,33 +398,27 @@ export default {
|
|
|
state = 0;
|
|
|
} else {
|
|
|
this.selectionList.forEach((e) => {
|
|
|
- if (e.orderMaterialNumber || e.orderMaterialWeight) {
|
|
|
- if (
|
|
|
- isNumber(e.orderMaterialNumber) ||
|
|
|
- isNumber(e.orderMaterialWeight)
|
|
|
- ) {
|
|
|
- if (
|
|
|
- isIntegerNumber(e.orderMaterialNumber) ||
|
|
|
- isIntegerNumber(e.orderMaterialWeight)
|
|
|
- ) {
|
|
|
+ if (e.orderMaterialWeight) {
|
|
|
+ if (isNumber(e.orderMaterialWeight)) {
|
|
|
+ if (isIntegerNumber(e.orderMaterialWeight)) {
|
|
|
state = 1;
|
|
|
} else {
|
|
|
this.$message({
|
|
|
- message: "件数(重量)只能是整数!",
|
|
|
+ message: "重量只能是整数!",
|
|
|
type: "warning",
|
|
|
});
|
|
|
state = 0;
|
|
|
}
|
|
|
} else {
|
|
|
this.$message({
|
|
|
- message: "件数(重量)只能是数字!",
|
|
|
+ message: "重量只能是数字!",
|
|
|
type: "warning",
|
|
|
});
|
|
|
state = 0;
|
|
|
}
|
|
|
} else {
|
|
|
this.$message({
|
|
|
- message: "件数(重量)不能为空!",
|
|
|
+ message: "重量不能为空!",
|
|
|
type: "warning",
|
|
|
});
|
|
|
state = 0;
|
|
@@ -515,47 +465,73 @@ export default {
|
|
|
margin-bottom: 1.25rem;
|
|
|
}
|
|
|
.remark {
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
.text {
|
|
|
display: inline-block;
|
|
|
- width: 5.625rem;
|
|
|
+ width: 6.875rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
+ .input{
|
|
|
+ width: 11.25rem;
|
|
|
+ margin-right: 1.25rem;
|
|
|
+ }
|
|
|
+ .span{
|
|
|
+ display: inline-block;
|
|
|
+ width: 3.125rem;height: 0.0625rem;
|
|
|
+ }
|
|
|
}
|
|
|
.lineId {
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
.text {
|
|
|
display: inline-block;
|
|
|
- width: 10rem;
|
|
|
+ width: 6.875rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
+ .input{
|
|
|
+ width: 12.5rem;
|
|
|
+ margin-right: 1.25rem;
|
|
|
+ }
|
|
|
}
|
|
|
.material {
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
.text {
|
|
|
display: inline-block;
|
|
|
- width: 10rem;
|
|
|
+ width: 6.875rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
+ .input{
|
|
|
+ width: 12.5rem;
|
|
|
+ margin-right: 1.25rem;
|
|
|
+ }
|
|
|
}
|
|
|
.orderType{
|
|
|
- .text{
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ .text {
|
|
|
display: inline-block;
|
|
|
- width: 5.625rem;
|
|
|
+ width: 5rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
-}
|
|
|
-.switch {
|
|
|
- width: 100%;
|
|
|
- height: 2.5rem;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: flex-end;
|
|
|
- padding-right: 6.875rem;
|
|
|
+ .span{
|
|
|
+ display: inline-block;
|
|
|
+ width: 4.375rem;height: 0.625rem;
|
|
|
+ }
|
|
|
}
|
|
|
.forwardingUnit {
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
.text {
|
|
|
display: inline-block;
|
|
|
- width: 10rem;
|
|
|
+ width: 6.875rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
+ .input{
|
|
|
+ width: 12.5rem;
|
|
|
+ margin-right: 1.25rem;
|
|
|
+ }
|
|
|
}
|
|
|
.truckList1 {
|
|
|
width: 100%;
|
|
@@ -567,7 +543,7 @@ export default {
|
|
|
text-align: right;
|
|
|
}
|
|
|
.truckBtn {
|
|
|
- width: 17.5rem;
|
|
|
+ width: 200px;
|
|
|
}
|
|
|
}
|
|
|
}
|