Inicio Explorar Ayuda
Registro Iniciar sesión
gdc
/
yiliangyiyun-pc
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/api/V2/houseSelfCollect/index.js
#	src/model/houseSelfCollect/index.js
achao hace 2 años
padre
dd6689698e a53116a756
commit
83293abdef
Se han modificado 31 ficheros con 3931 adiciones y 749 borrados
Dividir vista Mostrar estadísticas de diff
  1. BIN
      public/img/shz.png
  2. BIN
      public/img/wtg.png
  3. BIN
      public/img/ytg.png
  4. 708 0
      public/static/aduitprint.html
  5. 4 4
      public/static/payprint1.html
  6. 441 0
      public/static/printdry.html
  7. 7 3
      src/api/V2/houseSelfCollect/index.js
  8. 11 1
      src/api/V2/universalityAudit/index.js
  9. 2 1
      src/api/V2/warehouse/index.js
  10. 1 0
      src/lang/zh.js
  11. 7 6
      src/model/houseSelfCollect/index.js
  12. 17 2
      src/model/universalityAudit/index.js
  13. 4 1
      src/model/warehouse/index.js
  14. 5 1
      src/views/contractManagement/acquisitionContractAdd.vue
  15. 6 1
      src/views/contractManagement/purchaseContractAdd.vue
  16. 5 0
      src/views/contractManagement/salesContractAdd.vue
  17. 49 8
      src/views/houseSelfCollect/inspectionManagementNew.vue
  18. 131 84
      src/views/houseSelfCollect/newWeighingManagement.vue
  19. 13 8
      src/views/houseSelfCollect/paymentManagement.vue
  20. 437 30
      src/views/houseSelfCollect/settlement.vue
  21. 116 22
      src/views/houseSelfCollect/weightCheckRecord.vue
  22. 4 4
      src/views/outboundManagement/weighingManagementrecord.vue
  23. 5 2
      src/views/profitable/expensemanagementdetails.vue
  24. 47 5
      src/views/profitable/fixedAssets.vue
  25. 2 2
      src/views/taskManagement/tranManagementWarehouseInOutTask.vue
  26. 503 514
      src/views/universalityAudit/audit.vue
  27. 530 0
      src/views/universalityAudit/auditprint.vue
  28. 16 1
      src/views/universalityAudit/component/routers/route.js
  29. 20 7
      src/views/warehousenew/addCar.vue
  30. 400 18
      src/views/warehousenew/dryRecord.vue
  31. 440 24
      src/views/warehousenew/dryWarehousing.vue

BIN
public/img/shz.png
Ver fichero


BIN
public/img/wtg.png
Ver fichero


BIN
public/img/ytg.png
Ver fichero


+ 708 - 0
public/static/aduitprint.html
Ver fichero 

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

+ 4 - 4
public/static/payprint1.html
Ver fichero 

@@ -331,7 +331,7 @@
 
                                     {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
 
                                 </td>
 
                                 <td class="col " v-if="pengyuPrint">
 
-                                    {{printData1[index].unitContractPrice/1000}}
 
+                                    {{Number(printData1[index].unitContractPrice/1000).toFixed(3)}}
 
                                 </td>
 
                                 <td class="col ">{{ printData1[index].unitDeduction}}</td>
 
                                 <td class="col " v-if="pengyuPrint">
 
@@ -718,7 +718,7 @@
 
                             {{printData.qualityInspectionManagement.dryGrainPrice}}
 
                         </td>
 
                         <td class="col " v-if="pengyuPrint">
 
-                            {{printData.unitContractPrice/1000}}
 
+                            {{Number(printData.unitContractPrice/1000).toFixed(3)}}
 
                         </td>
 
                         <td class="col ">{{ printData.unitDeduction}}</td>
 
                         <td class="col " v-if="pengyuPrint">
 
@@ -837,7 +837,7 @@
 
                     <tr class="row">
 
                         <td class="col col-bgc">收货仓库</td>
 
                         <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
 
-                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-白城友谊自管仓':printData.warehouseName}}</td>
 
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-洮南安定自管仓':printData.warehouseName}}</td>
 
                         <td class="col col-bgc">身份证号</td>
 
                         <td class="col" colspan="4">
 
                            {{ printData.identityAuthenticationInfo.customerNumberCard}}
 
@@ -925,7 +925,7 @@
 
                             {{printData.qualityInspectionManagement.dryGrainPrice}}
 
                         </td>
 
                         <td class="col " v-if="pengyuPrint">
 
-                            {{printData.unitContractPrice/1000}}
 
+                            {{Number(printData.unitContractPrice/1000).toFixed(3)}}
 
                         </td>
 
                         <td class="col ">{{ printData.unitDeduction}}</td>
 
                         <td class="col " v-if="pengyuPrint">

+ 441 - 0
public/static/printdry.html
Ver fichero 

@@ -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"  v-if="isShowPrintType3&&!isShowPrintType6">
 
+              <!-- <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">{{print_company_name}}</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"  v-if="isShowPrintType3&&printData.extra2||isShowPrintType6">
 
+            <!-- <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>

+ 7 - 3
src/api/V2/houseSelfCollect/index.js
Ver fichero 

@@ -124,9 +124,13 @@ export const API_SPONSOR_WITHDRAW = '/newWorkflow/api/stopInstance'
 
 export const API_GET_BASEID = '/qualityInspectionManagement/selectBaseId'
 
     // 换任务号
 
 export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`
 
-    // 丹东港生成入库单
 
-export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 
     //获取摄像头
 
 export const API_POST_GETVIDEO = `/photoFrameController/api/devInit`
 
     //获取车牌号
 
-export const API_POST_GETCARNUMBER = `/photoFrameController/api/devSetTrigger`
 
+export const API_POST_GETCARNUMBER = `/photoFrameController/api/devSetTrigger`
 
+    // 换客户
 
+export const API_POST_CUSTOMER = `/weighingManagement/api/changeCustomer`
 
+    // 丹东港生成入库单
 
+export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 
+    // 检查客户送粮量
 
+export const API_GETQUALITY = '/qualityInspectionManagement/getQualityInspectionManagementMap'

+ 11 - 1
src/api/V2/universalityAudit/index.js
Ver fichero 

@@ -15,4 +15,14 @@ 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'
 
+// 审核流打印入库单获取
 
+export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'

+ 2 - 1
src/api/V2/warehouse/index.js
Ver fichero 

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

+ 1 - 0
src/lang/zh.js
Ver fichero 

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

+ 7 - 6
src/model/houseSelfCollect/index.js
Ver fichero 

@@ -67,7 +67,8 @@ import {
 
     API_SPONSOR_WITHDRAW,
 
     API_GET_BASEID,
 
     API_POST_GETVIDEO,
 
-    API_POST_GETCARNUMBER
 
+    API_POST_GETCARNUMBER,
 
+    API_POST_CUSTOMER
 
 } from '@/api/V2/houseSelfCollect'
 
 //客户管理列表
 
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 
@@ -199,9 +200,9 @@ export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, fi
 
 export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)
 
     // 丹东港生成入库单
 
 export const dandongOrder = appRx.post(API_POST_DANDONG_ORDER, errorCatcher, errorHandle, filter)
 
-
 
-// 获取仓库摄像头
 
+    // 获取仓库摄像头
 
 export const getVideo = appRx.post(API_POST_GETVIDEO, errorCatcher, errorHandle, filter)
 
-
 
-// 获取车牌号
 
-export const getCarNumber = appRx.post(API_POST_GETCARNUMBER, errorCatcher, errorHandle, filter)
 
+    // 获取车牌号
 
+export const getCarNumber = appRx.post(API_POST_GETCARNUMBER, errorCatcher, errorHandle, filter)
 
+    // 换客户
 
+export const changeCustomer = appRx.post(API_POST_CUSTOMER, errorCatcher, errorHandle, filter)

+ 17 - 2
src/model/universalityAudit/index.js
Ver fichero 

@@ -10,7 +10,12 @@ 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,
 
+    API_PRINT_DATA
 
 } from '@/api/V2/universalityAudit'
 
 // 查看
 
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
 
@@ -29,4 +34,14 @@ 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)
 
+// 审核流打印入库单
 
+export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)

+ 4 - 1
src/model/warehouse/index.js
Ver fichero 

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

+ 5 - 1
src/views/contractManagement/acquisitionContractAdd.vue
Ver fichero 

@@ -792,7 +792,11 @@ import { isUndefined } from 'xe-utils/methods'
 
           return
 
         }
 
        }
 
-        
+        if(this.deptBudgetList.transactionSubject == '自营'){
 
+          delete this.deptBudgetList.jointVentureParties
 
+          delete this.deptBudgetList.jointPhone
 
+          delete this.deptBudgetList.jointVentureMarkup
 
+       }
 
         if (!this.deptBudgetList.buyerPhone) {
 
           this.$message({
 
             message: '请输入收购方电话！',

+ 6 - 1
src/views/contractManagement/purchaseContractAdd.vue
Ver fichero 

@@ -1037,6 +1037,11 @@ import { isUndefined } from 'xe-utils/methods'
 
         }
 
 
         
+       }
 
+       if(this.deptBudgetList.transactionSubject == '自营'){
 
+          delete this.deptBudgetList.jointVentureParties
 
+          delete this.deptBudgetList.jointPhone
 
+          delete this.deptBudgetList.jointVentureMarkup
 
        }
 
         // if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
 
         //       this.$message({
 
@@ -1319,7 +1324,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',

+ 5 - 0
src/views/contractManagement/salesContractAdd.vue
Ver fichero 

@@ -885,6 +885,11 @@
 
           })
 
           return
 
         }
 
+       }
 
+       if(this.deptBudgetList.transactionSubject == '自营'){
 
+          delete this.deptBudgetList.jointVentureParties
 
+          delete this.deptBudgetList.jointPhone
 
+          delete this.deptBudgetList.jointVentureMarkup
 
        }
 
         //   if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
 
         //       this.$message({

+ 49 - 8
src/views/houseSelfCollect/inspectionManagementNew.vue
Ver fichero 

@@ -182,10 +182,16 @@
 
                       :value="item.value" />
 
                   </el-select>
 
                 </ws-form-item>
 
+                
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther"
 
                   v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
 
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
 
                     size="small" />
 
+                </ws-form-item>
 
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="交易量" span="1"
 
+                  prop="customerName">
 
+                  <el-input :class="redstatus?'volumeofbusiness':''" disabled  v-model="deptBudgetList.volumeofbusiness" placeholder="自动获取，不可编辑" maxlength="20"
 
+                    size="small" />
 
                 </ws-form-item>
 
                  <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="囤位号（选填）" span="1"
 
                   prop="storageTagNo">
 
@@ -551,7 +557,8 @@ import {
 
   getinspectLookGoods,
 
   getshippinginfo,
 
   postCheck,
 
-  getcontract
 
+  getcontract,
 
+  getquality
 
 } from '@/model/houseSelfCollect/index'
 
 import {
 
   pullDown,
 
@@ -626,6 +633,7 @@ export default {
 
       customerName: '',
 
       customerPhone: '',
 
       contractFlag:7,
 
+      redstatus:false,
 
       deptBudgetList: {
 
         type: '干粮',
 
         freight: 0,
 
@@ -1057,7 +1065,7 @@ export default {
 
         }
 
       }
 
     },
 
-    customerChange(e) {
 
+    async customerChange(e) {
 
       let customers = e.split('(')
 
       this.deptBudgetList.bankCard = customers[1].split(')')[0]
 
       this.deptBudgetList.customerName = customers[0]
 
@@ -1069,6 +1077,22 @@ export default {
 
           this.deptBudgetList.customerPhone = this.customerList1[i].customerPhone
 
         }
 
       }
 
+      if( this.deptBudgetList.goodsName&&this.deptBudgetList.customerName){
 
+        await getquality({goodsName:this.deptBudgetList.goodsName,compId:localStorage.getItem('ws-pf_compId'),warehouseName:this.warehouseName,customerNumberCard:this.deptBudgetList.customerNumberCard})
 
+        .toPromise().then((response) => {
 
+          if(response.A+response.B+response.C*50>response.D-50){
 
+            this.redstatus=true
 
+          }else{
 
+						this.redstatus=false
 
+					}
 
+          var a=response.A>0?'已完成'+Number(response.A).toFixed(2)+'吨，':''
 
+          var b=response.B>0?'进行中'+Number(response.B).toFixed(2)+'吨，':''
 
+          var c=response.C>0?'未称重'+Number(response.C)+'车':''
 
+          
+          this.deptBudgetList.volumeofbusiness=a+b+c
 
+          this.$forceUpdate()
 
+        })
 
+      }
 
     },
 
     waterContentChange(type) {
 
           //客户
 
@@ -1100,7 +1124,7 @@ export default {
 
 				this.deptBudgetList.waterPriceDeduction=0
 
 				this.deptBudgetList.qualityPriceIncrease=0
 
 				this.deptBudgetList.qualityPriceDeduction=0
 
-      // if(this.deptBudgetList.inOutType=="收购入库"){ //收购入库  价格取至合同
 
+      // if(this.deptBudgetList.inOutType!="收购入库"){ //非收购入库  价格取至合同
 
       //   return
 
       // }
 
       if (this.deptBudgetList.goodsName && type != 'water') {
 
@@ -1155,6 +1179,7 @@ export default {
 
         })
 
           .toPromise()
 
           .then((response) => {
 
+            debugger
 
             if (this.deptBudgetList.paramType == '1') {
 
               if(this.deptBudgetList.buckleMiscellaneous){
 
                 this.deptBudgetList.tidalGrainPrice = parseFloat(parseFloat(response) - parseFloat(this.deptBudgetList
 
@@ -1165,7 +1190,7 @@ export default {
 
                   .dryGrainPrice : 0)).toFixed(4)
 
               }
 
             } else {
 
-              if (this.inspect.type == '干粮') {
 
+              if (this.deptBudgetList.type == '干粮') {
 
                 if (response == 0) {
 
                   getDryGrainPrice({
 
                     warehouseId: this.cangid,
 
@@ -3693,7 +3718,7 @@ export default {
 
     find() {
 
       this.getList()
 
     },
 
-    contractNoChange(e) {
 
+    async contractNoChange(e) {
 
       // console.log(e)
 
       // 循环任务编号获取合同号
 
       for (let i = 0; i < this.taskNolist.length; i++) {
 
@@ -3734,7 +3759,7 @@ export default {
 
         }
 
       }
 
       if (!data) return
 
-      getcontract({contractNo:this.deptBudgetList.contractNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {
 
+      var response=await getcontract({contractNo:this.deptBudgetList.contractNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise()
 
         this.outContractNo=response  
         if(this.outContractNo.priceType == "定价收购"){
 
             if( this.deptBudgetList.type == "潮粮"){
 
@@ -3865,8 +3890,21 @@ export default {
 
           }else{
 
             this.fleetNameList = []
 
           }
 
-          console.log(this.deptBudgetList.inOutType,this.outContractNo.inOutType)
 
-      })
 
+          if( this.deptBudgetList.goodsName&&this.deptBudgetList.customerName){
 
+        await getquality({goodsName:this.deptBudgetList.goodsName,compId:localStorage.getItem('ws-pf_compId'),warehouseName:this.warehouseName,customerNumberCard:this.deptBudgetList.customerNumberCard})
 
+        .toPromise().then((response) => {
 
+          if(response.A+response.B+response.C*50>response.D-50){
 
+            this.redstatus=true
 
+          }else{
 
+						this.redstatus=false
 
+					}
 
+          var a=response.A>0?'已完成'+Number(response.A).toFixed(2)+'吨，':''
 
+          var b=response.B>0?'进行中'+Number(response.B).toFixed(2)+'吨，':''
 
+          var c=response.C>0?'未称重'+Number(response.C)+'车':''
 
+          this.deptBudgetList.volumeofbusiness=a+b+c
 
+          this.$forceUpdate()
 
+        })
 
+      }
 
     },
 
     selectstorageType() {
 
 
@@ -4166,4 +4204,7 @@ export default {
 
   font-weight: 500;
 
   margin-left: 10px;
 
 }
 
+/deep/.el-input.volumeofbusiness .el-input__inner{
 
+  color:red !important;
 
+}
 
 </style>

+ 131 - 84
src/views/houseSelfCollect/newWeighingManagement.vue
Ver fichero 

@@ -482,7 +482,7 @@ export default {
 
       tpyeNo: '1',
 
       disabled: true,
 
       relationId: '',
 
-      // warehouseId: '',
 
+      warehouseId: '',
 
       purchasePriceList: [],
 
       isShowPrint: false,
 
       tableData: {},
 
@@ -1067,7 +1067,8 @@ export default {
 
         path: 'weightCheckRecord',
 
         query: {
 
           inWarehouseType: this.inWarehouseType,
 
-          warehouseName: this.warehouseName
 
+          warehouseName: this.warehouseName,
 
+          warehouseId: this.cangid
 
         }
 
       })
 
     },
 
@@ -1715,25 +1716,25 @@ export default {
 
         })
 
         return
 
       }
 
-      if (this.weighingList.grossWeight < 1 || this.weighingList.grossWeight > 200000) {
 
-        this.$message({
 
-          message: '毛重输入错误',
 
-          type: 'warning',
 
-        })
 
-        return
 
-      }
 
-      if (
 
-        String(this.weighingList.grossWeight).indexOf('.') != -1 &&
 
-        String(this.weighingList.grossWeight).length -
 
-        (String(this.weighingList.grossWeight).indexOf('.') + 1) >
 
-        1
 
-      ) {
 
-        this.$message({
 
-          message: '毛重输入错误',
 
-          type: 'warning',
 
-        })
 
-        return
 
-      }
 
+      // if (this.weighingList.grossWeight < 1 || this.weighingList.grossWeight > 200000) {
 
+      //   this.$message({
 
+      //     message: '毛重输入错误',
 
+      //     type: 'warning',
 
+      //   })
 
+      //   return
 
+      // }
 
+      // if (
 
+      //   String(this.weighingList.grossWeight).indexOf('.') != -1 &&
 
+      //   String(this.weighingList.grossWeight).length -
 
+      //   (String(this.weighingList.grossWeight).indexOf('.') + 1) >
 
+      //   1
 
+      // ) {
 
+      //   this.$message({
 
+      //     message: '毛重输入错误',
 
+      //     type: 'warning',
 
+      //   })
 
+      //   return
 
+      // }
 
       if (this.tpyeNo == 2) {
 
         if (!this.weighingList.tare) {
 
           this.$message({
 
@@ -1756,25 +1757,25 @@ export default {
 
           })
 
           return
 
         }
 
-        if (this.weighingList.tare < 1 || this.weighingList.tare > 100000) {
 
-          this.$message({
 
-            message: '皮重输入错误',
 
-            type: 'warning',
 
-          })
 
-          return
 
-        }
 
-        if (
 
-          String(this.weighingList.tare).indexOf('.') != -1 &&
 
-          String(this.weighingList.tare).length -
 
-          (String(this.weighingList.tare).indexOf('.') + 1) >
 
-          1
 
-        ) {
 
-          this.$message({
 
-            message: '皮重输入错误',
 
-            type: 'warning',
 
-          })
 
-          return
 
-        }
 
+        // if (this.weighingList.tare < 1 || this.weighingList.tare > 100000) {
 
+        //   this.$message({
 
+        //     message: '皮重输入错误',
 
+        //     type: 'warning',
 
+        //   })
 
+        //   return
 
+        // }
 
+        // if (
 
+        //   String(this.weighingList.tare).indexOf('.') != -1 &&
 
+        //   String(this.weighingList.tare).length -
 
+        //   (String(this.weighingList.tare).indexOf('.') + 1) >
 
+        //   1
 
+        // ) {
 
+        //   this.$message({
 
+        //     message: '皮重输入错误',
 
+        //     type: 'warning',
 
+        //   })
 
+        //   return
 
+        // }
 
 
         if (Number(this.weighingList.netWeight < 0)) {
 
           this.$message({
 
@@ -1884,14 +1885,14 @@ export default {
 
                             '吨',
 
                             '提示', {
 
                             confirmButtonText: '确定',
 
-                            callback: (action) => {
 
-                              this.$message({
 
-                                type: 'info',
 
-                                message: `累计售粮已超出上限`,
 
-                              })
 
-                            },
 
+                            // callback: (action) => {
 
+                            //   this.$message({
 
+                            //     type: 'info',
 
+                            //     message: `累计售粮已超出上限`,
 
+                            //   })
 
+                            // },
 
                           })
 
-                        } else {
 
+                        } 
                           //累计售粮没有超上限完成毛检保存
 
                           grossWeight(this.weighingList)
 
                             .toPromise()
 
@@ -1905,7 +1906,6 @@ export default {
 
                               })
 
                               this.getList()
 
                             })
 
-                        }
 
                       })
 
                     return
 
                   }
 
@@ -2059,7 +2059,8 @@ export default {
 
 
             // console.log(this.inWarehouseType)
 
             //贸易入库需要再走入库接口
 
-            if (this.inWarehouseType == 1) { //贸易入库皮检
 
+            if (this.inWarehouseType == 1) {
 
+               //贸易入库皮检
 
               getsettleaccout({//查看结算单
 
                 id: this.weighingList.warehouseInOutId
 
               }).toPromise().then((response) => {
 
@@ -2171,43 +2172,89 @@ export default {
 
 
               })
 
             } else { //收购入库皮检
 
-              tare(this.weighingList)
 
-                .toPromise()
 
-                .then((response) => {
 
-                  // if (this.reader) {
 
-                  //   this.reader.cancel()
 
-                  // }
 
-                  this.$notify.success({
 
-                    title: '成功',
 
-                    message: '保存成功',
 
-                  })
 
-                  this.idPrint = response
 
-                  if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
 
-                    .warehouseName == '哈尔滨依兰库' || this
 
-                      .warehouseName == '白城内陆港' || this
 
-                        .warehouseName == '山东园丰库'|| this
 
-                        .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库')) {
 
-                    if (this.weighingList.seller && this.weighingList.buyer) {
 
-                      let cang = {}
 
-                      cang.value = this.weighingList.seller
 
-                      cang.label = this.weighingList.seller
 
-                      if (this.check(this.weighingList.seller, 1)) {
 
-                        this.ewCustomerOptions.push(cang)
 
-                      }
 
-                      let cang1 = {}
 
-                      cang1.value = this.weighingList.buyer
 
-                      cang1.label = this.weighingList.buyer
 
-                      if (this.check(this.weighingList.buyer, 2)) {
 
-                        this.companyNameEWOptions.push(cang1)
 
-                      }
 
-                    }
 
-                  }
 
-                  this.isShowPrintType = true
 
-                  this.getList()
 
+              var arr2 = {}
 
+              for (let i = 0; i < this.purchasePriceList.length; i++) {
 
+                if (
 
+                  this.weighingList.goodsName ==
 
+                  this.purchasePriceList[i].goodsName
 
+                ) {
 
+                  arr2 = JSON.parse(JSON.stringify(this.purchasePriceList[i]))
 
+                  arr2.saleLimit = this.purchasePriceList[i].saleLimit
 
+                }
 
+              }
 
+              if (Object.keys(arr2).length != 0) {
 
+                getamount({
 
+                  compId: localStorage.getItem('ws-pf_compId'),
 
+                  customerNumberCard: this.weighingList.customerNumberCard,
 
+                  goodsName: this.weighingList.goodsName,
 
                 })
 
-                .catch((response) => { })
 
+                  .toPromise()
 
+                  .then((response) => {
 
+                    //累计售粮超上限不能完成皮检保存
 
+                    let count = (
 
+                       arr2.saleLimit - response / 1000
 
+                    ).toFixed(2)
 
+                    if (count - this.weighingList.netWeight / 1000 < 0) {
 
+                      this.$alert(
 
+                        '该客户累计销售' +
 
+                        this.weighingList.goodsName +
 
+                        (response / 1000).toFixed(2) +
 
+                        '吨，还可售粮' +
 
+                        count +
 
+                        '吨，当前重量已超出售粮上限' + ((this.weighingList.netWeight / 1000).toFixed(2) - count).toFixed(2) + '吨',
 
+                        '提示',
 
+                        {
 
+                          confirmButtonText: '确定',
 
+                          callback: (action) => {
 
+                            this.$message({
 
+                              type: 'info',
 
+                              message: `累计售粮已超出上限`,
 
+                            })
 
+                          },
 
+                      })
 
+                    }
 
+                    else {
 
+                      //累计售粮没有超上限完成皮检保存
 
+                      tare(this.weighingList)
 
+                        .toPromise()
 
+                        .then((response) => {
 
+                          // if (this.reader) {
 
+                          //   this.reader.cancel()
 
+                          // }
 
+                          this.$notify.success({
 
+                            title: '成功',
 
+                            message: '保存成功',
 
+                          })
 
+                          this.idPrint = response
 
+                          if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
 
+                            .warehouseName == '哈尔滨依兰库' || this
 
+                              .warehouseName == '白城内陆港' || this
 
+                                .warehouseName == '山东园丰库' || this
 
+                                  .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库')) {
 
+                            if (this.weighingList.seller && this.weighingList.buyer) {
 
+                              let cang = {}
 
+                              cang.value = this.weighingList.seller
 
+                              cang.label = this.weighingList.seller
 
+                              if (this.check(this.weighingList.seller, 1)) {
 
+                                this.ewCustomerOptions.push(cang)
 
+                              }
 
+                              let cang1 = {}
 
+                              cang1.value = this.weighingList.buyer
 
+                              cang1.label = this.weighingList.buyer
 
+                              if (this.check(this.weighingList.buyer, 2)) {
 
+                                this.companyNameEWOptions.push(cang1)
 
+                              }
 
+                            }
 
+                          }
 
+                          this.isShowPrintType = true
 
+                          this.getList()
 
+                        })
 
+                        .catch((response) => { })
 
+                    }
 
+                  })
 
+                return
 
+              }
 
             }
 
-
 
           }
 
         })
 
         .catch(() => {

+ 13 - 8
src/views/houseSelfCollect/paymentManagement.vue
Ver fichero 

@@ -63,7 +63,7 @@
 
       </template>
 
     </BaseHeaderLayout>
 
     <el-row>
 
-      <el-col :span="18">
 
+      <el-col :span="20">
 
          <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
 
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
 
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
 
@@ -107,7 +107,7 @@
 
           <el-button type="primary">模板下载</el-button>
 
         </el-link>
 
       </el-col>
 
-      <el-col :span="6">
 
+      <el-col :span="4">
 
       </el-col>
 
     </el-row>
 
     <!-- <BaseHeaderLayout :leftSpan="10">
 
@@ -376,8 +376,8 @@
 
         <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
 
       </span>
 
     </el-dialog>
 
-    <div class="mask1" v-show="isShowPrintType1"></div>
 
-    <div class="print-type1" v-show="isShowPrintType1">
 
+    <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">
 
@@ -512,7 +512,7 @@
 
         },
 
         row: {},
 
         isShowPrintType: false,
 
-        isShowPrintType1:false,
 
+        isShowPrintTypeBills:false,
 
         customerList: {
 
           customerName: '',
 
           customerNumberCard: '',
 
@@ -878,7 +878,7 @@
 
       },
 
       typePrintCannelClick1() {
 
         this.dialogDataList = [] //打个打印取消时数组至空
 
-        this.isShowPrintType1= false
 
+        this.isShowPrintTypeBills= false
 
       },
 
       goodsNameChange(e) {
 
         if(e.indexOf('全部货名')!=-1){
 
@@ -1125,6 +1125,8 @@
 
         }
 
         if (arr.length > 0) {
 
           this.filesToRar(arr, '结算单文件')
 
+        }else{
 
+          this.$message.error('当前勾选的条目未生成结算单！')
 
         }
 
       },
 
       
@@ -1639,9 +1641,10 @@
 
       },
 
       printExtra(){
 
         this.isShowPrint=false
 
-        this.isShowPrintType1=true
 
+        this.isShowPrintTypeBills=true
 
       },
 
       printBig() {
 
+        localStorage.setItem('print_alone_extra',false)
 
         let _list1 = []
 
         let _list2 = []
 
         if (this.printType == 1) {
 
@@ -2306,7 +2309,9 @@
 
     border-radius: 5px;
 
     display: block;
 
   }
 
-
 
+  .inline-block{
 
+    display:inline-block;
 
+  }
 
   .pay_img {
 
     width: 50%;
 
     // display: flex;

+ 437 - 30
src/views/houseSelfCollect/settlement.vue
Ver fichero 

@@ -276,8 +276,59 @@
 
         <el-button type="primary" @click="closePrint">关闭</el-button>
 
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
 
         <el-button type="primary" @click="printBig">打印单据</el-button>
 
+        <el-button type="primary" @click="printExtra">打印额外单据</el-button>
 
       </div>
 
     </el-dialog>
 
+    <div class="mask1" v-show="isShowPrintType1"></div>
 
+    <div class="print-type1" v-show="isShowPrintType1">
 
+      <div class="print-type-content1">
 
+        <div class="print-type-title1">请选择打印纸张类型</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="paymentList.warehouseName=='鲅鱼圈金信库'||paymentList.warehouseName=='白城内陆港'||paymentList.warehouseName=='杜尔伯特家禾库'||paymentList.warehouseName=='洮南新友谊兴旺库'||paymentList.warehouseName=='甘南宏旗库'||paymentList.warehouseName=='哈尔滨依兰库'||paymentList.warehouseName=='山东园丰库'">
 
+          <div class="print-type-ew">
 
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
 
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
 
+          </div>
 
+          <div class="ew-print" v-if="printSeparately">
 
+            <div class="row">
 
+              <div>额外客户姓名：</div>
 
+              <!-- <div>{{companyName}}</div> -->
 
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
 
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
 
+                </el-option>
 
+              </el-select>
 
+            </div>
 
+            <div class="row">
 
+              <div>额外收货单位：</div>
 
+              <!-- <div>{{companyNameEW}}</div> -->
 
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
 
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
 
+                  :value="item.value">
 
+                </el-option>
 
+              </el-select>
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div class="bottom-btn">
 
+        <el-button @click="printBig1">确定</el-button>
 
+        <el-button @click="typePrintCannelClick1">取消</el-button>
 
+      </div>
 
+    </div>
 
   </div>
 
 </template>
 
 <script>
 
@@ -305,13 +356,91 @@
 
           },
 
           unitDeduction: 0
 
         },
 
-        ganwater:14,
 
+        ganwater:15,
 
         disabled: false,
 
         types: '',
 
         isShowPrint: false,
 
         information: '结算',
 
         printData: {},
 
         imgUrl: '',
 
+        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:[],
 
+        isShowPrintType1:false
 
       }
 
     },
 
     mounted() {
 
@@ -324,8 +453,215 @@
 
         this.information = '结算'
 
       }
 
       this.getList()
 
+      if(localStorage.getItem('compNameoptions')){
 
+        var company=JSON.parse(localStorage.getItem('compNameoptions'))
 
+        
+        var extra=company.filter((item)=>{
 
+          return item!='黑龙江中天昊元贸易有限公司'
 
+          &&item!='黑龙江利润元粮食贸易有限公司'
 
+          &&item!= '黑龙江众利合粮食贸易有限公司'
 
+          &&item!='黑龙江鑫满仓粮食贸易有限公司'
 
+          &&item!='黑龙江谷香粮食贸易有限公司'
 
+          &&item!='黑龙江秋收有限公司'
 
+          &&item!= '黑龙江欣洋粮食贸易有限公司'
 
+          &&item!='黑龙江益储益运粮食贸易有限公司'
 
+          &&item!='黑龙江启兴粮食贸易有限公司'
 
+        })
 
+        if(extra.length>0){
 
+          this.companyNameOptions=[
 
+          {
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+        
+          this.ewCustomerOptions= [
 
+          {
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+          this.companyNameEWOptions=[
 
+          {
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+           if(localStorage.getItem('print_company_name')){
 
+            this.companyName=localStorage.getItem('print_company_name')
 
+          }else{
 
+            this.companyName=extra[0]
 
+          }
 
+          if(localStorage.getItem('print_company_name_ew')){
 
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
 
+          }else{
 
+            this.companyNameEW=extra[0]
 
+          }
 
+          if(localStorage.getItem('print_customer_name_ew')){
 
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
 
+          }else{
 
+            this.ewCustomer=extra[0]
 
+          }
 
+          for (let i = 0; i < extra.length; i++) {
 
+            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
 
+            this.companyNameOptions.push({value: extra[i],label:extra[i]})
 
+            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
 
+          }
 
+        }
 
+      }
 
     },
 
     methods: {
 
+      changeEw(e) {
 
+        this.ddchecked = false
 
+        if (e) {
 
+          this.printSeparately = true
 
+        } else {
 
+          this.printSeparately = false
 
+        }
 
+      },
 
+      changeEwDD(e) {
 
+        this.checked = false
 
+        if (e) {
 
+          this.printSeparately = true
 
+        } else {
 
+          this.printSeparately = false
 
+        }
 
+      },
 
+      makeEWjjSelectPrintList() {
 
+        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.jjSelectPrintList));
 
+        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
 
+          let _data = _selectPrint_EWjjSelectPrintList[i];
 
+          _data.compName = this.companyNameEW;
 
+          _data.customer = this.ewCustomer
 
+        }
 
+        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
 
+      },
 
+      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)
 
+           localStorage.removeItem('print_in_data')
 
+        // 打印额外
 
+        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
 
+        }
 
+        let _list1 = []
 
+        let _list2 = []
 
+          localStorage.setItem('printData1',_list1)
 
+          _list1 = JSON.stringify(this.printData)
 
+          _list2 = JSON.stringify(this.customerList)
 
+          localStorage.setItem('print_pay_data',_list1)
 
+            window.open(
 
+              '../../../../../static/payprint1.html?type=2&customerList=' +
 
+              _list2 +
 
+              '&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.isShowPrintType1= false
 
+      },
 
+      printExtra(){
 
+        this.isShowPrint=false
 
+        this.isShowPrintType1=true
 
+      },
 
       inputFocus(event) {
 
         event.currentTarget.select()
 
       },
 
@@ -353,39 +689,40 @@
 
         })
 
       },
 
       closeDialog() {
 
-        html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
-          let dataURL = canvas.toDataURL('image/png')
 
-          this.imgUrl = dataURL
 
-          if (this.imgUrl !== '') {
 
-            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
 
-            let formdata = new FormData()
 
-            formdata.append('file', b)
 
-            axios({
 
-              method: 'post',
 
-              url:this.global.uploadPath,
 
-              data: formdata,
 
-            }).then((response) => {
 
-              //编辑接口
 
-              this.paymentList.pictureAddress = response.data.data.url
 
-              settlementEdit(this.paymentList)
 
-                .toPromise()
 
-                .then((response) => {
 
-                })
 
-              this.paymentList = []
 
+        // html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
+        //   let dataURL = canvas.toDataURL('image/png')
 
+        //   this.imgUrl = dataURL
 
+        //   if (this.imgUrl !== '') {
 
+        //     let b = this.dataURLtoFile(this.imgUrl, 'printImage')
 
+        //     let formdata = new FormData()
 
+        //     formdata.append('file', b)
 
+        //     axios({
 
+        //       method: 'post',
 
+        //       url:this.global.uploadPath,
 
+        //       data: formdata,
 
+        //     }).then((response) => {
 
+        //       //编辑接口
 
+        //       this.paymentList.pictureAddress = response.data.data.url
 
+        //       settlementEdit(this.paymentList)
 
+        //         .toPromise()
 
+        //         .then((response) => {
 
+        //         })
 
+        //       this.paymentList = []
 
 
-            })
 
-            this.dialogTableVisible = true
 
-          }
 
-        })
 
-        this.isShowPrint = false
 
-        this.$router.push({
 
-          path: 'paymentManagement'
 
-        })
 
+        //     })
 
+        //     this.dialogTableVisible = true
 
+        //   }
 
+        // })
 
+        // this.isShowPrint = false
 
+        // this.$router.push({
 
+        //   path: 'paymentManagement'
 
+        // })
 
       },
 
       printSmall() {
 
         window.open('../../../../../static/payprint1.html?type=1&dataList=' + JSON.stringify(this.printData))
 
       },
 
       printBig() {
 
+        localStorage.setItem('print_alone_extra',false)
 
         localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
 
         window.open('../../../../../static/payprint1.html?type=2')
 
       },
 
@@ -452,7 +789,7 @@
 
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
 
             if (this.paymentList.qualityInspectionManagement.paramType == '2') {
 
               this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
 
-                  .qualityInspectionManagement.waterContent - 14) *
 
+                  .qualityInspectionManagement.waterContent - 15) *
 
                 this.paymentList.buckleWeightRatio
 
               this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
 
                 .qualityInspectionManagement.weightDeduction.toFixed(2)
 
@@ -739,7 +1076,7 @@
 
       buckleWeightRatiochange(e) {
 
         if (this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2) {
 
           this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList.qualityInspectionManagement
 
-              .waterContent - 14) * this.paymentList
 
+              .waterContent - 15) * this.paymentList
 
             .buckleWeightRatio
 
           this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement
 
             .weightDeduction.toFixed(2)
 
@@ -928,4 +1265,74 @@
 
     border-collapse: collapse;
 
     border: 3px solid #333333;
 
   }
 
+   .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;
 
+    }
 
+  }
 
+    .bottom-btn {
 
+    margin: 20px 0;
 
+    text-align: center;
 
+  }
 
+
 
 </style>

+ 116 - 22
src/views/houseSelfCollect/weightCheckRecord.vue
Ver fichero 

@@ -48,15 +48,15 @@
 
         </el-upload>
 
       <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780"
 
         @selection-change="handleSelectionChange">
 
-        <el-table-column type="selection" width="55"></el-table-column>
 
-        <el-table-column type="index" label="序号" width="80">
 
+        <el-table-column key="0" type="selection" width="55"></el-table-column>
 
+        <el-table-column key="1" type="index" label="序号" width="80">
 
           <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="number" label="业务编号"></el-table-column>
 
-        <el-table-column prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130">
 
+        <el-table-column key="2" prop="number" label="业务编号"></el-table-column>
 
+        <el-table-column key="3" prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130">
 
           <template scope="scope">
 
             <span v-if="scope.row.contractNo">{{scope.row.contractNo}}</span>
 
             <span v-else>{{scope.row.moveTaskNo}}</span>
 
@@ -64,24 +64,25 @@
 
 
         </el-table-column>
 
         <!--//moveTaskNo -->
 
-        <el-table-column prop="customer" label="客户" v-if="warehousingType == 3"></el-table-column>
 
-        <el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
-        <el-table-column prop="goodsName" label="货名"></el-table-column>
 
-        <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
 
-        <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>
 
-        <el-table-column prop="buckleMiscellaneous" label="扣重（公斤）" width="100"></el-table-column>
 
-        <el-table-column prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
 
-        <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 
-        <el-table-column prop="grossDate" label="检斤时间"></el-table-column>
 
-        <el-table-column prop="status" label="状态"></el-table-column>
 
-        <el-table-column label="操作" min-width="300">
 
+        <el-table-column key="4" prop="customer" label="客户" v-if="warehousingType == 3"></el-table-column>
 
+        <el-table-column key="5" prop="carNumber" label="车牌号"></el-table-column>
 
+        <el-table-column key="6" prop="goodsName" label="货名"></el-table-column>
 
+        <el-table-column key="7" prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
 
+        <el-table-column key="8" prop="tare" label="皮重（公斤）" width="100"></el-table-column>
 
+        <el-table-column key="9" prop="buckleMiscellaneous" label="扣重（公斤）" width="100"></el-table-column>
 
+        <el-table-column key="10" prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
 
+        <el-table-column key="11" prop="secretaryWeigher" label="司称员"></el-table-column>
 
+        <el-table-column key="12" prop="grossDate" label="检斤时间"></el-table-column>
 
+        <el-table-column key="13" prop="status" label="状态"></el-table-column>
 
+        <el-table-column key="14" label="操作" min-width="400">
 
           <template scope="scope">
 
             <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
 
             <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
 
             <el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
 
-            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'">换仓</el-button>
 
-            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'">换任务号</el-button>
 
-            <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'">删除</el-button>
 
+            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换仓</el-button>
 
+            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换任务号</el-button>
 
+            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeName(scope.row)" v-if="(scope.row.status == '已称毛重'|| scope.row.status == '已质检') && warehousingType == 3">换客户</el-button>
 
+            <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">删除</el-button>
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
@@ -192,6 +193,35 @@
 
             <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
 
           </span>
 
         </el-dialog>
 
+        <el-dialog
 
+          title="提示"
 
+          :visible.sync="dialogVisible2"
 
+          width="30%"
 
+          :before-close="handleClose2">
 
+          <div style="text-align:center">
 
+            <el-form ref="form" label-width="110px">
 
+              <el-form-item label="客户名">
 
+             <el-select filterable clearable v-model="customerName" placeholder="请选择客户" class="typeselect"
 
+              @change="customerChange">
 
+              <el-option v-for="item in customerlist" :key="item.customerName" :label="item.customerName"
 
+                :value="item.customerName" />
 
+            </el-select>
 
+            </el-form-item>
 
+           <el-form-item label="手机号">
 
+            <el-input v-model="customerPhone" placeholder="手机号" :disabled="disabled" maxlength="15">
 
+            </el-input>
 
+             </el-form-item>
 
+             <el-form-item label="身份证号码">
 
+            <el-input v-model="customerNumberCard" placeholder="身份证号码" :disabled="disabled" maxlength="20">
 
+            </el-input>
 
+             </el-form-item>
 
+         </el-form>
 
+          </div>
 
+          <span slot="footer" class="dialog-footer">
 
+            <el-button @click="dialogVisible2 = false">取 消</el-button>
 
+            <el-button type="primary" @click="dialogVisibleconfirm2">确 定</el-button>
 
+          </span>
 
+        </el-dialog>
 
   </div>
 
 </template>
 
 <script>
 
@@ -202,6 +232,8 @@
 
     returnInfo,
 
     changeNo,
 
     changeTaskNo,
 
+    changeCustomer,
 
+    getcustomer,
 
     importWordYk,
 
     getweighingDelete
 
   } from '@/model/houseSelfCollect/index'
 
@@ -371,13 +403,18 @@
 
         endDate:'',
 
         dialogVisible:false,
 
         dialogVisible1:false,
 
+        dialogVisible2:false,
 
         binNumber:'',
 
         binnumberList:[],
 
         taskNolist:[],
 
+        customerlist:[],
 
         cangweiNum:'',
 
         contractNum:'',
 
         inOutTaskNo:'',
 
+        customerName:'',
 
         contractNo:'',
 
+        customerPhone:'',
 
+        customerNumberCard:'',
 
         positionId:'',
 
         warehouseInOutDetail:{},
 
       }
 
@@ -525,6 +562,7 @@
 
       this.compId = localStorage.getItem('ws-pf_compId')
 
       this.warehousingType = this.$route.query.inWarehouseType
 
       this.warehouseName = this.$route.query.warehouseName //仓库名
 
+      this.warehouseId = this.$route.query.warehouseId 
       this.getList()
 
     },
 
     methods: {
 
@@ -661,6 +699,15 @@
 
           }
 
         }
 
       },
 
+      customerChange(e){
 
+        this.customerName = e
 
+        for(let i = 0 ; i < this.customerlist.length ; i++){
 
+          if(this.customerName == this.customerlist[i].customerName){
 
+            this.customerPhone = this.customerlist[i].customerPhone
 
+            this.customerNumberCard = this.customerlist[i].customerNumberCard
 
+          }
 
+        }
 
+      },
 
       handleClose(){
 
         this.dialogVisible = false
 
       },
 
@@ -668,6 +715,12 @@
 
         this.inOutTaskNo=''
 
         this.dialogVisible1 = false
 
       },
 
+      handleClose2(){
 
+        this.customerName=''
 
+        this.customerPhone=''
 
+        this.customerNumberCard=''
 
+        this.dialogVisible2 = false
 
+      },
 
       dialogVisibleconfirm(){
 
         if(this.binNumber == this.cangweiNum){
 
           this.$message.error('已是该仓位无需修改')
 
@@ -696,10 +749,10 @@
 
           })
 
       },
 
       dialogVisibleconfirm1(){
 
-        if(this.contractNo == this.contractNum){
 
-          this.$message.error('已是该任务号无需修改')
 
-          return
 
-        }
 
+        // if(this.contractNo == this.contractNum){
 
+        //   this.$message.error('已是该任务号无需修改')
 
+        //   return
 
+        // }
 
         this.$confirm(`确定修改任务号？`, {
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
@@ -720,6 +773,30 @@
 
           .catch(() => {
 
             return false
 
           })
 
+      },
 
+      dialogVisibleconfirm2(){
 
+        this.$confirm(`确定修改客户？`, {
 
+            cancelButtonText: '取消',
 
+            confirmButtonText: '确定',
 
+            type: 'warning',
 
+          })
 
+          .then(() => {
 
+              changeCustomer({id:this.id,customer:this.customerName,customerPhone:this.customerPhone,customerNumberCard:this.customerNumberCard}).toPromise()
 
+						.then((response) => {
 
+              this.$notify.success({
 
+                  title: '成功',
 
+                  message: '修改客户成功',
 
+                })
 
+                this.getList()
 
+                this.customerName=''
 
+                this.customerPhone=''
 
+                this.customerNumberCard=''
 
+                this.dialogVisible2=false
 
+						})
 
+          })
 
+          .catch(() => {
 
+            return false
 
+          })
 
       },
 
         exchange(row){
 
           for(let i = 0 ; i < this.warehouseList.length; i++ ){
 
@@ -751,6 +828,18 @@
 
             this.contractNum = row.contractNo
 
             this.dialogVisible1 = true
 
        },
 
+       exchangeName(row){
 
+           getcustomer({
 
+            warehouseId: this.warehouseId,
 
+            goodsName: row.goodsName
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            this.customerlist = response
 
+          })
 
+            this.id = row.id
 
+            this.dialogVisible2 = true
 
+       },
 
        backInfo(row){
 
            this.$confirm('确定要退回该信息？', '提示', {
 
             confirmButtonText: '确定',
 
@@ -1049,6 +1138,11 @@
 
         }
 
       },
 
       warehouseNameChange() {
 
+        for(let i = 0 ; i < this.warehouseList.length; i++ ){
 
+            if(this.warehouseName == this.warehouseList[i].warehouseName){
 
+              		this.warehouseId = this.warehouseList[i].id
 
+            }
 
+          }
 
         this.getList()
 
       },
 
       handleSizeChange(val) {

+ 4 - 4
src/views/outboundManagement/weighingManagementrecord.vue
Ver fichero 

@@ -966,10 +966,10 @@
 
           })
 
       },
 
       dialogVisibleconfirm1(){
 
-        if(this.contractNo == this.contractNum){
 
-          this.$message.error('已是该任务号无需修改')
 
-          return
 
-        }
 
+        // if(this.contractNo == this.contractNum){
 
+        //   this.$message.error('已是该任务号无需修改')
 
+        //   return
 
+        // }
 
         this.$confirm(`确定修改任务号？`, {
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',

+ 5 - 2
src/views/profitable/expensemanagementdetails.vue
Ver fichero 

@@ -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) => {

+ 47 - 5
src/views/profitable/fixedAssets.vue
Ver fichero 

@@ -71,9 +71,36 @@
 
                     <el-table-column prop="businessType" label="类型" width="150"></el-table-column>
 
                     <el-table-column prop="leadingCadre" label="负责人"></el-table-column>
 
                     <el-table-column prop="purchaseQuantity" label="数量"></el-table-column>
 
-                    <el-table-column prop="purchasePrice" width="120" label="采购单价（元）"></el-table-column>
 
-                    <el-table-column prop="currentPrice" width="120" label="当前单价（元）"></el-table-column>
 
-                    <el-table-column prop="totalPrice" width="120" label="总价（元）"></el-table-column>
 
+                    <el-table-column prop="purchasePrice" width="120" label="采购单价（元）">
 
+                        <template scope="scope">
 
+                            <div v-if="!scope.row.purchasePrice">
 
+                                <span>暂无</span>
 
+                            </div>
 
+                            <div v-else>
 
+                                {{scope.row.purchasePrice}}
 
+                            </div>
 
+                        </template>
 
+                    </el-table-column>
 
+                    <el-table-column prop="currentPrice" width="120" label="当前单价（元）">
 
+                        <template scope="scope">
 
+                            <div v-if="!scope.row.currentPrice">
 
+                                <span>暂无</span>
 
+                            </div>
 
+                            <div v-else>
 
+                                {{scope.row.currentPrice}}
 
+                            </div>
 
+                        </template>
 
+                    </el-table-column>
 
+                    <el-table-column prop="totalPrice" width="120" label="总价（元）">
 
+                        <template scope="scope">
 
+                            <div v-if="!scope.row.totalPrice">
 
+                                <span>暂无</span>
 
+                            </div>
 
+                            <div v-else>
 
+                                {{scope.row.totalPrice}}
 
+                            </div>
 
+                        </template>
 
+                    </el-table-column>
 
                     <!-- <el-table-column prop="expenseRemarks" label="附件">
 
                                 <template slot-scope="scope">
 
                                   <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 
@@ -98,7 +125,16 @@
 
                             </div>
 
                         </template>
 
                     </el-table-column>
 
-                    <el-table-column prop="purchaseDate" label="采购日期" width="150"></el-table-column>
 
+                    <el-table-column prop="purchaseDate" label="采购日期" width="150">
 
+                        <template scope="scope">
 
+                            <div v-if="scope.row.purchaseDate == '1991-12-01'">
 
+                                <span>暂无</span>
 
+                            </div>
 
+                            <div v-else>
 
+                                {{scope.row.purchaseDate}}
 
+                            </div>
 
+                        </template>
 
+                    </el-table-column>
 
                     <el-table-column prop="remark" width="120" label="备注">
 
                         <template scope="scope">
 
                             <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
 
@@ -425,7 +461,9 @@ export default {
 
                         obj.status = v.状态
 
                         obj.businessType = v.经营方式
 
                         obj.remark = v.备注
 
-                        obj.purchaseDate = _this.formatDate(v.采购日期, '-')
 
+                        if(obj.purchaseDate){
 
+                            obj.purchaseDate = _this.formatDate(v.采购日期, '-')
 
+                        }
 
                         _this.excelFreightspace.push(obj)
 
                     })
 
                     if (_this.excelFreightspace) {
 
@@ -554,6 +592,9 @@ export default {
 
                         if (this.fixedAssetsInfoList[i].statusFlag != '7') {
 
                             this.allTotalPrice += Number(this.fixedAssetsInfoList[i].totalPrice)
 
                         }
 
+                        if (response.records[i].status) {
 
+                            response.records[i].currectstatus = response.records[i].status
 
+                        }
 
                         this.fixedAssetsInfoList[i].select = false
 
                     }
 
                     this.allTotalPrice = this.allTotalPrice.toFixed(2)
 
@@ -604,6 +645,7 @@ export default {
 
                             this.getList()
 
                         })
 
                         .catch((response) => {
 
+                            row.status = row.currectstatus
 
                             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
                         })
 
                 })

+ 2 - 2
src/views/taskManagement/tranManagementWarehouseInOutTask.vue
Ver fichero 

@@ -107,7 +107,7 @@
 
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
 
             </span>
 
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
 
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'" v-show="scope.row.showFlag"
 
             >撤回</span>
 
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
 
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
 
@@ -424,7 +424,7 @@
 
               }else{
 
                 response.records[i].show=false
 
               }
 
-              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
 
+              if (response.records[i].createUserId == localStorage.getItem('ws-pf_userId')) {
 
                 response.records[i].showFlag = true
 
               }

+ 503 - 514
src/views/universalityAudit/audit.vue
Ver fichero 

@@ -1,37 +1,38 @@
 
 //通用审核
 
 <template>
 
   <div class="container">
 
-    
+
 
     <div class="center">
 
       <el-row style='margin-bottom:10px;'>
 
         <el-col :span="12">
 
           <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" >
 
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css"
 
+              @change="changeDate">
 
             </el-date-picker>
 
             <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="12">
 
-          <el-button  style="margin-right:10px" @click="addlist" type="primary">添加</el-button>
 
+          <el-button style="margin-right:10px" @click="addlist" type="primary">添加</el-button>
 
         </el-col>
 
       </el-row>
 
       <el-row style='margin-bottom:10px;'>
 
         <el-col :span="18">
 
-          <el-button style="margin-left:10px" @click="typeChange1('')" :type="searchType == ''?'primary':''">全部</el-button>
 
-          <el-button @click="typeChange1(1)" :type="searchType == 1?'primary':''">待审核</el-button>
 
-          <el-button @click="typeChange1(2)" :type="searchType == 2?'primary':''">已驳回</el-button>
 
-          <el-button @click="typeChange1(3)" :type="searchType == 3?'primary':''">已通过</el-button>
 
-          <el-select v-model="businessType" filterable clearable placeholder="选择类型" @change="typeChange" >
 
-          <el-option  key="type0" label="全部类型" value=""
 
-            style="color: #8890b1" />
 
-            <el-option v-for="item in xialaList"  :key="item.id" :label="item.constValue" :value="item.constValue"
 
-            style="color: #8890b1" />
 
-        </el-select>
 
-        <i @click="aduitflow" class="el-icon-question"></i>
 
+          <el-button style="margin-left:10px" @click="typeChange1('')"
 
+            :type="searchType == '' ? 'primary' : ''">全部</el-button>
 
+          <el-button @click="typeChange1(1)" :type="searchType == 1 ? 'primary' : ''">待审核</el-button>
 
+          <el-button @click="typeChange1(2)" :type="searchType == 2 ? 'primary' : ''">已驳回</el-button>
 
+          <el-button @click="typeChange1(3)" :type="searchType == 3 ? 'primary' : ''">已通过</el-button>
 
+          <el-select v-model="businessType" filterable clearable placeholder="选择类型" @change="typeChange">
 
+            <el-option key="type0" label="全部类型" value="" style="color: #8890b1" />
 
+            <el-option v-for="item in xialaList" :key="item.id" :label="item.constValue" :value="item.constValue"
 
+              style="color: #8890b1" />
 
+          </el-select>
 
+          <i @click="aduitflow" class="el-icon-question"></i>
 
         </el-col>
 
         <el-col :span="6">
 
 
@@ -39,10 +40,8 @@
 
       </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="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>
 
@@ -56,114 +55,101 @@
 
           <el-table-column prop="businessType" label="类型">
 
           </el-table-column>
 
           <el-table-column prop="buyer" label="备注">
 
-             <template slot-scope="scope">
 
-              <el-popover
 
-              placement="bottom"
 
-              title="备注详情"
 
-              width="400"
 
-              trigger="click"
 
-             >
 
-              <div>
 
-                <div>{{scope.row.sponsor+'（'+scope.row.auditBusinessNo+'）'}}</div>
 
-                <div>{{scope.row.remark}}</div>
 
-              </div>
 
-              
-              <el-button slot="reference">查看</el-button>
 
-            </el-popover>
 
-            </template> 
+            <template slot-scope="scope">
 
+              <el-popover placement="bottom" title="备注详情" width="400" trigger="click">
 
+                <div>
 
+                  <div>{{ scope.row.sponsor + '（' + scope.row.auditBusinessNo + '）' }}</div>
 
+                  <div>{{ scope.row.remark }}</div>
 
+                </div>
 
+
 
+                <el-button slot="reference">查看</el-button>
 
+              </el-popover>
 
+            </template>
 
           </el-table-column>
 
           <el-table-column prop="addressUrl" label="附件">
 
-       <template slot-scope="scope">
 
-           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 
-            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
 
-          <span v-if="scope.row.addressUrlArray != null">
 
-            {{
 
-              scope.row.addressUrlArray.length == 0
 
-                ? ''
 
-                : scope.row.addressUrlArray.length
 
-            }}
 
-          </span>
 
-        </template> 
-      </el-table-column>
 
+            <template slot-scope="scope">
 
+              <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 
+                src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
 
+              <span v-if="scope.row.addressUrlArray != null">
 
+                {{
 
+                  scope.row.addressUrlArray.length == 0
 
+                    ? ''
 
+                    : scope.row.addressUrlArray.length
 
+                }}
 
+              </span>
 
+            </template>
 
+          </el-table-column>
 
           <el-table-column prop="createDate" label="时间"></el-table-column>
 
-    
+
 
           <el-table-column prop="status" label="状态">
 
-            <template slot-scope="scope">{{scope.row.approveStatus?scope.row.approveStatus:scope.row.status}}<i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i></template>
 
+            <template slot-scope="scope">{{ scope.row.approveStatus ? scope.row.approveStatus : scope.row.status }}<i
 
+                @click="handlerecord(scope.row)" class="el-icon-s-claim"></i></template>
 
           </el-table-column>
 
           <el-table-column prop="address" label="操作" width="300">
 
             <template slot-scope="scope">
 
-              
-              <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="pass(scope.row)" type="primary">通过</el-button>
 
-              <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="reject(scope.row)" type="primary">驳回</el-button>
 
+
 
+              <el-button v-if="scope.row.approveStatus && scope.row.taskId" @click="pass(scope.row)"
 
+                type="primary">通过</el-button>
 
+              <el-button v-if="scope.row.approveStatus && scope.row.taskId" @click="reject(scope.row)"
 
+                type="primary">驳回</el-button>
 
               <!-- <div style="display:inline-block;"> -->
 
-                <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus&&scope.row.approveStatus != '发起人撤回'" @click="withdraw(scope.row)" type="primary">撤回</el-button>
 
-                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="del(scope.row)" type="danger">删除</el-button>
 
-                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
 
+              <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
 
+                @click="withdraw(scope.row)" type="primary">撤回</el-button>
 
+              <el-button v-show="scope.row.showFlag" v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'"
 
+                @click="del(scope.row)" type="danger">删除</el-button>
 
+              <el-button v-show="scope.row.showFlag" v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'"
 
+                @click="edit(scope.row)" type="primary">编辑</el-button>
 
               <!-- </div> -->
 
             </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">
 
+        style="text-align:center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
 
+        :total="deptBudgetTotal">
 
       </el-pagination>
 
     </div>
 
-    <el-dialog
 
-  title="提示"
 
-  :visible.sync="addshow"
 
-  width="70%"
 
-  :before-close="handleClose">
 
-  <el-form ref="form" :model="form" label-width="80px">
 
-  <el-form-item label="类型">
 
-    <el-select v-model="form.businessType" filterable clearable placeholder="选择类型">
 
-      <el-option v-for="item in xialaList"  :key="item.id" :label="item.constValue" :value="item.constValue" style="color: #8890b1" />
 
-    </el-select>
 
-  </el-form-item>
 
-  <el-form-item label="附件">
 
-    <ws-upload ref="upload" limit="20" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="form.addressUrl" :size-limit="size"
 
-        @onChange="onChange" 
-       />
 
-  </el-form-item>
 
-  
-  <el-form-item label="备注">
 
-    <el-input maxlength="2000" rows="5" type="textarea" show-word-limit v-model="form.remark"></el-input>
 
-  </el-form-item>
 
-  <el-form-item>
 
-    <el-button @click="addshow=false">取消</el-button>
 
-    <el-button type="primary" @click="onSubmit(flag)">提交</el-button>
 
-  </el-form-item>
 
-</el-form>
 
-</el-dialog>
 
-<el-dialog
 
-  title="审核流详情"
 
-  :visible.sync="show"
 
-  width="30%"
 
-  :before-close="handleClose1">
 
-  <div v-for="item in blocks">
 
-  <div style="margin:10px 0;">{{item.title}}</div>
 
-  <div style="display:inline-block;" v-for="(item1,index) in item.subBlocks"><span v-if="item1.desc!='_PLACEHOLDER_'">{{item1.desc}}</span> <span v-if="item1.desc!='_PLACEHOLDER_'&&index!=item.subBlocks.length-1">----></span>  </div>
 
-  </div>
 
-</el-dialog>
 
-<el-dialog
 
-      :title="title"
 
-      :visible.sync="rejectshow"
 
-      width="30%"
 
-      :before-close="handleClose">
 
-      <span>{{title=='驳回'?'确定驳回审核？':'确定通过审核？'}}</span>
 
-      <div><el-input
 
-  type="textarea"
 
-  :rows="2"
 
-  placeholder="请输入审核意见"
 
-  v-model="textarea">
 
-</el-input>
 
-</div>
 
+    <el-dialog title="提示" :visible.sync="addshow" width="70%" :before-close="handleClose">
 
+      <el-form ref="form" :model="form" label-width="80px">
 
+        <el-form-item label="类型">
 
+          <el-select v-model="form.businessType" filterable clearable placeholder="选择类型">
 
+            <el-option v-for="item in xialaList" :key="item.id" :label="item.constValue" :value="item.constValue"
 
+              style="color: #8890b1" />
 
+          </el-select>
 
+        </el-form-item>
 
+        <el-form-item label="附件">
 
+          <ws-upload ref="upload" limit="20" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
 
+            :comp-id="compId" :appendix-ids="form.addressUrl" :size-limit="size" @onChange="onChange" />
 
+        </el-form-item>
 
+
 
+        <el-form-item label="备注">
 
+          <el-input maxlength="2000" rows="5" type="textarea" show-word-limit v-model="form.remark"></el-input>
 
+        </el-form-item>
 
+        <el-form-item>
 
+          <el-button @click="addshow = false">取消</el-button>
 
+          <el-button type="primary" @click="onSubmit(flag)">提交</el-button>
 
+        </el-form-item>
 
+      </el-form>
 
+    </el-dialog>
 
+    <el-dialog title="审核流详情" :visible.sync="show" width="30%" :before-close="handleClose1">
 
+      <div v-for="item in blocks">
 
+        <div style="margin:10px 0;" v-show="item.title !='分公司日常汇报'">{{ item.title }}</div>
 
+        <div style="display:inline-block;" v-for="(item1, index) in item.subBlocks" :key="index" v-show="item.title !='分公司日常汇报'"><span
 
+            v-if="item1.desc != '_PLACEHOLDER_'">{{ item1.desc }}</span> <span
 
+            v-if="item1.desc != '_PLACEHOLDER_' && index != item.subBlocks.length - 1">----></span> </div>
 
+      </div>
 
+    </el-dialog>
 
+    <el-dialog :title="title" :visible.sync="rejectshow" width="30%" :before-close="handleClose">
 
+      <span>{{ title== '驳回' ? '确定驳回审核？' : '确定通过审核？'}}</span>
 
+      <div><el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="textarea">
 
+        </el-input>
 
+      </div>
 
       <span slot="footer" class="dialog-footer">
 
         <el-button @click="rejectshow = false">取 消</el-button>
 
         <el-button type="primary" @click="rejectclick">确 定</el-button>
 
       </span>
 
     </el-dialog>
 
-<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 
       @on-cancel="handleClose">
 
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
 
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 
@@ -173,9 +159,9 @@
 
         'border-bottom':
 
           index != recordList.length - 1 ? '1px solid #ccc' : 'none',
 
       }">
 
-          <div style="width: 100%; text-align: left">
 
-            {{ item.operateUser }}（{{item.approveResult==1?'已通过':'已驳回'}}）
 
-          </div>
 
+        <div style="width: 100%; text-align: left">
 
+          {{ item.operateUser }}（{{ item.approveResult == 1 ? '已通过' : '已驳回' }}）
 
+        </div>
 
         <div style="width: 100%; text-align: left">
 
           {{ item.verifyRemark }}
 
         </div>
 
@@ -184,89 +170,89 @@
 
   </div>
 
 </template>
 
 <script>
 
-  import {
 
-    xiala,
 
-    aduitinfoList,
 
-    addaduitinfo,
 
-    deladuitinfo,
 
-    workflow,
 
-    gethis,
 
-    sponsorWithdraw,
 
-    editaduitinfo,
 
-    getaduitinfo
 
-  } from '@/model/universalityAudit/index'
 
-  import { getUuid } from '../../utils'
 
-  import WsUpload from '@/components/WsUpload'
 
-  import {
 
-    woekflowhandle
 
-  } from '@/model/tasksport/index'
 
-  import {
 
+import {
 
+  xiala,
 
+  aduitinfoList,
 
+  addaduitinfo,
 
+  deladuitinfo,
 
+  workflow,
 
+  gethis,
 
+  sponsorWithdraw,
 
+  editaduitinfo,
 
+  getaduitinfo
 
+} from '@/model/universalityAudit/index'
 
+import { getUuid } from '../../utils'
 
+import WsUpload from '@/components/WsUpload'
 
+import {
 
+  woekflowhandle
 
+} from '@/model/tasksport/index'
 
+import {
 
   getAuditRecord,
 
 } from '@/model/profitable/index'
 
-  export default {
 
-    components: {
 
-      WsUpload
 
-    },
 
-    data() {
 
-      return {
 
-        value: '',
 
-        tableData: [],
 
-        show:false,
 
-        title:'',
 
-        textarea:'',
 
-        rejectshow:false,
 
-        addshow:false,
 
-        correlationshow:false,
 
-        deptBudgetTotal: 0,
 
-        currentPage: 1,
 
-        pageSize: 10,
 
-        businessType:'',
 
-        searchType:'',
 
-        searchKeyWord:'',
 
-        startDate:'',
 
-        endDate:'',
 
-        showFlag:false,
 
-        flag:'',
 
-        outtotal:0,
 
-        xialaList:[],
 
-        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() {
 
-      xiala({constId:'EXA1'}).toPromise()
 
-          .then(response => {
 
-            this.xialaList=response
 
-          })
 
-          this.getList()
 
-    },
 
-    methods: {
 
-      rejectclick(){
 
-        if(this.title=='驳回'){
 
-          woekflowhandle({
 
-            taskId: this.currectdata.taskId,
 
-            approved:false,
 
-            auditMind: this.textarea,
 
-            needReapply: true,
 
-          }).toPromise()
 
+export default {
 
+  components: {
 
+    WsUpload
 
+  },
 
+  data() {
 
+    return {
 
+      value: '',
 
+      tableData: [],
 
+      show: false,
 
+      title: '',
 
+      textarea: '',
 
+      rejectshow: false,
 
+      addshow: false,
 
+      correlationshow: false,
 
+      deptBudgetTotal: 0,
 
+      currentPage: 1,
 
+      pageSize: 10,
 
+      businessType: '',
 
+      searchType: '',
 
+      searchKeyWord: '',
 
+      startDate: '',
 
+      endDate: '',
 
+      showFlag: false,
 
+      flag: '',
 
+      outtotal: 0,
 
+      xialaList: [],
 
+      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() {
 
+    xiala({ constId: 'EXA1' }).toPromise()
 
+      .then(response => {
 
+        this.xialaList = response
 
+      })
 
+    this.getList()
 
+  },
 
+  methods: {
 
+    rejectclick() {
 
+      if (this.title == '驳回') {
 
+        woekflowhandle({
 
+          taskId: this.currectdata.taskId,
 
+          approved: false,
 
+          auditMind: this.textarea,
 
+          needReapply: true,
 
+        }).toPromise()
 
           .then((response) => {
 
             this.$message({
 
               message: '驳回成功!',
 
               type: 'success',
 
             })
 
-            this.rejectshow=false
 
+            this.rejectshow = false
 
             this.getList()
 
           }).catch((response) => {
 
             this.$message({
 
@@ -274,30 +260,30 @@
 
               type: 'error',
 
             })
 
           })
 
-        }else{
 
-          woekflowhandle({
 
-              taskId: this.currectdata.taskId,
 
-              approved:true,
 
-              auditMind: this.textarea,
 
-              needReapply: true,
 
-            }).toPromise()
 
-            .then((response) => {
 
-              this.$message({
 
-                message: '通过成功!',
 
-                type: 'success',
 
-              })
 
-              this.rejectshow=false
 
-              this.getList()
 
-            }).catch((response) => {
 
-              this.$message({
 
-                message: '通过失败!',
 
-                type: 'error',
 
-              })
 
+      } else {
 
+        woekflowhandle({
 
+          taskId: this.currectdata.taskId,
 
+          approved: true,
 
+          auditMind: this.textarea,
 
+          needReapply: true,
 
+        }).toPromise()
 
+          .then((response) => {
 
+            this.$message({
 
+              message: '通过成功!',
 
+              type: 'success',
 
             })
 
-        }
 
-        
-      },
 
-      handlerecord(row) {
 
+            this.rejectshow = false
 
+            this.getList()
 
+          }).catch((response) => {
 
+            this.$message({
 
+              message: '通过失败!',
 
+              type: 'error',
 
+            })
 
+          })
 
+      }
 
+
 
+    },
 
+    handlerecord(row) {
 
       getAuditRecord({ id: row.id, workflowId: row.workflowId })
 
         .toPromise()
 
         .then((response) => {
 
@@ -306,46 +292,46 @@
 
         })
 
         .catch((response) => { })
 
     },
 
-      pass(row){
 
-        this.currectdata=row
 
-        this.title='通过'
 
-        this.rejectshow=true
 
-      },
 
-      reject(row){
 
-        this.currectdata=row
 
-        this.title='驳回'
 
-        this.rejectshow=true
 
-      },
 
-      aduitflow(){
 
-        workflow({businessCode: 'GENERAL-AUDIT-APPROVE'}).toPromise().then(response => {
 
-          for (let i = 0; i < response.length; i++) {
 
-            if(response[i].latest==1){
 
-              gethis({workflowId:response[i].id}).toPromise().then(response => {
 
-                const branchSameNodeIds = [];
 
+    pass(row) {
 
+      this.currectdata = row
 
+      this.title = '通过'
 
+      this.rejectshow = true
 
+    },
 
+    reject(row) {
 
+      this.currectdata = row
 
+      this.title = '驳回'
 
+      this.rejectshow = true
 
+    },
 
+    aduitflow() {
 
+      workflow({ businessCode: 'GENERAL-AUDIT-APPROVE' }).toPromise().then(response => {
 
+        for (let i = 0; i < response.length; i++) {
 
+          if (response[i].latest == 1) {
 
+            gethis({ workflowId: response[i].id }).toPromise().then(response => {
 
+              const branchSameNodeIds = [];
 
               this.convertStepsToBlocks(response.steps ? response.steps : [], this.blocks, branchSameNodeIds, 0, false, false);
 
-                console.log(this.blocks,branchSameNodeIds)
 
-              })
 
-              
-            }
 
+              console.log(this.blocks, branchSameNodeIds)
 
+            })
 
+
 
           }
 
-          
-        })
 
-      },
 
-      convertStepsToBlocks (steps, blocks, branchSameNodeIds, fromIndex, onBranch, shouldAddEndPoint) {
 
+        }
 
+
 
+      })
 
+    },
 
+    convertStepsToBlocks(steps, blocks, branchSameNodeIds, fromIndex, onBranch, shouldAddEndPoint) {
 
       let index = fromIndex;
 
       let index1 = 0;
 
-      let arr=[]
 
+      let arr = []
 
       while (index < steps.length) {
 
         const item = steps[index];
 
         switch (item.stepType) {
 
           case 'NORMAL':
 
             if (item.branchNodeLocation !== 'END') { // 普通节点直接加上
 
               arr[index1].subBlocks.push({
 
-              ...item,
 
+                ...item,
 
               })
 
             } else { // END节点，需要在合适时机给加到主分支节点下面
 
               arr[index1].subBlocks.push({
 
-              ...item,
 
+                ...item,
 
               })
 
               index1++
 
             }
 
@@ -356,10 +342,10 @@
 
             })
 
             break;
 
           case 'CONDITION':
 
-            if (item.branchSameNodeId==0&&item.branchConditions) { // 新的条件主节点
 
-              arr[index1]={subBlocks:[],title:item.branchConditions[0].varValue}
 
+            if (item.branchSameNodeId == 0 && item.branchConditions) { // 新的条件主节点
 
+              arr[index1] = { subBlocks: [], title: item.branchConditions[0].varValue }
 
               arr[index1].subBlocks.push({
 
-              ...item,
 
+                ...item,
 
               })
 
             }
 
             break;
 
@@ -368,36 +354,36 @@
 
         }
 
         index++;
 
       }
 
-      this.blocks=arr
 
-      this.show=true
 
+      this.blocks = arr
 
+      this.show = true
 
       // console.log(arr)
 
     },
 
-      // convertStepsToBlocks (steps, fromIndex) {
 
-      //   let index = fromIndex;
 
-      //   while (index < steps.length) {
 
-      //     const item = steps[index];
 
-      //     switch (item.stepType) {
 
-      //     case 'NORMAL':
 
-      //       if(item.branchNodeLocation !== 'END'){
 
-      //         this. blocks.push({
 
-      //           ...item,
 
-      //           type: 0,
 
-      //         })
 
-      //       }else{
 
-
 
-      //       }
 
-      //     break;
 
-      //     case 'COUNTERSIGN':
 
-      //     break;
 
-      //     case 'CONDITION':
 
-      //     break;
 
-      //     default:
 
-      //     break;
 
-      //     }
 
-      //     index++
 
-      //   }
 
-      // },
 
-      withdraw(row) {
 
+    // convertStepsToBlocks (steps, fromIndex) {
 
+    //   let index = fromIndex;
 
+    //   while (index < steps.length) {
 
+    //     const item = steps[index];
 
+    //     switch (item.stepType) {
 
+    //     case 'NORMAL':
 
+    //       if(item.branchNodeLocation !== 'END'){
 
+    //         this. blocks.push({
 
+    //           ...item,
 
+    //           type: 0,
 
+    //         })
 
+    //       }else{
 
+
 
+    //       }
 
+    //     break;
 
+    //     case 'COUNTERSIGN':
 
+    //     break;
 
+    //     case 'CONDITION':
 
+    //     break;
 
+    //     default:
 
+    //     break;
 
+    //     }
 
+    //     index++
 
+    //   }
 
+    // },
 
+    withdraw(row) {
 
       this.$confirm(`撤回成功后，可再次提交，确定撤回该申请吗？`, {
 
         cancelButtonText: '取消',
 
         confirmButtonText: '确定',
 
@@ -413,291 +399,294 @@
 
           })
 
       })
 
     },
 
-      fujian(row) {
 
-        this.id = row.id
 
-        this.accessoryTFs = true
 
-        this.appendixIdss = row.addressUrl
 
-        console.log(this.appendixIdss)
 
-      },
 
-      del(row){
 
-        this.$confirm('确定删除审核信息？', '提示', {
 
-            confirmButtonText: '确定',
 
-            cancelButtonText: '取消',
 
-            type: 'warning'
 
-          })
 
-          .then(() => {
 
-            deladuitinfo({id:row.id}).toPromise().then(response => {
 
+    fujian(row) {
 
+      this.id = row.id
 
+      this.accessoryTFs = true
 
+      this.appendixIdss = row.addressUrl
 
+      console.log(this.appendixIdss)
 
+    },
 
+    del(row) {
 
+      this.$confirm('确定删除审核信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning'
 
+      })
 
+        .then(() => {
 
+          deladuitinfo({ id: row.id }).toPromise().then(response => {
 
             this.$message({
 
-                message: '删除成功!',
 
-                type: 'success',
 
+              message: '删除成功!',
 
+              type: 'success',
 
             })
 
             this.getList()
 
           })
 
-          })
 
-      }, 
-      edit(row) {
 
-        getaduitinfo({ id: row.id }).toPromise().then(response => {
 
-          this.form = response
 
         })
 
-        this.addshow = true
 
-        this.flag = 1
 
-      },
 
-      onChange() {
 
-        this.$refs.upload
 
-          .handleSaveBill()
 
-          .then(async (response) => {
 
-            this.form.addressUrl = response
 
-          })
 
-          .catch((res) => {
 
-            EventBus.$emit('error', (JSON.parse(res) || {}).message)
 
-            this.$refs.upload.clearFiles()
 
-          })
 
-      },
 
-      
-      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()
 
+    },
 
+    edit(row) {
 
+      getaduitinfo({ id: row.id }).toPromise().then(response => {
 
+        this.form = response
 
+      })
 
+      this.addshow = true
 
+      this.flag = 1
 
+    },
 
+    onChange() {
 
+      this.$refs.upload
 
+        .handleSaveBill()
 
+        .then(async (response) => {
 
+          this.form.addressUrl = response
 
+        })
 
+        .catch((res) => {
 
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
 
+          this.$refs.upload.clearFiles()
 
+        })
 
+    },
 
+
 
+    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.form = {}
 
-              this.$refs.upload.clearFiles()
 
-              this.addshow = false
 
+              this.getList()
 
             })
 
-        } else {
 
-          this.$confirm('确定提交本次修改？', '提示', {
 
-            confirmButtonText: '确定',
 
-            cancelButtonText: '取消',
 
-            type: 'warning'
 
+            this.form = {}
 
+            this.$refs.upload.clearFiles()
 
+            this.addshow = false
 
           })
 
-            .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()
 
+      } 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.form = {}
 
-              this.$refs.upload.clearFiles()
 
-              this.addshow = false
 
+              this.getList()
 
             })
 
-        }
 
-      },
 
-      addlist(){
 
-        this.addshow=true
 
-      },
 
-      handleClose(){
 
-        this.addshow=false
 
-      },
 
-      handleClose1(){
 
-        this.show=false
 
-      },
 
-      typeChange(num){
 
-        this.businessType= num
 
-        this.getList()
 
-      },
 
-      typeChange1(num){
 
-        this.searchType= num
 
-        this.getList()
 
-      },
 
-      returnsales(){
 
-        this.$router.go(-1)
 
-      },
 
-      handleSelectionChange(val) {
 
-        this.multipleSelection = val;
 
-      },
 
-      async getList() {
 
-        aduitinfoList({
 
-            startDate:this.startDate,
 
-            endDate:this.endDate,
 
-            searchKeyWord:this.searchKeyWord,
 
-            currentPage: this.currentPage,
 
-            pageSize:this.pageSize ,
 
-            searchType:this.searchType,
 
-            businessType:this.businessType,
 
-            flag:0
 
+            this.form = {}
 
+            this.$refs.upload.clearFiles()
 
+            this.addshow = false
 
           })
 
-          .toPromise()
 
-          .then(response => {
 
-            if(response.records.length>0){
 
-              for (let i = 0; i < response.records.length; i++) {
 
-                if(response.records[i].addressUrl){
 
-                  response.records[i].addressUrlArray=[]
 
-                  var arr=response.records[i].addressUrl.split(',')
 
-                  for (let q = 0; q < arr.length; q++) {
 
-                    if(arr[q]!=''){
 
-                      response.records[i].addressUrlArray.push(arr[q])
 
-                    }
 
+      }
 
+    },
 
+    addlist() {
 
+      this.addshow = true
 
+    },
 
+    handleClose() {
 
+      this.addshow = false
 
+    },
 
+    handleClose1() {
 
+      this.show = false
 
+    },
 
+    typeChange(num) {
 
+      this.businessType = num
 
+      this.getList()
 
+    },
 
+    typeChange1(num) {
 
+      this.searchType = num
 
+      this.getList()
 
+    },
 
+    returnsales() {
 
+      this.$router.go(-1)
 
+    },
 
+    handleSelectionChange(val) {
 
+      this.multipleSelection = val;
 
+    },
 
+    async getList() {
 
+      aduitinfoList({
 
+        startDate: this.startDate,
 
+        endDate: this.endDate,
 
+        searchKeyWord: this.searchKeyWord,
 
+        currentPage: this.currentPage,
 
+        pageSize: this.pageSize,
 
+        searchType: this.searchType,
 
+        businessType: this.businessType,
 
+        flag: 0
 
+      })
 
+        .toPromise()
 
+        .then(response => {
 
+          if (response.records.length > 0) {
 
+            for (let i = 0; i < response.records.length; i++) {
 
+              if (response.records[i].addressUrl) {
 
+                response.records[i].addressUrlArray = []
 
+                var arr = response.records[i].addressUrl.split(',')
 
+                for (let q = 0; q < arr.length; q++) {
 
+                  if (arr[q] != '') {
 
+                    response.records[i].addressUrlArray.push(arr[q])
 
                   }
 
                 }
 
-                if(response.records[i].sponsor == localStorage.getItem('ws-pf_staffName')){
 
-                  response.records[i].showFlag = true
 
-                }
 
+              }
 
+              if (response.records[i].sponsor == localStorage.getItem('ws-pf_staffName')) {
 
+                response.records[i].showFlag = true
 
               }
 
             }
 
-            this.tableData=response.records
 
-            this.deptBudgetTotal=response.total
 
-          })
 
-      },
 
+          }
 
+          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()
 
-      },
 
+    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;
 
-      }
 
+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;
 
-      }
 
+.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;
 
-      }
 
+table {
 
+  width: 100%;
 
+  text-align: center;
 
+  border-collapse: collapse;
 
+  border: 3px solid #333333;
 
+}
 
 
-      .col-bgc {
 
-        background: #f6f7fb;
 
-      }
 
+.col-bgc {
 
+  background: #f6f7fb;
 
+}
 
 
-  .container {
 
-    background: #E8ECF6;
 
-  }
 
+.container {
 
+  background: #E8ECF6;
 
+}
 
 
-  .center {
 
-    margin: 0 auto;
 
-    background: #ffffff;
 
-    height: calc(100vh - 13vh);
 
-    border-radius: 4px;
 
-    padding: 20px 0;
 
+.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;
 
-    }
 
+  /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;
 
-    }
 
+.row_top {
 
+  background: #F6F7FC;
 
+  border-radius: 4px;
 
+  margin-bottom: 10px;
 
 
-    .title {
 
-      position: relative;
 
-    }
 
+  .bg-left {
 
+    padding-left: 30px;
 
+  }
 
 
-    .title::before {
 
-      content: '';
 
-      display: inline-block;
 
-      width: 5px;
 
-      height: 30px;
 
-      background: #5473e8;
 
-      position: absolute;
 
-      left: 0;
 
-    }
 
+  .bg-right {
 
+    padding-right: 10px;
 
+    text-align: right;
 
   }
 
 
-  .datascreen {
 
-    display: flex;
 
+  .title {
 
+    position: relative;
 
+  }
 
 
-    .data_css {
 
-      width: 40%;
 
-    }
 
+  .title::before {
 
+    content: '';
 
+    display: inline-block;
 
+    width: 5px;
 
+    height: 30px;
 
+    background: #5473e8;
 
+    position: absolute;
 
+    left: 0;
 
+  }
 
+}
 
 
-    .input_css {
 
-      width: 50%;
 
-      margin: 0 10px;
 
-    }
 
+.datascreen {
 
+  display: flex;
 
 
-    .find {
 
-      margin-right: 10px;
 
-    }
 
+  .data_css {
 
+    width: 40%;
 
   }
 
 
-  .fromdata {
 
-    margin: 20px 0;
 
-    overflow-y: scroll;
 
-    height: 546px;
 
+  .input_css {
 
+    width: 50%;
 
+    margin: 0 10px;
 
   }
 
-  .top_info{
 
-    margin: 10px 0 0 10px;
 
-    min-width: 712px;
 
-    .info_css{
 
-      margin-right: 20px;
 
-    }
 
+
 
+  .find {
 
+    margin-right: 10px;
 
   }
 
-  .bg-right{
 
-    padding-top:15px;
 
+}
 
+
 
+.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;
 
+}
 
 </style>

+ 530 - 0
src/views/universalityAudit/auditprint.vue
Ver fichero 

@@ -0,0 +1,530 @@
 
+//审核流打印
 
+<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,
 
+  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 {
 
+    purchasePriceLook,
 
+  } from '@/model/houseSelfCollect/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=='费用审核'||row.type=='运费结算'){
 
+            this.deptBudgetList=[await lookexenseinfo({id:row.id}).toPromise()]
 
+            this.deptBudgetList[0].currectstatus=row.status
 
+            if(this.deptBudgetList[0].addressUrl){
 
+                var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
 
+                this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
 
+                this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
 
+                this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
 
+            }else{
 
+                this.deptBudgetList[0].addressUrlArray=[]
 
+                this.deptBudgetList[0].addressUrlArrayImage=[]
 
+                this.deptBudgetList[0].addressUrlArrayFilelen==0
 
+            }
 
+            if(this.deptBudgetList[0].expensesType!=1){
 
+                if(row.type=='费用审核'){
 
+                  this.deptBudgetList[0].printType=1
 
+                }else if(row.type=='运费结算'){
 
+                  this.deptBudgetList[0].printType=7
 
+                  if (this.deptBudgetList[0].tranTaskInfoList.length > 0) {
 
+                    var num = 0
 
+                    for (var i = 0; i < this.deptBudgetList[0].tranTaskInfoList.length; i++) {
 
+                      if (this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList) {
 
+                        var data = this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList
 
+                        for (var q = 0; q < data.length; q++) {
 
+                          if (data[q].totalPayable) {
 
+                            this.num += data[q].totalPayable
 
+                          }
 
+                        }
 
+                      }
 
+                    }
 
+                  }
 
+                  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++) {
 
+                    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()
 
+            }
 
+        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'){
 
+          if(row.type=='入库单请款'){
 
+            this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
 
+            this.deptBudgetList[0].printType=3
 
+          }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
 
+          }else if(row.type=='仓库设置'){
 
+            this.deptBudgetList=[await purchasePriceLook({id:row.id}).toPromise()]
 
+            this.deptBudgetList[0].printType=8
 
+          }
 
+          if(this.deptBudgetList[0].addressUrl){
 
+            var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
 
+            this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
 
+            this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
 
+            this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
 
+          }else{
 
+            this.deptBudgetList[0].addressUrlArray=[]
 
+            this.deptBudgetList[0].addressUrlArrayImage=[]
 
+            this.deptBudgetList[0].addressUrlArrayFilelen==0
 
+          }
 
+          this.deptBudgetList[0].currectstatus=row.status
 
+          var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
 
+                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){
 
+                        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.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
 
+                            var arr1=[]
 
+                            for (let q = 0; q < arr.fileUrls.length; q++) {
 
+                              arr1.push({appendixPath:arr.fileUrls[q]})
 
+                            }
 
+                            this.deptBudgetList[0].addressUrlArrayImage.push(...arr1)
 
+                        }else{
 
+                            arr.auditMind = arr.workflowHistoricTasks[len].auditMind
 
+                        }
 
+                    }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'
 
+                })
 
+                
+        }
 
+        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
Ver fichero 

@@ -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'
 
+      //   }
 
+      // }, 
     
   ],

+ 20 - 7
src/views/warehousenew/addCar.vue
Ver fichero 

@@ -76,6 +76,7 @@
 
                                         </ws-info-table>
 
                                         <div class="but">
 
                                             <el-button @click="submit" type="primary">提交</el-button>
 
+                                            <el-button @click="canel" type="primary">取消</el-button>
 
                                         </div>
 
                                     </div>
 
                                 </div>
 
@@ -151,11 +152,11 @@ export default {
 
             weighingList: {},
 
             deptBudgetList: {},
 
             warehouseList: [],
 
-            warehouseId: "",
 
+            warehouseId: '',
 
             deliveryList: [],
 
-            index: "",
 
-            monitorUrl1: "",
 
-            monitorUrl2: "",
 
+            index: '',
 
+            monitorUrl1: '',
 
+            monitorUrl2: '',
 
             deptBudgetTotal: 0,
 
         }
 
     },
 
@@ -169,6 +170,7 @@ export default {
 
             } else {
 
                 this.disabled = true
 
             }
 
+
 
         }
 
     },
 
     activated() { },
 
@@ -196,7 +198,7 @@ export default {
 
             this.$refs.weightChild.openPort()
 
         },
 
         carDel(val) {
 
-            this.$confirm('确定删除车辆 ' + val.carNo + " ？", '提示', {
 
+            this.$confirm('确定删除车辆 ' + val.carNo + ' ？', '提示', {
 
                 confirmButtonText: '确定',
 
                 cancelButtonText: '取消',
 
                 type: 'warning',
 
@@ -286,6 +288,7 @@ export default {
 
                 return
 
             }
 
             this.weighingList.warehouseName = this.warehouseName
 
+            this.weighingList.baseId = this.warehouseId
 
             this.$confirm('确定保存车辆信息？', '提示', {
 
                 confirmButtonText: '确定',
 
                 cancelButtonText: '取消',
 
@@ -299,8 +302,8 @@ export default {
 
                                 message: '添加成功！',
 
                                 type: 'success'
 
                             });
 
-                            this.weighingList.carNo = ""
 
-                            this.weighingList.tare = ""
 
+                            this.weighingList.carNo = ''
 
+                            this.weighingList.tare = ''
 
                             this.getList()
 
                         })
 
                 })
 
@@ -308,6 +311,11 @@ export default {
 
                     return false
 
                 })
 
         },
 
+        canel(){
 
+            this.weighingList.carNo = ''
 
+            this.weighingList.tare = ''
 
+            this.$router.go(-1)
 
+        },
 
         carNoTypeChange() {
 
             this.carjudge = !this.carjudge
 
             if (this.carjudge) {
 
@@ -403,6 +411,11 @@ export default {
 
                     } else {
 
                         this.warehouseName = response[0].warehouseName
 
                         this.warehouseId = response[0].id
 
+                        if (response[0].allowEdit == 1) {
 
+                            this.disabled = false
 
+                        } else {
 
+                            this.disabled = true
 
+                        }
 
                         this.getList()
 
                     }
 
                     this.warehouseList = response

+ 400 - 18
src/views/warehousenew/dryRecord.vue
Ver fichero 

@@ -3,7 +3,7 @@
 
     <div class="container">
 
         <el-row class="toptitle">
 
             <el-col :span="12">
 
-                <h2 class="bg-left title">检斤记录</h2>
 
+                <h2 class="bg-left title">烘干入库记录</h2>
 
             </el-col>
 
             <el-col :span="12" class="bg-right">
 
                 <el-button type="primary" size="small" @click="returnsales()">
 
@@ -51,13 +51,14 @@
 
                 <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
 
                 <el-table-column prop="goodsName" label="货名"></el-table-column>
 
                 <el-table-column prop="weigher" label="检斤员"></el-table-column>
 
-                <el-table-column prop="grossWeight" label="毛重（吨）" width="100"></el-table-column>
 
-                <el-table-column prop="tare" label="皮重（吨）" width="100"></el-table-column>
 
-                <el-table-column prop="netWeight" label="净重（吨）" width="100"></el-table-column>
 
+                <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
 
+                <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>
 
+                <el-table-column prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
 
                 <el-table-column prop="status" label="状态"></el-table-column>
 
                 <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
 
                 <el-table-column label="操作">
 
                     <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,86 @@ 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 +291,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('确定删除检斤信息？', '提示', {
 
@@ -196,6 +523,7 @@ export default {
 
                     this.count += this.modification[i].netWeight
 
                 }
 
             }
 
+            this.count = this.count.toFixed(2)
 
         },
 
         dateFormat(fmt, date) {
 
             let ret
 
@@ -220,7 +548,7 @@ export default {
 
             return fmt
 
         },
 
         lookup() {
 
-            if (this.value2.length > 0) {
 
+            if (this.value2) {
 
                 this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
 
                 this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
 
             } else {
 
@@ -258,24 +586,13 @@ export default {
 
                 currentPage: this.currentPage,
 
                 pageSize: this.pageSize,
 
                 searchKeyWord: this.searchKeyWord,
 
-                searchType: "",
 
+                searchType: '',
 
                 startDate: this.startDate,
 
                 endDate: this.endDate,
 
             })
 
                 .toPromise()
 
                 .then((response) => {
 
                     this.weighingRecordList = response.records
 
-                    for (let i = 0; i < this.weighingRecordList.length; i++) {
 
-                        if (this.weighingRecordList[i].grossWeight) {
 
-                            this.weighingRecordList[i].grossWeight /= 1000
 
-                        }
 
-                        if (this.weighingRecordList[i].tare) {
 
-                            this.weighingRecordList[i].tare /= 1000
 
-                        }
 
-                        if (this.weighingRecordList[i].netWeight) {
 
-                            this.weighingRecordList[i].netWeight /= 1000
 
-                        }
 
-                    }
 
                     this.deptBudgetTotal = response.total
 
                 })
 
                 .catch((response) => {
 
@@ -503,4 +820,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>

+ 440 - 24
src/views/warehousenew/dryWarehousing.vue
Ver fichero 

@@ -27,7 +27,7 @@
 
                     </div>
 
                     <div class="confirmInfo">
 
                         <div class="car-type">车牌号</div>
 
-                        <div class="car-no">{{ weighingList.carNumber }}</div>
 
+                        <div class="car-no">{{ weighingList.carNo }}</div>
 
                     </div>
 
                 </div>
 
                 <div class="bg-left titleup">
 
@@ -115,6 +115,7 @@
 
                                         </ws-info-table>
 
                                         <div class="but">
 
                                             <el-button @click="submit" type="primary">提交</el-button>
 
+                                            <el-button @click="canel" type="primary">清空</el-button>
 
                                         </div>
 
                                     </div>
 
                                 </div>
 
@@ -144,6 +145,56 @@
 
                 </el-row>
 
             </div>
 
         </div>
 
+        <div class="mask1" v-show="isShowPrintTypeBills"></div>
 
+    <div class="print-type1" v-show="isShowPrintTypeBills">
 
+      <div class="print-type-content">
 
+        <div class="print-type-title">请选择打印纸张类型</div>
 
+        <div class="print-type-checkbox">
 
+          <!-- <el-radio-group v-model="radio">
 
+            <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
 
+            <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
 
+          </el-radio-group> -->
 
+        </div>
 
+
 
+        <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
 
+          <div>收货单位：</div>
 
+          <!-- <div>{{companyName}}</div> -->
 
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
 
+            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
 
+            </el-option>
 
+          </el-select>
 
+        </div>
 
+        <div v-if="printData.warehouseName=='鲅鱼圈金信库'||printData.warehouseName=='白城内陆港'||printData.warehouseName=='杜尔伯特家禾库'||printData.warehouseName=='洮南新友谊兴旺库'||printData.warehouseName=='甘南宏旗库'||printData.warehouseName=='哈尔滨依兰库'||printData.warehouseName=='山东园丰库'">
 
+          <div class="print-type-ew">
 
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
 
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
 
+          </div>
 
+          <div class="ew-print" v-if="printSeparately">
 
+            <div class="row">
 
+              <div>额外客户姓名：</div>
 
+              <!-- <div>{{companyName}}</div> -->
 
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
 
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
 
+                </el-option>
 
+              </el-select>
 
+            </div>
 
+            <div class="row">
 
+              <div>额外收货单位：</div>
 
+              <!-- <div>{{companyNameEW}}</div> -->
 
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
 
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
 
+                  :value="item.value">
 
+                </el-option>
 
+              </el-select>
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div class="bottom-btn">
 
+        <el-button @click="printBig1">确定</el-button>
 
+        <el-button @click="typePrintCannelClick1">取消</el-button>
 
+      </div>
 
+    </div>
 
     </div>
 
 </template>
 
 <script>
 
@@ -156,6 +207,7 @@ import {
 
     addDryWarehouse,
 
     getRecord,
 
     editDryWarehouse,
 
+    getdrylist
 
 } from '@/model/warehouse/index'
 
 import { hasPermission } from '../../utils/getHasPermission'
 
 import WsUpload from '@/components/WsUpload'
 
@@ -180,17 +232,102 @@ export default {
 
             taskNolist: [],
 
             deliveryList: [],
 
             warehouseType: 1,
 
-            weighingList: {},
 
+            weighingList: {
 
+                grossWeight: '',
 
+                tare: '',
 
+                netWeight: 0
 
+            },
 
             deptBudgetList: {},
 
             warehouseList: [],
 
             goodsNameList: [],
 
             carList: [],
 
-            index: '',
 
+            index: 1,
 
             monitorUrl1: '',
 
             monitorUrl2: '',
 
             deptBudgetTotal: 0,
 
             cartips: '手动输入',
 
             warehouseId: '',
 
+            ddchecked: false,
 
+        checked: false,
 
+        ewCustomerOptions: [{
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '厦门建发物产有限公司',
 
+          label: '厦门建发物产有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        }, {
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }],
 
+        companyNameOptions: [{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        }, {
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }],
 
+        companyNameEWOptions: [{
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '厦门建发物产有限公司',
 
+          label: '厦门建发物产有限公司'
 
+        }],
 
+        isShowPrintTypeBills:false,
 
+        companyName: '黑龙江中天昊元贸易有限公司',
 
+        companyNameEW: '厦门建发物产有限公司',
 
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
 
+        printSeparately:false,
 
+        onePrint:false,
 
+        dialogDataList:[],
 
+        printData:{
 
+            warehouseName:''
 
+        }
 
         }
 
     },
 
     mounted() { },
 
@@ -199,8 +336,195 @@ export default {
 
         this.getGoodsList()
 
         this.isShowBalance = true
 
         this.openPort()
 
+        if(localStorage.getItem('compNameoptions')){
 
+        var company=JSON.parse(localStorage.getItem('compNameoptions'))
 
+        
+        var extra=company.filter((item)=>{
 
+          return item!='黑龙江中天昊元贸易有限公司'
 
+          &&item!='黑龙江利润元粮食贸易有限公司'
 
+          &&item!= '黑龙江众利合粮食贸易有限公司'
 
+          &&item!='黑龙江鑫满仓粮食贸易有限公司'
 
+          &&item!='黑龙江谷香粮食贸易有限公司'
 
+          &&item!='黑龙江秋收有限公司'
 
+          &&item!= '黑龙江欣洋粮食贸易有限公司'
 
+          &&item!='黑龙江益储益运粮食贸易有限公司'
 
+          &&item!='黑龙江启兴粮食贸易有限公司'
 
+        })
 
+        if(extra.length>0){
 
+          this.companyNameOptions=[
 
+          {
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+        
+          this.ewCustomerOptions= [
 
+          {
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+          this.companyNameEWOptions=[
 
+          {
 
+          value: '天津建源供应链管理有限公司',
 
+          label: '天津建源供应链管理有限公司'
 
+        },{
 
+          value: '黑龙江中天昊元贸易有限公司',
 
+          label: '黑龙江中天昊元贸易有限公司'
 
+        }, {
 
+          value: '黑龙江利润元粮食贸易有限公司',
 
+          label: '黑龙江利润元粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江众利合粮食贸易有限公司',
 
+          label: '黑龙江众利合粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江鑫满仓粮食贸易有限公司',
 
+          label: '黑龙江鑫满仓粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江欣洋粮食贸易有限公司',
 
+          label: '黑龙江欣洋粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江谷香粮食贸易有限公司',
 
+          label: '黑龙江谷香粮食贸易有限公司'
 
+        },{
 
+          value: '黑龙江秋收有限公司',
 
+          label: '黑龙江秋收有限公司'
 
+        },  {
 
+          value: '黑龙江益储益运粮食贸易有限公司',
 
+          label: '黑龙江益储益运粮食贸易有限公司'
 
+        }, {
 
+          value: '黑龙江启兴粮食贸易有限公司',
 
+          label: '黑龙江启兴粮食贸易有限公司'
 
+        }]
 
+           if(localStorage.getItem('print_company_name')){
 
+            this.companyName=localStorage.getItem('print_company_name')
 
+          }else{
 
+            this.companyName=extra[0]
 
+          }
 
+          if(localStorage.getItem('print_company_name_ew')){
 
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
 
+          }else{
 
+            this.companyNameEW=extra[0]
 
+          }
 
+          if(localStorage.getItem('print_customer_name_ew')){
 
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
 
+          }else{
 
+            this.ewCustomer=extra[0]
 
+          }
 
+          for (let i = 0; i < extra.length; i++) {
 
+            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
 
+            this.companyNameOptions.push({value: extra[i],label:extra[i]})
 
+            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
 
+          }
 
+        }
 
+      }
 
     },
 
     methods: {
 
+        changeEw(e) {
 
+        this.ddchecked = false
 
+        if (e) {
 
+          this.printSeparately = true
 
+        } else {
 
+          this.printSeparately = false
 
+        }
 
+      },
 
+      changeEwDD(e) {
 
+        this.checked = false
 
+        if (e) {
 
+          this.printSeparately = true
 
+        } else {
 
+          this.printSeparately = false
 
+        }
 
+      },
 
+        printBig1(type, radioType) {
 
+        this.printData.extra1=true
 
+        localStorage.setItem('print_company_name',this.companyName)
 
+        localStorage.setItem('print_company_name_ew',this.companyNameEW)
 
+        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
 
+        // 打印额外
 
+        if (this.checked || this.ddchecked) {
 
+          this.printData.extra2=true
 
+          if(this.ddchecked){
 
+            localStorage.setItem('print_alone_extra',true)
 
+          }else{
 
+            localStorage.setItem('print_alone_extra',false)
 
+          }
 
+          //  this.selectEW = true;
 
+        }else{
 
+          this.printData.extra2=false
 
+        }
 
+        localStorage.setItem('printdrydata',JSON.stringify(this.printData))
 
+            window.open(
 
+              '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
 
+            )
 
+        // if (type == 1) {
 
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
 
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
 
+        //     .checked + '&selectEWDD=' + this.ddchecked)
 
+        // } else if (type == 2) {
 
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
 
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
 
+        // } else {
 
+        //   console.log(this.dialogDataList)
 
+          
+        //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
 
+        //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
 
+        //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
 
+        // }
 
+      },
 
+      typePrintCannelClick1() {
 
+        this.dialogDataList = [] //打个打印取消时数组至空
 
+        this.isShowPrintTypeBills= false
 
+      },
 
         goodsNameChange(e) {
 
             this.weighingList.goodsName = e
 
             for (let i = 0; i < this.goodsNameList.length; i++) {
 
@@ -225,6 +549,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])
 
@@ -239,7 +564,10 @@ export default {
 
             for (let i = 0; i < this.carList.length; i++) {
 
                 if (e == this.carList[i].id) {
 
                     this.weighingList.carNo = this.carList[i].carNo
 
-                    this.weighingList.tare = this.carList[i].tare
 
+                    // this.weighingList.tare = this.carList[i].tare
 
+                    // if (this.weighingList.grossWeight) {
 
+                    //     this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare
 
+                    // }
 
                     break
 
                 }
 
             }
 
@@ -271,12 +599,16 @@ export default {
 
             this.getList()
 
         },
 
         setVal(data) {
 
+            debugger
 
+            data = 1000
 
             if (this.information == '毛重') {
 
                 this.weighingList.grossWeight = data
 
                 this.weighingList.netWeight =
 
                     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
 
             } else {
 
                 this.weighingList.tare = data
 
+                this.weighingList.netWeight =
 
+                    Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
 
             }
 
         },
 
         openPort() {
 
@@ -294,19 +626,30 @@ export default {
 
                 path: 'addCar',
 
             })
 
         },
 
-
 
-        submit() {
 
-            var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
 
-            if (!allow) {// 提交为外勤权限，错误提示“暂未获得权限”
 
-                this.$message({
 
-                    message: '暂未获得权限，不可保存检斤信息！',
 
-                    type: 'warning',
 
-                })
 
-                return
 
+        canel() {
 
+            if (this.tpyeNo == '1') {
 
+                this.weighingList.tare = ''
 
+            } else {
 
+                this.weighingList.carNo = ''
 
+                this.weighingList.grossWeight = ''
 
+                this.weighingList.tare = ''
 
+                this.weighingList.netWeight = ''
 
             }
 
+        },
 
+        submit() {
 
+            // var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
 
+            // if (!allow) {// 提交为外勤权限，错误提示“暂未获得权限”
 
+            //     this.$message({
 
+            //         message: '暂未获得权限，不可保存检斤信息！',
 
+            //         type: 'warning',
 
+            //     })
 
+            //     return
 
+            // }
 
             this.weighingList.compId = localStorage.getItem('ws-pf_compId')
 
             this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
 
             this.weighingList.warehouseName = this.warehouseName
 
+            this.weighingList.baseId = this.warehouseId
 
+            this.weighingList.warehouseNo = this.weighingList.warehouseNo
 
             if (this.tpyeNo == 2) {
 
                 this.weighingList.statusFlag = 1
 
                 if (!this.weighingList.goodsName) {
 
@@ -425,10 +768,10 @@ export default {
 
                                     message: '操作成功！',
 
                                     type: 'success'
 
                                 });
 
-                                this.weighingList.carNo = ""
 
-                                this.weighingList.grossWeight = ""
 
-                                this.weighingList.tare = ""
 
-                                this.weighingList.netWeight = ""
 
+                                this.weighingList.carNo = ''
 
+                                this.weighingList.grossWeight = ''
 
+                                this.weighingList.tare = ''
 
+                                this.weighingList.netWeight = ''
 
                                 this.getList()
 
                             })
 
                     } else if (this.tpyeNo == 1) {//称皮重
 
@@ -439,10 +782,16 @@ export default {
 
                                     message: '操作成功！',
 
                                     type: 'success'
 
                                 });
 
-                                this.weighingList.carNo = ""
 
-                                this.weighingList.grossWeight = ""
 
-                                this.weighingList.tare = ""
 
-                                this.weighingList.netWeight = ""
 
+                                this.weighingList.carNo = ''
 
+                                this.weighingList.grossWeight = ''
 
+                                this.weighingList.tare = ''
 
+                                this.weighingList.netWeight = ''
 
+                                getdrylist({id:this.weighingList.id}).toPromise()
 
+                                .then((response) => {
 
+                                    console.log(1111111111)
 
+                                    this.printData=response
 
+                                    this.isShowPrintTypeBills=true
 
+                                })
 
                                 this.getList()
 
                             })
 
                     }
 
@@ -528,6 +877,7 @@ export default {
 
                         this.getCarXiaLa()
 
                         this.getList()
 
                     }
 
+                    this.deptBudgetList.warehouseName = this.warehouseName
 
                 })
 
         },
 
         getList() {
 
@@ -536,9 +886,9 @@ export default {
 
                 currentPage: this.currentPage,
 
                 pageSize: this.pageSize,
 
                 searchType: 1,
 
-                startDate: "",
 
-                endDate: "",
 
-                searchKeyWord: "",
 
+                startDate: '',
 
+                endDate: '',
 
+                searchKeyWord: '',
 
             })
 
                 .toPromise()
 
                 .then((response) => {
 
@@ -820,4 +1170,70 @@ export default {
 
 .right-content{
 
     margin-top: 20px;
 
 }
 
+
 
+.mask1 {
 
+    background: black;
 
+    width: 100vw;
 
+    height: 100vh;
 
+    position: fixed;
 
+    top: 0;
 
+    z-index: 1001;
 
+    opacity: 0.3;
 
+  }
 
+
 
+  .print-type-title {
 
+    text-align: center;
 
+    font-size: 18px;
 
+    margin: 20px;
 
+  }
 
+
 
+
 
+  .print-type-checkbox1 {
 
+    // padding-left: 20px;
 
+  }
 
+
 
+  .print-type1 {
 
+    position: absolute;
 
+    top: 0;
 
+    bottom: 0;
 
+    left: 0;
 
+    right: 0;
 
+    margin: auto;
 
+    width: 440px;
 
+    height: 320px;
 
+    background: white;
 
+    border-radius: 10px;
 
+    z-index: 1001;
 
+  }
 
+  .shdw-style1 {
 
+    display: flex;
 
+    justify-content: space-between;
 
+    align-items: center;
 
+    padding: 0 20px;
 
+    margin-top: 20px;
 
+  }
 
+  .print-type-ew {
 
+    display: flex;
 
+    justify-content: space-between;
 
+    padding: 0 20px;
 
+
 
+    /deep/.el-radio__label {
 
+      font-size: 14px;
 
+    }
 
+
 
+    margin-top: 10px;
 
+  }
 
+  .ew-print {
 
+    padding: 0 20px;
 
+    margin-top: 10px;
 
+
 
+    // display: flex;
 
+    // justify-content: space-between;
 
+    // align-content: center;
 
+    .row {
 
+      display: flex;
 
+      margin-top: 10px;
 
+      align-items: center;
 
+    }
 
+  }
 
 </style>