|
@@ -113,6 +113,14 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
+ <div class="shdw-style" v-if="checked || (!ddchecked && !checked)">
|
|
|
+ <div>发货单位:</div>
|
|
|
+ <!-- <div>{{companyName}}</div> -->
|
|
|
+ <el-select v-model="customer" placeholder="请选择" style="width: 75%;">
|
|
|
+ <el-option v-for="item in customerOptions" :key="item.value" :label="item.label" :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
<div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2||
|
|
|
warehouseName=='白城内陆港'&&printType==2||
|
|
|
warehouseName=='杜尔伯特家禾库'&&printType==2||
|
|
@@ -453,6 +461,8 @@
|
|
|
ddchecked: false,
|
|
|
checked: false,
|
|
|
outchecked:false,
|
|
|
+ customerOptions:[],
|
|
|
+ customer:'',
|
|
|
isShowPrintType: false,
|
|
|
dialogDataList: [],
|
|
|
jjSelectPrintList: [],
|
|
@@ -1067,6 +1077,7 @@
|
|
|
}else{
|
|
|
this.dialogData.compName = this.companyName
|
|
|
}
|
|
|
+ this.dialogData.customer=this.customer
|
|
|
if (this.checked) {
|
|
|
if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
|
|
|
this.dialogData.customer = this.dialogData.contractManagement.seller
|
|
@@ -1132,6 +1143,7 @@
|
|
|
if (response.compName == '黑龙江秋收有限公司') {
|
|
|
response.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
}
|
|
|
+ response.customer=this.customer
|
|
|
this.jjSelectPrintList.push(response)
|
|
|
if (index1 == this.modification.length) {
|
|
|
this.printBig(1, this.radio)
|
|
@@ -1188,29 +1200,35 @@
|
|
|
return
|
|
|
}
|
|
|
for (let _num = 0; _num < this.modification.length; _num++) {
|
|
|
- if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
|
|
|
+ if (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库') {
|
|
|
if (this.modification[_num].seller && this.modification[_num].buyer) {
|
|
|
let cang = {}
|
|
|
cang.value = this.modification[_num].seller
|
|
|
cang.label = this.modification[_num].seller
|
|
|
+ let cang1 = {}
|
|
|
+ cang1.value = this.modification[_num].buyer
|
|
|
+ cang1.label = this.modification[_num].buyer
|
|
|
// if (this.check(this.modification[_num].seller, 1)) {
|
|
|
// this.ewCustomerOptions.push(cang)
|
|
|
// }
|
|
|
if(this.warehouseName=='佳屹农仓储库'){
|
|
|
- if (this.check(this.modification[_num].seller, 3)) {
|
|
|
- this.companyNameOptions.push(cang)
|
|
|
- this.companyName=this.modification[_num].seller
|
|
|
+ if (this.check(this.modification[_num].buyer, 3)) {
|
|
|
+ this.companyNameOptions.push(cang1)
|
|
|
+ this.companyName=this.modification[_num].buyer
|
|
|
+ }
|
|
|
+ if(this.modification[_num].serviceManagementType == 3){
|
|
|
+ this.customerOptions=[{label:this.modification[_num].customer,value:this.modification[_num].customer}]
|
|
|
+ this.customerOptions.push({label:this.modification[_num].seller,value:this.modification[_num].seller})
|
|
|
+ this.customer=this.modification[_num].customer
|
|
|
}
|
|
|
}else{
|
|
|
- if (this.check(this.modification[_num].seller, 1)) {
|
|
|
- this.ewCustomerOptions.push(cang)
|
|
|
+ if (this.check(this.modification[_num].buyer, 2)) {
|
|
|
+ this.ewCustomerOptions.push(cang1)
|
|
|
}
|
|
|
}
|
|
|
- let cang1 = {}
|
|
|
- cang1.value = this.modification[_num].buyer
|
|
|
- cang1.label = this.modification[_num].buyer
|
|
|
- if (this.check(this.modification[_num].buyer, 2)) {
|
|
|
- this.companyNameEWOptions.push(cang1)
|
|
|
+
|
|
|
+ if (this.check(this.modification[_num].seller, 1)) {
|
|
|
+ this.companyNameEWOptions.push(cang)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1219,7 +1237,7 @@
|
|
|
this.isShowPrintType = true
|
|
|
|
|
|
} else {
|
|
|
- if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
|
|
|
+ if (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库') {
|
|
|
if (row.seller && row.buyer) {
|
|
|
let cang = {}
|
|
|
cang.value = row.seller
|
|
@@ -1230,11 +1248,19 @@
|
|
|
let cang1 = {}
|
|
|
cang1.value = row.buyer
|
|
|
cang1.label = row.buyer
|
|
|
+ console.log(111111)
|
|
|
if(this.warehouseName=='佳屹农仓储库'){
|
|
|
if (this.check(row.buyer, 3)) {
|
|
|
this.companyNameOptions.push(cang1)
|
|
|
this.companyName=row.buyer
|
|
|
}
|
|
|
+ if(row.serviceManagementType == 3){
|
|
|
+ this.customerOptions=[{label:row.customer,value:row.customer}]
|
|
|
+ this.customerOptions.push({label:row.seller,value:row.seller})
|
|
|
+ this.customer=row.customer
|
|
|
+ console.log(this.customerOptions,this.customer,222222)
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
if (this.check(row.buyer, 2)) {
|
|
|
this.companyNameEWOptions.push(cang1)
|