Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
wangchao
/
yiliangyiyun-pc-jj
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

前端烘干入库打印

gjy 2 gadi atpakaļ
vecāks
c9ffd32524
revīzija
0783fd2dfa
13 mainītis faili ar 1852 papildinājumiem un 7 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. BIN
      public/img/shz.png
  2. BIN
      public/img/wtg.png
  3. BIN
      public/img/ytg.png
  4. 484 0
      public/static/aduitprint.html
  5. 441 0
      public/static/printdry.html
  6. 9 1
      src/api/V2/universalityAudit/index.js
  7. 1 0
      src/lang/zh.js
  8. 14 2
      src/model/universalityAudit/index.js
  9. 5 2
      src/views/profitable/expensemanagementdetails.vue
  10. 490 0
      src/views/universalityAudit/auditprint.vue
  11. 16 1
      src/views/universalityAudit/component/routers/route.js
  12. 391 1
      src/views/warehousenew/dryRecord.vue
  13. 1 0
      src/views/warehousenew/dryWarehousing.vue

BIN
public/img/shz.png
Parādīt failu


BIN
public/img/wtg.png
Parādīt failu


BIN
public/img/ytg.png
Parādīt failu


+ 484 - 0
public/static/aduitprint.html
Parādīt failu 

@@ -0,0 +1,484 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <title>Document</title>
 
+</head>
 
+<style >
 
+    
+    .number {
 
+        text-align: center;
 
+        margin: 0 0 10px 0;
 
+        font-size:20px;
 
+    }
 
+    table,
 
+    table tr th,
 
+    table tr td {
 
+        border: 2px solid #333333;
 
+        padding: 5px 0;
 
+    }
 
+    table tr th{
 
+        text-align:left;
 
+        padding-left:20px;
 
+    }
 
+
 
+    
+
 
+    table {
 
+        width: 100%;
 
+        min-height: 25px;
 
+        line-height: 25px;
 
+        text-align: center;
 
+        border-collapse: collapse;
 
+        border: 3px solid #333333;
 
+        font-size:24px;
 
+    }
 
+
 
+    .col-bgc {
 
+        background: #f6f7fb;
 
+        width:30%;
 
+    }
 
+
 
+    .bottom-row1 {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        margin: 10px 0;
 
+    }
 
+
 
+    .bottom-row2 {
 
+        display: flex;
 
+        margin: 10px 0;
 
+
 
+    } 
+    .bottom-row2 .left img{
 
+        width: 120px;
 
+            height: 120px;
 
+            margin-right: 118px;
 
+    }
 
+    .bottom-row2 .config{
 
+        margin-right: 240px;
 
+    }
 
+    .bottom-row3 {
 
+        margin: 10px 0;
 
+    }
 
+
 
+    .bottom-row4 {
 
+        margin-top: 50px;
 
+        text-align: center;
 
+    }
 
+    .wrap{
 
+        position:relative;
 
+        padding-top:60px;
 
+        width: 1000px;
 
+        margin: auto;
 
+    }
 
+    .seal{
 
+        position:absolute;
 
+        right:0;
 
+        top:0.5%;
 
+    }
 
+    .sfcard {
 
+        /* background: red; */
 
+    }  
+    .sfcard-content{
 
+      display:flex;
 
+      
+    }
 
+    .sfcard-content .image {
 
+        background-repeat: no-repeat;
 
+        background-size:contain;
 
+        width:120vw;
 
+        height:100vh;
 
+        
+        transform-origin: 50% 50%;
 
+        transform: rotate(270deg);
 
+    }
 
+    @media print {
 
+    .image{ page-break-inside:avoid;}
 
+    }
 
+</style>
 
+<body>
 
+    <div id="app">
 
+        <div class="center">
 
+        <div class="wrap" v-for="item in printData">
 
+          <div v-if="item.printType==1" class="number">费用审核-请款</div>
 
+          <div v-if="item.printType==2" class="number">费用审核-收款</div>
 
+          <div v-if="item.printType==3" class="number">入库单请款</div>
 
+          <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>
 
+          <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="">
 
+          <table v-if="item.printType==1||item.printType==2" 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" v-if="item.expensesPurpose==1" class="col">合同费用</td>
 
+                    <td colspan="2" v-if="item.expensesPurpose==3" class="col">库点费用</td>
 
+                    <td colspan="2" v-if="item.expensesPurpose==5" class="col">经营性费用</td>
 
+                </tr>
 
+                <tr v-if="item.expensesPurpose==3" class="row">
 
+                    <td class="col col-bgc">仓库名称</td>
 
+                    <td colspan="2" class="col">{{ item.warehouseName }}</td>
 
+                </tr>
 
+                <tr v-if="item.expensesPurpose==1" 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.expenseName }}</td>
 
+                </tr>
 
+                <tr v-if="item.expensesType==2" class="row">
 
+                    <td class="col col-bgc">付款方名头</td>
 
+                    <td colspan="2" class="col">{{ item.payerHeader }}</td>
 
+                </tr>
 
+                <tr v-if="item.expensesPurpose==5&&item.expensesType==2" class="row">
 
+                    <td class="col col-bgc">所属名头</td>
 
+                    <td  colspan="2" class="col">{{ item.belongName }}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">金额（元）</td>
 
+                    <td colspan="2" class="col">{{ item.amountMoney }}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">备注</td>
 
+                    <td style="width:65%;" 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 }}</td>
 
+                </tr>
 
+            </tbody>
 
+            <thead v-if="item.expensesType==2">
 
+                <tr class="row">
 
+                    <th colspan="3" class="col">账户信息</th>
 
+                </tr>
 
+            </thead>
 
+            <tbody v-if="item.expensesType==2">
 
+                <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.bank }}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">开户支行</td>
 
+                    <td colspan="2" class="col">{{ item.bankBranch }}</td>
 
+                </tr>
 
+            </tbody>
 
+            <thead>
 
+                <tr class="row">
 
+                    <th colspan="3" class="col">审核流</th>
 
+                </tr>
 
+            </thead>
 
+            <tbody v-if="item.expensesType==2">
 
+                <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>
 
+            <tbody v-if="item.expensesType==1">
 
+              <tr v-for="(item1,index) in item.aduitInfo" class="row">
 
+                  <td class="col col-bgc">{{item1.operateUser}}</td>
 
+                  <td style="width:30%;" class="col">{{ item1.updateDate }}</td>
 
+                  <td v-if="item1.approveResult == 1" style="text-align:left;padding-left:10px;width:30%;"  class="col"> 通过：{{item1.verifyRemark}}</td>
 
+                  <td v-else-if="item1.approveResult == 0" style="text-align:left;padding-left:10px;width:30%;"  class="col"> 驳回：{{item1.verifyRemark}}</td>
 
+                  <td v-else style="text-align:left;padding-left:10px;width:30%;"  class="col"> {{item.dealMsg}}：{{item1.verifyRemark}}</td>
 
+              </tr>
 
+          </tbody>
 
+        </table>
 
+        <table v-if="item.printType==4" 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.tranType}}运费</td>
 
+              </tr>
 
+              <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.processNo }}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                  <td class="col col-bgc">发货地址</td>
 
+                  <td colspan="2" class="col">{{ item.sendPrivate }}{{ item.sendCity }}{{ item.sendArea }}{{ item.sendDetailedAddress }}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                  <td class="col col-bgc">收货地址</td>
 
+                  <td colspan="2" class="col">{{ item.receivePrivate }}{{ item.receiveCity }}{{ item.receiveArea }}{{ item.receiveDetailedAddress }}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                  <td class="col col-bgc">运费（元）</td>
 
+                  <td v-if='item.billingMethod==1&&item.tranType=="汽运"' style="width:65%;" colspan="2" class="col">{{ item.tranPriceIng }}</td>
 
+                  <td v-else-if='item.billingMethod1=1&&item.tranType=="汽运"' style="width:65%;" colspan="2" class="col">{{ item.tranPriceIngCar }}</td>
 
+                  <td v-else style="width:65%;" colspan="2" class="col">{{ item.tranPriceIng }}</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==5" 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.businessType}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">备注</td>
 
+                    <td style="width:65%;" 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 }}</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==6" class="table">
 
+            <tr class="row">
 
+              <th colspan="2" class="col">基本信息</th>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">合同编号</td>
 
+              <td class="col">{{ item.contractNo }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">买方</td>
 
+              <td class="col">{{ item.buyer }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">买方电话</td>
 
+              <td class="col">{{ item.buyerPhone }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">卖方</td>
 
+              <td class="col">{{ item.seller }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">卖方电话</td>
 
+              <td class="col">{{ item.sellerPhone }}</td>
 
+            </tr>
 
+            <tr v-if="item.agreementType=='采购合同'" class="row">
 
+              <td class="col col-bgc">交易主体</td>
 
+              <td class="col">{{ item.transactionSubject }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">合营方</td>
 
+              <td class="col">{{ item.jointVentureParties }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">合营方电话</td>
 
+              <td class="col">{{ item.jointPhone }}</td>
 
+            </tr>
 
+            <tr v-if="item.agreementType=='销售合同'" class="row">
 
+              <td class="col col-bgc">中转公司</td>
 
+              <td class="col">{{ item.transitCompany }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">交货日期（起 - 止）</td>
 
+              <td class="col">{{item.deliveryDateStart }} ~ {{item.deliveryDateEnd}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">签订日期</td>
 
+              <td class="col">{{ item.signingDate }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">合同总价（元）</td>
 
+              <td class="col">{{ item.totalContractPrice }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">合同单价（元/吨）</td>
 
+              <td class="col">{{ item.unitContractPrice }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">货源所在地区</td>
 
+              <td class="col">{{item.sourceProvince}}{{item.sourceCity}}{{item.sourceArea}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">货源详细地址</td>
 
+              <td class="col">{{ item.sourceGoods }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">交货地所在地区</td>
 
+              <td class="col">{{item.deliveryProvince}}{{item.deliveryCity}}{{item.deliveryArea}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">交货地详细地址</td>
 
+              <td class="col">{{ item.placeDelivery }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">最终实际交易量（吨）</td>
 
+              <td class="col">{{ item.finalTradingVolume }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">结算单价（元/吨）</td>
 
+              <td class="col">{{ item.settlementPrice }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.goodsNameKey" class="row">
 
+              <td class="col col-bgc">合同收入（元）</td>
 
+              <td class="col">{{ item.contractProcessInfo.goodsNameKey }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.goodsName" class="row">
 
+              <td class="col col-bgc">已开发票（元）</td>
 
+              <td class="col">{{ item.contractProcessInfo.goodsName }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.waterContent" class="row">
 
+              <td class="col col-bgc">费用支出（元）</td>
 
+              <td class="col">{{ item.contractProcessInfo.waterContent }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.impurity" class="row">
 
+              <td class="col col-bgc">未开发票（元）</td>
 
+              <td class="col">{{ item.contractProcessInfo.impurity }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.mildewGrain" class="row">
 
+              <td class="col col-bgc">未回款（元）</td>
 
+              <td class="col">{{ item.contractProcessInfo.mildewGrain }}</td>
 
+            </tr>
 
+            <tr v-if="item.contractProcessInfo.grade" class="row">
 
+              <td class="col col-bgc">双章原件回收情况</td>
 
+              <td class="col">{{ item.contractProcessInfo.grade }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">备注信息</td>
 
+              <td class="col">{{ item.remarks }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <th colspan="2" class="col">货物信息</th>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">货名</td>
 
+              <td class="col">{{ item.contractGoodsInfo.goodsName }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">品级</td>
 
+              <td class="col">{{ item.contractGoodsInfo.grade }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">容量（克/升）>=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.bulkDensity }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">水分（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.waterContent }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">热损伤（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.jiaorenli }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">杂质（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.impurity }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">霉变粒（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.mildewGrain }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">不完善粒（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.imperfectGrain }}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <th colspan="3" class="col">审核流</th>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">不完善粒（%）&lt;=</td>
 
+              <td class="col">{{ item.contractGoodsInfo.imperfectGrain }}</td>
 
+              <td class="col">{{ item.contractGoodsInfo.imperfectGrain }}</td>
 
+            </tr>
 
+          </table>
 
+          <div  v-if="item.printType==1||item.printType==5" class="sfcard" >
 
+            <div v-for="item1 in item.addressUrlArray" class="sfcard-content">
 
+                <div class="sfcard-title">
 
+                    <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->
 
+                </div>
 
+                <div :style="{'backgroundImage':'url('+item1.appendixPath+')'}" class="image"></div>
 
+                <!-- <img :src="" class="avatar" /> -->
 
+            </div>
 
+        </div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+</body>
 
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
 
+<script type="text/javascript">
 
+    new Vue({
 
+        el: '#app',
 
+        data: {
 
+            printData: [],
 
+
 
+        },
 
+        computed: {},
 
+        methods: {
 
+
 
+        },
 
+        mounted() {
 
+            console.log(1111111111,JSON.parse(localStorage.getItem('aduitprintdata')))
 
+
 
+            this.printData = JSON.parse(localStorage.getItem('aduitprintdata'))
 
+            window.print()
 
+                // sessionStorage.removeItem('selectPrint_selectPrintList');
 
+                // sessionStorage.removeItem('selectPrint_selectCustomerList');
 
+            window.onafterprint = function(event) {
 
+                window.history.back(-1)
 
+            }
 
+        },
 
+        watch: {}
 
+    })
 
+</script>
 
+</html>

+ 441 - 0
public/static/printdry.html
Parādīt failu 

@@ -0,0 +1,441 @@
 
+<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+    <meta charset="utf-8" />
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
+    <title></title>
 
+    <style>
 
+        table,
 
+        table tr th,
 
+        table tr td {
 
+            border: 2px solid #333333;
 
+            padding: 5px 0;
 
+            height: 37px;
 
+        }
 
+
 
+        body {
 
+            margin: 0;
 
+        }
 
+
 
+        #app {
 
+            /* height: 98vh;
 
+        position: relative; */
 
+        }
 
+
 
+        .content {
 
+            width: 1000px;
 
+            padding: 30px 20px 20px 20px;
 
+            font-size: 18px;
 
+            height: 630px;
 
+            /* height: 570px; */
 
+            position: relative;
 
+            margin: auto;
 
+        }
 
+
 
+        .a5-content {
 
+            height: 130vh;
 
+        }
 
+
 
+        table {
 
+            width: 100%;
 
+            text-align: center;
 
+            border-collapse: collapse;
 
+            border: 3px solid #333333;
 
+        }
 
+
 
+        .col-bgc {
 
+            background: #f6f7fb;
 
+        }
 
+
 
+        .bottom-row1 {
 
+            display: flex;
 
+            /* justify-content: space-between; */
 
+            margin-top: 5px 0;
 
+        }
 
+
 
+        .bottom-row2 {
 
+            display: flex;
 
+        }
 
+
 
+        img,
 
+        .left {
 
+            width: 120px;
 
+            height: 120px;
 
+            position: absolute;
 
+            left: 12px;
 
+            top: 10px;
 
+        }
 
+
 
+        .config {
 
+            margin-top: 10px;
 
+            margin-right: 240px;
 
+        }
 
+
 
+        .autograph {
 
+            margin-top: 10px;
 
+            margin-right: 170px;
 
+        }
 
+
 
+        .bottom-row3 {
 
+            margin: 10px 0;
 
+        }
 
+
 
+        .title {
 
+            text-align: center;
 
+            font-size: 36px;
 
+            font-weight: 500;
 
+            position: relative;
 
+            /* margin-top: 47px; */
 
+        }
 
+
 
+        .number {
 
+            text-align: right;
 
+            margin-bottom: 10px;
 
+            margin-top: 30px;
 
+        }
 
+
 
+        .small-row {
 
+            display: flex;
 
+        }
 
+
 
+        .small-content {
 
+            width: 300px;
 
+            /* margin: 0 auto;
 
+        border: 1px solid #ccc;
 
+        padding: 20px 20px 160px 20px;
 
+        position: absolute;
 
+        top: 0;
 
+        bottom: 0;
 
+        left: 0;
 
+        right: 0;
 
+        margin: auto; */
 
+        }
 
+
 
+        .small-title {
 
+            text-align: center;
 
+            font-size: 18px;
 
+            /* display: flex; */
 
+            justify-content: space-between;
 
+            align-items: center;
 
+        }
 
+
 
+        .numberNo {
 
+            font-size: 36px;
 
+            margin: auto;
 
+        }
 
+
 
+        .small-row {
 
+            display: flex;
 
+            justify-content: space-between;
 
+            margin: 10px;
 
+        }
 
+
 
+        .small-img {
 
+            margin-right: 0;
 
+        }
 
+
 
+        .sign {
 
+            margin-right: 100px;
 
+        }
 
+
 
+        .small-code {
 
+            position: relative;
 
+            left: calc(50% - 55px)
 
+        }
 
+    </style>
 
+</head>
 
+
 
+<body>
 
+    <div id="app">
 
+            <div class="content" >
 
+              <!-- <div class="title">{{item.customer}}</div> -->
 
+              <div class="title">入库检斤单</div>
 
+              <div class="left">
 
+                  <!-- <img :src="item.codeUrl" alt=""> -->
 
+              </div>
 
+              <div class="number">{{printData.dryNumber}}</div>
 
+              <table class="table">
 
+                  <tr class="row">
 
+                      <td colspan="3" class="col col-bgc">发货单位</td>
 
+                      <td class="col" colspan="3" >{{print_company_name}}</td>
 
+                      <td class="col col-bgc">车牌号</td>
 
+                      <td class="col" >{{printData.carNo}}</td>
 
+                  </tr>
 
+                  <tr class="row">
 
+                      <td colspan="3" class="col col-bgc">收货单位</td>
 
+                      <td class="col" colspan="5"></td>
 
+                  </tr>
 
+                  <tr class="row">
 
+                      <td class="col col-bgc">货名</td>
 
+                      <td class="col">{{printData.goodsName}}</td>
 
+                      <td class="col col-bgc">类型</td>
 
+                      <td class="col">干粮</td>
 
+                      <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
 
+                      <td class="col">
 
+                      </td>
 
+                      <td class="col col-bgc">不完善粒（%）</td>
 
+                      <td class="col">
 
+                          
+                      </td>
 
+                  </tr>
 
+                  <tr class="row">
 
+                      <td class="col col-bgc">等级</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">水分（%）</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">热损伤（%）</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">检斤时间</td>
 
+                      <td class="col">
 
+                          {{printData.updateDate}}
 
+                      </td>
 
+                  </tr>
 
+                  <tr class="row">
 
+                      <td class="col col-bgc">杂质（%）</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">霉变粒（%）</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">扣杂</td>
 
+                      <td class="col"></td>
 
+                      <td class="col col-bgc">仓位号</td>
 
+                      <td class="col"></td>
 
+                  </tr>
 
+                  <tr class="row">
 
+                      <td class="col col-bgc">毛重（公斤）</td>
 
+                      <td class="col">{{printData.grossWeight}}</td>
 
+                      <td class="col col-bgc">皮重（公斤）</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}}</td>
 
+                      <!-- <td class="col " colspan="2"></td> -->
 
+
 
+                  </tr>
 
+              </table>
 
+              <div class="bottom">
 
+                  <div class="bottom-row1">
 
+                      <div>检斤：{{printData.weigher}}</div>
 
+
 
+                      <!-- <div>{{tableData.qualityDate}}</div> -->
 
+                  </div>
 
+                  <div class="bottom-row2">
 
+                      <!-- <div class="left">
 
+          <img :src="item.codeUrl" alt="">
 
+        </div> -->
 
+                      <div class="config" v-if="printData.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
 
+                      <div class="config" v-if="printData.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
 
+                      <div class="autograph" v-if="printData.warehouseName!='白城补数据'">司机签名：</div>
 
+                  </div>
 
+                  <!-- <div class="bottom-row3">扫一扫</div> -->
 
+              </div>
 
+          </div>
 
+          <div class="content" >
 
+            <!-- <div class="title">{{item.customer}}</div> -->
 
+            <div class="title">入库检斤单</div>
 
+            <div class="left">
 
+                <!-- <img :src="item.codeUrl" alt=""> -->
 
+            </div>
 
+            <div class="number">{{printData.dryNumber}}</div>
 
+            <table class="table">
 
+                <!-- <tr class="row">
 
+                    <td class="col col-bgc">发货单位</td>
 
+                    <td class="col" colspan="2" >{{print_customer_name_ew}}</td>
 
+                    <td class="col col-bgc">联系电话</td>
 
+                    <td class="col" ></td>
 
+                    <td class="col col-bgc">车牌号</td>
 
+                    <td class="col" colspan="2">{{printData.carNo}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">收货单位</td>
 
+                    <td class="col" colspan="2">{{print_company_name_ew}}</td>
 
+                    <td class="col col-bgc">联系人</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">联系电话</td>
 
+                    <td class="col" colspan="2"></td>
 
+                </tr> -->
 
+                <tr class="row">
 
+                  <td colspan="3" class="col col-bgc">发货单位</td>
 
+                  <td class="col" colspan="3" >{{print_customer_name_ew}}</td>
 
+                  <td class="col col-bgc">车牌号</td>
 
+                  <td class="col">{{printData.carNo}}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                  <td colspan="3" class="col col-bgc">收货单位</td>
 
+                  <td class="col" colspan="5">{{print_company_name_ew}}</td>
 
+              </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">货名</td>
 
+                    <td class="col">{{printData.goodsName}}</td>
 
+                    <td class="col col-bgc">类型</td>
 
+                    <td class="col">干粮</td>
 
+                    <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
 
+                    <td class="col">
 
+                    </td>
 
+                    <td class="col col-bgc">不完善粒（%）</td>
 
+                    <td class="col">
 
+                        
+                    </td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">等级</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">水分（%）</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">热损伤（%）</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">检斤时间</td>
 
+                    <td class="col">
 
+                        {{printData.updateDate}}
 
+                    </td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">杂质（%）</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">霉变粒（%）</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">扣杂</td>
 
+                    <td class="col"></td>
 
+                    <td class="col col-bgc">仓位号</td>
 
+                    <td class="col"></td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">毛重（公斤）</td>
 
+                    <td class="col">{{printData.grossWeight}}</td>
 
+                    <td class="col col-bgc">皮重（公斤）</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}}</td>
 
+                    <!-- <td class="col " colspan="2"></td> -->
 
+
 
+                </tr>
 
+            </table>
 
+            <div class="bottom">
 
+                <div class="bottom-row1">
 
+                    <div>检斤：{{printData.weigher}}</div>
 
+
 
+                    <!-- <div>{{tableData.qualityDate}}</div> -->
 
+                </div>
 
+                <div class="bottom-row2">
 
+                    <!-- <div class="left">
 
+        <img :src="item.codeUrl" alt="">
 
+      </div> -->
 
+                    <div class="config" v-if="printData.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
 
+                    <div class="config" v-if="printData.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
 
+                    <div class="autograph" v-if="printData.warehouseName!='白城补数据'">司机签名：</div>
 
+                </div>
 
+                <!-- <div class="bottom-row3">扫一扫</div> -->
 
+            </div>
 
+        </div>
 
+  </div>
 
+</body>
 
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
 
+<script type="text/javascript">
 
+    new Vue({
 
+        el: '#app',
 
+        data: {
 
+            isShowPrintType1: false,
 
+            isShowPrintType2: false,
 
+            isShowPrintType3: false,
 
+            isShowPrintType4: false,
 
+            isShowPrintType5: false,
 
+            isShowPrintType6:false,
 
+            showType: [],
 
+            printData: {},
 
+            printData1: [],
 
+            customerList: {},
 
+            customerList1: [],
 
+            name: '',
 
+            bigContent: false,
 
+            smallContent: false,
 
+            date: '',
 
+            imageUrl1: '',
 
+            imageUrl2: '',
 
+            imageUrl3: '',
 
+            imageUrl4: '',
 
+            identity: [],
 
+            bank: [],
 
+            selectPrint: false,
 
+            onlyShowPz: false,
 
+            tableData: [],
 
+            compId: '',
 
+            print_company_name:'',
 
+            print_company_name_ew:'',
 
+            print_customer_name_ew:'',
 
+            pengyuPrint:'false'
 
+        },
 
+        computed: {},
 
+        methods: {
 
+            dealNo(str) {
 
+              console.log(str)
 
+                return str.slice(4)
 
+            },
 
+            tableRowClassName({
 
+                row,
 
+                rowIndex
 
+            }) {
 
+                if (rowIndex === 1) {
 
+                    return 'warning-row'
 
+                } else if (rowIndex === 3) {
 
+                    return 'success-row'
 
+                }
 
+                return ''
 
+            },
 
+            getQueryVariable(variable) {
 
+                var query = window.location.search.substring(1)
 
+                var vars = query.split('&')
 
+                for (var i = 0; i < vars.length; i++) {
 
+                    var pair = vars[i].split('=')
 
+                    if (pair[0] == variable) {
 
+                        return pair[1]
 
+                    }
 
+                }
 
+                return false
 
+            },
 
+            printSmall() {},
 
+            printBig() {}
 
+        },
 
+        mounted() {
 
+            if(localStorage.getItem('print_company_name')){
 
+                this.print_company_name=localStorage.getItem('print_company_name')
 
+            }
 
+            if(localStorage.getItem('print_company_name_ew')){
 
+                this.print_company_name_ew=localStorage.getItem('print_company_name_ew')
 
+            }
 
+            if(localStorage.getItem('print_customer_name_ew')){
 
+                this.print_customer_name_ew=localStorage.getItem('print_customer_name_ew')
 
+            }
 
+            //公司id
 
+            this.compId = localStorage.getItem('ws-pf_compId')
 
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
 
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
 
+            }
 
+            if(localStorage.getItem('print_alone_extra')=='true'){
 
+                this.isShowPrintType6=true
 
+            }else{
 
+              this.isShowPrintType3=true
 
+            }
 
+            this.date = new Date().toLocaleString()
 
+                // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
 
+            this.printData = JSON.parse(localStorage.getItem('printdrydata'))
 
+
 
+            
+
 
+            if (this.printData.compName == undefined) this.printData.compName = ''
 
+            document.title = this.printData.compName + '结算凭证'
 
+            window.print()
 
+                // sessionStorage.removeItem('selectPrint_selectPrintList');
 
+                // sessionStorage.removeItem('selectPrint_selectCustomerList');
 
+            window.onafterprint = function(event) {
 
+                window.history.back(-1)
 
+            }
 
+        },
 
+        watch: {}
 
+    })
 
+</script>
 
+
 
+</html>

+ 9 - 1
src/api/V2/universalityAudit/index.js
Parādīt failu 

@@ -15,4 +15,12 @@ export const API_GET_workflow= '/newWorkflow/query/workflowsByBusinessCode'
 
 // 审核流2
 
 export const API_GET_HIS= '/newWorkflow/query/workflowInfo'
 
 // 发起人撤回
 
-export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 
+// 审核流打印列表
 
+export const API_PRINT_LIST ='/generalAuditInfo/selectAuditPrintList'
 
+// 审核流打印取流程id
 
+export const API_PRINT_WORKFLOW ='/workflow/query/workflowDefinitions'
 
+// 审核流打印取流程
 
+export const API_PRINT_GETHIS ='/commonUser/getHis'
 
+// 审核流打印取附件
 
+export const API_PRINT_GETFILE ='/appendix/query/getFileList'

+ 1 - 0
src/lang/zh.js
Parādīt failu 

@@ -662,6 +662,7 @@ export default {
 
     // 通用审核
 
     aduitmanagement:'审核管理',
 
     universalityaudit:'通用审核',
 
+    auditprint:'审核流打印',
 
     // 采购模块
 
     procurement: '采购管理',
 
     sparepart: '备件采购',

+ 14 - 2
src/model/universalityAudit/index.js
Parādīt failu 

@@ -10,7 +10,11 @@ import {
 
     API_GET_INFO,
 
     API_GET_workflow,
 
     API_GET_HIS,
 
-    API_SPONSOR_WITHDRAW
 
+    API_SPONSOR_WITHDRAW,
 
+    API_PRINT_LIST,
 
+    API_PRINT_WORKFLOW,
 
+    API_PRINT_GETHIS,
 
+    API_PRINT_GETFILE,
 
 } from '@/api/V2/universalityAudit'
 
 // 查看
 
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
 
@@ -29,4 +33,12 @@ export const workflow = appRx.get(API_GET_workflow, errorCatcher, errorHandle, f
 
 // 审核流2
 
 export const gethis = appRx.get(API_GET_HIS, errorCatcher, errorHandle, filter)
 
 // 发起人撤回
 
-export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
 
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
 
+// 审核流打印列表
 
+export const printlist = appRx.get(API_PRINT_LIST, errorCatcher, errorHandle, filter)
 
+// 审核流打印取流程id
 
+export const printworkflow = appRx.get(API_PRINT_WORKFLOW, errorCatcher, errorHandle, filter)
 
+// 审核流打印取流程
 
+export const printgethis = appRx.get(API_PRINT_GETHIS, errorCatcher, errorHandle, filter)
 
+// 审核流打印取流程
 
+export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHandle, filter)

+ 5 - 2
src/views/profitable/expensemanagementdetails.vue
Parādīt failu 

@@ -55,6 +55,7 @@
 
             <el-select v-model="toExamineType"  filterable  clearable @change="getList1" class="options_css">
 
               <el-option label="全部状态" value=""></el-option>
 
               <el-option label="待审核" value="1"></el-option>
 
+              <el-option label="待付款" value="2"></el-option>
 
             </el-select>
 
             <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
 
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
 
@@ -264,10 +265,10 @@
 
           </div>
 
           <div style="width: 33.333%; text-align: center">
 
             {{
 
-                item.dealMsg != '请款'
 
+                statusdata.expensesType != 1
 
                   ? item.approveResult == 1
 
                     ? '通过'
 
-                    : '驳回'
 
+                    : item.approveResult == 0?'驳回':item.dealMsg
 
                   : item.dealMsg
 
             }}
 
           </div>
 
@@ -361,6 +362,7 @@ export default {
 
       outtotal: 0,
 
       intotal: 0,
 
       fujianshow: false,
 
+      statusdata:{},
 
       appendixIdss: [],
 
       appendixIdss1:'',
 
       approveStatus: false,
 
@@ -573,6 +575,7 @@ export default {
 
       } else {
 
         this.title1 = '请款审核记录'
 
       }
 
+      this.statusdata=row
 
       getAuditRecord({ id: row.id, workflowId: row.workflowId })
 
         .toPromise()
 
         .then((response) => {

+ 490 - 0
src/views/universalityAudit/auditprint.vue
Parādīt failu 

@@ -0,0 +1,490 @@
 
+//审核流打印
 
+<template>
 
+  <div class="container">
 
+
 
+    <div class="center">
 
+      <el-row style='margin-bottom:10px;'>
 
+        <el-col :span="14">
 
+          <div style='margin-left:10px;' class="datascreen">
 
+            <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
 
+              start-placeholder="起始日期" end-placeholder="截止日期" :picker-options="pickerOptions" class="data_css"
 
+              @change="changeDate">
 
+            </el-date-picker>
 
+            <el-select class="typechange" style="margin-left:10px;" v-model="businessType" filterable clearable placeholder="选择类型" @change="typeChange">
 
+                <el-option v-for="item in xialaList" :key="item.value" :label="item.label" :value="item.value"
 
+                style="color: #8890b1" />
 
+            </el-select>
 
+            <el-input placeholder="可按发起人姓名或业务编号查找" class="input_css" v-model="searchKeyWord"></el-input>
 
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
 
+                    src="../../../public/img/sousuo.png" alt="" /></el-button>
 
+        </div>
 
+          
+        </el-col>
 
+        <el-col style="text-align:right;" :span="10">
 
+          <el-button style="margin-right:10px" @click="addlist" type="primary">批量打印</el-button>
 
+        </el-col>
 
+      </el-row>
 
+      <div class="fromdata">
 
+        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
 
+          <el-table-column type="selection" width="55">
 
+          </el-table-column>
 
+          <el-table-column type="index" label="序号">
 
+            <template scope="scope">
 
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+              <span v-else>{{ scope.$index + 1 }}</span>
 
+            </template>
 
+          </el-table-column>
 
+          <el-table-column prop="businessNo" label="业务编号">
 
+          </el-table-column>
 
+          <el-table-column prop="creater" label="发起人">
 
+          </el-table-column>
 
+          <el-table-column prop="type" label="类型">
 
+          </el-table-column>
 
+          <el-table-column prop="status" label="状态">
 
+            <template slot-scope="scope">{{ scope.row.approveStatus ? scope.row.approveStatus : scope.row.status }}</template>
 
+          </el-table-column>
 
+          <el-table-column prop="createDate" label="发起时间"></el-table-column>
 
+
 
+          
+          <el-table-column prop="address" label="操作" width="300">
 
+            <template slot-scope="scope">
 
+
 
+              <el-button @click="printItem(scope.row)"
 
+                type="primary">打印</el-button>
 
+            </template>
 
+          </el-table-column>
 
+        </el-table>
 
+      </div>
 
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 
+        style="text-align:center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
 
+        :total="deptBudgetTotal">
 
+      </el-pagination>
 
+    </div>
 
+  </div>
 
+</template>
 
+<script>
 
+
 
+import {
 
+  xiala,
 
+  aduitinfoList,
 
+  addaduitinfo,
 
+  getaduitinfo,
 
+  editaduitinfo,
 
+  printlist,
 
+  printworkflow,
 
+  printgethis,
 
+  printgetfile
 
+} from '@/model/universalityAudit/index'
 
+import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
 
+import { seeCat } from '@/model/transport/index'
 
+import WsUpload from '@/components/WsUpload'
 
+import {
 
+  woekflowhandle
 
+} from '@/model/tasksport/index'
 
+export default {
 
+  components: {
 
+    WsUpload
 
+  },
 
+  data() {
 
+    return {
 
+      value: '',
 
+      tableData: [],
 
+      show: false,
 
+      title: '',
 
+      textarea: '',
 
+      deptBudgetList:{},
 
+      rejectshow: false,
 
+      addshow: false,
 
+      correlationshow: false,
 
+      deptBudgetTotal: 0,
 
+      currentPage: 1,
 
+      pageSize: 10,
 
+      businessType: '',
 
+      searchType: '',
 
+      searchKeyWord: '',
 
+      startDate: '',
 
+      endDate: '',
 
+      showFlag: false,
 
+      flag: '',
 
+      outtotal: 0,
 
+      xialaList: [
 
+        {label:'全部审核',value:''},
 
+        {label:'费用审核',value:'费用审核'},
 
+        {label:'入库单请款',value:'入库单请款'},
 
+        {label:'运价审核',value:'运价审核'},
 
+        {label:'通用审核',value:'通用审核'},
 
+        {label:'合同审核',value:'合同审核'},
 
+        {label:'运费结算',value:'运费结算'},
 
+        {label:'仓库设置',value:'仓库设置'},
 
+        {label:'出入库任务',value:'出入库任务'}
 
+        ],
 
+      intotal: 0,
 
+      form: {},
 
+      generalAuditInfo: {},
 
+      dialogVisible: false,
 
+      contractList: [],
 
+      datalist: {},
 
+      size: 100,
 
+      accessoryTFs: false,
 
+      appendixIdss: '',
 
+      blocks: [],
 
+      compId: localStorage.getItem('ws-pf_compId'),
 
+      currectdata: {},
 
+      dialogVisible1: false,
 
+      recordList: []
 
+    }
 
+  },
 
+  activated() {
 
+    this.getList()
 
+  },
 
+  methods: {
 
+    async printItem(row){
 
+        if(row.type=='费用审核'){
 
+            this.deptBudgetList=[await lookexenseinfo({id:row.id}).toPromise()]
 
+            this.deptBudgetList[0].currectstatus=row.status
 
+            if(this.deptBudgetList[0].expensesType!=1){
 
+                this.deptBudgetList[0].printType=1
 
+                var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
 
+                this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
 
+                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')
 
+                        }else{
 
+                            this.$set(arr,'status','error')
 
+                        }
 
+                        arr.operatorName=arr.workflowHistoricTasks[len].operatorName
 
+                        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(",")
 
+                        }else{
 
+                            arr.auditMind = arr.workflowHistoricTasks[len].auditMind
 
+                        }
 
+                    }else{
 
+                        this.$set(arr,'status','question')
 
+                        arr.operatorName=arr.desc
 
+                        arr.updateDate=arr.updateDate
 
+                        arr.auditMind =''
 
+                    }
 
+                }
 
+                this.deptBudgetList[0].aduitInfo.unshift({
 
+                operatorName:row.creater,
 
+                updateDate:row.createDate,
 
+                auditMind:'',
 
+                desc:'发起',
 
+                workflowHistoricTasks:[],
 
+                status:'success'
 
+                })
 
+            }else{
 
+                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)
 
+            }else{
 
+                this.deptBudgetList[0].addressUrlArray=[]
 
+            }
 
+        }else if(row.type=='入库单请款'){
 
+            if(this.deptBudgetList[0].addressUrl){
 
+                var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
 
+                this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
 
+            }else{
 
+                this.deptBudgetList[0].addressUrlArray=[]
 
+            } 
+        }else if(row.type=='运价审核'||row.type=='通用审核'){
 
+          if(row.type=='运价审核'){
 
+            this.deptBudgetList=[await seeCat({id:row.id}).toPromise()]
 
+            this.deptBudgetList[0].printType=4
 
+          }else if(row.type=='通用审核'){
 
+            this.deptBudgetList=[await getaduitinfo({id:row.id}).toPromise()]
 
+            this.deptBudgetList[0].printType=5
 
+          }
 
+          this.deptBudgetList[0].currectstatus=row.status
 
+          var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
 
+                this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
 
+                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')
 
+                        }else{
 
+                            this.$set(arr,'status','error')
 
+                        }
 
+                        arr.operatorName=arr.workflowHistoricTasks[len].operatorName
 
+                        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(",")
 
+                        }else{
 
+                            arr.auditMind = arr.workflowHistoricTasks[len].auditMind
 
+                        }
 
+                    }else{
 
+                        this.$set(arr,'status','question')
 
+                        arr.operatorName=arr.desc
 
+                        arr.updateDate=arr.updateDate
 
+                        arr.auditMind =''
 
+                    }
 
+                }
 
+                this.deptBudgetList[0].aduitInfo.unshift({
 
+                operatorName:row.creater,
 
+                updateDate:row.createDate,
 
+                auditMind:'',
 
+                desc:'发起',
 
+                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)
 
+                }else{
 
+                    this.deptBudgetList[0].addressUrlArray=[]
 
+                }
 
+        }
 
+        localStorage.setItem('aduitprintdata',JSON.stringify(this.deptBudgetList))
 
+        window.open('../../../static/aduitprint.html')
 
+    },
 
+    imagefilter(arr){
 
+        var arr1=[]
 
+        for (let i = 0; i < arr.length; i++) {
 
+            if(arr[i].appendixName.indexOf('jpg')!=-1||arr[i].appendixName.indexOf('jpeg')!=-1||arr[i].appendixName.indexOf('png')!=-1){
 
+                    arr1.push(arr[i])
 
+            }       
+        }
 
+        return arr1
 
+    },
 
+    onSubmit() {
 
+      if (!this.form.businessType) {
 
+        this.$message({
 
+          message: '审核类型不能为空!',
 
+          type: 'warning',
 
+        })
 
+      }
 
+      if (this.form.remark && this.form.remark.length < 2 || this.form.remark && this.form.remark.length > 1000) {
 
+        this.$message({
 
+          message: '备注信息10-2000个字!',
 
+          type: 'warning',
 
+        })
 
+      }
 
+      if (this.flag != 1) {
 
+        this.$confirm('确定发起审核？', '提示', {
 
+          confirmButtonText: '确定',
 
+          cancelButtonText: '取消',
 
+          type: 'warning'
 
+        })
 
+          .then(() => {
 
+            this.form.compId = localStorage.getItem('ws-pf_compId')
 
+            this.form.sponsor = localStorage.getItem('ws-pf_staffName')
 
+            addaduitinfo(this.form).toPromise().then(response => {
 
+              this.$message({
 
+                message: '提交成功!',
 
+                type: 'success',
 
+              })
 
+              this.getList()
 
+            })
 
+            this.form = {}
 
+            this.$refs.upload.clearFiles()
 
+            this.addshow = false
 
+          })
 
+      } else {
 
+        this.$confirm('确定提交本次修改？', '提示', {
 
+          confirmButtonText: '确定',
 
+          cancelButtonText: '取消',
 
+          type: 'warning'
 
+        })
 
+          .then(() => {
 
+            // this.form.compId = localStorage.getItem('ws-pf_compId')
 
+            // this.form.sponsor = localStorage.getItem('ws-pf_staffName')
 
+            editaduitinfo(this.form).toPromise().then(response => {
 
+              this.$message({
 
+                message: '修改成功!',
 
+                type: 'success',
 
+              })
 
+              this.getList()
 
+            })
 
+            this.form = {}
 
+            this.$refs.upload.clearFiles()
 
+            this.addshow = false
 
+          })
 
+      }
 
+    },
 
+    addlist() {
 
+      this.addshow = true
 
+    },
 
+    handleClose() {
 
+      this.show = false
 
+    },
 
+    typeChange(num) {
 
+      this.searchType = num
 
+      this.getList()
 
+    },
 
+    returnsales() {
 
+      this.$router.go(-1)
 
+    },
 
+    handleSelectionChange(val) {
 
+      this.multipleSelection = val;
 
+    },
 
+    async getList() {
 
+        printlist({
 
+        compId:localStorage.getItem('ws-pf_compId'),
 
+        startDate: this.startDate,
 
+        endDate: this.endDate,
 
+        searchKeyWord: this.searchKeyWord,
 
+        currentPage: this.currentPage,
 
+        pageSize: this.pageSize,
 
+        searchType: this.searchType,
 
+      })
 
+        .toPromise()
 
+        .then(response => {
 
+          this.tableData = response.records
 
+          this.deptBudgetTotal = response.total
 
+        })
 
+    },
 
+
 
+    changeDate() {
 
+      if (this.value) {
 
+        this.startDate = this.value[0]
 
+        this.endDate = this.value[1]
 
+      }
 
+      this.getList()
 
+    },
 
+    pickerOptions() { },
 
+    find() {
 
+      this.getList()
 
+
 
+    },
 
+    handleSizeChange(val) {
 
+      console.log(`每页 ${val} 条`)
 
+      this.pageSize = val
 
+      this.getList()
 
+    },
 
+    handleCurrentChange(val) {
 
+      this.currentPage = val
 
+      console.log(`当前页: ${val}`)
 
+      this.getList()
 
+    },
 
+  },
 
+}
 
+</script>
 
+<style lang="scss" scoped>
 
+table,
 
+table tr th,
 
+table tr td {
 
+  border: 2px solid #333333;
 
+  padding: 5px 0;
 
+  height: 55px;
 
+}
 
+
 
+.content {
 
+  width: 1000px;
 
+  padding: 70px 20px 20px 20px;
 
+  font-size: 22px;
 
+  position: absolute;
 
+  top: 0;
 
+  bottom: 0;
 
+  left: 0;
 
+  right: 0;
 
+}
 
+
 
+table {
 
+  width: 100%;
 
+  text-align: center;
 
+  border-collapse: collapse;
 
+  border: 3px solid #333333;
 
+}
 
+
 
+.col-bgc {
 
+  background: #f6f7fb;
 
+}
 
+
 
+.container {
 
+  background: #E8ECF6;
 
+}
 
+
 
+.center {
 
+  margin: 0 auto;
 
+  background: #ffffff;
 
+  height: calc(100vh - 13vh);
 
+  border-radius: 4px;
 
+  padding: 20px 0;
 
+
 
+  /deep/.el-table td,
 
+  /deep/.el-table th {
 
+    text-align: center;
 
+  }
 
+}
 
+
 
+.row_top {
 
+  background: #F6F7FC;
 
+  border-radius: 4px;
 
+  margin-bottom: 10px;
 
+
 
+  .bg-left {
 
+    padding-left: 30px;
 
+  }
 
+
 
+  .bg-right {
 
+    padding-right: 10px;
 
+    text-align: right;
 
+  }
 
+
 
+  .title {
 
+    position: relative;
 
+  }
 
+
 
+  .title::before {
 
+    content: '';
 
+    display: inline-block;
 
+    width: 5px;
 
+    height: 30px;
 
+    background: #5473e8;
 
+    position: absolute;
 
+    left: 0;
 
+  }
 
+}
 
+
 
+.datascreen {
 
+  display: flex;
 
+
 
+  .data_css {
 
+    width: 40%;
 
+  }
 
+
 
+  .input_css {
 
+    width: 50%;
 
+    margin: 0 10px;
 
+  }
 
+
 
+  .find {
 
+    margin-right: 10px;
 
+  }
 
+}
 
+
 
+.fromdata {
 
+  margin: 20px 0;
 
+  overflow-y: scroll;
 
+  height: 546px;
 
+}
 
+
 
+.top_info {
 
+  margin: 10px 0 0 10px;
 
+  min-width: 712px;
 
+
 
+  .info_css {
 
+    margin-right: 20px;
 
+  }
 
+}
 
+
 
+.bg-right {
 
+  padding-top: 15px;
 
+}
 
+.typechange{
 
+    width:50%;
 
+}
 
+</style>

+ 16 - 1
src/views/universalityAudit/component/routers/route.js
Parādīt failu 

@@ -27,7 +27,22 @@ const profitableRouter = {
 
           _title:'通用审核'
 
           // module: 'procurement.sparepart.applDetail'
 
         }
 
-      },  
+      }, 
+      // {
 
+      //   path: 'auditprint',
 
+      //   component: () =>
 
+      //     import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/auditprint'),
 
+      //   name: 'auditprint',
 
+      //   meta: {
 
+      //     title: 'auditprint',
 
+      //     shortcutEntrance: 'profitable',
 
+      //     module: 'generalAudit',
 
+      //     permissicon: [],
 
+      //     keepAlive: true,
 
+      //     _title:'审核流打印'
 
+      //     // module: 'procurement.sparepart.applDetail'
 
+      //   }
 
+      // }, 
     
   ],

+ 391 - 1
src/views/warehousenew/dryRecord.vue
Parādīt failu 

@@ -58,6 +58,7 @@
 
                 <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
 
                 <el-table-column label="操作">
 
                     <template scope="scope">
 
+                        <el-button @click="printInfo(scope.row)" >打印</el-button>
 
                         <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '待称皮重'">删除</el-button>
 
                     </template>
 
                 </el-table-column>
 
@@ -69,6 +70,56 @@
 
                 layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
             </el-pagination>
 
         </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="warehouseName1=='鲅鱼圈金信库'||warehouseName1=='白城内陆港'||warehouseName1=='杜尔伯特家禾库'||warehouseName1=='洮南新友谊兴旺库'||warehouseName1=='甘南宏旗库'||warehouseName1=='哈尔滨依兰库'||warehouseName1=='山东园丰库'">
 
+          <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>
 
@@ -85,6 +136,8 @@ export default {
 
             weighingRecordList: [],
 
             warehouseId: '',
 
             warehouseName: '',
 
+            warehouseName1: '',
 
+
 
             compId: '',
 
             //分页
 
             currentPage: 1,
 
@@ -96,6 +149,7 @@ export default {
 
             searchKeyWord: '',
 
             title: '',
 
             modification: [],
 
+            isShowPrintTypeBills:false,
 
             count: 0,//合计
 
             startDate: '',
 
             endDate: '',
 
@@ -142,6 +196,84 @@ export default {
 
                 },
 
                 ],
 
             },
 
+            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: '厦门建发物产有限公司'
 
+        }],
 
+        companyName: '黑龙江中天昊元贸易有限公司',
 
+        companyNameEW: '厦门建发物产有限公司',
 
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
 
+        printSeparately:false,
 
+        onePrint:false,
 
+        dialogDataList:[],
 
+        printData:{}
 
 
         }
 
     },
 
@@ -157,10 +289,203 @@ export default {
 
         this.compId = localStorage.getItem('ws-pf_compId')
 
         this.warehouseName = this.$route.query.warehouseName //仓库名
 
         this.warehouseId = this.$route.query.warehouseId //仓库Id
 
+        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]})
 
+          }
 
+        }
 
+      }
 
         this.getList()
 
     },
 
     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
 
+      },
 
+        printInfo(row){
 
+            this.printData=row
 
+            this.warehouseName1=row.warehouseName
 
+            
+            this.isShowPrintTypeBills=true
 
+            // window.open('../../../static/printdry.html')
 
+        },
 
         deleteInfo(row) {
 
             //删除
 
             this.$confirm('确定删除检斤信息？', '提示', {
 
@@ -503,4 +828,69 @@ export default {
 
     padding: 0 20px;
 
     margin-top: 20px;
 
 }
 
+.mask1 {
 
+    background: black;
 
+    width: 100vw;
 
+    height: 100vh;
 
+    position: fixed;
 
+    top: 0;
 
+    z-index: 1001;
 
+    opacity: 0.3;
 
+  }
 
+
 
+  .print-type-title1 {
 
+    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>

+ 1 - 0
src/views/warehousenew/dryWarehousing.vue
Parādīt failu 

@@ -225,6 +225,7 @@ export default {
 
             })
 
                 .toPromise()
 
                 .then((response) => {
 
+                    this.goodsNameList=[]
 
                     for (let i = 0; i < response.length; i++) {
 
                         if (response[i].constValue.indexOf('潮粮') == -1) {
 
                             this.goodsNameList.push(response[i])