|
|
@@ -7,7 +7,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
<span>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="110px">
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="客户名称" prop="corpId">
|
|
|
@@ -18,7 +18,7 @@
|
|
|
filterable
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -36,7 +36,7 @@
|
|
|
placeholder="请选择业务类型"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in billTypeList"
|
|
|
@@ -54,7 +54,7 @@
|
|
|
placeholder="请选择运输方式"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in transTypeList"
|
|
|
@@ -66,13 +66,136 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
+ <el-form-item label="提单号" prop="mblno">
|
|
|
+ <el-input
|
|
|
+ v-model="form.mblno"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.transType != 3"
|
|
|
+ label="提箱地点"
|
|
|
+ prop="loadAddr"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.loadAddr"
|
|
|
+ placeholder="请输入提箱地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item v-else label="装货地点" prop="loadAddr">
|
|
|
+ <el-input
|
|
|
+ v-model="form.loadAddr"
|
|
|
+ placeholder="请输入装货地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.billType == 1 && form.transType != 3"
|
|
|
+ label="卸货地点"
|
|
|
+ prop="mdLoadAddr"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAddr"
|
|
|
+ placeholder="请输入装卸货地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.billType == 2 && form.transType != 3"
|
|
|
+ label="装货地点"
|
|
|
+ prop="mdLoadAddr"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAddr"
|
|
|
+ placeholder="请输入装货地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="form.transType != 3" :span="6">
|
|
|
+ <el-form-item label="卸箱地点" prop="unLoadAddr">
|
|
|
+ <el-input
|
|
|
+ v-model="form.unLoadAddr"
|
|
|
+ placeholder="请输入卸箱地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-else :span="6">
|
|
|
+ <el-form-item label="卸货地点" prop="unLoadAddr">
|
|
|
+ <el-input
|
|
|
+ v-model="form.unLoadAddr"
|
|
|
+ placeholder="请输入卸箱地点"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="装车时间" prop="loadDate">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="form.loadDate"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="请选择装车时间"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
+ <el-form-item label="装货联系人" prop="mdLoadAttn">
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAttn"
|
|
|
+ placeholder="请输入装卸货联系人"
|
|
|
+ disabled
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
+ <el-form-item label="装货联系电话" prop="mdLoadAttnTel">
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAttnTel"
|
|
|
+ placeholder="请输入装卸货联系电话"
|
|
|
+ disabled
|
|
|
+ v-input-limit="0"
|
|
|
+ size="mini"
|
|
|
+ style="width: 100%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row v-show="detailsHidden">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="运输性质" prop="transProp">
|
|
|
<el-select
|
|
|
v-model="form.transProp"
|
|
|
placeholder="请选择运输方式"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in transPropList"
|
|
|
@@ -83,19 +206,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="提单号" prop="mblno">
|
|
|
- <el-input
|
|
|
- v-model="form.mblno"
|
|
|
- placeholder="请输入提单号"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="货品名称" prop="goodsId">
|
|
|
<el-select
|
|
|
@@ -105,7 +215,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in goodsOptions"
|
|
|
@@ -124,7 +234,7 @@
|
|
|
disabled
|
|
|
v-input-limit="2"
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -136,12 +246,10 @@
|
|
|
disabled
|
|
|
v-input-limit="2"
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="船名" prop="ysl">
|
|
|
<el-input
|
|
|
@@ -149,7 +257,7 @@
|
|
|
placeholder="请输入船名"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -160,7 +268,7 @@
|
|
|
placeholder="请输入航次"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -173,7 +281,7 @@
|
|
|
filterable
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in polList"
|
|
|
@@ -193,7 +301,7 @@
|
|
|
filterable
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in podList"
|
|
|
@@ -204,104 +312,40 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- v-if="form.transType != 3"
|
|
|
- label="提箱地点"
|
|
|
- prop="loadAddr"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.loadAddr"
|
|
|
- placeholder="请输入提箱地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item v-else label="装货地点" prop="loadAddr">
|
|
|
- <el-input
|
|
|
- v-model="form.loadAddr"
|
|
|
- placeholder="请输入装货地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="计划时间" prop="loadDate">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- v-model="form.loadDate"
|
|
|
- type="datetime"
|
|
|
- placeholder="选择计划装车时间"
|
|
|
- disabled
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="联系人" prop="loadAttn">
|
|
|
+ <el-form-item label="装车联系人" prop="loadAttn">
|
|
|
<el-input
|
|
|
v-model="form.loadAttn"
|
|
|
placeholder="请输入装车联系人"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="联系电话" prop="loadAttntel">
|
|
|
+ <el-form-item label="装车联系电话" prop="loadAttntel">
|
|
|
<el-input
|
|
|
v-model="form.loadAttntel"
|
|
|
placeholder="请输入装车联系电话"
|
|
|
disabled
|
|
|
v-input-limit="0"
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row v-if="form.transType != 3">
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- v-if="form.billType == 1"
|
|
|
- label="卸货地点"
|
|
|
- prop="mdLoadAddr"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.mdLoadAddr"
|
|
|
- placeholder="请输入装卸货地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.billType == 2"
|
|
|
- label="装货地点"
|
|
|
- prop="mdLoadAddr"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.mdLoadAddr"
|
|
|
- placeholder="请输入装货地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
- <el-form-item label="计划时间" prop="mdLoadDate">
|
|
|
+ <el-col
|
|
|
+ :span="6"
|
|
|
+ v-if="
|
|
|
+ (form.billType == 1 || form.billType == 2) && form.transType != 3
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-form-item label="装卸时间" prop="mdLoadDate">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
v-model="form.mdLoadDate"
|
|
|
type="datetime"
|
|
|
placeholder="选择计划装卸货时间"
|
|
|
@@ -310,59 +354,12 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
- <el-form-item label="联系人" prop="mdLoadAttn">
|
|
|
- <el-input
|
|
|
- v-model="form.mdLoadAttn"
|
|
|
- placeholder="请输入装卸货联系人"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
- <el-form-item label="联系电话" prop="mdLoadAttnTel">
|
|
|
- <el-input
|
|
|
- v-model="form.mdLoadAttnTel"
|
|
|
- placeholder="请输入装卸货联系电话"
|
|
|
- disabled
|
|
|
- v-input-limit="0"
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col v-if="form.transType != 3" :span="6">
|
|
|
- <el-form-item label="卸箱地点" prop="unLoadAddr">
|
|
|
- <el-input
|
|
|
- v-model="form.unLoadAddr"
|
|
|
- placeholder="请输入卸箱地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col v-else :span="6">
|
|
|
- <el-form-item label="卸货地点" prop="unLoadAddr">
|
|
|
- <el-input
|
|
|
- v-model="form.unLoadAddr"
|
|
|
- placeholder="请输入卸箱地点"
|
|
|
- disabled
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="计划时间" prop="unLoadDate">
|
|
|
+ <el-form-item label="卸车时间" prop="unLoadDate">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
v-model="form.unLoadDate"
|
|
|
type="datetime"
|
|
|
placeholder="选择计划卸车时间"
|
|
|
@@ -372,13 +369,13 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="联系人" prop="unLoadAttn">
|
|
|
+ <el-form-item label="卸车联系人" prop="unLoadAttn">
|
|
|
<el-input
|
|
|
v-model="form.unLoadAttn"
|
|
|
placeholder="请输入卸车联系人"
|
|
|
disabled
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -390,12 +387,10 @@
|
|
|
disabled
|
|
|
v-input-limit="0"
|
|
|
size="mini"
|
|
|
- style="width: 180px"
|
|
|
+ style="width:100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
<el-col>
|
|
|
<el-form-item label="线路描述" prop="routeDesc">
|
|
|
<el-input
|
|
|
@@ -423,11 +418,16 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <!-- <div style="display: flex; justify-content: flex-end; margin: 10px 0">
|
|
|
- <el-button type="danger" @click="submitAllowChanges"
|
|
|
- >申请修改</el-button
|
|
|
- >
|
|
|
- </div> -->
|
|
|
+ <div
|
|
|
+ style="display: flex; justify-content: flex-end; margin-bottom: 10px"
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ @click="
|
|
|
+ detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
|
|
|
+ "
|
|
|
+ >{{ detailsHidden ? "隐藏" : "更多" }}
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
<el-collapse v-model="collapses2">
|
|
|
<el-collapse-item v-if="userType == '00'" name="1">
|
|
|
<template slot="title">
|
|
|
@@ -732,25 +732,25 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
label="运单号"
|
|
|
align="center"
|
|
|
prop="orderNo"
|
|
|
width="100"
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
label="单据类型"
|
|
|
align="center"
|
|
|
prop="billKind"
|
|
|
width="100"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
<span v-if="scope.row.billKind === 'NN'">直单</span>
|
|
|
<span v-if="scope.row.billKind === 'MM'">主单</span>
|
|
|
<span v-if="scope.row.billKind === 'MH'">从单</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
label="主单号"
|
|
|
align="center"
|
|
|
prop="mBillNo"
|
|
|
@@ -841,8 +841,11 @@
|
|
|
type="text"
|
|
|
icon="el-icon-document-checked"
|
|
|
@click.native.prevent="selectStowage(scope.row)"
|
|
|
- v-if="schedulingList[0].transProp == '1' && scope.row.billStatus >= 6"
|
|
|
- :disabled="scope.row.mBillNo?true:false"
|
|
|
+ v-if="
|
|
|
+ schedulingList[0].transProp == '1' &&
|
|
|
+ scope.row.billStatus >= 6
|
|
|
+ "
|
|
|
+ :disabled="scope.row.mBillNo ? true : false"
|
|
|
v-hasPermi="['fleet:ftmsorderbillscars:edit']"
|
|
|
>配载</el-button
|
|
|
>
|
|
|
@@ -851,7 +854,10 @@
|
|
|
type="text"
|
|
|
icon="el-icon-document-delete"
|
|
|
@click.native.prevent="changeStowageRow(scope.row)"
|
|
|
- v-if="schedulingList[0].transProp == '1' && scope.row.billStatus >= 6"
|
|
|
+ v-if="
|
|
|
+ schedulingList[0].transProp == '1' &&
|
|
|
+ scope.row.billStatus >= 6
|
|
|
+ "
|
|
|
:disabled="!scope.row.mBillNo"
|
|
|
v-hasPermi="['fleet:ftmsorderbillscars:edit']"
|
|
|
>撤销配载</el-button
|
|
|
@@ -1582,6 +1588,7 @@ export default {
|
|
|
Authorization: "Bearer " + getToken(),
|
|
|
},
|
|
|
addStowagData: "",
|
|
|
+ detailsHidden: false,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -1639,9 +1646,9 @@ export default {
|
|
|
revokeStowage(row.id).then((response) => {
|
|
|
if (response.code == 200) {
|
|
|
this.msgSuccess("配载撤销成功");
|
|
|
- response.data.map((e,index)=>{
|
|
|
- this.$set(this.vehicleList,index,e)
|
|
|
- })
|
|
|
+ response.data.map((e, index) => {
|
|
|
+ this.$set(this.vehicleList, index, e);
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -1667,9 +1674,9 @@ export default {
|
|
|
this.stowageDialog = false;
|
|
|
let row = response.data;
|
|
|
|
|
|
- response.data.map((e,index)=>{
|
|
|
- this.$set(this.vehicleList,index,e)
|
|
|
- })
|
|
|
+ response.data.map((e, index) => {
|
|
|
+ this.$set(this.vehicleList, index, e);
|
|
|
+ });
|
|
|
this.addStowagData = "";
|
|
|
}
|
|
|
});
|
Qukaidi