|
|
@@ -110,7 +110,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
|
|
|
+ <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
|
|
|
<div class="print-type-ew">
|
|
|
<el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
|
|
|
<el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
|
|
|
@@ -256,6 +256,9 @@
|
|
|
title: '',
|
|
|
modification: [],
|
|
|
ewCustomerOptions: [{
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
value: '黑龙江中天昊元贸易有限公司',
|
|
|
label: '黑龙江中天昊元贸易有限公司'
|
|
|
}, {
|
|
|
@@ -315,6 +318,9 @@
|
|
|
label: '黑龙江启兴粮食贸易有限公司'
|
|
|
}],
|
|
|
companyNameEWOptions: [{
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
value: '厦门建发物产有限公司',
|
|
|
label: '厦门建发物产有限公司'
|
|
|
}],
|
|
|
@@ -344,6 +350,7 @@
|
|
|
console.log(localStorage.getItem('compNameoptions'))
|
|
|
if(localStorage.getItem('compNameoptions')){
|
|
|
var company=JSON.parse(localStorage.getItem('compNameoptions'))
|
|
|
+
|
|
|
var extra=company.filter((item)=>{
|
|
|
return item!='黑龙江中天昊元贸易有限公司'
|
|
|
&&item!='黑龙江利润元粮食贸易有限公司'
|
|
|
@@ -356,12 +363,115 @@
|
|
|
&&item!='黑龙江启兴粮食贸易有限公司'
|
|
|
})
|
|
|
if(extra.length>0){
|
|
|
- this.ewCustomerOptions=[]
|
|
|
- this.companyNameOptions=[]
|
|
|
- this.companyNameEWOptions=[]
|
|
|
- this.companyName=extra[0]
|
|
|
- this.companyNameEW=extra[0]
|
|
|
- this.ewCustomer=extra[0]
|
|
|
+ this.companyNameOptions=[
|
|
|
+ {
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+
|
|
|
+ this.ewCustomerOptions= [
|
|
|
+ {
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+ this.companyNameEWOptions=[
|
|
|
+ {
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+ if(localStorage.getItem('print_company_name')){
|
|
|
+ this.companyName=localStorage.getItem('print_company_name')
|
|
|
+ }else{
|
|
|
+ this.companyName=extra[0]
|
|
|
+ }
|
|
|
+ if(localStorage.getItem('print_company_name_ew')){
|
|
|
+ this.companyNameEW=localStorage.getItem('print_company_name_ew')
|
|
|
+ }else{
|
|
|
+ this.companyNameEW=extra[0]
|
|
|
+ }
|
|
|
+ if(localStorage.getItem('print_customer_name_ew')){
|
|
|
+ this.ewCustomer=localStorage.getItem('print_customer_name_ew')
|
|
|
+ }else{
|
|
|
+ this.ewCustomer=extra[0]
|
|
|
+ }
|
|
|
for (let i = 0; i < extra.length; i++) {
|
|
|
this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
|
|
|
this.companyNameOptions.push({value: extra[i],label:extra[i]})
|
|
|
@@ -668,6 +778,9 @@
|
|
|
this.$router.go(-1)
|
|
|
},
|
|
|
async typePrintClick(type) {
|
|
|
+ localStorage.setItem('print_company_name',this.companyName)
|
|
|
+ localStorage.setItem('print_company_name_ew',this.companyNameEW)
|
|
|
+ localStorage.setItem('print_customer_name',this.ewCustomer)
|
|
|
if (this.onePrint) { //判断是否是单个打印
|
|
|
getPrint({
|
|
|
id: this.idPrint
|
|
|
@@ -678,7 +791,10 @@
|
|
|
this.dialogData = response
|
|
|
if (response.compName == '黑龙江秋收有限公司') {
|
|
|
this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
+ }else{
|
|
|
+ this.dialogData.compName = this.companyName
|
|
|
}
|
|
|
+ debugger
|
|
|
if (this.checked) {
|
|
|
if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
|
|
|
this.dialogData.customer = this.dialogData.contractManagement.seller
|
|
|
@@ -695,7 +811,7 @@
|
|
|
_datas.customer = this.ewCustomer
|
|
|
this.dialogDataList.push(_datas)
|
|
|
} else {
|
|
|
- this.dialogData.companyName = this.companyName
|
|
|
+ this.dialogData.compName = this.companyName
|
|
|
if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
|
|
|
this.dialogData.customer = this.dialogData.contractManagement.seller
|
|
|
}
|
|
|
@@ -770,7 +886,7 @@
|
|
|
return
|
|
|
}
|
|
|
for (let _num = 0; _num < this.modification.length; _num++) {
|
|
|
- if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
|
|
|
+ if (this.modification[_num].serviceManagementType == 1 && (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
|
|
|
@@ -789,7 +905,7 @@
|
|
|
}
|
|
|
this.isShowPrintType = true
|
|
|
} else {
|
|
|
- if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
|
|
|
+ if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
|
|
|
if (row.seller && row.buyer) {
|
|
|
let cang = {}
|
|
|
cang.value = row.seller
|
|
|
@@ -832,7 +948,8 @@
|
|
|
console.log(this.dialogDataList)
|
|
|
|
|
|
localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
- window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
+ // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
+ window.open('../../../../static/weightCheck.html?type=2&tableData=' )
|
|
|
}
|
|
|
},
|
|
|
warehouseNameChange() {
|
