前端

public/static/aduitprint.html

@@ -92,8 +92,8 @@
         width:120vw;
         height:100vh;
         
-        transform-origin: 50% 50%;
-        transform: rotate(270deg);
+        transform-origin: top top;
+        transform: rotate(90deg);
     }
     @media print {
     .image{ page-break-inside:avoid;}
@@ -155,7 +155,7 @@
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">附件</td>
-                    <td colspan="2" class="col">{{ item.addressUrlArray.length }}</td>
+                    <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
                 </tr>
             </tbody>
             <thead v-if="item.expensesType==2">
@@ -204,14 +204,82 @@
                   <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==3" 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.requestDate}}</td>
+            </tr>
+            <tr class="row">
+                <td class="col col-bgc">请款人</td>
+                <td colspan="2" class="col">{{ item.requestPerson }}</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 class="col col-bgc">重量</td>
+                <td class="col col-bgc">金额（元）</td>
+            </tr>
+            <tr v-for="item1 in item.goodNameList" class="row">
+              <td class="col">{{item1.goodsName}}</td>
+              <td class="col">{{item1.inWarehouseWeight}}</td>
+              <td class="col">{{item1.requestFunds}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">合计重量（吨）</td>
+              <td colspan="2" class="col">{{ item.inWarehouseWeightTotal.toFixed(2) }}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">合计金额（元）</td>
+              <td colspan="2" class="col">{{ item.requestFundsTotal }}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收购名头</td>
+              <td colspan="2" class="col">{{ item.purchaser }}</td>
+            </tr>
+          </tbody>
+          <thead>
+            <tr class="row">
+                <th colspan="3" class="col">支付明细</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="item1 in item.warehousingOrderList" class="row">
+                <td class="col col-bgc">{{item1.customer}}</td>
+                <td colspan="2" class="col">{{item1.goodsName}}&nbsp;{{item1.inWarehouseWeight}}吨&nbsp;{{item1.avgCost}}元/吨&nbsp;应付{{item1.requestFunds}}元&nbsp;</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==4" class="table">
-          <thead>
+            <thead>
               <tr class="row">
                   <th colspan="3" class="col">基本信息</th>
               </tr>
-          </thead>
-          <tbody>
+            </thead>
+            <tbody>
               <tr class="row">
                   <td class="col col-bgc">运费类型</td>
                   <td colspan="2" class="col">{{item.tranType}}运费</td>
@@ -238,13 +306,13 @@
                   <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>
+            </tbody>
+            <thead>
               <tr class="row">
                   <th colspan="3" class="col">审核流</th>
               </tr>
-          </thead>
-          <tbody>
+            </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>
@@ -252,7 +320,7 @@
                   <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>
           </table>
           <table v-if="item.printType==5" class="table">
             <thead>
@@ -271,7 +339,7 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">附件</td>
-                  <td colspan="2" class="col">{{ item.addressUrlArray.length }}</td>
+                  <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
               </tr>
             </tbody>
             <thead>
@@ -290,158 +358,185 @@
             </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>
+            <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 v-if="item.agreementType=='收购合同'" class="row">
+                <td class="col col-bgc">收购方</td>
+                <td colspan="2" class="col">{{ item.buyer }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='收购合同'" class="row">
+                <td class="col col-bgc">收购方电话</td>
+                <td colspan="2" class="col">{{ item.buyerPhone }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'" class="row">
+                <td class="col col-bgc">买方</td>
+                <td colspan="2" class="col">{{ item.buyer }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'" class="row">
+                <td class="col col-bgc">买方电话</td>
+                <td colspan="2" class="col">{{ item.buyerPhone }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'" class="row">
+                <td class="col col-bgc">卖方</td>
+                <td colspan="2" class="col">{{ item.seller }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'" class="row">
+                <td class="col col-bgc">卖方电话</td>
+                <td colspan="2" class="col">{{ item.sellerPhone }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'" class="row">
+                <td class="col col-bgc">交易主体</td>
+                <td colspan="2" class="col">{{ item.transactionSubject }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">合营方</td>
+                <td colspan="2" class="col">{{ item.jointVentureParties }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">合营方电话</td>
+                <td colspan="2" class="col">{{ item.jointPhone }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='销售合同'" class="row">
+                <td class="col col-bgc">中转公司</td>
+                <td colspan="2" class="col">{{ item.transitCompany }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">交货日期（起 - 止）</td>
+                <td colspan="2" class="col">{{item.deliveryDateStart }} ~ {{item.deliveryDateEnd}}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">签订日期</td>
+                <td colspan="2" class="col">{{ item.signingDate }}</td>
+              </tr>
+              <tr class="row">
+                <td v-if="item.agreementType=='收购合同'" class="col col-bgc">溢短装（%）</td>
+                <td colspan="2" class="col">{{ item.overShort }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">合同单价（元/吨）</td>
+                <td colspan="2" class="col">{{ item.unitContractPrice }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">合同总价（元）</td>
+                <td colspan="2" class="col">{{ item.totalContractPrice }}</td>
+              </tr>
+              
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">货源所在地区</td>
+                <td colspan="2" class="col">{{item.sourceProvince}}{{item.sourceCity}}{{item.sourceArea}}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">货源详细地址</td>
+                <td colspan="2" class="col">{{ item.sourceGoods }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">交货地所在地区</td>
+                <td colspan="2" class="col">{{item.deliveryProvince}}{{item.deliveryCity}}{{item.deliveryArea}}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">交货地详细地址</td>
+                <td colspan="2" class="col">{{ item.placeDelivery }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">最终实际交易量（吨）</td>
+                <td colspan="2" class="col">{{ item.finalTradingVolume }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'||item.agreementType=='销售合同'"  class="row">
+                <td class="col col-bgc">结算单价（元/吨）</td>
+                <td colspan="2" class="col">{{ item.settlementPrice }}</td>
+              </tr>
+              <tr v-if="item.contractProcessInfo.goodsNameKey" class="row">
+                <td class="col col-bgc">合同收入（元）</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.goodsNameKey }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'&&item.contractProcessInfo.goodsName||item.agreementType=='销售合同'&&item.contractProcessInfo.goodsName" class="row">
+                <td class="col col-bgc">已开发票（元）</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.goodsName }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'&&item.contractProcessInfo.waterContent||item.agreementType=='销售合同'&&item.contractProcessInfo.waterContent" class="row">
+                <td class="col col-bgc">费用支出（元）</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.waterContent }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'&&item.contractProcessInfo.impurity||item.agreementType=='销售合同'&&item.contractProcessInfo.impurity" class="row">
+                <td class="col col-bgc">未开发票（元）</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.impurity }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'&&item.contractProcessInfo.mildewGrain||item.agreementType=='销售合同'&&item.contractProcessInfo.mildewGrain" class="row">
+                <td class="col col-bgc">未回款（元）</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.mildewGrain }}</td>
+              </tr>
+              <tr v-if="item.agreementType=='采购合同'&&item.contractProcessInfo.grade||item.agreementType=='销售合同'&&item.contractProcessInfo.grade" class="row">
+                <td class="col col-bgc">双章原件回收情况</td>
+                <td colspan="2" class="col">{{ item.contractProcessInfo.grade }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">备注信息</td>
+                <td colspan="2" class="col">{{ item.remarks }}</td>
+              </tr>
+            </tbody>
+            <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.contractGoodsInfo.goodsName }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">品级</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.grade }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">容量（克/升）>=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.bulkDensity }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">水分（%）&lt;=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.waterContent }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">热损伤（%）&lt;=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.jiaorenli }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">杂质（%）&lt;=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.impurity }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">霉变粒（%）&lt;=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.mildewGrain }}</td>
+              </tr>
+              <tr class="row">
+                <td class="col col-bgc">不完善粒（%）&lt;=</td>
+                <td colspan="2" class="col">{{ item.contractGoodsInfo.imperfectGrain }}</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>
-          <div  v-if="item.printType==1||item.printType==5" class="sfcard" >
+          <div  v-if="item.printType==1||item.printType==5||item.printType==6" class="sfcard" >
             <div v-for="item1 in item.addressUrlArray" class="sfcard-content">
                 <div class="sfcard-title">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->

src/api/V2/universalityAudit/index.js

@@ -23,4 +23,6 @@ export const API_PRINT_WORKFLOW ='/workflow/query/workflowDefinitions'
 // 审核流打印取流程
 export const API_PRINT_GETHIS ='/commonUser/getHis'
 // 审核流打印取附件
-export const API_PRINT_GETFILE ='/appendix/query/getFileList'
+export const API_PRINT_GETFILE ='/appendix/query/getFileList'
+// 审核流打印入库单获取
+export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'

src/model/universalityAudit/index.js

@@ -15,6 +15,7 @@ import {
     API_PRINT_WORKFLOW,
     API_PRINT_GETHIS,
     API_PRINT_GETFILE,
+    API_PRINT_DATA
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
@@ -41,4 +42,6 @@ export const printworkflow = appRx.get(API_PRINT_WORKFLOW, errorCatcher, errorHa
 // 审核流打印取流程
 export const printgethis = appRx.get(API_PRINT_GETHIS, errorCatcher, errorHandle, filter)
 // 审核流打印取流程
-export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHandle, filter)
+export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHandle, filter)
+// 审核流打印入库单
+export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContractAdd.vue

@@ -1319,7 +1319,7 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if(!this.deptBudgetList.personCharge){
+        if(this.deptBudgetList.deliverType==1&&!this.deptBudgetList.personCharge){
           this.$message({
             message: '请选择临时仓库负责人！',
             type: 'warning',

src/views/universalityAudit/auditprint.vue

@@ -73,10 +73,14 @@ import {
   printlist,
   printworkflow,
   printgethis,
-  printgetfile
+  printgetfile,
+  printgetdata
 } from '@/model/universalityAudit/index'
 import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
 import { seeCat } from '@/model/transport/index'
+import {
+    examineList,
+  } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import {
   woekflowhandle
@@ -139,11 +143,29 @@ export default {
   },
   methods: {
     async printItem(row){
-        if(row.type=='费用审核'){
+        if(row.type=='费用审核'||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
+                if(row.type=='费用审核'){
+                  this.deptBudgetList[0].printType=1
+                }else if(row.type=='运费结算'){
+                  this.deptBudgetList[0].printType=7
+                  if (this.deptBudgetList.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 q = 0; q < data.length; q++) {
+                          if (data[q].totalPayable) {
+                            this.num += data[q].totalPayable
+                          }
+                        }
+                      }
+                    }
+                  }
+                  this.deptBudgetList[0].num=num.toFixed(2)
+                }
                 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++) {
@@ -186,24 +208,26 @@ export default {
             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=='入库单请款'){
-            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=='运价审核'){
+        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'){
+          if(row.type=='入库单请款'){
+            this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
+            this.deptBudgetList[0].printType=3
+          }else 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
           }
+          else if(row.type=='合同审核'){
+            this.deptBudgetList=[await examineList({id:row.id}).toPromise()]
+            this.deptBudgetList[0].printType=6
+          }
           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()
@@ -241,10 +265,12 @@ export default {
                 status:'success'
                 })
                 if(this.deptBudgetList[0].addressUrl){
-                    var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
-                    this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
+                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))

src/views/warehousenew/dryRecord.vue

@@ -456,7 +456,7 @@ export default {
         }else{
           this.printData.extra2=false
         }
-        localStorage.setItem('printdrydata',JSON.stringify(this.printData))
+        localStorage.setItem('printdrydata',JSON.str(this.printData))
             window.open(
               '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
             )