|
|
@@ -77,7 +77,7 @@
|
|
|
<el-table-column key="14" label="操作" min-width="400">
|
|
|
<template scope="scope">
|
|
|
<!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
|
|
|
- <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
|
|
|
+ <el-button @click="print(scope.row,2)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
|
|
|
<el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
|
|
|
<el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换仓</el-button>
|
|
|
<el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换任务号</el-button>
|
|
|
@@ -112,7 +112,13 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
|
|
|
+ <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2||
|
|
|
+ warehouseName=='白城内陆港'&&printType==2||
|
|
|
+ warehouseName=='杜尔伯特家禾库'&&printType==2||
|
|
|
+ warehouseName=='洮南新友谊兴旺库'&&printType==2||
|
|
|
+ warehouseName=='甘南宏旗库'&&printType==2||
|
|
|
+ warehouseName=='哈尔滨依兰库'&&printType==2||
|
|
|
+ warehouseName=='山东园丰库'&&printType==2">
|
|
|
<div class="print-type-ew">
|
|
|
<el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
|
|
|
<el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
|
|
|
@@ -137,6 +143,30 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2">
|
|
|
+ <div class="print-type-ew">
|
|
|
+ <el-checkbox v-model="outchecked" @change="changeOut">是否打印出库</el-checkbox>
|
|
|
+ </div>
|
|
|
+ <div class="ew-print" v-if="printout">
|
|
|
+ <div class="row">
|
|
|
+ <div>出库发货单位：</div>
|
|
|
+ <!-- <div>{{companyName}}</div> -->
|
|
|
+ <el-select v-model="inshipments" placeholder="请选择" style="width: 75%;">
|
|
|
+ <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="row">
|
|
|
+ <div>出库收货单位：</div>
|
|
|
+ <!-- <div>{{companyNameEW}}</div> -->
|
|
|
+ <el-select v-model="outshipments" placeholder="请选择" style="width: 75%;">
|
|
|
+ <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="bottom-btn">
|
|
|
<el-button @click="typePrintClick">确定</el-button>
|
|
|
@@ -259,6 +289,7 @@
|
|
|
// binNumberId: '', //仓位Id
|
|
|
// warehouseType: '',
|
|
|
compId: '',
|
|
|
+ printType:0,
|
|
|
UserInfo:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')),
|
|
|
pickerOptions: {
|
|
|
shortcuts: [{
|
|
|
@@ -391,13 +422,18 @@
|
|
|
companyName: '黑龙江中天昊元贸易有限公司',
|
|
|
companyNameEW: '厦门建发物产有限公司',
|
|
|
ewCustomer: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ inshipments:'黑龙江中天昊元贸易有限公司',
|
|
|
+ outshipments:'黑龙江中天昊元贸易有限公司',
|
|
|
ewradio: '',
|
|
|
ddchecked: false,
|
|
|
checked: false,
|
|
|
+ outchecked:false,
|
|
|
isShowPrintType: false,
|
|
|
dialogDataList: [],
|
|
|
jjSelectPrintList: [],
|
|
|
+ outPrintList: [],
|
|
|
printSeparately: false,
|
|
|
+ printout:false,
|
|
|
onePrint: false,
|
|
|
startDate:'',
|
|
|
endDate:'',
|
|
|
@@ -918,6 +954,13 @@
|
|
|
} else {
|
|
|
this.printSeparately = false
|
|
|
}
|
|
|
+ },
|
|
|
+ changeOut(e) {
|
|
|
+ if (e) {
|
|
|
+ this.printout = true
|
|
|
+ } else {
|
|
|
+ this.printout = false
|
|
|
+ }
|
|
|
},
|
|
|
dateFormat(fmt, date) {
|
|
|
let ret
|
|
|
@@ -967,12 +1010,14 @@
|
|
|
localStorage.setItem('print_company_name',this.companyName)
|
|
|
localStorage.setItem('print_company_name_ew',this.companyNameEW)
|
|
|
localStorage.setItem('print_customer_name_ew',this.ewCustomer)
|
|
|
+ localStorage.setItem('print_out',this.outchecked)
|
|
|
if (this.onePrint) { //判断是否是单个打印
|
|
|
getPrint({
|
|
|
id: this.idPrint
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
+ // 判断是否打印出库
|
|
|
this.dialogDataList = [] //点击确认时先清空要打印的数组
|
|
|
this.dialogData = response
|
|
|
if (response.compName == '黑龙江秋收有限公司') {
|
|
|
@@ -995,13 +1040,33 @@
|
|
|
_datas.compName = this.companyNameEW;
|
|
|
_datas.customer = this.ewCustomer
|
|
|
this.dialogDataList.push(_datas)
|
|
|
- } else {
|
|
|
+ }else {
|
|
|
this.dialogData.compName = this.companyName
|
|
|
if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
|
|
|
this.dialogData.customer = this.dialogData.contractManagement.seller
|
|
|
}
|
|
|
+
|
|
|
this.dialogDataList.push(this.dialogData)
|
|
|
+
|
|
|
}
|
|
|
+ if(this.outchecked){
|
|
|
+ if(!this.checked&&!this.ddchecked){
|
|
|
+ this.dialogDataList=[]
|
|
|
+ var _data = JSON.parse(JSON.stringify(this.dialogData))
|
|
|
+ this.$set(_data,'printtype','out')
|
|
|
+ _data.compName = this.outshipments;
|
|
|
+ _data.customer = this.inshipments
|
|
|
+ this.dialogDataList.push(_data)
|
|
|
+ }else{
|
|
|
+ var _data = JSON.parse(JSON.stringify(this.dialogData))
|
|
|
+ this.$set(_data,'printtype','out')
|
|
|
+ _data.compName = this.outshipments;
|
|
|
+ _data.customer = this.inshipments
|
|
|
+ this.dialogDataList.push(_data)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ console.log(this.dialogDataList)
|
|
|
this.printBig('', this.radio)
|
|
|
})
|
|
|
.catch((response) => {
|
|
|
@@ -1064,6 +1129,7 @@
|
|
|
|
|
|
},
|
|
|
print(row, type, pageType) {
|
|
|
+ this.printType=type
|
|
|
//打印
|
|
|
if (type == 1) { //
|
|
|
if (this.modification.length == 0) {
|
|
|
@@ -1122,6 +1188,11 @@
|
|
|
this.makeEWjjSelectPrintList()
|
|
|
// this.selectEW = true;
|
|
|
}
|
|
|
+ // if(this.outchecked){
|
|
|
+ // var _data = JSON.parse(JSON.stringify(this.dialogData))
|
|
|
+ // this.$set(_data,'printtype','out')
|
|
|
+ // localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
|
|
|
+ // }
|
|
|
if (type == 1) {
|
|
|
localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
|
|
|
window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
|
|
|
@@ -1131,7 +1202,6 @@
|
|
|
window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
|
|
|
} else {
|
|
|
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=' )
|
|
|
@@ -1316,7 +1386,7 @@
|
|
|
right: 0;
|
|
|
margin: auto;
|
|
|
width: 440px;
|
|
|
- height: 320px;
|
|
|
+ height: 406px;
|
|
|
background: white;
|
|
|
border-radius: 10px;
|
|
|
z-index: 999;
|
