|
|
@@ -91,18 +91,18 @@
|
|
|
<!-- <el-button type="primary" @click="batchoperation()"
|
|
|
><i class="el-icon-edit"></i>批量更改</el-button
|
|
|
> -->
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
type="primary"
|
|
|
@click="checkPoint()"
|
|
|
v-if="!notRoutList.includes('checkPoint')"
|
|
|
><i class="el-icon-map-location"></i>实时路径</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-if="isShowOperate">
|
|
|
+ <!-- <el-form-item v-if="isShowOperate">
|
|
|
<el-button type="primary" @click="openReceive()">
|
|
|
<i class="el-icon-document"></i>签收抵达</el-button
|
|
|
>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item>
|
|
|
<label
|
|
|
class="el-form-item__label"
|
|
|
@@ -412,166 +412,19 @@
|
|
|
<div class="steelMapClass2">
|
|
|
<div class="steelMapClass22">
|
|
|
<span>收货地址:</span>
|
|
|
- <el-select
|
|
|
- v-model="steelMap.addressProvince"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- @change="onchangeProvince"
|
|
|
- style="width:120px"
|
|
|
- :disabled="notRoutList.includes('province')"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in provinceList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.addressProvince"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- <el-select
|
|
|
- v-model="steelMap.addressDistrict"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- @change="onchangeCity"
|
|
|
- style="width:120px"
|
|
|
- :disabled="notRoutList.includes('city')"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in cityList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.addressDistrict"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- <el-select
|
|
|
- v-model="steelMap.addressTown"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- @change="onchangeCounty"
|
|
|
- style="width:120px"
|
|
|
- :disabled="notRoutList.includes('country')"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in countyList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.addressTown"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- <el-autocomplete
|
|
|
- class="inline-input"
|
|
|
- v-model="steelMap.place"
|
|
|
- :fetch-suggestions="querySearch1"
|
|
|
- placeholder="请输入具体收货地址"
|
|
|
- :trigger-on-focus="false"
|
|
|
- @select="handleSelect1"
|
|
|
- style="width:250px"
|
|
|
- :disabled="notRoutList.includes('place')"
|
|
|
- >
|
|
|
- </el-autocomplete>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="addAddressClick"
|
|
|
- v-if="!notRoutList.includes('addressClick')"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
+ <span>{{ steelMap.addressPlace }}</span>
|
|
|
+ <span style="margin-left: 30px;">收货客户电话:</span>
|
|
|
+ <span>{{ steelMap.consigneeTel }}</span>
|
|
|
</div>
|
|
|
- <!-- <div
|
|
|
- class="steelMapClass23"
|
|
|
- v-if="
|
|
|
- (steelMap.carStatus == 4 ||
|
|
|
- steelMap.carStatus == 5 ||
|
|
|
- steelMap.carStatus == null) &&
|
|
|
- !notRoutList.includes('closeOrder')
|
|
|
- "
|
|
|
- >
|
|
|
- <el-button type="danger" round @click="deleteEasEntryId"
|
|
|
- >关闭运单</el-button
|
|
|
- >
|
|
|
- </div> -->
|
|
|
- <!-- <div
|
|
|
- class="steelMapClass23"
|
|
|
- v-if="
|
|
|
- steelMap.carStatus == 7 && !notRoutList.includes('closeOrder')
|
|
|
- "
|
|
|
- >
|
|
|
- <el-button type="danger" round @click="reverseCloseOrder"
|
|
|
- >反关闭运单</el-button
|
|
|
- >
|
|
|
- </div> -->
|
|
|
</div>
|
|
|
-
|
|
|
<div class="steelMapClass3">
|
|
|
- <div class="steelMapClass32">
|
|
|
- <span>收货客户电话:</span>
|
|
|
- <el-input
|
|
|
- v-model="steelMap.consigneeTel"
|
|
|
- style="width:150px"
|
|
|
- :disabled="notRoutList.includes('consigeeTel')"
|
|
|
- ></el-input>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="updateconsigneeTel"
|
|
|
- v-if="!notRoutList.includes('consigeeTel')"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
<div class="steelMapClass33">
|
|
|
<span>承运商:</span>
|
|
|
- <el-autocomplete
|
|
|
- style="width:120px"
|
|
|
- v-model="steelMap.carrierName"
|
|
|
- :fetch-suggestions="querySearchCarrier"
|
|
|
- placeholder="请输入承运商"
|
|
|
- @select="handleSelectCarrier"
|
|
|
- :disabled="notRoutList.includes('carrierName')"
|
|
|
- >
|
|
|
- </el-autocomplete>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="updateTruckCarrierDebounce"
|
|
|
- v-if="!notRoutList.includes('carrierName')"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- <div class="steelMapClass33">
|
|
|
- <span>车牌号:</span>
|
|
|
- <el-autocomplete
|
|
|
- style="width:120px"
|
|
|
- v-model="steelMap.capacityNo"
|
|
|
- :fetch-suggestions="querySearch"
|
|
|
- placeholder="请输入车牌号"
|
|
|
- @select="handleSelect()"
|
|
|
- :disabled="
|
|
|
- notRoutList.includes('capacityNo') &&
|
|
|
- steelMap.capacityId != null
|
|
|
- "
|
|
|
- ></el-autocomplete>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="updateCapacityDebounce"
|
|
|
- v-if="
|
|
|
- !(
|
|
|
- notRoutList.includes('capacityNo') &&
|
|
|
- steelMap.capacityId != null
|
|
|
- )
|
|
|
- "
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- <div class="steelMapClass33">
|
|
|
- <span>司机电话:</span>
|
|
|
- <el-input
|
|
|
- style="width:120px"
|
|
|
- v-model="steelMap.capacityTel"
|
|
|
- placeholder="请输入电话号码"
|
|
|
- ></el-input>
|
|
|
- <el-button type="success" circle @click="updateDriverTel"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
+ <span>{{steelMap.carrierName}}</span>
|
|
|
+ <span style="margin-left: 30px;">车牌号:</span>
|
|
|
+ <span>{{ steelMap.capacityNo }}</span>
|
|
|
+ <span style="margin-left: 30px;">司机电话:</span>
|
|
|
+ <span>{{ steelMap.capacityTel }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="steelMapClass4">
|
|
|
@@ -591,18 +444,6 @@
|
|
|
<span>{{ steelMap.orderStatusTime }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="steelMapClass5">
|
|
|
- <div class="steelMapClass52" v-if="steelMap.arrivalAddress != null">
|
|
|
- <span>抵达地址:</span>
|
|
|
- <span>{{ steelMap.arrivalAddress }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass6">
|
|
|
- <div class="steelMapClass62" v-if="steelMap.receiptAddress != null">
|
|
|
- <span>签收地址:</span>
|
|
|
- <span>{{ steelMap.receiptAddress }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<div class="steelMapClass7">
|
|
|
<div class="steelMapClass72" v-if="steelMap.priceValue != null">
|
|
|
<span>系统建议运价:</span>
|
|
|
@@ -643,35 +484,6 @@
|
|
|
align="center"
|
|
|
width="200px"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <button
|
|
|
- type="primary"
|
|
|
- @click="scope.row.materialNum--"
|
|
|
- style="height:40px"
|
|
|
- v-if="!notRoutList.includes('materialNum')"
|
|
|
- >
|
|
|
- -
|
|
|
- </button>
|
|
|
- <input
|
|
|
- v-model="scope.row.materialNum"
|
|
|
- style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
|
|
|
- :disabled="notRoutList.includes('materialNum')"
|
|
|
- />
|
|
|
- <button
|
|
|
- type="primary"
|
|
|
- @click="scope.row.materialNum++"
|
|
|
- style="height:40px"
|
|
|
- v-if="!notRoutList.includes('materialNum')"
|
|
|
- >
|
|
|
- +
|
|
|
- </button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="updateBillOrder(scope.row)"
|
|
|
- v-if="!notRoutList.includes('materialNum')"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="grossWeight" label="毛重"> </el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -698,35 +510,6 @@
|
|
|
width="100px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="分录操作"
|
|
|
- fixed="right"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- @click="closeEasEntryId(scope.row)"
|
|
|
- v-if="
|
|
|
- scope.row.deletedStatus == null &&
|
|
|
- !notRoutList.includes('closeEntry')
|
|
|
- "
|
|
|
- >关闭分录</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- @click="adverseCloseSaleMaterial(scope.row)"
|
|
|
- v-if="
|
|
|
- scope.row.deletedStatus != null &&
|
|
|
- !notRoutList.includes('closeEntry')
|
|
|
- "
|
|
|
- >反关闭分录</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -812,7 +595,7 @@
|
|
|
<el-drawer
|
|
|
title="修改详单地址"
|
|
|
:visible.sync="dialogFormVisible"
|
|
|
- size="40%"
|
|
|
+ size="50%"
|
|
|
>
|
|
|
原详单地址
|
|
|
<el-input
|
|
|
@@ -841,6 +624,7 @@
|
|
|
v-bind.sync="Address"
|
|
|
@radio-change="currentRadioChange2"
|
|
|
:drawer="aaadrawer"
|
|
|
+ style="overflow-y:scroll"
|
|
|
></dilTable>
|
|
|
</div>
|
|
|
<div class="opreation">
|
|
|
@@ -1118,7 +902,8 @@ export default {
|
|
|
batchList: [],
|
|
|
Address: {
|
|
|
requestUrl: '',
|
|
|
- selectionType: 'radio'
|
|
|
+ selectionType: 'radio',
|
|
|
+ maxHeight:300
|
|
|
},
|
|
|
dialogFormVisible: false,
|
|
|
addresText: null,
|
|
|
@@ -1375,25 +1160,25 @@ export default {
|
|
|
// })
|
|
|
// }
|
|
|
// },
|
|
|
- openReceive() {
|
|
|
- if (Object.values(this.steelMap).length == 0) {
|
|
|
- this.$message.warning('请选择需要补录的实绩')
|
|
|
- return
|
|
|
- }
|
|
|
- let row = this.steelMap
|
|
|
- if (!row.outGateTime) {
|
|
|
- this.$message.warning('该车未出厂，不允许签收')
|
|
|
- return
|
|
|
- }
|
|
|
- if (row.arrivalAddress) {
|
|
|
- this.location = row.arrivalAddress
|
|
|
- } else {
|
|
|
- this.location = row.addressPlace
|
|
|
- }
|
|
|
- this.orderNumber = row.orderNo
|
|
|
- this.capacityNumber = row.capacityNo
|
|
|
- this.arrivalReceiving = true
|
|
|
- },
|
|
|
+ // openReceive() {
|
|
|
+ // if (Object.values(this.steelMap).length == 0) {
|
|
|
+ // this.$message.warning('请选择需要补录的实绩')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // let row = this.steelMap
|
|
|
+ // if (!row.outGateTime) {
|
|
|
+ // this.$message.warning('该车未出厂，不允许签收')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (row.arrivalAddress) {
|
|
|
+ // this.location = row.arrivalAddress
|
|
|
+ // } else {
|
|
|
+ // this.location = row.addressPlace
|
|
|
+ // }
|
|
|
+ // this.orderNumber = row.orderNo
|
|
|
+ // this.capacityNumber = row.capacityNo
|
|
|
+ // this.arrivalReceiving = true
|
|
|
+ // },
|
|
|
arrivalAndReceive() {
|
|
|
if (!this.location) {
|
|
|
this.$message.warning('请填写签收地址')
|
|
|
@@ -2882,12 +2667,8 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
align-items: flex-start;
|
|
|
font-size: 16px;
|
|
|
- .steelMapClass32 {
|
|
|
- margin-left: 50px;
|
|
|
- // margin-right: 10px;
|
|
|
- }
|
|
|
.steelMapClass33 {
|
|
|
- margin-left: 20px;
|
|
|
+ margin-left: 50px;
|
|
|
// margin-right: 10px;
|
|
|
}
|
|
|
}
|
zengyf