|
|
@@ -145,6 +145,56 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="mask1" v-show="isShowPrintTypeBills"></div>
|
|
|
+ <div class="print-type1" v-show="isShowPrintTypeBills">
|
|
|
+ <div class="print-type-content">
|
|
|
+ <div class="print-type-title">请选择打印纸张类型</div>
|
|
|
+ <div class="print-type-checkbox">
|
|
|
+ <!-- <el-radio-group v-model="radio">
|
|
|
+ <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
|
|
|
+ <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
|
|
|
+ </el-radio-group> -->
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
|
|
|
+ <div>收货单位：</div>
|
|
|
+ <!-- <div>{{companyName}}</div> -->
|
|
|
+ <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
|
|
|
+ <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div v-if="printData.warehouseName=='鲅鱼圈金信库'||printData.warehouseName=='白城内陆港'||printData.warehouseName=='杜尔伯特家禾库'||printData.warehouseName=='洮南新友谊兴旺库'||printData.warehouseName=='甘南宏旗库'||printData.warehouseName=='哈尔滨依兰库'||printData.warehouseName=='山东园丰库'">
|
|
|
+ <div class="print-type-ew">
|
|
|
+ <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
|
|
|
+ <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
|
|
|
+ </div>
|
|
|
+ <div class="ew-print" v-if="printSeparately">
|
|
|
+ <div class="row">
|
|
|
+ <div>额外客户姓名：</div>
|
|
|
+ <!-- <div>{{companyName}}</div> -->
|
|
|
+ <el-select v-model="ewCustomer" 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="companyNameEW" 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="printBig1">确定</el-button>
|
|
|
+ <el-button @click="typePrintCannelClick1">取消</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -157,6 +207,7 @@ import {
|
|
|
addDryWarehouse,
|
|
|
getRecord,
|
|
|
editDryWarehouse,
|
|
|
+ getdrylist
|
|
|
} from '@/model/warehouse/index'
|
|
|
import { hasPermission } from '../../utils/getHasPermission'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
@@ -196,6 +247,87 @@ export default {
|
|
|
deptBudgetTotal: 0,
|
|
|
cartips: '手动输入',
|
|
|
warehouseId: '',
|
|
|
+ ddchecked: false,
|
|
|
+ checked: false,
|
|
|
+ ewCustomerOptions: [{
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '厦门建发物产有限公司',
|
|
|
+ label: '厦门建发物产有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }],
|
|
|
+ companyNameOptions: [{
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ },{
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }],
|
|
|
+ companyNameEWOptions: [{
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ },{
|
|
|
+ value: '厦门建发物产有限公司',
|
|
|
+ label: '厦门建发物产有限公司'
|
|
|
+ }],
|
|
|
+ isShowPrintTypeBills:false,
|
|
|
+ companyName: '黑龙江中天昊元贸易有限公司',
|
|
|
+ companyNameEW: '厦门建发物产有限公司',
|
|
|
+ ewCustomer: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ printSeparately:false,
|
|
|
+ onePrint:false,
|
|
|
+ dialogDataList:[],
|
|
|
+ printData:{
|
|
|
+ warehouseName:''
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
mounted() { },
|
|
|
@@ -204,8 +336,195 @@ export default {
|
|
|
this.getGoodsList()
|
|
|
this.isShowBalance = true
|
|
|
this.openPort()
|
|
|
+ if(localStorage.getItem('compNameoptions')){
|
|
|
+ var company=JSON.parse(localStorage.getItem('compNameoptions'))
|
|
|
+
|
|
|
+ var extra=company.filter((item)=>{
|
|
|
+ return item!='黑龙江中天昊元贸易有限公司'
|
|
|
+ &&item!='黑龙江利润元粮食贸易有限公司'
|
|
|
+ &&item!= '黑龙江众利合粮食贸易有限公司'
|
|
|
+ &&item!='黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ &&item!='黑龙江谷香粮食贸易有限公司'
|
|
|
+ &&item!='黑龙江秋收有限公司'
|
|
|
+ &&item!= '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ &&item!='黑龙江益储益运粮食贸易有限公司'
|
|
|
+ &&item!='黑龙江启兴粮食贸易有限公司'
|
|
|
+ })
|
|
|
+ if(extra.length>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]})
|
|
|
+ this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeEw(e) {
|
|
|
+ this.ddchecked = false
|
|
|
+ if (e) {
|
|
|
+ this.printSeparately = true
|
|
|
+ } else {
|
|
|
+ this.printSeparately = false
|
|
|
+ }
|
|
|
+ },
|
|
|
+ changeEwDD(e) {
|
|
|
+ this.checked = false
|
|
|
+ if (e) {
|
|
|
+ this.printSeparately = true
|
|
|
+ } else {
|
|
|
+ this.printSeparately = false
|
|
|
+ }
|
|
|
+ },
|
|
|
+ printBig1(type, radioType) {
|
|
|
+ this.printData.extra1=true
|
|
|
+ localStorage.setItem('print_company_name',this.companyName)
|
|
|
+ localStorage.setItem('print_company_name_ew',this.companyNameEW)
|
|
|
+ localStorage.setItem('print_customer_name_ew',this.ewCustomer)
|
|
|
+ // 打印额外
|
|
|
+ if (this.checked || this.ddchecked) {
|
|
|
+ this.printData.extra2=true
|
|
|
+ if(this.ddchecked){
|
|
|
+ localStorage.setItem('print_alone_extra',true)
|
|
|
+ }else{
|
|
|
+ localStorage.setItem('print_alone_extra',false)
|
|
|
+ }
|
|
|
+ // this.selectEW = true;
|
|
|
+ }else{
|
|
|
+ this.printData.extra2=false
|
|
|
+ }
|
|
|
+ localStorage.setItem('printdrydata',JSON.stringify(this.printData))
|
|
|
+ window.open(
|
|
|
+ '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
|
|
|
+ )
|
|
|
+ // if (type == 1) {
|
|
|
+ // localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
|
|
|
+ // window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
|
|
|
+ // .checked + '&selectEWDD=' + this.ddchecked)
|
|
|
+ // } else if (type == 2) {
|
|
|
+ // localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
|
|
|
+ // 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=' )
|
|
|
+ // }
|
|
|
+ },
|
|
|
+ typePrintCannelClick1() {
|
|
|
+ this.dialogDataList = [] //打个打印取消时数组至空
|
|
|
+ this.isShowPrintTypeBills= false
|
|
|
+ },
|
|
|
goodsNameChange(e) {
|
|
|
this.weighingList.goodsName = e
|
|
|
for (let i = 0; i < this.goodsNameList.length; i++) {
|
|
|
@@ -433,6 +752,12 @@ export default {
|
|
|
this.weighingList.grossWeight = ''
|
|
|
this.weighingList.tare = ''
|
|
|
this.weighingList.netWeight = ''
|
|
|
+ getdrylist({id:this.weighingList.id}).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ console.log(1111111111)
|
|
|
+ this.printData=response
|
|
|
+ this.isShowPrintTypeBills=true
|
|
|
+ })
|
|
|
this.getList()
|
|
|
})
|
|
|
}
|
|
|
@@ -811,4 +1136,70 @@ export default {
|
|
|
.right-content{
|
|
|
margin-top: 20px;
|
|
|
}
|
|
|
+
|
|
|
+.mask1 {
|
|
|
+ background: black;
|
|
|
+ width: 100vw;
|
|
|
+ height: 100vh;
|
|
|
+ position: fixed;
|
|
|
+ top: 0;
|
|
|
+ z-index: 1001;
|
|
|
+ opacity: 0.3;
|
|
|
+ }
|
|
|
+
|
|
|
+ .print-type-title {
|
|
|
+ text-align: center;
|
|
|
+ font-size: 18px;
|
|
|
+ margin: 20px;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ .print-type-checkbox1 {
|
|
|
+ // padding-left: 20px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .print-type1 {
|
|
|
+ position: absolute;
|
|
|
+ top: 0;
|
|
|
+ bottom: 0;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+ width: 440px;
|
|
|
+ height: 320px;
|
|
|
+ background: white;
|
|
|
+ border-radius: 10px;
|
|
|
+ z-index: 1001;
|
|
|
+ }
|
|
|
+ .shdw-style1 {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ padding: 0 20px;
|
|
|
+ margin-top: 20px;
|
|
|
+ }
|
|
|
+ .print-type-ew {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ padding: 0 20px;
|
|
|
+
|
|
|
+ /deep/.el-radio__label {
|
|
|
+ font-size: 14px;
|
|
|
+ }
|
|
|
+
|
|
|
+ margin-top: 10px;
|
|
|
+ }
|
|
|
+ .ew-print {
|
|
|
+ padding: 0 20px;
|
|
|
+ margin-top: 10px;
|
|
|
+
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: space-between;
|
|
|
+ // align-content: center;
|
|
|
+ .row {
|
|
|
+ display: flex;
|
|
|
+ margin-top: 10px;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
