|
|
@@ -1,4 +1,4 @@
|
|
|
-// 汽运卸车反馈
|
|
|
+// 汽车卸车
|
|
|
<template>
|
|
|
<div class="container">
|
|
|
<el-row>
|
|
|
@@ -22,153 +22,151 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div class="center">
|
|
|
- <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
|
|
|
- <div class="basicInformation">
|
|
|
- <div class="small-title">任务详情</div>
|
|
|
- <ws-info-table>
|
|
|
- <!-- 任务编号 -->
|
|
|
- <ws-form-item label="任务编号" span="1" prop="processNo">
|
|
|
- {{deptBudgetList.processNo}}
|
|
|
- </ws-form-item>
|
|
|
- <!-- 货名 -->
|
|
|
- <ws-form-item label="货名" span="1" prop="goodsName">
|
|
|
- {{deptBudgetList.goodsName}}
|
|
|
- </ws-form-item>
|
|
|
- <!--重量（吨）-->
|
|
|
- <ws-form-item label="重量（吨）" span="1" prop="weight">
|
|
|
- {{deptBudgetList.weight}}
|
|
|
- </ws-form-item>
|
|
|
- <!--发货地址-->
|
|
|
- <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
|
|
|
-
|
|
|
- {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
|
|
|
- </ws-form-item>
|
|
|
- <!--发货人-->
|
|
|
- <ws-form-item label="发货人" span="1" prop="sender">
|
|
|
-
|
|
|
- {{deptBudgetList.sender}}
|
|
|
- </ws-form-item>
|
|
|
+ <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
|
|
|
+ <div class="basicInformation">
|
|
|
+ <div class="small-title" style="font-size: 16px">任务详情</div>
|
|
|
+ <ws-info-table>
|
|
|
+ <!-- 任务编号 -->
|
|
|
+ <ws-form-item label="任务编号" span="1" prop="processNo">
|
|
|
+ {{ deptBudgetList.processNo }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!-- 货名 -->
|
|
|
+ <ws-form-item label="货名" span="1">
|
|
|
+ {{ deptBudgetList.goodsName }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--重量（吨）-->
|
|
|
+ <ws-form-item
|
|
|
+ label="重量（吨）"
|
|
|
+ span="1"
|
|
|
+ prop="tare"
|
|
|
+ class="readonly"
|
|
|
+ >
|
|
|
+ {{ deptBudgetList.weight }}
|
|
|
+ </ws-form-item>
|
|
|
|
|
|
- <!--发货人电话-->
|
|
|
- <ws-form-item label="发货人电话" span="1" prop="senderPhone">
|
|
|
-
|
|
|
- {{deptBudgetList.senderPhone}}
|
|
|
- </ws-form-item>
|
|
|
- <!--收货地址-->
|
|
|
- <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
|
|
|
-
|
|
|
- {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
|
|
|
- </ws-form-item>
|
|
|
- <!--收货人-->
|
|
|
- <ws-form-item label="收货人" span="1" prop="receiver">
|
|
|
- {{deptBudgetList.receiver}}
|
|
|
- </ws-form-item>
|
|
|
+ <!--发货地址-->
|
|
|
+ <ws-form-item label="发货地址" span="1" prop="netWeight">
|
|
|
+ {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
|
|
|
+ }}{{ deptBudgetList.sendArea
|
|
|
+ }}{{ deptBudgetList.sendDetailedAddress }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--发货人-->
|
|
|
+ <ws-form-item label="发货人" span="1" prop="agent">
|
|
|
+ {{ deptBudgetList.sender }}
|
|
|
+ </ws-form-item>
|
|
|
|
|
|
- <!--收货人电话-->
|
|
|
- <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
|
|
|
-
|
|
|
- {{deptBudgetList.receiverPhone}}
|
|
|
- </ws-form-item>
|
|
|
- <!--发货日期-->
|
|
|
- <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
|
|
|
-
|
|
|
- {{deptBudgetList.deliveryDateStart}}
|
|
|
- </ws-form-item>
|
|
|
- <!--最晚发货日期-->
|
|
|
- <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
|
|
|
-
|
|
|
- {{deptBudgetList.deliveryDateEnd}}
|
|
|
+ <!--发货人电话-->
|
|
|
+ <ws-form-item label="发货人电话" span="1" prop="agent">
|
|
|
+ {{ deptBudgetList.senderPhone }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--收货地址-->
|
|
|
+ <ws-form-item label="收货地址" span="1" prop="netWeight">
|
|
|
+ {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
|
|
|
+ }}{{ deptBudgetList.receiveArea
|
|
|
+ }}{{ deptBudgetList.receiveDetailedAddress }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--收货人-->
|
|
|
+ <ws-form-item label="收货人" span="1" prop="receiver">
|
|
|
+ {{ deptBudgetList.receiver }}
|
|
|
+ </ws-form-item>
|
|
|
+
|
|
|
+ <!--收货人电话-->
|
|
|
+ <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
|
|
|
+ {{ deptBudgetList.receiverPhone }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--发货日期-->
|
|
|
+ <ws-form-item
|
|
|
+ label="发货日期"
|
|
|
+ span="1"
|
|
|
+ prop="inOutDate"
|
|
|
+ class="deliverydate"
|
|
|
+ >
|
|
|
+ {{ deptBudgetList.deliveryDateStart }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--最晚发货日期-->
|
|
|
+ <ws-form-item
|
|
|
+ label="最晚发货日期"
|
|
|
+ span="1"
|
|
|
+ prop="inOutDate"
|
|
|
+ class="deliverydate"
|
|
|
+ >
|
|
|
+ {{ deptBudgetList.deliveryDateEnd }}
|
|
|
+ </ws-form-item>
|
|
|
+ <!--合同编号-->
|
|
|
+ <ws-form-item label="合同编号" span="1" prop="contractNo">
|
|
|
+ {{ deptBudgetList.contractNo }}
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="运输方式" span="1" prop="contractNo">
|
|
|
+ {{ deptBudgetList.contractNo }}
|
|
|
</ws-form-item>
|
|
|
- <!--合同编号-->
|
|
|
- <ws-form-item label="合同编号" span="1" prop="contractNo">
|
|
|
-
|
|
|
- {{deptBudgetList.contractNo}}
|
|
|
- </ws-form-item>
|
|
|
- <!-- 运输方式 -->
|
|
|
- <ws-form-item label="运输方式" span="1" prop="tranType">
|
|
|
- {{deptBudgetList.tranType}}
|
|
|
- </ws-form-item>
|
|
|
- </ws-info-table>
|
|
|
-
|
|
|
- <div class="small-title">卸车详情</div>
|
|
|
- <div class="liaison">
|
|
|
- <div
|
|
|
- style="width: 100%"
|
|
|
- class="flex position"
|
|
|
- v-for="(item, index) in this.freightspace"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <ws-info-table>
|
|
|
- <div class="catNos" v-show="item.temporaryDriverFlag ==0">司机-{{index+1}}</div>
|
|
|
+ </ws-info-table>
|
|
|
+
|
|
|
+ <div class="small-title" style="font-size: 16px">卸车详情</div>
|
|
|
+
|
|
|
+ <div
|
|
|
+ class="driver position liaison"
|
|
|
+ v-for="(item, index) in deptBudgetList.tranCarInfoList"
|
|
|
+ >
|
|
|
+ <ws-info-table>
|
|
|
+ <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
|
|
|
<div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
|
|
|
- <!--姓名-->
|
|
|
- <ws-form-item :label="'姓名' + (index + 1)" span="1" prop="driver">
|
|
|
- <!-- <el-input
|
|
|
- v-show="item.temporaryDriverFlag != 0"
|
|
|
- v-model="item.driver"
|
|
|
- placeholder="请选择姓名"
|
|
|
- filterable
|
|
|
- :filter-method="dataFilter"
|
|
|
- @change="selectstaff"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in options"
|
|
|
- :key="item.value"
|
|
|
- :label="item.staffName"
|
|
|
- :value="item.staffName"
|
|
|
- />
|
|
|
- </el-input> -->
|
|
|
- {{item.driver}}
|
|
|
- <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span>
|
|
|
-
|
|
|
+ <!--司机-->
|
|
|
+ <ws-form-item
|
|
|
+ label="姓名："
|
|
|
+ span="1"
|
|
|
+ prop="driver"
|
|
|
+ >
|
|
|
+ <span v-show="item.temporaryDriverFlag == 0"
|
|
|
+ >
|
|
|
+ {{ item.driver }}
|
|
|
+ </span>
|
|
|
</ws-form-item>
|
|
|
- <!--电话-->
|
|
|
- <ws-form-item label="司机电话" span="1" prop="driverPhone">
|
|
|
- <!-- <ws-input
|
|
|
- v-show="item.temporaryDriverFlag != 0"
|
|
|
+ <!--电话-->
|
|
|
+ <ws-form-item label="电话：" span="1" prop="driverPhone">
|
|
|
+ <!-- <ws-input
|
|
|
+ v-show="item.temporaryDriverFlag != 0"
|
|
|
v-model="item.driverPhone"
|
|
|
- placeholder="请输入司机电话"
|
|
|
maxlength="20"
|
|
|
size="small"
|
|
|
- /> -->
|
|
|
- {{item.driverPhone}}
|
|
|
- <span v-show="item.temporaryDriverFlag == 0">{{item.driverPhone}} </span>
|
|
|
+ /> -->
|
|
|
+ <span v-show="item.temporaryDriverFlag == 0"
|
|
|
+ >{{ item.driverPhone }}
|
|
|
+ </span>
|
|
|
</ws-form-item>
|
|
|
- <!--车牌号-->
|
|
|
- <ws-form-item label="车牌号" span="1" prop="carNo">
|
|
|
- <!-- <ws-input
|
|
|
- v-show="item.temporaryDriverFlag != 0"
|
|
|
+ <!--车牌号-->
|
|
|
+ <ws-form-item label="车牌号：" span="1" prop="carNo">
|
|
|
+ <!-- <ws-input
|
|
|
+ v-show="item.temporaryDriverFlag != 0"
|
|
|
v-model="item.carNo"
|
|
|
- placeholder="请输入车牌号"
|
|
|
maxlength="20"
|
|
|
size="small"
|
|
|
- /> -->
|
|
|
- {{item.carNo}}
|
|
|
- <span v-show="item.temporaryDriverFlag == 0">{{item.carNo}} </span>
|
|
|
+ /> -->
|
|
|
+ <span v-show="item.temporaryDriverFlag == 0"
|
|
|
+ >{{ item.carNo }}
|
|
|
+ </span>
|
|
|
</ws-form-item>
|
|
|
- <!--装车净重-->
|
|
|
- <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
|
|
|
+ <!--装车净重-->
|
|
|
+ <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
|
|
|
<!-- <ws-input
|
|
|
v-model="item.loadNetWeight"
|
|
|
- placeholder="请输入装车净重"
|
|
|
+ placeholder="请输入装车(吨)"
|
|
|
maxlength="20"
|
|
|
size="small"
|
|
|
/> -->
|
|
|
- {{item.lo}}
|
|
|
+ {{item.loadNetWeight}}
|
|
|
</ws-form-item>
|
|
|
- <!--卸车净重(吨)-->
|
|
|
- <ws-form-item label="卸车净重(吨)" span="1" prop="unloadNetWeight">
|
|
|
+ <!--卸车净重(吨)-->
|
|
|
+ <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
|
|
|
<ws-input
|
|
|
v-model="item.unloadNetWeight"
|
|
|
- placeholder=""
|
|
|
+ placeholder="请输入卸车净重"
|
|
|
maxlength="20"
|
|
|
size="small"
|
|
|
/>
|
|
|
</ws-form-item>
|
|
|
- <!--磅单-->
|
|
|
- <ws-form-item label="磅单" span="1" prop="loadPoundImg">
|
|
|
+ <!--磅单-->
|
|
|
+ <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
|
|
|
<template slot-scope="scope">
|
|
|
-
|
|
|
<img
|
|
|
width="18"
|
|
|
height="20"
|
|
|
@@ -181,52 +179,59 @@
|
|
|
@click="fujian(scope.row)"
|
|
|
alt=""
|
|
|
/>
|
|
|
- <span v-show="item.temporaryDriverFlag == 0" >{{item.signStatus}}</span>
|
|
|
+ <div v-show="item.temporaryDriverFlag == 0">
|
|
|
+ {{ item.signStatus }}
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</ws-form-item>
|
|
|
- </ws-info-table>
|
|
|
+ </ws-info-table>
|
|
|
+ <!-- <span
|
|
|
+ v-show="!item.temporaryDriverFlag"
|
|
|
+ width="22"
|
|
|
+ height="22"
|
|
|
+ class="del"
|
|
|
+ @click="del(index)"
|
|
|
+ src="../../../public/img/del.png"
|
|
|
+ alt=""
|
|
|
+ >×</span
|
|
|
+ > -->
|
|
|
+ </div>
|
|
|
+ <div style="text-align: right; color: #8890b1; font-size: 16px">
|
|
|
+ 合计{{ total }}/{{ deptBudgetList.weight }}
|
|
|
+ </div>
|
|
|
+ <!-- <el-button class="add" type="primary" size="small" @click="add()">
|
|
|
+ <img
|
|
|
+ width="22"
|
|
|
+ height="22"
|
|
|
+ @click="add"
|
|
|
+ src="../../../public/img/add.png"
|
|
|
+ alt=""
|
|
|
+ />
|
|
|
+ <div class="spans">添加司机</div>
|
|
|
+ </el-button
|
|
|
+ > -->
|
|
|
+ <div style="text-align: right; padding: 10px">
|
|
|
+ <el-button
|
|
|
+ class="bg-bottom-up"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="submit()"
|
|
|
+ >提交</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </ws-form>
|
|
|
- <div style="text-align: right; padding: 10px">
|
|
|
- <el-button
|
|
|
- class="bg-bottom-up"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="submit(deptBudgetList)"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- <WinseaContentModal
|
|
|
- v-model="accessoryTFs"
|
|
|
- :title="$t('system.noticeCircular.information')"
|
|
|
- @on-cancel="handleClose"
|
|
|
- >
|
|
|
- <p>上传附件</p>
|
|
|
- <ws-upload
|
|
|
- ref="upload"
|
|
|
- table-name="maintain_work_order"
|
|
|
- oss-key="mainPlan"
|
|
|
- :comp-id="compId"
|
|
|
- :file-list="fileList"
|
|
|
- :appendix-ids="appendixIdsAdd"
|
|
|
- :vesselId="deptBudgetList.loadPoundImg"
|
|
|
- :size-limit="size"
|
|
|
- @uploadSuccess="uploadSuccess"
|
|
|
- accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
|
|
|
- />
|
|
|
- </WinseaContentModal>
|
|
|
+ </ws-form>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
|
|
|
-import {seeCat, packList, feedback} from '@/model/transport/index'
|
|
|
-import{getstaff}from '@/model/warehouse/index'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
+import {
|
|
|
+ seeCat,
|
|
|
+ packList,
|
|
|
+ feedback
|
|
|
+} from '@/model/transport/index'
|
|
|
// import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
|
import { dayjs, EventBus } from 'base-core-lib'
|
|
|
export default {
|
|
|
@@ -245,40 +250,19 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- //弹出框
|
|
|
- dialogViewSpareMoney: false,
|
|
|
- dialogApproveFormVisible: false,
|
|
|
- // 船舶类型
|
|
|
- monetaryKey: null,
|
|
|
- // 表格显示数据
|
|
|
- tableDate: [],
|
|
|
// 是否显示
|
|
|
showType: true,
|
|
|
- // 年
|
|
|
- year: '',
|
|
|
- item:[],
|
|
|
- shipType:[],
|
|
|
- tranType: 3,
|
|
|
deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
searchType: 1,
|
|
|
- searchKeyWord: '',
|
|
|
- contractType: 2,
|
|
|
startDate: null,
|
|
|
endDate: null,
|
|
|
- goodnameList: {},
|
|
|
+ carList: [],
|
|
|
// 提交类型
|
|
|
- submitType: true,
|
|
|
- storageType: [],
|
|
|
readonly: true,
|
|
|
appendixIdsAdd: '',
|
|
|
- uploadSuccess: {},
|
|
|
onChange: {},
|
|
|
- selectedOptions: [],
|
|
|
- options:[],
|
|
|
- tranCarInfoList: {},
|
|
|
- staffList :[],
|
|
|
gradeList: [],
|
|
|
rules: {
|
|
|
netWeight: [
|
|
|
@@ -290,15 +274,6 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
- fileList:[],
|
|
|
- freightspace: [
|
|
|
- {
|
|
|
- driver: '',
|
|
|
- driverPhone: '',
|
|
|
- carNo: '',
|
|
|
- loadNetWeight: '',
|
|
|
- },
|
|
|
- ],
|
|
|
size: 10,
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
deptCircularPage: {},
|
|
|
@@ -309,10 +284,9 @@ export default {
|
|
|
},
|
|
|
contractList: [],
|
|
|
deptBudgetList: {
|
|
|
- warehouseInOutDetail: {},
|
|
|
+ tranCarInfoList: [],
|
|
|
},
|
|
|
historyList: [],
|
|
|
-
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -321,119 +295,59 @@ export default {
|
|
|
accessoryTFs: false,
|
|
|
}
|
|
|
},
|
|
|
- mounted() {
|
|
|
- this.deptBudgetList.id = this.$route.query.id
|
|
|
+ activated() {
|
|
|
this.getList()
|
|
|
},
|
|
|
-// activated(){
|
|
|
-// this.loaddata()
|
|
|
-// this.getList()
|
|
|
-// },
|
|
|
- computed: {
|
|
|
- totalStorage: function () {
|
|
|
+ computed: {
|
|
|
+ total: function () {
|
|
|
var maxStorage = 0
|
|
|
- for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
- maxStorage += Number(this.freightspace[i].maxStorage)
|
|
|
+ for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
|
|
|
+ maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
|
|
|
}
|
|
|
return maxStorage
|
|
|
},
|
|
|
},
|
|
|
+ mounted() {
|
|
|
+ this.deptBudgetList.id = this.$route.query.id
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
methods: {
|
|
|
- getList() {
|
|
|
- seeCat({ id: this.deptBudgetList.id })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.deptBudgetList = response
|
|
|
- // this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
|
|
|
- this.freightspace = response.tranCarInfoList
|
|
|
- for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
- if (!this.freightspace[i].loadNetWeight) {
|
|
|
- this.freightspace[i].loadNetWeight = 0
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- dataFilter(val) {
|
|
|
- this.deptBudgetList.personCharge = val
|
|
|
- if (val) {
|
|
|
- console.log(val)
|
|
|
- this.options = this.staffList.filter((item) => {
|
|
|
- if (
|
|
|
- !!~item.staffName.indexOf(val) ||
|
|
|
- !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
|
|
|
- ) {
|
|
|
- return true
|
|
|
- }
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.options = this.staffList
|
|
|
- }
|
|
|
- },
|
|
|
- selectstaff(e) {
|
|
|
- for (var i = 0; i < this.staffList.length; i++) {
|
|
|
- if (this.staffList[i].staffName == e) {
|
|
|
- this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
|
|
|
- this.deptBudgetList.personChargeKey = this.staffList[i].staffId
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- // loaddata() {
|
|
|
- // dispatchCat({ id: this.deptBudgetList.id })
|
|
|
- // .toPromise()
|
|
|
- // .then((response) => {
|
|
|
- // this.deptBudgetList = response
|
|
|
- // this.freightspace = response.tranCarInfoList
|
|
|
- // for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
- // if (!this.freightspace[i].loadNetWeight) {
|
|
|
- // this.freightspace[i].loadNetWeight = 0
|
|
|
- // }
|
|
|
- // }
|
|
|
- // for(var i = 0; i<this.deptBudgetList.tranCarInfoList.length;i++){
|
|
|
- // var num = this.deptBudgetList.tranCarInfoList[i].positionWeight.split("," )
|
|
|
- // for(var j = 0;j<num.length;j++){
|
|
|
- // var num2 = num[j].split("/")
|
|
|
- // this.freightspace.push({
|
|
|
- // 'impurity': num2[i],
|
|
|
- // 'positionWeight':num2[num2.length-1]
|
|
|
- // })
|
|
|
- // }
|
|
|
-
|
|
|
- // }
|
|
|
- // })
|
|
|
- // },
|
|
|
- //上传
|
|
|
- fujian(row) {
|
|
|
- if (
|
|
|
- row.receiveAttachmentPath === null ||
|
|
|
- row.receiveAttachmentPath === ''
|
|
|
- ) {
|
|
|
- EventBus.$emit(
|
|
|
- 'warning',
|
|
|
- this.$t('system.noticeCircular.NoInformation')
|
|
|
- )
|
|
|
- } else {
|
|
|
- this.accessoryTFs = true
|
|
|
- }
|
|
|
- this.appendixIdss = row.receiveAttachmentPath
|
|
|
- },
|
|
|
//返回按钮
|
|
|
revert() {
|
|
|
- this.freightspace=[]
|
|
|
this.$router.push({ path: 'tranManagementReceivingFeedback' })
|
|
|
},
|
|
|
-
|
|
|
- selectdriver() {},
|
|
|
- handleChange(value) {
|
|
|
- this.selectedOptions = value
|
|
|
- },
|
|
|
- returnsales() {
|
|
|
- this.deptBudgetList = {}
|
|
|
- this.freightspace = {}
|
|
|
- this.selectedOptions = ''
|
|
|
- this.$router.push({ path: 'tranManagementReceivingFeedback' })
|
|
|
+ del(index) {
|
|
|
+ if (this.deptBudgetList.tranCarInfoList.length > 1) {
|
|
|
+ this.deptBudgetList.tranCarInfoList.splice(index, 1)
|
|
|
+ }
|
|
|
},
|
|
|
+ // add() {
|
|
|
+ // console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
|
|
|
+ // this.deptBudgetList.tranCarInfoList.push({
|
|
|
+ // driverName: '',
|
|
|
+ // driverPhone: '',
|
|
|
+ // carLength: 0,
|
|
|
+ // carLengthKey: '',
|
|
|
+ // loadWeight: null,
|
|
|
+ // carModel: '',
|
|
|
+ // carModelKey: '',
|
|
|
+ // carNumber: '',
|
|
|
+ // disabled: false,
|
|
|
+ // tranType: '1',
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ selectwaterContent() {},
|
|
|
//提交按钮
|
|
|
- submit() {
|
|
|
+ submit() {
|
|
|
+ for(var i = 0 ; i < this.freightspace.length ; i++){
|
|
|
+ if(this.freightspace[i].unloadNetWeight==null){
|
|
|
+ this.$message({
|
|
|
+ message:"卸重不能为空！",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
this.$confirm(`所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`, {
|
|
|
cancelButtonText: '取消',
|
|
|
confirmButtonText: '确定',
|
|
|
@@ -442,38 +356,33 @@ export default {
|
|
|
.then(() => {
|
|
|
this.$refs.deptBudgetList.validate((valid) => {
|
|
|
if (valid) {
|
|
|
-
|
|
|
- // for(var i = 0; i < this.freightspace.length; i++){
|
|
|
- // var num = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
|
|
|
- // this.arr.push(
|
|
|
- // num
|
|
|
- // )
|
|
|
- // }
|
|
|
-
|
|
|
- this.tranCarInfoList=this.freightspace
|
|
|
- this.tranCarInfoList.driver = this.deptBudgetList.driver
|
|
|
+ // this.deptBudgetList.totalStorage = this.totalStorage
|
|
|
+ this.tranCarInfoList = this.freightspace
|
|
|
+ this.tranCarInfoList.driver = this.deptBudgetList.driver
|
|
|
this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
|
|
|
- this.tranCarInfoList. carNo = this.deptBudgetList.carNo
|
|
|
- this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeigh
|
|
|
- this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
|
|
|
- this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
|
|
|
- this.tranCarInfoList.tranType = this.deptBudgetList.tranType
|
|
|
- for(var i = 0 ; i<this.tranCarInfoList.length;i++){
|
|
|
+ this.tranCarInfoList.carNo = this.deptBudgetList.carNo
|
|
|
+ this.tranCarInfoList.loadNetWeight =
|
|
|
+ this.deptBudgetList.loadNetWeight
|
|
|
+ this.tranCarInfoList.tranType = this.tranType
|
|
|
+ this.tranCarInfoList.loadPoundImg =
|
|
|
+ this.deptBudgetList.loadPoundImg
|
|
|
+ // this.tranCarInfoList.boxNo = this.arr.toString()
|
|
|
+ for (var i = 0; i < this.tranCarInfoList.length; i++) {
|
|
|
this.tranCarInfoList[i].id = this.freightspace[i].id
|
|
|
- if(this.tranCarInfoList[i].temporaryDriverFlag !=0){
|
|
|
- this.tranCarInfoList[i].temporaryDriverFlag = 1
|
|
|
- this.tranCarInfoList[i].tranType = this.tranType
|
|
|
- }
|
|
|
- }
|
|
|
+ if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
|
|
|
+ this.tranCarInfoList[i].temporaryDriverFlag = 1
|
|
|
+ this.tranCarInfoList[i].tranType = this.tranType
|
|
|
+ }
|
|
|
+ }
|
|
|
var tranProcessInfo = {}
|
|
|
- var tranList = this.tranCarInfoList
|
|
|
tranProcessInfo.id = this.deptBudgetList.id
|
|
|
tranProcessInfo.infoId = this.deptBudgetList.infoId
|
|
|
tranProcessInfo.tranCarInfoList = this.tranCarInfoList
|
|
|
+ // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
|
|
|
feedback(tranProcessInfo)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- this.$message.success('添加成功')
|
|
|
+ this.$message.success('提交成功')
|
|
|
this.deptBudgetList = {}
|
|
|
this.freightspace = {}
|
|
|
this.selectedOptions = ''
|
|
|
@@ -491,21 +400,84 @@ export default {
|
|
|
return false
|
|
|
})
|
|
|
},
|
|
|
- resetForm(deptBudgetList) {
|
|
|
- this.$refs[deptBudgetList].resetFields()
|
|
|
- },
|
|
|
+
|
|
|
handleClose() {
|
|
|
this.accessoryTFs = false
|
|
|
},
|
|
|
- handleSizeChange(val) {
|
|
|
- console.log(`每页 ${val} 条`)
|
|
|
- this.pageSize = val
|
|
|
- this.getList()
|
|
|
+
|
|
|
+ getList() {
|
|
|
+ seeCat({ id: this.deptBudgetList.id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.deptBudgetList = response
|
|
|
+ // this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
|
|
|
+ this.freightspace = response.tranCarInfoList
|
|
|
+ for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
+ if (!this.freightspace[i].loadNetWeight) {
|
|
|
+ this.freightspace[i].loadNetWeight = 0
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ carchange(val, index) {
|
|
|
+ for (var i = 0; i < this.carList.length; i++) {
|
|
|
+ if (this.carList[i].driverName == val) {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].driverPhone =
|
|
|
+ this.carList[i].driverPhone
|
|
|
+ arrange({ id: this.carList[i].id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ console.log(this, response)
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carNo =
|
|
|
+ response.carNumber
|
|
|
+ if (response.carLoad != null) {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].loadWeight =
|
|
|
+ response.carLoad
|
|
|
+ } else {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
|
|
|
+ }
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carModel =
|
|
|
+ response.carModel
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carLength =
|
|
|
+ response.carLength
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carLengthKey =
|
|
|
+ response.carLengthKey
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carModelKey =
|
|
|
+ response.carModelKey
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
- handleCurrentChange(val) {
|
|
|
- this.currentPage = val
|
|
|
- console.log(`当前页: ${val}`)
|
|
|
- this.getList()
|
|
|
+ phonechange(val, index) {
|
|
|
+ for (var i = 0; i < this.carList.length; i++) {
|
|
|
+ if (this.carList[i].driverPhone == val) {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].driver =
|
|
|
+ this.carList[i].driver
|
|
|
+ arrange({ id: this.carList[i].id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ console.log(this, response)
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carNo =
|
|
|
+ response.carNumber
|
|
|
+ if (response.carLoad != null) {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].loadWeight =
|
|
|
+ response.carLoad
|
|
|
+ } else {
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
|
|
|
+ }
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carModel =
|
|
|
+ response.carModel
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carLength =
|
|
|
+ response.carLength
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carLengthKey =
|
|
|
+ response.carLengthKey
|
|
|
+ this.deptBudgetList.tranCarInfoList[index].carModelKey =
|
|
|
+ response.carModelKey
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
selecttaskType(e) {
|
|
|
for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
|
@@ -516,8 +488,8 @@ export default {
|
|
|
},
|
|
|
approve() {},
|
|
|
listQuery() {},
|
|
|
- },
|
|
|
-}
|
|
|
+ }
|
|
|
+
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
/deep/.basicInformation {
|
|
|
@@ -527,6 +499,7 @@ export default {
|
|
|
.el-form-item {
|
|
|
width: 33.3333%;
|
|
|
border: none;
|
|
|
+ height: 50px;
|
|
|
.el-form-item__label {
|
|
|
background: transparent;
|
|
|
border: none;
|
|
|
@@ -563,8 +536,8 @@ export default {
|
|
|
text-align: right;
|
|
|
padding: 16px 20px;
|
|
|
}
|
|
|
-.center{
|
|
|
- width: 80%;
|
|
|
+.center {
|
|
|
+ width: 90%;
|
|
|
margin: 0 auto;
|
|
|
}
|
|
|
|
|
|
@@ -593,94 +566,117 @@ export default {
|
|
|
top: 13px;
|
|
|
padding: 4px 2px;
|
|
|
}
|
|
|
-.position{
|
|
|
- width: 90%;
|
|
|
-}
|
|
|
-.position .siji{
|
|
|
- width: 16%;
|
|
|
-}
|
|
|
-/deep/.position .ws-info-table .el-form-item .el-form-item__label{
|
|
|
- width: 40%;
|
|
|
- text-align: center;
|
|
|
+.position {
|
|
|
+ position: relative;
|
|
|
}
|
|
|
-.position .zaizhong{
|
|
|
+.position .zaizhong {
|
|
|
width: 16%;
|
|
|
}
|
|
|
//减号
|
|
|
.del {
|
|
|
- right: -70px;
|
|
|
-}
|
|
|
-.bot{
|
|
|
- width: 30%;
|
|
|
-}
|
|
|
-.position .siji {
|
|
|
- width: 20.5%;
|
|
|
-}
|
|
|
-/deep/.el-form-item {
|
|
|
- border-right: 0px;
|
|
|
- border-bottom: 0px;
|
|
|
-}
|
|
|
-/deep/.ws-info-table {
|
|
|
- border-left: 0px;
|
|
|
- border-top: 0px;
|
|
|
-}
|
|
|
-.ws-info-table .el-form-item .el-form-item__content {
|
|
|
- border-right: 0px;
|
|
|
- border-bottom: 0px;
|
|
|
- border-left: 0px;
|
|
|
- border-top: 0px;
|
|
|
+ position: absolute;
|
|
|
+ // right: -38px;
|
|
|
+ top: 9px;
|
|
|
+ cursor: pointer;
|
|
|
+ right: 0;
|
|
|
+ display: inline-block;
|
|
|
+ font-size: 20px;
|
|
|
+ width: 20px;
|
|
|
+ height: 10px;
|
|
|
+ line-height: 0px;
|
|
|
}
|
|
|
-/deep/.ws-info-table .el-form-item {
|
|
|
- border-right: 0px;
|
|
|
- border-bottom: 0px;
|
|
|
- border-left: 0px;
|
|
|
- border-top: 0px;
|
|
|
+.driver .el-form-item {
|
|
|
+ width: 16.63%;
|
|
|
}
|
|
|
/deep/.ws-info-table .el-form-item .el-form-item__content {
|
|
|
background: #f5f7fa;
|
|
|
border-radius: 4px;
|
|
|
- border: 1px solid #d8dce6;
|
|
|
- font-family: PingFangSC-Regular, PingFang SC;
|
|
|
- margin-bottom: 5px;
|
|
|
- background-color: #fff;
|
|
|
- font-size: 14px;
|
|
|
- font-weight: 400;
|
|
|
color: #8890b1;
|
|
|
- line-height: 16px;
|
|
|
-}
|
|
|
-/deep/.ws-info-table .el-form-item .el-form-item__label {
|
|
|
- background-color: #fff;
|
|
|
font-size: 14px;
|
|
|
- font-family: PingFangSC-Regular, PingFang SC;
|
|
|
- font-weight: 400;
|
|
|
- color: #8890b1;
|
|
|
- line-height: 16px;
|
|
|
-}
|
|
|
-// .flex .position{
|
|
|
-// margin-top: 150px;
|
|
|
-// margin-left: 20px;
|
|
|
-// }
|
|
|
-.position{
|
|
|
- width: 100%;
|
|
|
}
|
|
|
-.position .siji{
|
|
|
- width: 20.6%;
|
|
|
+/deep/.driver .ws-info-table .el-form-item .el-form-item__label {
|
|
|
+ width: 72px;
|
|
|
}
|
|
|
-//下表格式
|
|
|
/deep/.liaison .ws-info-table .el-form-item {
|
|
|
- width: 15%;
|
|
|
- height: 50px;
|
|
|
+ width: 16.66%;
|
|
|
+ color: #8890b1;
|
|
|
+ font-size: 14px;
|
|
|
+}
|
|
|
+/deep/.ws-info-table .el-form-item {
|
|
|
+ border: none;
|
|
|
+ height: 50px;
|
|
|
}
|
|
|
/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
|
|
|
- width: 30%;
|
|
|
- background: #F6F7FC;
|
|
|
+ width: 40%;
|
|
|
+ border: 0px solid #d8dce6;
|
|
|
+ background: #f5f7fa;
|
|
|
+ text-align: center;
|
|
|
}
|
|
|
-/deep/.liaison .flex {
|
|
|
- display: contents;
|
|
|
+/deep/.liaison {
|
|
|
+ background: #f5f7fa;
|
|
|
+ border-radius: 4px;
|
|
|
+ border: 0px solid #d8dce6;
|
|
|
+}
|
|
|
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
|
|
|
+ border: none;
|
|
|
+ background: #f5f7fa;
|
|
|
+}
|
|
|
+.catNos {
|
|
|
+ width: 100%;
|
|
|
+ height: 30px;
|
|
|
+ margin-top: 10px;
|
|
|
+ margin-left: 20px;
|
|
|
+ font-size: 14px;
|
|
|
+}
|
|
|
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
|
|
|
+ // border: 0px solid #d8dce6;
|
|
|
+ border-radius: 0px;
|
|
|
+ border-left: none;
|
|
|
+ border-bottom: none;
|
|
|
+ border-top: none;
|
|
|
}
|
|
|
/deep/.liaison .ws-info-table{
|
|
|
background: #F6F7FC;
|
|
|
border-radius: 4px;
|
|
|
border: 1px solid #D8DCE6;
|
|
|
+margin-top: 20px;
|
|
|
+}
|
|
|
+//送达/未送达
|
|
|
+.noservice,
|
|
|
+.service {
|
|
|
+ display: inline-block;
|
|
|
+ border-radius: 4px;
|
|
|
+ border: 1px solid #d8dce6;
|
|
|
+ padding: 2px;
|
|
|
+ font-size: 12px;
|
|
|
+}
|
|
|
+.noservice {
|
|
|
+ background: #c4cada;
|
|
|
+ color: #ffffff;
|
|
|
+}
|
|
|
+.service {
|
|
|
+ background: #e5f1f7;
|
|
|
+ color: #50cad4;
|
|
|
+}
|
|
|
+//添加司机
|
|
|
+.add {
|
|
|
+ width: 100px;
|
|
|
+ height: 34px;
|
|
|
+ background: #f6f7fb;
|
|
|
+ border-radius: 17px;
|
|
|
+ color: #5473e8;
|
|
|
+ font-size: 14px;
|
|
|
+ border: none;
|
|
|
+}
|
|
|
+.add img {
|
|
|
+ display: inline-block;
|
|
|
+ margin-top: 3px;
|
|
|
+ margin-left: -12px;
|
|
|
+}
|
|
|
+.add .spans {
|
|
|
+ display: table-caption;
|
|
|
+ width: 56px;
|
|
|
+ height: 20px;
|
|
|
+ line-height: 18px;
|
|
|
}
|
|
|
</style>
|
mxx