|
|
@@ -90,7 +90,6 @@
|
|
|
> -->
|
|
|
<el-button
|
|
|
type="success"
|
|
|
- circle
|
|
|
@click="updateDetailsOrderPrice"
|
|
|
v-if="!notRoutList.includes('capacityNo')"
|
|
|
>
|
|
|
@@ -296,22 +295,6 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="isPrintDelivery"
|
|
|
- label="送货单打印"
|
|
|
- align="center"
|
|
|
- width="100px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="outGateTime"
|
|
|
- column-key="outGateTimeList"
|
|
|
- label="出厂时间"
|
|
|
- width="130px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="arrivalAddress"
|
|
|
label="抵达地址"
|
|
|
@@ -377,20 +360,6 @@
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeTel"
|
|
|
- label="收货客户电话"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="isSelfMention"
|
|
|
- label="是否自提"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
<el-table-column
|
|
|
prop="saleOrderNo"
|
|
|
label="销售订单号"
|
|
|
@@ -574,22 +543,7 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="isPrintDelivery"
|
|
|
- label="送货单打印"
|
|
|
- align="center"
|
|
|
- width="100px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="outGateTime"
|
|
|
- column-key="outGateTimeList"
|
|
|
- label="出厂时间"
|
|
|
- width="130px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="arrivalAddress"
|
|
|
label="抵达地址"
|
|
|
@@ -655,20 +609,6 @@
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeTel"
|
|
|
- label="收货客户电话"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="isSelfMention"
|
|
|
- label="是否自提"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
<el-table-column
|
|
|
prop="saleOrderNo"
|
|
|
label="销售订单号"
|
|
|
@@ -724,190 +664,6 @@
|
|
|
</div>
|
|
|
</vxe-modal>
|
|
|
</div>
|
|
|
- <div class="dialog">
|
|
|
- <el-dialog
|
|
|
- title="运单详情"
|
|
|
- :visible.sync="centerDialogVisible"
|
|
|
- width="90%"
|
|
|
- center
|
|
|
- >
|
|
|
- <div class="steelMapClass">
|
|
|
- <div class="steelMapClass1">
|
|
|
- <div class="steelMapClass12">
|
|
|
- <span>销售订单号:</span>
|
|
|
- <span>{{ steelMap.saleOrderNo }}</span>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass12">
|
|
|
- <span>订单状态:</span>
|
|
|
- <span>{{ steelMap.saleOrderStatus }}</span>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass12">
|
|
|
- <span>业务员:</span>
|
|
|
- <span>{{ steelMap.saler }}</span>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass12">
|
|
|
- <span>客户:</span>
|
|
|
- <span>{{ steelMap.consigneeName }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass2">
|
|
|
- <div class="steelMapClass22">
|
|
|
- <span>收货地址:</span>
|
|
|
- <span>{{ steelMap.addressPlace }}</span>
|
|
|
- <span style="margin-left: 30px;">收货客户电话:</span>
|
|
|
- <span>{{ steelMap.consigneeTel }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass3">
|
|
|
- <div class="steelMapClass33">
|
|
|
- <span>承运商:</span>
|
|
|
- <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">
|
|
|
- <div class="steelMapClass42" v-if="steelMap.orderNo != null">
|
|
|
- <span>运输订单号:</span>
|
|
|
- <span>{{ steelMap.orderNo }}</span>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass43">
|
|
|
- <span>运单状态:</span>
|
|
|
- <span>{{ steelMap.orderStatus }}</span>
|
|
|
- </div>
|
|
|
- <div
|
|
|
- class="steelMapClass43"
|
|
|
- v-if="steelMap.orderStatusTime != null"
|
|
|
- >
|
|
|
- <span>状态更新时间:</span>
|
|
|
- <span>{{ steelMap.orderStatusTime }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="steelMapClass7">
|
|
|
- <div class="steelMapClass72" v-if="steelMap.priceValue != null">
|
|
|
- <span>系统建议运价:</span>
|
|
|
- <span>{{ steelMap.priceValue }}</span>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- circle
|
|
|
- @click="updateDetailsOrderPrice"
|
|
|
- v-if="!notRoutList.includes('capacityNo')"
|
|
|
- >修改</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="table1">
|
|
|
- <el-table
|
|
|
- :data="steelMap.mapList"
|
|
|
- border
|
|
|
- style="width: 100%; margin-top: 20px"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- prop="materialName"
|
|
|
- label="物资名称"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialSpe"
|
|
|
- label="物资规格"
|
|
|
- align="center"
|
|
|
- sortable
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialNum"
|
|
|
- label="物资件数"
|
|
|
- align="center"
|
|
|
- width="200px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="grossWeightTime"
|
|
|
- label="毛重时间"
|
|
|
- width="130px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="tareWeight" label="皮重"> </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="tareWeightTime"
|
|
|
- label="皮重时间"
|
|
|
- width="130px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="netWeight" label="净重"> </el-table-column>
|
|
|
- <el-table-column prop="loadTime" label="装货时间" width="130px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="detailsAmount" label="运费" width="130px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="closeEntryId"
|
|
|
- label="金蝶分录ID"
|
|
|
- width="100px"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="centerDialogVisible = false">返 回</el-button>
|
|
|
- </span>
|
|
|
- <div>
|
|
|
- <vxe-modal
|
|
|
- width="549px"
|
|
|
- height="731px"
|
|
|
- v-model="isShow"
|
|
|
- show-zoom
|
|
|
- show-footer
|
|
|
- class="vxeModal"
|
|
|
- title="抵达上传照片"
|
|
|
- >
|
|
|
- <div class="demo-image__preview">
|
|
|
- <div
|
|
|
- class="demo-image__preview"
|
|
|
- v-for="(item, index) in srcList"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <span>{{ item.title }}</span>
|
|
|
- <el-image
|
|
|
- style="height:731px;text-align:center"
|
|
|
- :src="item.src"
|
|
|
- >
|
|
|
- <div slot="error" class="image-slot">
|
|
|
- <span>司机未上传抵达图片</span>
|
|
|
- </div>
|
|
|
- </el-image>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </vxe-modal>
|
|
|
- <vxe-modal
|
|
|
- width="549px"
|
|
|
- height="731px"
|
|
|
- v-model="isShow2"
|
|
|
- show-zoom
|
|
|
- show-footer
|
|
|
- title="签收上传照片"
|
|
|
- >
|
|
|
- <div
|
|
|
- class="demo-image__preview"
|
|
|
- v-for="(item, index) in srcList2"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <span>{{ item.title }}</span>
|
|
|
- <el-image style="height:731px;text-align:center" :src="item.src">
|
|
|
- <div slot="error" class="image-slot">
|
|
|
- <span>司机未上传签收图片</span>
|
|
|
- </div>
|
|
|
- </el-image>
|
|
|
- </div>
|
|
|
- </vxe-modal>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
- </div>
|
|
|
<div style="height: 100%">
|
|
|
<vxe-modal
|
|
|
width="1237"
|
|
|
@@ -973,64 +729,6 @@
|
|
|
<el-button type="primary" @click="makeSure">确 定</el-button>
|
|
|
</div>
|
|
|
</el-drawer>
|
|
|
- <el-dialog
|
|
|
- title="抵达签收"
|
|
|
- :visible.sync="arrivalReceiving"
|
|
|
- :before-close="closeUpload"
|
|
|
- >
|
|
|
- <el-form style="margin-left:20%">
|
|
|
- <el-form-item label="车牌号码">
|
|
|
- <el-input
|
|
|
- v-model="capacityNumber"
|
|
|
- disabled
|
|
|
- style="width:300px"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="签收地址">
|
|
|
- <el-input v-model="location" style="width:400px"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="抵达图片（车头、满货箱）" style="">
|
|
|
- <el-upload
|
|
|
- ref="arrival"
|
|
|
- list-type="picture-card"
|
|
|
- action="/api/v1/otms/addtmstruckArrivalResult"
|
|
|
- :limit="2"
|
|
|
- :on-change="fileChange1"
|
|
|
- :on-preview="handlePictureCardPreview"
|
|
|
- :on-exceed="exceed"
|
|
|
- accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF"
|
|
|
- :auto-upload="false"
|
|
|
- >
|
|
|
- <i class="el-icon-plus"></i>
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="签收图片（空货箱、质保书、签收单）">
|
|
|
- <el-upload
|
|
|
- ref="receive"
|
|
|
- list-type="picture-card"
|
|
|
- action="null"
|
|
|
- :limit="11"
|
|
|
- :on-change="fileChange2"
|
|
|
- :on-preview="handlePictureCardPreview"
|
|
|
- :on-exceed="exceed"
|
|
|
- accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF"
|
|
|
- :auto-upload="false"
|
|
|
- >
|
|
|
- <i class="el-icon-plus"></i>
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="arrivalAndReceive"
|
|
|
- :loading="isLoading"
|
|
|
- style="margin-left:40%"
|
|
|
- >确定</el-button
|
|
|
- >
|
|
|
- </el-dialog>
|
|
|
- <el-dialog :visible.sync="dialogVisible" width="80%">
|
|
|
- <img width="100%" :src="dialogImageUrl" alt="" />
|
|
|
- </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
luobang