|
|
@@ -6,88 +6,70 @@
|
|
|
<h2 class="bg-left title">火运装车反馈</h2>
|
|
|
</el-col>
|
|
|
<el-col :span="12" class="bg-right">
|
|
|
- <el-button
|
|
|
- class="bg-bottom"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="revert()"
|
|
|
- ><img
|
|
|
+ <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
|
|
|
+ <img
|
|
|
width="6"
|
|
|
height="10"
|
|
|
style="vertical-align: bottom; margin-right: 3px"
|
|
|
src="../../../public/img/lujing.png"
|
|
|
- alt=""
|
|
|
- />返回</el-button
|
|
|
- >
|
|
|
+ alt
|
|
|
+ />返回
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <ws-form
|
|
|
- class="position"
|
|
|
- ref="deptBudgetList"
|
|
|
- :rules="rules"
|
|
|
- :model="deptBudgetList"
|
|
|
- >
|
|
|
+ <ws-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
|
|
|
<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" 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="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="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" class="readonly">
|
|
|
- {{ deptBudgetList.sender }}
|
|
|
- </ws-form-item>
|
|
|
+ <ws-form-item
|
|
|
+ label="发货人"
|
|
|
+ span="1"
|
|
|
+ prop="sender"
|
|
|
+ class="readonly"
|
|
|
+ >{{ deptBudgetList.sender }}</ws-form-item>
|
|
|
<!--发货人电话-->
|
|
|
<ws-form-item
|
|
|
label="发货人电话"
|
|
|
span="1"
|
|
|
prop="senderPhone"
|
|
|
class="readonly"
|
|
|
- >
|
|
|
- {{ deptBudgetList.senderPhone }}
|
|
|
- </ws-form-item>
|
|
|
+ >{{ 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="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="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="deliveryDateStart"
|
|
|
+ >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
|
|
|
<!--最晚到货日期-->
|
|
|
- <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
|
|
|
- {{ deptBudgetList.deliveryDateEnd }}
|
|
|
- </ws-form-item>
|
|
|
+ <ws-form-item
|
|
|
+ label="最晚到货日期"
|
|
|
+ span="1"
|
|
|
+ prop="deliveryDateEnd"
|
|
|
+ >{{ 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="tranType">
|
|
|
- {{ deptBudgetList.tranType }}
|
|
|
- </ws-form-item>
|
|
|
+ <ws-form-item label="运输方式" span="1" prop="tranType">{{ deptBudgetList.tranType }}</ws-form-item>
|
|
|
</ws-info-table>
|
|
|
<div class="small-title" style="font-size: 16px">联络员及车次</div>
|
|
|
<div class="lianluoyuan">
|
|
|
@@ -121,6 +103,20 @@
|
|
|
</ws-info-table>
|
|
|
</div>
|
|
|
<div class="small-title" style="font-size: 16px">装车详情</div>
|
|
|
+ <!-- 导入 -->
|
|
|
+ <div style="font-size: 16px; width: 100%; text-align: right">
|
|
|
+ <el-upload
|
|
|
+ style="margin-left: 8px;"
|
|
|
+ class="upload-demo inline-block margin-right-10"
|
|
|
+ action
|
|
|
+ :on-change="handleChange"
|
|
|
+ :show-file-list="false"
|
|
|
+ accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
|
|
|
+ :auto-upload="false"
|
|
|
+ >
|
|
|
+ <el-button type="primary">导入</el-button>
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
<div class="liaison">
|
|
|
<div
|
|
|
style="width: 100%"
|
|
|
@@ -166,32 +162,31 @@
|
|
|
"
|
|
|
class="avatar-uploader"
|
|
|
accept=".jpg, .jpeg, .png, .gif"
|
|
|
- ><img
|
|
|
+ >
|
|
|
+ <img
|
|
|
width="18"
|
|
|
height="20"
|
|
|
style="vertical-align: text-top; position: relative"
|
|
|
src="../../../public/img/fujian.png"
|
|
|
- alt=""
|
|
|
+ alt
|
|
|
/>
|
|
|
</el-upload>
|
|
|
<span
|
|
|
v-if="
|
|
|
deptBudgetList.tranCarInfoList[index].loadPoundImg != null
|
|
|
"
|
|
|
- >1</span
|
|
|
- >
|
|
|
+ >1</span>
|
|
|
<span
|
|
|
v-if="
|
|
|
deptBudgetList.tranCarInfoList[index].loadPoundImg == null
|
|
|
"
|
|
|
- >未上传</span
|
|
|
- >
|
|
|
+ >未上传</span>
|
|
|
</template>
|
|
|
</ws-form-item>
|
|
|
<!--装车日期-->
|
|
|
<el-form-item label="装车日期:" span="1" prop="loadingDate">
|
|
|
<ws-date-picker
|
|
|
- v-if="item.status == '已装车' || item.status == '已送达'"
|
|
|
+ v-if="item.status == '已装车' || item.status == '已送达'"
|
|
|
:disabled="readonly"
|
|
|
v-model="item.loadingDate"
|
|
|
type="date"
|
|
|
@@ -210,11 +205,7 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<!-- 提交 -->
|
|
|
- <span
|
|
|
- class="servicein"
|
|
|
- v-show="item.status == '已装车' || item.status == '已送达'"
|
|
|
- >已装车</span
|
|
|
- >
|
|
|
+ <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
|
|
|
<span
|
|
|
style="text-align: right; padding: 10px"
|
|
|
class="center"
|
|
|
@@ -230,8 +221,7 @@
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="submit(deptBudgetList)"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
+ >提交</el-button>
|
|
|
</div>
|
|
|
</span>
|
|
|
<!-- <div
|
|
|
@@ -249,7 +239,7 @@
|
|
|
class="signStatus1"
|
|
|
>
|
|
|
{{ item.signStatus }}
|
|
|
- </div> -->
|
|
|
+ </div>-->
|
|
|
<span
|
|
|
v-show="item.temporaryDriverFlag != 0"
|
|
|
width="22"
|
|
|
@@ -257,36 +247,29 @@
|
|
|
class="del"
|
|
|
@click="del(index)"
|
|
|
src="../../../public/img/del.png"
|
|
|
- alt=""
|
|
|
- >×</span
|
|
|
- >
|
|
|
+ alt
|
|
|
+ >×</span>
|
|
|
</ws-info-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div style="text-align: right; color: #8890b1; font-size: 16px">
|
|
|
合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
|
|
|
- <!--阶段状态-->
|
|
|
- <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
|
|
|
- 未完货
|
|
|
- </span>
|
|
|
- <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
|
|
|
+ <!--阶段状态-->
|
|
|
+ <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">未完货</span>
|
|
|
+ <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">
|
|
|
+ {{
|
|
|
deptBudgetList.feedbackStatus
|
|
|
- }}</span>
|
|
|
+ }}
|
|
|
+ </span>
|
|
|
</div>
|
|
|
<!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
|
|
|
<img width="22" height="22" src="../../../public/img/add.png" alt="" />
|
|
|
<div class="spans">添加临时用车</div></el-button
|
|
|
- > -->
|
|
|
+ >-->
|
|
|
</ws-form>
|
|
|
<!-- 完货 -->
|
|
|
<div style="text-align: right; padding: 10px" class="wanhuo">
|
|
|
- <el-button
|
|
|
- class="bg-bottom"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="finished(deptBudgetList)"
|
|
|
- >完货</el-button
|
|
|
- >
|
|
|
+ <el-button class="bg-bottom" type="primary" size="small" @click="finished(deptBudgetList)">完货</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -299,7 +282,7 @@ export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
components: {
|
|
|
WsUpload,
|
|
|
- mapDrag,
|
|
|
+ mapDrag
|
|
|
},
|
|
|
watch: {
|
|
|
vesselId(val) {
|
|
|
@@ -307,12 +290,12 @@ export default {
|
|
|
},
|
|
|
isShow(val) {
|
|
|
this.showType = val
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
deptBudgetList: {
|
|
|
- totalStorage: 0,
|
|
|
+ totalStorage: 0
|
|
|
},
|
|
|
options_: regionData,
|
|
|
heightData: '600px',
|
|
|
@@ -333,15 +316,15 @@ export default {
|
|
|
{
|
|
|
required: true,
|
|
|
message: '请输入仓库名称',
|
|
|
- trigger: 'blur',
|
|
|
+ trigger: 'blur'
|
|
|
},
|
|
|
{
|
|
|
min: 2,
|
|
|
max: 20,
|
|
|
message: '仓库名长度不符合要求，请输入2-20字符之内',
|
|
|
- trigger: 'blur',
|
|
|
- },
|
|
|
- ],
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
tranType: 2,
|
|
|
size: 10,
|
|
|
@@ -356,24 +339,25 @@ export default {
|
|
|
compName: '',
|
|
|
bankDeposit: '',
|
|
|
addressUrlArray: [],
|
|
|
- bankCard: '',
|
|
|
- },
|
|
|
+ bankCard: ''
|
|
|
+ }
|
|
|
],
|
|
|
freightspace: [
|
|
|
{
|
|
|
boxNo: '',
|
|
|
loadNetWeight: '',
|
|
|
loadPoundImg: '',
|
|
|
- loadingDate: '',
|
|
|
- },
|
|
|
+ loadingDate: ''
|
|
|
+ }
|
|
|
// {loadPoundImg:{}},
|
|
|
],
|
|
|
name: '',
|
|
|
staffList: [],
|
|
|
options: [],
|
|
|
carModel: [],
|
|
|
+ fileTemp: {},
|
|
|
tranCarInfoList: {
|
|
|
- loadPoundImg: '',
|
|
|
+ loadPoundImg: ''
|
|
|
},
|
|
|
// tranCarList: {
|
|
|
// driver: '',
|
|
|
@@ -385,7 +369,7 @@ export default {
|
|
|
//上传
|
|
|
accessoryTFs: false,
|
|
|
fileList: [],
|
|
|
- appendixIdsAdd: '',
|
|
|
+ appendixIdsAdd: ''
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
@@ -393,14 +377,14 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
computed: {
|
|
|
- totalStorage: function () {
|
|
|
+ totalStorage: function() {
|
|
|
var maxStorage = 0
|
|
|
for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
maxStorage += Number(this.freightspace[i].maxStorage)
|
|
|
}
|
|
|
return maxStorage
|
|
|
},
|
|
|
- total: function () {
|
|
|
+ total: function() {
|
|
|
if (this.deptBudgetList.tranCarInfoList != null) {
|
|
|
var maxStorage = 0
|
|
|
for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
|
|
|
@@ -412,10 +396,97 @@ export default {
|
|
|
} else {
|
|
|
return 0
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
- marker: function (item) {
|
|
|
+ handleChange(file, fileList) {
|
|
|
+ this.fileTemp = file.raw
|
|
|
+ let fileName = file.raw.name
|
|
|
+ let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
|
|
|
+ // 判断上传文件格式
|
|
|
+ if (this.fileTemp) {
|
|
|
+ if (fileType == 'xlsx' || fileType == 'xls') {
|
|
|
+ this.importf(this.fileTemp)
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '附件格式错误，请删除后重新上传！'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请上传附件！'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ importf(obj) {
|
|
|
+ this.dialogVisible = true
|
|
|
+ let _this = this
|
|
|
+ let inputDOM = this.$refs.inputer // 通过DOM取文件数据
|
|
|
+ this.file = event.currentTarget.files[0]
|
|
|
+ var rABS = false //是否将文件读取为二进制字符串
|
|
|
+ var f = this.file
|
|
|
+ var reader = new FileReader()
|
|
|
+ //if (!FileReader.prototype.readAsBinaryString) {
|
|
|
+ FileReader.prototype.readAsBinaryString = function(f) {
|
|
|
+ var binary = ''
|
|
|
+ var rABS = false //是否将文件读取为二进制字符串
|
|
|
+ var pt = this
|
|
|
+ var wb //读取完成的数据
|
|
|
+ var outdata
|
|
|
+ var reader = new FileReader()
|
|
|
+ reader.onload = function(e) {
|
|
|
+ var bytes = new Uint8Array(reader.result)
|
|
|
+ var length = bytes.byteLength
|
|
|
+ for (var i = 0; i < length; i++) {
|
|
|
+ binary += String.fromCharCode(bytes[i])
|
|
|
+ }
|
|
|
+ var XLSX = require('xlsx')
|
|
|
+ if (rABS) {
|
|
|
+ wb = XLSX.read(btoa(fixdata(binary)), {
|
|
|
+ //手动转化
|
|
|
+ type: 'base64'
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ wb = XLSX.read(binary, {
|
|
|
+ type: 'binary'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ // outdata就是你想要的东西 excel导入的数据
|
|
|
+ outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
|
|
|
+ // excel 数据再处理
|
|
|
+ let arr = []
|
|
|
+ outdata.map(v => {
|
|
|
+ // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
|
|
|
+ let jsonString = JSON.stringify(v)
|
|
|
+ .replace(/\//g, '')
|
|
|
+ .replace(/\s/gi, '')
|
|
|
+ console.log(jsonString)
|
|
|
+ v = JSON.parse(jsonString)
|
|
|
+ let obj = {}
|
|
|
+ //xxx代表列名
|
|
|
+ obj.boxNo = v.车厢号
|
|
|
+ obj.loadNetWeight = v.装车净重
|
|
|
+ obj.loadingDate = toString(v.装车日期)
|
|
|
+ obj.status = v.状态
|
|
|
+ obj.unloadPoundImg = v.磅单
|
|
|
+ console.log(obj)
|
|
|
+ _this.freightspace.push(obj)
|
|
|
+ })
|
|
|
+ // _this.freightspace.concat(arr)
|
|
|
+ console.log(arr, _this.freightspace)
|
|
|
+ }
|
|
|
+ reader.readAsArrayBuffer(f)
|
|
|
+ }
|
|
|
+ if (rABS) {
|
|
|
+ reader.readAsArrayBuffer(f)
|
|
|
+ } else {
|
|
|
+ reader.readAsBinaryString(f)
|
|
|
+ }
|
|
|
+ console.log(reader)
|
|
|
+ },
|
|
|
+ marker: function(item) {
|
|
|
this.deptBudgetList.warehousePositioning =
|
|
|
item.lnglat.lat + ',' + item.lnglat.lng
|
|
|
},
|
|
|
@@ -428,7 +499,7 @@ export default {
|
|
|
driver: '',
|
|
|
driverPhone: '',
|
|
|
carNo: '',
|
|
|
- loadNetWeight: '',
|
|
|
+ loadNetWeight: ''
|
|
|
})
|
|
|
},
|
|
|
del(index) {
|
|
|
@@ -444,22 +515,22 @@ export default {
|
|
|
this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
.then(() => {
|
|
|
- this.$refs.deptBudgetList.validate((valid) => {
|
|
|
+ this.$refs.deptBudgetList.validate(valid => {
|
|
|
if (valid) {
|
|
|
var tranProcessInfo = {}
|
|
|
tranProcessInfo.id = this.deptBudgetList.id
|
|
|
state(tranProcessInfo)
|
|
|
.toPromise()
|
|
|
- .then((response) => {
|
|
|
+ .then(response => {
|
|
|
this.$message.success('完货成功')
|
|
|
this.deptBudgetList = {}
|
|
|
this.freightspace = {}
|
|
|
this.selectedOptions = ''
|
|
|
this.$router.push({
|
|
|
- path: 'tranManagementTransporHairRespond',
|
|
|
+ path: 'tranManagementTransporHairRespond'
|
|
|
})
|
|
|
})
|
|
|
} else {
|
|
|
@@ -471,121 +542,137 @@ export default {
|
|
|
return false
|
|
|
})
|
|
|
},
|
|
|
+ validateFunc() {
|
|
|
+ this.$refs.deptBudgetList.validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ // this.deptBudgetList.totalStorage = this.totalStorage
|
|
|
+ this.tranCarInfoList = this.freightspace
|
|
|
+ this.tranCarInfoList.driver = this.deptBudgetList.driver
|
|
|
+ this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
|
|
|
+ this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
|
|
|
+ this.tranCarInfoList.carNo = this.deptBudgetList.carNo
|
|
|
+ this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
|
|
|
+ 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
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var tranProcessInfo = {}
|
|
|
+ tranProcessInfo.id = this.deptBudgetList.id
|
|
|
+ tranProcessInfo.infoId = this.deptBudgetList.infoId
|
|
|
+ tranProcessInfo.processNo = this.deptBudgetList.processNo
|
|
|
+ tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
|
|
|
+ tranProcessInfo.tranCarInfoList = this.tranCarInfoList
|
|
|
+ // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
|
|
|
+ feedback(tranProcessInfo)
|
|
|
+ .toPromise()
|
|
|
+ .then(response => {
|
|
|
+ this.$message.success('提交成功')
|
|
|
+ this.deptBudgetList = {}
|
|
|
+ this.freightspace = {}
|
|
|
+ this.selectedOptions = ''
|
|
|
+ this.$router.push({
|
|
|
+ path: 'tranManagementTransporHairRespond'
|
|
|
+ })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
submit() {
|
|
|
- debugger
|
|
|
for (var i = 0; i < this.freightspace.length; i++) {
|
|
|
if (this.freightspace[i].temporaryDriverFlag != 0) {
|
|
|
if (!this.freightspace[i].driver) {
|
|
|
this.$message({
|
|
|
message: '司机姓名不能为空！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
if (!this.freightspace[i].driverPhone) {
|
|
|
this.$message({
|
|
|
message: '司机电话不能为空！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
if (!this.freightspace[i].carNo) {
|
|
|
this.$message({
|
|
|
message: '车牌号不能为空！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- debugger
|
|
|
if (!this.freightspace[i].loadNetWeight) {
|
|
|
this.$message({
|
|
|
message: '装车净重不能为空！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.freightspace[i].loadNetWeight < 0 || this.freightspace[i].loadNetWeight > 10000) {
|
|
|
+ if (
|
|
|
+ this.freightspace[i].loadNetWeight < 0 ||
|
|
|
+ this.freightspace[i].loadNetWeight > 10000
|
|
|
+ ) {
|
|
|
this.$message({
|
|
|
message: '装车净重输入错误！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (!this.freightspace[i].loadingDate) {
|
|
|
+ if (!this.freightspace[i].loadingDate) {
|
|
|
this.$message({
|
|
|
message: '装车日期不能为空！',
|
|
|
- type: 'warning',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning',
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$refs.deptBudgetList.validate((valid) => {
|
|
|
- if (valid) {
|
|
|
- // this.deptBudgetList.totalStorage = this.totalStorage
|
|
|
- this.tranCarInfoList = this.freightspace
|
|
|
- this.tranCarInfoList.driver = this.deptBudgetList.driver
|
|
|
- this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
|
|
|
- this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
|
|
|
- this.tranCarInfoList.carNo = this.deptBudgetList.carNo
|
|
|
- this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
|
|
|
- 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
|
|
|
- }
|
|
|
- }
|
|
|
- var tranProcessInfo = {}
|
|
|
- tranProcessInfo.id = this.deptBudgetList.id
|
|
|
- tranProcessInfo.infoId = this.deptBudgetList.infoId
|
|
|
- tranProcessInfo.processNo = this.deptBudgetList.processNo
|
|
|
- tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
|
|
|
- tranProcessInfo.tranCarInfoList = this.tranCarInfoList
|
|
|
- // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
|
|
|
- feedback(tranProcessInfo)
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.$message.success('提交成功')
|
|
|
- this.deptBudgetList = {}
|
|
|
- this.freightspace = {}
|
|
|
- this.selectedOptions = ''
|
|
|
- this.$router.push({
|
|
|
- path: 'tranManagementTransporHairRespond',
|
|
|
- })
|
|
|
- })
|
|
|
- } else {
|
|
|
- // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
- return false
|
|
|
- }
|
|
|
+ if (sessionStorage.getItem('sh-msg')) {
|
|
|
+ this.validateFunc()
|
|
|
+ } else {
|
|
|
+ this.$alert(
|
|
|
+ '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
|
|
|
+ '',
|
|
|
+ {
|
|
|
+ dangerouslyUseHTMLString: true,
|
|
|
+ distinguishCancelAndClose: true,
|
|
|
+ showCancelButton: true,
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消'
|
|
|
+ }
|
|
|
+ )
|
|
|
+ .then(() => {
|
|
|
+ this.validateFunc()
|
|
|
})
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- return false
|
|
|
- })
|
|
|
+ .catch(() => {
|
|
|
+ return false
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
getList() {
|
|
|
seeCat({ id: this.deptBudgetList.id })
|
|
|
.toPromise()
|
|
|
- .then((response) => {
|
|
|
+ .then(response => {
|
|
|
this.deptBudgetList = response
|
|
|
// this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
|
|
|
this.deptBudgetList.driver = response.tranCarInfoList[0].driver
|
|
|
this.deptBudgetList.driverPhone =
|
|
|
response.tranCarInfoList[0].driverPhone
|
|
|
- this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
|
|
|
+ this.$set(
|
|
|
+ this.deptBudgetList,
|
|
|
+ 'sendDateStart',
|
|
|
+ response.tranCarInfoList[0].sendDateStart
|
|
|
+ )
|
|
|
this.deptBudgetList.receiveDateEnd =
|
|
|
response.tranCarInfoList[0].receiveDateEnd
|
|
|
this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel
|
|
|
@@ -599,8 +686,8 @@ export default {
|
|
|
},
|
|
|
uploadSuccessHandle1(e, index) {
|
|
|
this.freightspace[index].loadPoundImg = e.url
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
@@ -1058,7 +1145,7 @@ export default {
|
|
|
margin-top: 11px;
|
|
|
margin-left: 53px;
|
|
|
}
|
|
|
-/deep/.el-input--suffix .el-input__inner{
|
|
|
+/deep/.el-input--suffix .el-input__inner {
|
|
|
padding-right: 0px !important;
|
|
|
}
|
|
|
//送达/未送达
|
