前端

public/static/aduitprint.html

@@ -109,6 +109,8 @@
           <div v-if="item.printType==4" class="number">运价审核</div>
           <div v-if="item.printType==5" class="number">通用审核</div>
           <div v-if="item.printType==6" class="number">合同审核</div>
+          <div v-if="item.printType==7" class="number">运费结算</div>
+          <div v-if="item.printType==8" class="number">仓库设置</div>
           <img v-if="item.currectstatus=='已通过'" class="seal" width="144" height="144" src="../img/ytg.png" alt="">
           <img v-if="item.currectstatus=='审核中'" class="seal" width="144" height="144" src="../img/shz.png" alt="">
           <img v-if="item.currectstatus=='已驳回'" class="seal" width="144" height="144" src="../img/wtg.png" alt="">
@@ -155,7 +157,13 @@
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">附件</td>
-                    <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
+                    <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                      <template v-if="item.expensesType==2">
+                        <template v-for="(item1,index) in item.aduitInfo">
+                          {{item1.fileUrls.length}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                        </template>
+                      </template>
+                        ），{{item.addressUrlArrayFilelen}}个文档</td>
                 </tr>
             </tbody>
             <thead v-if="item.expensesType==2">
@@ -340,7 +348,7 @@
                 <tr class="row">
                   <td class="col col-bgc">附件</td>
                   <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
-              </tr>
+                </tr>
             </tbody>
             <thead>
                 <tr class="row">
@@ -536,8 +544,129 @@
               </tr>
           </tbody>
           </table>
-          <div  v-if="item.printType==1||item.printType==5||item.printType==6" class="sfcard" >
-            <div v-for="item1 in item.addressUrlArray" class="sfcard-content">
+          <table v-if="item.printType==7" class="table">
+            <thead>
+              <tr class="row">
+                  <th colspan="3" class="col">基本信息</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr class="row">
+                  <td class="col col-bgc">合同编号/移库编号</td>
+                  <td colspan="2" class="col">{{item.contractNo}}</td>
+              </tr>
+              <tr class="row">
+                  <td class="col col-bgc">收款方</td>
+                  <td colspan="2" class="col">{{ item.payee }}</td>
+              </tr>
+              <tr class="row">
+                  <td class="col col-bgc">账号</td>
+                  <td colspan="2" class="col">{{ item.accountNumber }}</td>
+              </tr>
+              <tr class="row">
+                  <td class="col col-bgc">开户支行</td>
+                  <td colspan="2" class="col">{{ item.bankBranch }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">合计（元）</td>
+                <td colspan="2" class="col">{{ item.num }}</td>
+              </tr>
+            </tbody>
+            <tbody v-for="item1 in item.tranTaskInfoList">
+              <tr  class="row">
+                <td class="col col-bgc">运输编号</td>
+                <td colspan="2" class="col">{{ item1.taskNo }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">发货地</td>
+                <td colspan="2" class="col">{{ item1.startPrivate }}{{item1.startCity}}{{ item1.startArea }}{{item1.startDetailedAddress}}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">收货地</td>
+                <td colspan="2" class="col">{{ item1.endPrivate }}{{item1.endCity}}{{ item1.endArea }}{{item1.endDetailedAddress}}</td>
+              </tr>
+            </tbody>
+              <tbody>
+                <tr class="row">
+                  <td class="col col-bgc">备注</td>
+                  <td colspan="2" class="col">{{ item.remark }}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">附件</td>
+                  <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
+                </tr>
+              </tbody>
+            <thead>
+              <tr class="row">
+                  <th colspan="3" class="col">审核流</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item1,index) in item.aduitInfo" class="row">
+                  <td class="col col-bgc">{{item1.operatorName}}</td>
+                  <td style="width:30%;" class="col">{{ item1.updateDate }}</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='question'" class="col">待审核</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='success'" class="col">{{index!=0?item1.auditMind?'通过：'+item1.auditMind:'通过':item1.desc}}</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='error'" class="col">{{item1.auditMind?'驳回：'+item1.auditMind:'驳回'}}</td>
+              </tr>
+            </tbody>
+          </table>
+          <table v-if="item.printType==8" class="table">
+            <thead>
+              <tr class="row">
+                  <th :colspan="item.bulkDensityStandard ==1?2:5" class="col">基本信息</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr class="row">
+                  <td class="col col-bgc">仓库名称</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:4" class="col">{{item.warehouseName}}</td>
+              </tr>
+              <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:4" class="col">{{ item.goodsName }}</td>
+              </tr>
+              <tr v-if="item.bulkDensityStandard ==1">
+                <td>{{item.goodsName!='大豆' ? '容重(g/L)' : '蛋白(g/L)'}}</td>
+					      <td>价格(元/公斤)</td>
+              </tr>
+              <tr v-if="item.bulkDensityStandard !=1">
+                <td class="col">水分</td>
+                <td class="col">一等</td>
+                <td class="col">二等</td>
+                <td class="col">三等</td>
+                <td class="col">等外</td>
+              </tr>
+            </tbody>
+            <tbody v-for="item1 in item.detailPrints">
+              <tr v-if="item.bulkDensityStandard ==1" class="row">
+                <td class="col">{{item1.bulkDensityMax}}~{{item1.bulkDensityMin}}</td>
+                <td class="col">{{ item1.bulkDensityPrice }}</td>
+              </tr>
+              <tr v-if="item.bulkDensityStandard !=1" class="row">
+                <td class="col">{{ item1.waterMin }}</td>
+                <td class="col">{{ item1.price1 }}</td>
+                <td class="col">{{ item1.price2 }}</td>
+                <td class="col">{{ item1.price3 }}</td>
+                <td class="col">{{ item1.priceOther }}</td>
+              </tr>
+            </tbody>
+            <thead>
+              <tr class="row">
+                  <th colspan="3" class="col">审核流</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item1,index) in item.aduitInfo" class="row">
+                  <td class="col col-bgc">{{item1.operatorName}}</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:2" style="width:30%;" class="col">{{ item1.updateDate }}</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:2" style="text-align:left;padding-left:10px;" v-if="item1.status=='question'" class="col">待审核</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:2" style="text-align:left;padding-left:10px;" v-if="item1.status=='success'" class="col">{{index!=0?item1.auditMind?'通过：'+item1.auditMind:'通过':item1.desc}}</td>
+                  <td :colspan="item.bulkDensityStandard ==1?1:2" style="text-align:left;padding-left:10px;" v-if="item1.status=='error'" class="col">{{item1.auditMind?'驳回：'+item1.auditMind:'驳回'}}</td>
+              </tr>
+            </tbody>
+          <div  v-if="item.printType==1||item.printType==5||item.printType==6||item.printType==7" class="sfcard" >
+            <div v-for="item1 in item.addressUrlArrayImage" class="sfcard-content">
                 <div class="sfcard-title">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->
                 </div>

public/static/printdry.html

@@ -148,7 +148,7 @@
 
 <body>
     <div id="app">
-            <div class="content" >
+            <div class="content"  v-if="isShowPrintType3&&!isShowPrintType6">
               <!-- <div class="title">{{item.customer}}</div> -->
               <div class="title">入库检斤单</div>
               <div class="left">
@@ -203,13 +203,13 @@
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">毛重（公斤）</td>
-                      <td class="col">{{printData.grossWeight*1000}}</td>
+                      <td class="col">{{printData.grossWeight}}</td>
                       <td class="col col-bgc">皮重（公斤）</td>
-                      <td class="col">{{printData.tare*1000}}</td>
+                      <td class="col">{{printData.tare}}</td>
                       <td class="col col-bgc">扣重（公斤）</td>
                       <td style="width:50px;" class="col">0</td>
                       <td class="col col-bgc">净重（公斤）</td>
-                      <td class="col">{{printData.netWeight*1000}}</td>
+                      <td class="col">{{printData.netWeight}}</td>
                       <!-- <td class="col " colspan="2"></td> -->
 
                   </tr>
@@ -231,7 +231,7 @@
                   <!-- <div class="bottom-row3">扫一扫</div> -->
               </div>
           </div>
-          <div class="content" >
+          <div class="content"  v-if="isShowPrintType3&&printData.extra2||isShowPrintType6">
             <!-- <div class="title">{{item.customer}}</div> -->
             <div class="title">入库检斤单</div>
             <div class="left">
@@ -302,13 +302,13 @@
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">毛重（公斤）</td>
-                    <td class="col">{{printData.grossWeight*1000}}</td>
+                    <td class="col">{{printData.grossWeight}}</td>
                     <td class="col col-bgc">皮重（公斤）</td>
-                    <td class="col">{{printData.tare*1000}}</td>
+                    <td class="col">{{printData.tare}}</td>
                     <td class="col col-bgc">扣重（公斤）</td>
                     <td style="width:50px;" class="col">0</td>
                     <td class="col col-bgc">净重（公斤）</td>
-                    <td class="col">{{printData.netWeight*1000}}</td>
+                    <td class="col">{{printData.netWeight}}</td>
                     <!-- <td class="col " colspan="2"></td> -->
 
                 </tr>

src/api/V2/warehouse/index.js

@@ -153,6 +153,7 @@ export const API_POST_DELETEINFO='/dryWarehouse/api/deleteDryWarehouse'
 export const API_GET_BINTYPE='/warehousePositionInfo/selectBinNumberList'
 // 发起人撤回
 export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
-API_EXPORT_ORDER
 // 导出入库单
 export const API_EXPORT_ORDER ='/warehousingOrder/exportWarehousingOrder'
+// 烘干入库获取
+export const API_GET_DRYLIST='/dryWarehouse/getInfo'

src/model/warehouse/index.js

@@ -75,7 +75,8 @@ import {
      API_POST_DELETEINFO,
      API_GET_BINTYPE,
     API_SPONSOR_WITHDRAW,
-    API_EXPORT_ORDER
+    API_EXPORT_ORDER,
+    API_GET_DRYLIST
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -232,3 +233,5 @@ export const getbintype= appRx.get(API_GET_BINTYPE,errorCatcher, errorHandle, fi
 export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
 // 导出入库单
 export const exportOrder = appRx.post(API_EXPORT_ORDER)
+// 烘干记录获取
+export const getdrylist = appRx.get(API_GET_DRYLIST, errorCatcher, errorHandle, filter)

src/views/universalityAudit/auditprint.vue

@@ -81,6 +81,9 @@ import { seeCat } from '@/model/transport/index'
 import {
     examineList,
   } from '@/model/contarct/index'
+  import {
+    purchasePriceLook,
+  } from '@/model/houseSelfCollect/index'
 import WsUpload from '@/components/WsUpload'
 import {
   woekflowhandle
@@ -146,16 +149,26 @@ export default {
         if(row.type=='费用审核'||row.type=='运费结算'){
             this.deptBudgetList=[await lookexenseinfo({id:row.id}).toPromise()]
             this.deptBudgetList[0].currectstatus=row.status
+            if(this.deptBudgetList[0].addressUrl){
+                var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
+                this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
+                this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
+                this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
+            }else{
+                this.deptBudgetList[0].addressUrlArray=[]
+                this.deptBudgetList[0].addressUrlArrayImage=[]
+                this.deptBudgetList[0].addressUrlArrayFilelen==0
+            }
             if(this.deptBudgetList[0].expensesType!=1){
                 if(row.type=='费用审核'){
                   this.deptBudgetList[0].printType=1
                 }else if(row.type=='运费结算'){
                   this.deptBudgetList[0].printType=7
-                  if (this.deptBudgetList.tranTaskInfoList.length > 0) {
+                  if (this.deptBudgetList[0].tranTaskInfoList.length > 0) {
                     var num = 0
-                    for (var i = 0; i < this.deptBudgetList.tranTaskInfoList.length; i++) {
-                      if (this.deptBudgetList.tranTaskInfoList[i].tranSettlementReportList) {
-                        var data = this.deptBudgetListtranTaskInfoList[i].tranSettlementReportList
+                    for (var i = 0; i < this.deptBudgetList[0].tranTaskInfoList.length; i++) {
+                      if (this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList) {
+                        var data = this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList
                         for (var q = 0; q < data.length; q++) {
                           if (data[q].totalPayable) {
                             this.num += data[q].totalPayable
@@ -205,15 +218,7 @@ export default {
                 this.deptBudgetList[0].printType=2 
                 this.deptBudgetList[0].aduitInfo=await getAuditRecord({id:row.id}).toPromise()
             }
-            if(this.deptBudgetList[0].addressUrl){
-                var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
-                this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
-                this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
-            }else{
-                this.deptBudgetList[0].addressUrlArray=[]
-                this.deptBudgetList[0].addressUrlArrayFilelen==0
-            }
-        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'){
+        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'){
           if(row.type=='入库单请款'){
             this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
             this.deptBudgetList[0].printType=3
@@ -223,10 +228,22 @@ export default {
           }else if(row.type=='通用审核'){
             this.deptBudgetList=[await getaduitinfo({id:row.id}).toPromise()]
             this.deptBudgetList[0].printType=5
-          }
-          else if(row.type=='合同审核'){
+          }else if(row.type=='合同审核'){
             this.deptBudgetList=[await examineList({id:row.id}).toPromise()]
             this.deptBudgetList[0].printType=6
+          }else if(row.type=='仓库设置'){
+            this.deptBudgetList=[await purchasePriceLook({id:row.id}).toPromise()]
+            this.deptBudgetList[0].printType=8
+          }
+          if(this.deptBudgetList[0].addressUrl){
+            var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
+            this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
+            this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
+            this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
+          }else{
+            this.deptBudgetList[0].addressUrlArray=[]
+            this.deptBudgetList[0].addressUrlArrayImage=[]
+            this.deptBudgetList[0].addressUrlArrayFilelen==0
           }
           this.deptBudgetList[0].currectstatus=row.status
           var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
@@ -234,7 +251,6 @@ export default {
                 for (let i = 0; i < this.deptBudgetList[0].aduitInfo.length; i++) {
                     var arr=this.deptBudgetList[0].aduitInfo[i]
                     if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
-                      console.log(arr.workflowHistoricTasks)
                         var len =arr.workflowHistoricTasks.length-1
                         if(arr.workflowHistoricTasks[len].approved){
                             this.$set(arr,'status','success')
@@ -245,7 +261,12 @@ export default {
                         arr.updateDate=arr.workflowHistoricTasks[len].claimTime
                         if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
-                            arr.fileUrl = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            var arr1=[]
+                            for (let q = 0; q < arr.fileUrls.length; q++) {
+                              arr1.push({appendixPath:arr.fileUrls[q]})
+                            }
+                            this.deptBudgetList[0].addressUrlArrayImage.push(...arr1)
                         }else{
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind
                         }
@@ -264,14 +285,7 @@ export default {
                 workflowHistoricTasks:[],
                 status:'success'
                 })
-                if(this.deptBudgetList[0].addressUrl){
-                var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
-                this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
-                this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
-                }else{
-                    this.deptBudgetList[0].addressUrlArray=[]
-                    this.deptBudgetList[0].addressUrlArrayFilelen==0
-                }
+                
         }
         localStorage.setItem('aduitprintdata',JSON.stringify(this.deptBudgetList))
         window.open('../../../static/aduitprint.html')

src/views/warehousenew/dryRecord.vue

@@ -3,7 +3,7 @@
     <div class="container">
         <el-row class="toptitle">
             <el-col :span="12">
-                <h2 class="bg-left title">检斤记录</h2>
+                <h2 class="bg-left title">烘干入库记录</h2>
             </el-col>
             <el-col :span="12" class="bg-right">
                 <el-button type="primary" size="small" @click="returnsales()">
@@ -51,9 +51,9 @@
                 <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
                 <el-table-column prop="goodsName" label="货名"></el-table-column>
                 <el-table-column prop="weigher" label="检斤员"></el-table-column>
-                <el-table-column prop="grossWeight" label="毛重（吨）" width="100"></el-table-column>
-                <el-table-column prop="tare" label="皮重（吨）" width="100"></el-table-column>
-                <el-table-column prop="netWeight" label="净重（吨）" width="100"></el-table-column>
+                <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
+                <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>
+                <el-table-column prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
                 <el-table-column prop="status" label="状态"></el-table-column>
                 <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
                 <el-table-column label="操作">
@@ -273,7 +273,9 @@ export default {
         printSeparately:false,
         onePrint:false,
         dialogDataList:[],
-        printData:{}
+        printData:{
+          
+        }
 
         }
     },
@@ -591,17 +593,6 @@ export default {
                 .toPromise()
                 .then((response) => {
                     this.weighingRecordList = response.records
-                    for (let i = 0; i < this.weighingRecordList.length; i++) {
-                        if (this.weighingRecordList[i].grossWeight) {
-                            this.weighingRecordList[i].grossWeight /= 1000
-                        }
-                        if (this.weighingRecordList[i].tare) {
-                            this.weighingRecordList[i].tare /= 1000
-                        }
-                        if (this.weighingRecordList[i].netWeight) {
-                            this.weighingRecordList[i].netWeight /= 1000
-                        }
-                    }
                     this.deptBudgetTotal = response.total
                 })
                 .catch((response) => {

src/views/warehousenew/dryWarehousing.vue

@@ -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++) {
@@ -467,6 +786,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()
                             })
                     }
@@ -845,4 +1170,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>