|
|
@@ -4,7 +4,7 @@
|
|
|
<template slot="left">
|
|
|
</template>
|
|
|
<template slot="right">
|
|
|
- <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
|
|
|
+ <el-select style="width:400px;" v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
|
|
|
<el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
|
|
|
style="color: #8890b1" />
|
|
|
</el-select>
|
|
|
@@ -141,12 +141,12 @@
|
|
|
value-format="yyyy-MM-dd" />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="运输方式" span="1" prop="outType">
|
|
|
- <el-select v-model="weighingList.outType" placeholder="请选择运输方式" :disabled="recheck1">
|
|
|
+ <el-select @change="outTypechange" v-model="weighingList.outType" placeholder="请选择运输方式" :disabled="recheck1">
|
|
|
<el-option v-for="item in multiSelector" :key="item.value" :label="item.name"
|
|
|
:value="item.name" />
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
|
|
|
+ <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1&&weighingList.outType == '汽运'" label="车队" span="1" prop="fleetName">
|
|
|
<el-select @change="fleetNameChange" :disabled="recheck" v-model="weighingList.fleet" placeholder="非车队车辆">
|
|
|
<el-option key="" label="非车队"
|
|
|
value="非车队" />
|
|
|
@@ -155,6 +155,7 @@
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="车牌号" span="1" prop="carNo" v-if="
|
|
|
+ weighingList.outType == '散船' ||
|
|
|
weighingList.outType == '汽运' ||
|
|
|
weighingList.outType == '集装箱船'
|
|
|
">
|
|
|
@@ -200,7 +201,12 @@
|
|
|
size="small" />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
|
|
|
- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
|
|
|
+ <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
|
|
|
+ <el-select filterable clearable v-model="weighingList.shipName"
|
|
|
+ placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
|
|
|
+ <el-option v-for="item in shipInfoList" :key="item.id" :label="item.shipName"
|
|
|
+ :value="item.shipName" />
|
|
|
+ </el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
|
|
|
<ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
|
|
|
@@ -422,6 +428,7 @@
|
|
|
warehouseList1: [],
|
|
|
currentPage: 1,
|
|
|
pageSize: 50,
|
|
|
+ shipInfoList:[],
|
|
|
priceedit:false,
|
|
|
submitAllow: false,
|
|
|
deliveryList: [],
|
|
|
@@ -612,6 +619,15 @@
|
|
|
},
|
|
|
activated() {},
|
|
|
methods: {
|
|
|
+ shipInfoChange(e){
|
|
|
+ console.log(e)
|
|
|
+
|
|
|
+ for (let i = 0; i < this.shipInfoList.length; i++) {
|
|
|
+ if(this.shipInfoList[i].shipName==this.weighingList.shipName){
|
|
|
+ this.weighingList.shipNumber=this.shipInfoList[i].shipNo
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
async typePrintClick(type) {
|
|
|
getweighing({
|
|
|
id: this.idPrint
|
|
|
@@ -651,6 +667,24 @@
|
|
|
})
|
|
|
.catch((response) => {})
|
|
|
},
|
|
|
+ outTypechange(e){
|
|
|
+ console.log(e)
|
|
|
+ if(e=='汽运'){
|
|
|
+ if(this.carChange1 == '手动填写'){
|
|
|
+ this.weighingList.selfLoading = '0'
|
|
|
+ this.carjudge=false
|
|
|
+ }else{
|
|
|
+ this.weighingList.selfLoading = '1'
|
|
|
+ this.carjudge=true
|
|
|
+ }
|
|
|
+ }else if(e=='散船'){
|
|
|
+ this.carjudge=true
|
|
|
+ this.weighingList.selfLoading = '0'
|
|
|
+ }else if(e=='集装箱船'){
|
|
|
+ this.carjudge=true
|
|
|
+ this.weighingList.selfLoading = '0'
|
|
|
+ }
|
|
|
+ },
|
|
|
typePrintCannelClick() {
|
|
|
this.ddchecked = false,
|
|
|
this.checked = false,
|
|
|
@@ -2085,7 +2119,7 @@
|
|
|
// if (!data) return
|
|
|
for (var i = 0; i < this.outContractNo.length; i++) {
|
|
|
if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
|
|
|
-
|
|
|
+ this.shipInfoList=this.outContractNo[i].shipInfoList
|
|
|
this.weighingList.goodsName = this.outContractNo[i].goodsName
|
|
|
if (this.weighingList.goodsName == '玉米（潮粮）') {
|
|
|
this.weighingList.type = '潮粮'
|
