瀏覽代碼

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

gjy 3 年之前
父節點
當前提交
95bac70a5e

+ 1 - 1
public/static/outWeightPrint.html

@@ -137,7 +137,7 @@
             <table class="table">
                 <tr class="row">
                     <td class="col col-bgc">收货单位</td>
-                    <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</td>
+                    <td class="col" colspan="2">{{tableData.customer?tableData.customer:(tableData.contractManagement?tableData.contractManagement.buyer:"")}}</td>
                     <td class="col col-bgc">客户电话</td>
                     <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
                     <td class="col col-bgc">车牌号</td>

+ 23 - 17
public/static/payprint.html

@@ -165,20 +165,26 @@
 
       .sfcard-content img {
         width: 100%;
-        height: 130vh;
+        height: 110vh;
       }
 
       .sfcard-title {
         font-size: 28px;
         text-align: center;
+        height:10vh;
       }
 
       .center {
-        height: 140vh;
+        height: 130vh;
+      }
+.bankcard {
+        height: 130vh;
+      }
+      .part1 {
+        height: 130vh;
       }
-
       .part2 {
-        height: 140vh;
+        height: 130vh;
         /* background: red; */
       }
 
@@ -209,8 +215,8 @@
             </div>
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>
-              <div class="line"></div>
-              <div class="line"></div>
+             <!-- <div class="line"></div>
+              <div class="line"></div> -->
               <div class="header">
                 <div>单位名称:{{ printData1[index].compName}}</div>
                 <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
@@ -421,9 +427,9 @@
               <div style="height: 120px;">
 
                 <div class="title">入库检斤单</div>
-                <div class="leftimg">
+               <!-- <div class="leftimg">
                   <img :src="printData1[index].weighingManagement.codeUrl" alt="">
-                </div>
+                </div> -->
                 <div class="number1">{{printData1[index].weighingManagement.number}}</div>
               </div>
 
@@ -438,11 +444,11 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">收货单位</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col" colspan="2">{{printData1[index].compName}}</td>
                   <td class="col col-bgc">联系人</td>
-                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col">{{printData1[index].contacts}}</td>
                   <td class="col col-bgc">联系电话</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                  <td class="col" colspan="2">{{printData1[index].contactsPhone}}</td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">货名</td>
@@ -546,7 +552,7 @@
             </div>
             <div class="bankcard" v-if="isShowPrintType2">
 
-              <div class="sfcard-content part2">
+              <div class="sfcard-content">
                 <div class="sfcard-title">
                   {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
                 </div>
@@ -755,9 +761,9 @@
           <div>
 
             <div class="title">入库检斤单</div>
-            <div class="leftimg">
+            <!-- <div class="leftimg">
               <img :src="tableData.codeUrl" alt="">
-            </div>
+            </div> -->
             <div class="number1">{{tableData.number}}</div>
           </div>
           <table class="table">
@@ -771,11 +777,11 @@
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{printData.compName}}</td>
               <td class="col col-bgc">联系人</td>
-              <td class="col">{{tableData.person}}</td>
+              <td class="col">{{printData.contacts}}</td>
               <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+              <td class="col" colspan="2">{{tableData.contactsPhone}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>

+ 1251 - 0
public/static/payprint1.html

@@ -0,0 +1,1251 @@
+<!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 tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+      }
+
+      #app {
+        height: 88vh;
+        position: relative;
+      }
+
+      .simple {
+        height: 120vh !important;
+      }
+
+      .content {
+        width: 1000px;
+        margin: auto;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+      .bottom-row1 {
+        display: flex;
+        justify-content: space-between;
+        margin: 20px 0;
+      }
+
+      .bottom-row2 {
+        display: flex;
+        margin: 10px 0;
+      }
+
+      img {
+        width: 80px;
+        height: 80px;
+        /* margin-right: 118px; */
+      }
+
+      .leftimg {
+        width: 80px;
+        height: 80px;
+        position: absolute;
+        right: 20px;
+        top: 3px;
+      }
+
+      .config {
+        margin-right: 240px;
+      }
+
+      .bottom-row3 {
+        margin: 10px 0;
+      }
+
+      .title {
+        text-align: center;
+        font-size: 24px;
+      }
+
+      .number {
+        text-align: right;
+        margin-bottom: 10px;
+      }
+
+      .number1 {
+        text-align: right;
+        margin-bottom: 10px;
+        margin-top: 60px;
+      }
+
+      .small-row {
+        display: flex;
+      }
+
+      .small-content {
+        width: 400px;
+        margin: 0 auto;
+        border: 1px solid #ccc;
+        padding: 20px 20px 160px 20px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 650px;
+      }
+
+      .small-title {
+        text-align: center;
+        font-size: 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .small-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 10px;
+      }
+
+      .small-img {
+        margin-right: 0;
+      }
+
+      .sign {
+        margin-right: 100px;
+      }
+
+      .header {
+        display: flex;
+        justify-content: space-between;
+        font-size: 16px;
+        margin: 10px 0;
+      }
+
+      .header1 {
+        font-size: 24px;
+        /* margin: 30px 60px 10px 60px; */
+        display: flex;
+        justify-content: center;
+      }
+
+      .line {
+        height: 2px;
+        width: 410px;
+        margin: 3px auto;
+        background: black;
+      }
+
+      .line:nth-of-type(3) {
+        margin-bottom: 30px;
+      }
+
+      .header-top {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      .sfcard {
+        background: red;
+      }
+
+      .sfcard-content {
+        /*        display: flex;
+        align-items: center;
+        justify-content: space-evenly; */
+      }
+
+      .sfcard-content img {
+        width: 100%;
+        height: 130vh;
+      }
+
+      .sfcard-title {
+        font-size: 28px;
+        text-align: center;
+      }
+
+      .center {
+        height: 140vh;
+      }
+
+      .part2 {
+        height: 140vh;
+        /* background: red; */
+      }
+
+      .part5 {
+        width: 100%
+      }
+
+      .paymentScreenshot {
+        width: 100%;
+        height: 130vh
+      }
+
+      /* .onlypz-center{
+        height: 130vh;
+      } */
+    </style>
+  </head>
+  <body>
+    <div id="app">
+      <div v-if="selectPrint">
+        <div v-for="(item,index) in printData1" :key="index">
+          <div class="content">
+            <div class="part5" v-if="isShowPrintType5">
+              <div class="header1">
+                付款回执单
+              </div>
+              <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
+            </div>
+            <div class="center" v-if="isShowPrintType3">
+              <div class="header1">{{ printData1[index].compName}}结算凭证</div>
+              <div class="line"></div>
+              <div class="line"></div>
+              <div class="header">
+                <div>单位名称:{{ printData1[index].compName}}</div>
+                <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
+              </div>
+              <div class="header-top">
+                <div>单位:公斤/元</div>
+                <div>No.</div>
+              </div>
+              <div class="header-top">
+                <div>开票日期:{{printData1[index].createDate}}</div>
+                <!-- <div>开票日期:{{new Date(yyyy,mm,dd)}}</div> -->
+                <div class="number">
+                  {{dealNo(printData1[index].paymentNo)}}
+                </div>
+              </div>
+              <table class="table">
+                <tr class="row">
+                  <td rowspan="4" class="col col-bgc">买方</td>
+                  <td class="col col-bgc">单位名称</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].compName}}
+                  </td>
+                  <td rowspan="4" class="col col-bgc">卖方</td>
+                  <td class="col col-bgc">姓名</td>
+                  <td class="col" colspan="4">
+                    {{ printData1[index].customerName}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">税务登记号</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].taxRegistrationNo}}
+                  </td>
+                  <td class="col col-bgc">身份证号</td>
+                  <td class="col" colspan="4">
+                    {{
+                    printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">业务编号</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].paymentNo}}
+                  </td>
+                  <td class="col col-bgc">卡号</td>
+                  <td class="col" colspan="4">
+                    {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货仓库</td>
+                  <td class="col" colspan="3">
+                    {{printData1[index].warehouseName}}
+                  </td>
+                  <td class="col col-bgc">地址</td>
+                  <td class="col" colspan="4">
+                    {{printData1[index].identityAuthenticationInfo.compAddress}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col col-bgc">等级</td>
+                  <td class="col col-bgc">水分%</td>
+                  <td class="col col-bgc">杂质%</td>
+                  <td class="col col-bgc">容重(克/升)</td>
+                  <td class="col col-bgc">毛重</td>
+                  <td class="col col-bgc">皮重</td>
+                  <td class="col col-bgc">扣杂重</td>
+                  <td class="col col-bgc">净重</td>
+                </tr>
+                <tr class="row">
+                  <td class="col">{{ printData1[index].goodsName}}</td>
+                  <td class="col">{{ printData1[index].type}}</td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.grade}}
+                  </td>
+                  <td class="col">
+                    {{
+                    printData1[index].qualityInspectionManagement.waterContent}}
+                  </td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.impurity}}
+                  </td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                  </td>
+                  <td class="col">{{ printData1[index].grossWeight}}</td>
+                  <td class="col">{{ printData1[index].tare}}</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                  </td>
+                  <td class="col">{{ printData1[index].netWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">纯重</td>
+                  <td class="col col-bgc" v-if="printData1[index].type == '潮粮'">
+                    净重单价
+                  </td>
+                  <td class="col col-bgc" v-if="printData1[index].type == '干粮'">
+                    单价
+                  </td>
+                  <td class="col col-bgc">扣单价</td>
+                  <td class="col col-bgc">粮款</td>
+                  <td class="col col-bgc">称重补助</td>
+                  <td class="col col-bgc">运费补助</td>
+                  <td class="col col-bgc">卸车补助</td>
+                  <td class="col col-bgc">其他补助</td>
+                  <td class="col col-bgc">称重扣款</td>
+                  <td class="col col-bgc">运费扣款</td>
+                </tr>
+                <tr class="row">
+                  <td class="col">{{ printData1[index].pureWeight}}</td>
+                  <td class="col " v-if="printData1[index].type == '潮粮'">
+                    {{printData1[index].tidalGrainPrice}}
+                  </td>
+                  <td class="col " v-if="printData1[index].type == '干粮'">
+                    {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
+                  </td>
+                  <td class="col ">{{ printData1[index].unitDeduction}}</td>
+                  <td class="col ">{{ printData1[index].grainMoney}}</td>
+                  <td class="col ">{{ printData1[index].weighingSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].freightSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].unloadSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].otherSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].weighingDeduction}}</td>
+                  <td class="col ">{{ printData1[index].freightDeduction}}</td>
+                  <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">卸车扣款</td>
+                  <td class="col col-bgc">质量扣款</td>
+                  <td class="col col-bgc">其他扣款</td>
+                  <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                    纯重单价
+                  </td>
+                  <td class="col col-bgc">合计应付</td>
+                  <td class="col col-bgc">购粮性质</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col col-bgc" colspan="4">记事</td>
+                </tr>
+                <tr class="row">
+                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                  <td class="col ">{{ printData1[index].qualityDeduction}}</td>
+                  <td class="col ">{{ printData1[index].otherDeduction}}</td>
+                  <td class="col " v-if="printData1[index].type == '潮粮'">
+                    {{ printData1[index].solidGrainPrice}}
+                  </td>
+                  <td class="col ">
+                    {{ printData1[index].calculationPayable}}
+                  </td>
+                  <td class="col ">
+                    {{
+                    printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
+                  </td>
+                  <td class="col ">{{ printData1[index].carNo}}</td>
+                  <td class="col " colspan="4">
+                    {{ printData1[index].remarks}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">实付金额</td>
+                  <td class="col " colspan="2">
+                    {{printData1[index].actualPayment}}
+                  </td>
+                  <td class="col col-bgc" colspan="3">人民币(大写)</td>
+                  <td class="col " colspan="4">
+                    {{printData1[index].capitalize}}
+                  </td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>
+                    质检:{{
+                    printData1[index].qualityInspectionManagement.qualityInspector}}
+                  </div>
+                  <div>
+                    毛检:{{
+                    printData1[index].weighingManagement.secretaryWeigher}}
+                  </div>
+                  <div>
+                    皮检:{{
+                    printData1[index].weighingManagement.skinInspector}}
+                  </div>
+                  <div>结算:{{ printData1[index].settlementClerk}}</div>
+                  <div>付款:{{ printData1[index].cashier}}</div>
+                  <div>复点:{{ }}</div>
+                  <div></div>
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="left">
+                   <img src="../../../../public/img/add.png" alt="" />
+                 </div> -->
+                  <div class="config">收货单位签名或盖章</div>
+                  <div class="">客户签名</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+                <!-- <div class="bottom-row4">
+                 <el-button type="primary">关闭</el-button>
+                  <el-button type="primary" @click="printSmall">打印小票</el-button>
+                  <el-button type="primary" @click="printBig">打印单据</el-button>
+               </div> -->
+              </div>
+            </div>
+            <div v-if="isShowPrintType4" class="part2">
+              <div style="height: 120px;">
+
+                <div class="title">入库检斤单</div>
+                <div class="leftimg">
+                  <img :src="printData1[index].weighingManagement.codeUrl" alt="">
+                </div>
+                <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+              </div>
+
+              <table class="table">
+                <tr class="row">
+                  <td class="col col-bgc">客户姓名</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.customer}}</td>
+                  <td class="col col-bgc">客户电话</td>
+                  <td class="col">{{printData1[index].weighingManagement.customerPhone}}</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.carNumber}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货单位</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col col-bgc">联系人</td>
+                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col col-bgc">联系电话</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col">{{printData1[index].weighingManagement.type}}</td>
+                  <td class="col col-bgc">容量(克/升)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                  </td>
+                  <td class="col col-bgc">不完善粒(%)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">等级</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
+                  </td>
+                  <td class="col col-bgc">水分(%)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
+                  </td>
+                  <td class="col col-bgc">热损伤(%)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
+                  </td>
+                  <td class="col col-bgc">质检时间</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">杂质(%)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
+                  </td>
+                  <td class="col col-bgc">霉变粒(%)</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
+                  </td>
+                  <td class="col col-bgc">扣杂</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
+                  </td>
+                  <td class="col " colspan="2"></td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">毛重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.grossWeight}}</td>
+                  <td class="col col-bgc">皮重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.tare}}</td>
+                  <td class="col col-bgc">扣重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td>
+                  <td class="col col-bgc">净重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.grossDate}}</td>
+                  <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.tareDate}}</td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>毛检:{{printData1[index].weighingManagement.secretaryWeigher}}</div>
+                  <div style="margin-left:60px">
+                    皮检:{{printData1[index].weighingManagement.skinInspector}}
+                  </div>
+                  <!-- <div>{{tableData.qualityDate}}</div> -->
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="leftimg">
+                    <img src="../img/add.png" alt="">
+                  </div> -->
+                  <div class="config">收货单位签名或盖章:</div>
+                  <div class="autograph">客户签名:</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+              </div>
+            </div>
+
+            <div class="part1" v-if="isShowPrintType1">
+              <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
+              </div>
+         <!--     <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
+              </div> -->
+            </div>
+            <div class="bankcard" v-if="isShowPrintType2">
+
+              <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" />
+              </div>
+    <!--          <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
+              </div> -->
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="content" v-else>
+        <div class="part5" v-if="isShowPrintType5">
+          <div class="header1">
+            付款回执单
+          </div>
+          <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+        </div>
+        <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
+          <div class="header1">{{ printData.compName}}结算凭证</div>
+          <div class="line"></div>
+          <div class="line"></div>
+          <div class="header">
+            <div>单位名称:{{ printData.compName}}</div>
+            <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
+          </div>
+          <div class="header-top">
+            <div>单位:公斤/元</div>
+            <div>No.</div>
+          </div>
+          <div class="header-top">
+            <div>开票日期:{{printData.createDate}}</div>
+            <!-- <div>开票日期:{{new Date(yyyy,mm,dd)}}</div> -->
+            <div class="number">{{dealNo(printData.paymentNo)}}</div>
+          </div>
+          <table class="table">
+            <tr class="row">
+              <td rowspan="4" class="col col-bgc">买方</td>
+              <td class="col col-bgc">单位名称</td>
+              <td class="col" colspan="3">{{ printData.compName}}</td>
+              <td rowspan="4" class="col col-bgc">卖方</td>
+              <td class="col col-bgc">姓名</td>
+              <td class="col" colspan="4">{{ printData.customerName}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">税务登记号</td>
+              <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
+              <td class="col col-bgc">身份证号</td>
+              <td class="col" colspan="4">
+                {{ printData.identityAuthenticationInfo.customerNumberCard}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">业务编号</td>
+              <td class="col" colspan="3">{{ printData.paymentNo}}</td>
+              <td class="col col-bgc">卡号</td>
+              <td class="col" colspan="4">
+                {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货仓库</td>
+              <td class="col" colspan="3">{{printData.warehouseName}}</td>
+              <td class="col col-bgc">地址</td>
+              <td class="col" colspan="4">
+                {{printData.identityAuthenticationInfo.compAddress}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">货名</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col col-bgc">等级</td>
+              <td class="col col-bgc">水分%</td>
+              <td class="col col-bgc">杂质%</td>
+              <td class="col col-bgc">毛重</td>
+              <td class="col col-bgc">皮重</td>
+              <td class="col col-bgc">扣杂重</td>
+              <td class="col col-bgc">净重</td>
+              <td class="col col-bgc">出库净重</td>
+              <!-- <td class="col col-bgc">纯重</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col">{{ printData.goodsName}}</td>
+              <td class="col">{{ printData.type}}</td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.grade}}
+              </td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.waterContent}}
+              </td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.impurity}}
+              </td>
+              <td class="col">{{ printData.grossWeight}}</td>
+              <td class="col">{{ printData.tare}}</td>
+              <td class="col">
+                {{ printData.weighingManagement.buckleMiscellaneous}}
+              </td>
+              <td class="col">{{ printData.netWeight}}</td>
+              <td class="col">{{printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
+              <!-- <td class="col">{{ printData.pureWeight}}</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">纯重</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                净重单价
+              </td>
+              <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+              <td class="col col-bgc">扣单价</td>
+              <td class="col col-bgc">粮款</td>
+              <td class="col col-bgc">称重补助</td>
+              <td class="col col-bgc">运费补助</td>
+              <td class="col col-bgc">卸车补助</td>
+              <td class="col col-bgc">其他补助</td>
+              <td class="col col-bgc">称重扣款</td>
+              <td class="col col-bgc">运费扣款</td>
+              <!-- <td class="col col-bgc">1卸车扣款</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col">{{ printData.pureWeight}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">
+                {{printData.tidalGrainPrice}}
+              </td>
+              <td class="col " v-if="printData.type == '干粮'">
+                {{printData.qualityInspectionManagement.dryGrainPrice}}
+              </td>
+              <td class="col ">{{ printData.unitDeduction}}</td>
+              <td class="col ">{{ printData.grainMoney}}</td>
+              <td class="col ">{{ printData.weighingSubsidy}}</td>
+              <td class="col ">{{ printData.freightSubsidy}}</td>
+              <td class="col ">{{ printData.unloadSubsidy}}</td>
+              <td class="col ">{{ printData.otherSubsidy}}</td>
+              <td class="col ">{{ printData.weighingDeduction}}</td>
+              <td class="col ">{{ printData.freightDeduction}}</td>
+              <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">卸车扣款</td>
+              <td class="col col-bgc">质量扣款</td>
+              <td class="col col-bgc">其他扣款</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                纯重单价
+              </td>
+              <td class="col col-bgc">合计应付</td>
+              <td class="col col-bgc">购粮性质</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col col-bgc" colspan="4">记事</td>
+            </tr>
+            <tr class="row">
+              <td class="col ">{{ printData.unloadDeduction}}</td>
+              <td class="col ">{{ printData.qualityDeduction}}</td>
+              <td class="col ">{{ printData.otherDeduction}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">
+                {{ printData.solidGrainPrice}}
+              </td>
+              <td class="col ">{{ printData.calculationPayable}}</td>
+              <td class="col ">
+                {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
+              </td>
+              <td class="col ">{{ printData.carNo}}</td>
+              <td class="col " colspan="4">{{ printData.remarks}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">实付金额</td>
+              <td class="col " colspan="2">{{printData.actualPayment}}</td>
+              <td class="col col-bgc" colspan="3">人民币(大写)</td>
+              <td class="col " colspan="4">{{printData.capitalize}}</td>
+            </tr>
+          </table>
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>
+                质检:{{
+                printData.qualityInspectionManagement.qualityInspector}}
+              </div>
+              <div>
+                毛检:{{ printData.weighingManagement.secretaryWeigher}}
+              </div>
+              <div>皮检:{{ printData.weighingManagement.skinInspector}}</div>
+              <div>结算:{{ printData.settlementClerk}}</div>
+              <div>付款:{{ printData.cashier}}</div>
+              <div>复点:{{ }}</div>
+              <div></div>
+            </div>
+            <div class="bottom-row2">
+              <!-- <div class="left">
+               <img src="../../../../public/img/add.png" alt="" />
+             </div> -->
+              <div class="config">收货单位签名或盖章</div>
+              <div class="">客户签名</div>
+            </div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
+            <!-- <div class="bottom-row4">
+             <el-button type="primary">关闭</el-button>
+              <el-button type="primary" @click="printSmall">打印小票</el-button>
+              <el-button type="primary" @click="printBig">打印单据</el-button>
+           </div> -->
+          </div>
+        </div>
+
+        <div v-if="isShowPrintType4" class="part2">
+          <div>
+
+            <div class="title">入库检斤单</div>
+            <div class="leftimg">
+              <img :src="tableData.codeUrl" alt="">
+            </div>
+            <div class="number1">{{tableData.number}}</div>
+          </div>
+          <table class="table">
+            <tr class="row">
+              <td class="col col-bgc">客户姓名</td>
+              <td class="col" colspan="2">{{tableData.customer}}</td>
+              <td class="col col-bgc">客户电话</td>
+              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col" colspan="2">{{tableData.carNumber}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货单位</td>
+              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col col-bgc">联系人</td>
+              <td class="col">{{tableData.person}}</td>
+              <td class="col col-bgc">联系电话</td>
+              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">货名</td>
+              <td class="col">{{tableData.goodsName}}</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col">{{tableData.type}}</td>
+              <td class="col col-bgc">容量(克/升)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+              </td>
+              <td class="col col-bgc">不完善粒(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">等级</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+              </td>
+              <td class="col col-bgc">水分(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}
+              </td>
+              <td class="col col-bgc">热损伤(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}
+              </td>
+              <td class="col col-bgc">质检时间</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">杂质(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}
+              </td>
+              <td class="col col-bgc">霉变粒(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}
+              </td>
+              <td class="col col-bgc">扣杂</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+              </td>
+              <td class="col " colspan="2"></td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">毛重(公斤)</td>
+              <td class="col">{{tableData.grossWeight}}</td>
+              <td class="col col-bgc">皮重(公斤)</td>
+              <td class="col">{{tableData.tare}}</td>
+              <td class="col col-bgc">扣重(公斤)</td>
+              <td class="col">{{tableData.buckleMiscellaneous}}</td>
+              <td class="col col-bgc">净重(公斤)</td>
+              <td class="col">{{tableData.netWeight}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.grossDate}}</td>
+              <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.tareDate}}</td>
+            </tr>
+          </table>
+
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>毛检:{{tableData.secretaryWeigher}}</div>
+              <div style="margin-left:60px">
+                皮检:{{tableData.skinInspector}}
+              </div>
+              <!-- <div>{{tableData.qualityDate}}</div> -->
+            </div>
+            <div class="bottom-row2">
+              <!-- <div class="left">
+                <img src="../img/add.png" alt="">
+              </div> -->
+              <div class="config">收货单位签名或盖章:</div>
+              <div class="autograph">客户签名:</div>
+            </div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
+          </div>
+        </div>
+
+        <div class="sfcard part3" v-if="isShowPrintType1">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl1" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl2" class="avatar" />
+          </div>
+        </div>
+
+        <div class="bankcard part4" v-if="isShowPrintType2">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+            </div>
+            <img :src="imageUrl3" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+            </div>
+            <img :src="imageUrl4" class="avatar" />
+          </div>
+
+        </div>
+      </div>
+
+      <div class="small-content" v-if="smallContent">
+        <div class="small-title">
+          <div>
+            {{printData.compName}}结算凭证
+          </div>
+          <img class="small-img" src="../img/add.png" alt="" />
+        </div>
+        <div class="small-row">
+          <div>开票日期</div>
+          <div>{{printData.createDate}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方单位名称</div>
+          <div>{{printData.compName}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方姓名</div>
+          <div>{{printData.customerName}}</div>
+        </div>
+        <div class="small-row">
+          <div>税务登记号</div>
+          <div>{{printData.taxRegistrationNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>身份证号</div>
+          <div>{{printData.customerNumberCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>化验单号</div>
+          <div>{{printData.paymentNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>卡号</div>
+          <div>{{printData.bankCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>收货仓库</div>
+          <div>{{printData.warehouseName}}</div>
+        </div>
+        <div class="small-row">
+          <div>货名</div>
+          <div>{{printData.goodsName}}</div>
+        </div>
+        <div class="small-row">
+          <div>类型</div>
+          <div>{{printData.type}}</div>
+        </div>
+        <div class="small-row">
+          <div>等级</div>
+          <div>{{printData.grade}}</div>
+        </div>
+        <div class="small-row">
+          <div>水分%</div>
+          <div>{{printData.waterContent}}</div>
+        </div>
+        <div class="small-row">
+          <div>杂质%</div>
+          <div>{{printData.impurity}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛重</div>
+          <div>{{printData.grossWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮重</div>
+          <div>{{printData.tare}}</div>
+        </div>
+        <div class="small-row">
+          <div>扣杂重</div>
+          <div>{{printData.weighingManagement.buckleMiscellaneous}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重</div>
+          <div>{{printData.netWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重</div>
+          <div>{{printData.pureWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重单价</div>
+          <div>{{printData.tidalGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>粮款</div>
+          <div>{{printData.grainMoney}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重补助</div>
+          <div>{{printData.weighingSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费补助</div>
+          <div>{{printData.freightSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车补助</div>
+          <div>{{printData.unloadSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他补助</div>
+          <div>{{printData.otherSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重扣款</div>
+          <div>{{printData.weighingDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费扣款</div>
+          <div>{{printData.freightDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车扣款</div>
+          <div>{{printData.unloadDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>质量扣款</div>
+          <div>{{printData.qualityDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他扣款</div>
+          <div>{{printData.otherDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重单价</div>
+          <div>{{printData.solidGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>合计应付</div>
+          <div>{{printData.calculationPayable}}</div>
+        </div>
+        <div class="small-row">
+          <div>购粮性质</div>
+          <div>{{printData.natureOfGrainPurchase}}</div>
+        </div>
+        <div class="small-row">
+          <div>车牌号</div>
+          <div>{{printData.carNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>记事</div>
+          <div>{{printData.remarks}}</div>
+        </div>
+        <div class="small-row">
+          <div>实付金额</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>人民币(大写)</div>
+          <div>{{printData.capitalize}}</div>
+        </div>
+        <div class="small-row">
+          <div>质检</div>
+          <div>{{printData.qualityInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛检</div>
+          <div>{{printData.secretaryWeigher}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮检</div>
+          <div>{{printData.skinInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>结算</div>
+          <div>{{printData.settlementClerk}}</div>
+        </div>
+        <div class="small-row">
+          <div>付款</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>复点</div>
+          <div>&nbsp;&nbsp;&nbsp;</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,
+        showType: [],
+        printData: {},
+        printData1: [],
+        customerList: {},
+        customerList1: [],
+        name: '',
+        bigContent: false,
+        smallContent: false,
+        date: '',
+        imageUrl1: '',
+        imageUrl2: '',
+        imageUrl3: '',
+        imageUrl4: '',
+        identity: [],
+        bank: [],
+        selectPrint: false,
+        onlyShowPz: false,
+        tableData: []
+      },
+      computed: {},
+      methods: {
+        dealNo(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() {
+        this.date = new Date().toLocaleString()
+        let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        if (!_data) {
+          this.selectPrint = true
+          this.printData1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectPrintList')
+          )
+          console.log("对象", this.printData1)
+          console.log("对象", this.printData)
+          for (let i = 0; i < this.printData1.length; i++) {
+            if (!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i]
+              .identityAuthenticationInfo.compAddress = ''
+            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
+              this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
+                .identityAuthenticationInfo
+                .compAddress.substring(0, 24)
+            }
+          }
+        } else {
+          this.printData = JSON.parse(_data)
+          //地址过长截取
+          if (this.printData.identityAuthenticationInfo.compAddress.length > 24) {
+            this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
+              .compAddress.substring(0, 24)
+          }
+          this.selectPrint = false
+        }
+        let _type = decodeURIComponent(this.getQueryVariable('type'))
+        this.showType = decodeURIComponent(
+          this.getQueryVariable('printTypeList')
+        )
+        // this.pzList = this.showType.split(',')
+        // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+        //   this.onlyShowPz = true
+        // }
+        // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
+        if (!_data1) {
+          this.customerList1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectCustomerList')
+          )
+        } else {
+          this.customerList = JSON.parse(_data1)
+        }
+        console.log('cwprint', localStorage.getItem('cwprint'))
+        var cwprint = localStorage.getItem('cwprint')
+        if (cwprint == 'true') {
+          if (this.selectPrint) {
+            for (let i = 0; i < this.customerList1.length; i++) {
+              let _url1 = this.customerList1[i].cardAddressUrl.split(',')
+              let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+              this.customerList1[i].imgURl = {
+                imageUrl1: _url1[0],
+                imageUrl2: _url1[1],
+                imageUrl3: _url2[0],
+                imageUrl4: _url2[0]
+              }
+            }
+          } else {
+            if (this.customerList.cardAddressUrl) {
+              this.identity = this.customerList.cardAddressUrl.split(',')
+              this.imageUrl1 = this.identity[0]
+              this.imageUrl2 = this.identity[1]
+            }
+            if (this.customerList.payeeAddressUrl) {
+              this.bank = this.customerList.payeeAddressUrl.split(',')
+
+              this.imageUrl3 = this.bank[0]
+              this.imageUrl4 = this.bank[1]
+            }
+            this.tableData = this.printData.weighingManagement
+          }
+          let _lsit = this.showType.split(',')
+          for (let i = 0; i < _lsit.length; i++) {
+            switch (_lsit[i]) {
+              case '打印身份证':
+                this.isShowPrintType1 = !this.isShowPrintType1
+                break
+              case '打印银行卡':
+                this.isShowPrintType2 = !this.isShowPrintType2
+                break
+              case '打印结算凭证':
+                this.isShowPrintType3 = !this.isShowPrintType3
+                break
+              case '打印检斤单':
+                this.isShowPrintType4 = !this.isShowPrintType4
+                break
+              case '打印回执单':
+                this.isShowPrintType5 = !this.isShowPrintType5
+                break
+            }
+          }
+        } else {
+          this.isShowPrintType3 = true
+        }
+        if (_type == 2) {
+          this.bigContent = true
+          this.smallContent = false
+        } else {
+          this.smallContent = true
+          this.bigContent = false
+        }
+        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>

+ 3 - 0
src/api/V2/houseSelfCollect/index.js

@@ -112,3 +112,6 @@ export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'
 export const API_POST_RETURN= '/weighingManagement/weightReturn'
 // 新检斤保存
 export const API_POST_SUBMIT= '/warehouseInOutInfo/api/newInOutWarehouse'
+// 换仓
+export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
+

+ 2 - 0
src/api/V2/outboundManagement/index.js

@@ -38,3 +38,5 @@ export const API_POST_COLLECTION_EDITCOLLECT = '/paymentManagement/api/editColle
 export const API_POST_COLLECTION_ADDREMARKS = '/paymentManagement/api/addRemarks'
 // 新检斤保存
 export const API_POST_NEW_SUBMIT = '/warehouseInOutInfo/api/newInOutWarehouse'
+// 换仓
+export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`

+ 2 - 1
src/components/balanceAlert.vue

@@ -133,6 +133,7 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
+            this.deptBudgetList.warehouseName == '山东园丰库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
@@ -140,7 +141,7 @@ export default {
               this.deptBudgetList.warehouseName == '白城内陆港'||
               this.deptBudgetList.warehouseName == '肇东金信库'||
               this.deptBudgetList.warehouseName == '呼兰大金仓')
-          ) {
+          )) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {

+ 8 - 2
src/model/houseSelfCollect/index.js

@@ -57,7 +57,9 @@ import {
   API_GET_INSPECT_CONTRACTNO,
   API_GET_SETTLEACCOUT,
   API_POST_RETURN,
-  API_POST_SUBMIT
+  API_POST_SUBMIT,
+  API_POST_CHANE_NO,
+  API_POST_DELETE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -171,5 +173,9 @@ export const importWord = appRx.post(API_POST_IMPORT, errorCatcher, errorHandle,
 export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)
 // 退回
 export const returnInfo = appRx.post(API_POST_RETURN, errorCatcher, errorHandle, filter)
+// 删除
+export const deleteInfo = appRx.post(API_POST_DELETE, errorCatcher, errorHandle, filter)
 // 新检斤保存
-export const newSubmit = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+export const newSubmit = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+// 换仓
+export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)

+ 5 - 2
src/model/outboundManagement/index.js

@@ -21,7 +21,8 @@ import {
     API_POST_COLLECTION_ADDREMARKS,
     API_POST_COLLECTION_MONEY,
     API_GET_INSPECT_CONTRANCLISTWEIGHING,
-    API_POST_NEW_SUBMIT
+    API_POST_NEW_SUBMIT,
+    API_POST_CHANE_NO
 }   from '@/api/V2/outboundManagement'
 
   //质检列表
@@ -63,4 +64,6 @@ export const editcollect = appRx.post(API_POST_COLLECTION_EDITCOLLECT, errorCatc
 //添加备注
 export const remarksAdd = appRx.post(API_POST_COLLECTION_ADDREMARKS, errorCatcher, errorHandle, filter)
 //新检斤保存
-export const newSubmit = appRx.post(API_POST_NEW_SUBMIT, errorCatcher, errorHandle, filter)
+export const newSubmit = appRx.post(API_POST_NEW_SUBMIT, errorCatcher, errorHandle, filter)
+// 换仓
+export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)

+ 6 - 11
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -92,16 +92,16 @@
                     disabled />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo">
-                  <ws-input disabled v-model="weighingList.boxNo" placeholder="暂无" maxlength="20" size="small" />
-                </ws-form-item>
-                <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-                  <ws-input disabled v-model="weighingList.boxNoOther" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.boxNo" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-1" span="1" prop="titleNo">
-                  <ws-input disabled v-model="weighingList.titleNo" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.titleNo" placeholder="暂无" maxlength="20" size="small" />
+                </ws-form-item>
+                <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                  <ws-input  v-model="weighingList.boxNoOther" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-                  <ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.titleNoOther" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
                   <ws-input type="number" @mousewheel.native.prevent v-if="index == 0"
@@ -728,7 +728,6 @@
           })
           .toPromise()
           .then((response) => {
-            debugger
             this.dialogDataList = [] //点击确认时先清空要打印的数组
             this.dialogData = response
             if (response.compName == '黑龙江秋收有限公司') {
@@ -955,8 +954,6 @@
           this.carList1 = this.mListTotal
           if (this.mList.length != 0) {
             this.setCurrent(this.mList[0])
-
-          debugger
             this.weighingList = this.mList[0]
             this.carWeightInfo = {
               carNumber: this.mList[0].carNumber,
@@ -970,7 +967,6 @@
           this.carList1 = this.pListTotal
           if (this.pList.length != 0) {
             this.setCurrent(this.pList[0])
-          debugger
             this.weighingList = this.pList[0]
             this.weighingList.inOutType = this.pList[0].qualityInspectionManagement.inOutType
             this.weighingList.inOutTypeKey = this.pList[0].qualityInspectionManagement.inOutTypeKey
@@ -1224,7 +1220,6 @@
             type: this.information,
             weight: val.grossWeight,
           }
-          debugger
           this.weighingList = val
           if (val.qualityInspectionManagement) {
             this.weighingList.boxNo = val.qualityInspectionManagement.boxNo

+ 82 - 50
src/views/houseSelfCollect/paymentManagement.vue

@@ -36,10 +36,11 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
-         <el-select class="warehouse_select" v-model="goodsName" placeholder="请选择货名" @change="goodsNameChange"
-          filterable clearable style="margin: 0 10px">
-           <el-option label="全部货名" value="全部货名"></el-option>
-          <el-option v-for="item in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName" ></el-option>
+        <el-select class="warehouse_select" v-model="goodsName" placeholder="请选择货名" @change="goodsNameChange" filterable
+          clearable style="margin: 0 10px">
+          <el-option label="全部货名" value="全部货名"></el-option>
+          <el-option v-for="item in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
+          </el-option>
         </el-select>
         <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
           filterable clearable style="margin: 0 10px">
@@ -472,8 +473,8 @@
         fileList: [],
         appendixIdsAdd: '',
         excelFreightspace: [],
-        goodnameList:[],
-        goodsName:'全部',
+        goodnameList: [],
+        goodsName: '全部',
       }
     },
     mounted() {
@@ -496,7 +497,7 @@
       })
     },
     methods: {
-      goodsNameChange(){
+      goodsNameChange() {
         this.getList()
       },
       importClick(file, fileList) {
@@ -573,7 +574,7 @@
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
-              obj.qualityDate = _this.formatDate(v.日期,'-')
+              obj.qualityDate = _this.formatDate(v.日期, '-')
               obj.deductionAmount = v.扣款
               _this.excelFreightspace.push(obj)
             })
@@ -608,10 +609,11 @@
         const old = numb - 1;
         const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
         const time = new Date(1900, 0, old, 0, 0, t)
-        const year = time.getFullYear() ;
-        const month = time.getMonth() + 1 ;
-        const date = time.getDate() ;
-        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date)+' 00:00:00'
+        const year = time.getFullYear();
+        const month = time.getMonth() + 1;
+        const date = time.getDate();
+        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+          ' 00:00:00'
       },
       invoicingClose() {
         this.invoicingshow = false
@@ -800,16 +802,16 @@
             if (response.length > 0) {
               var arr = []
               for (let i = 0; i < response.length; i++) {
-                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/','')
+                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/', '')
                 arr.push({
                   fileUrl: response[i],
                   renameFileName: _name,
                 })
               }
               this.filesToRar(arr, '开票XML文件')
-            }else{
-               this.$message.error('暂无数据')
-               return
+            } else {
+              this.$message.error('暂无数据')
+              return
             }
           })
           .catch(() => {})
@@ -1082,12 +1084,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要通过的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-			     this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
-			     return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
+              return
+            }
+          }
           this.$confirm(`审核通过后,任务将发送给财务,是否确定通过?`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
@@ -1199,7 +1201,19 @@
         let _list2 = []
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
-          // 财务批量打印数据
+          if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+            // 财务批量打印数据
+            for (let i = 0; i < this.selectPrintList.length; i++) {
+              if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+                this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+                this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+              } else {
+                this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+                this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+              }
+            }
+          }
+          
           localStorage.setItem(
             'selectPrint_selectPrintList',
             JSON.stringify(this.selectPrintList)
@@ -1208,6 +1222,9 @@
             'selectPrint_selectCustomerList',
             JSON.stringify(this.selectCustomerList)
           )
+       
+
+
         } else if (this.printType == 0) {
           localStorage.setItem('cwprint', true)
           _list1 = JSON.stringify(this.printData)
@@ -1216,22 +1233,37 @@
           _list1 = JSON.stringify(this.printData)
           _list2 = JSON.stringify(this.customerList)
         }
-        window.open(
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          _list1 +
-          '&customerList=' +
-          _list2 +
-          '&printTypeList=' +
-          this.ruleForm.type,
-          '结算凭证'
-        )
+        if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+            window.open(
+              '../../../../../static/payprint.html?type=2&dataList=' +
+              _list1 +
+              '&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          }
+          else{
+            window.open(
+              '../../../../../static/payprint1.html?type=2&dataList=' +
+              _list1 +
+              '&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          }
+        
       },
       getList() {
-        for(let _temp = 0 ; _temp < this.warehouseList.length ; _temp++){
-          if(this.warehouseName == this.warehouseList[_temp].warehouseName){
-            for(let _num = 0 ; _num < this.warehouseList[_temp].goodsNameInfos.length;_num++){
-                const res = new Map()
-                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr)=> !res.has(arr.goodsName)&&res.set(arr.goodsName,1))
+        for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
+          if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
+            for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
+              const res = new Map()
+              this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
+                res.set(arr.goodsName, 1))
             }
           }
         }
@@ -1261,7 +1293,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
-            goodsName:this.goodsName == '全部'?'':this.goodsName
+            goodsName: this.goodsName == '全部' ? '' : this.goodsName
           })
           .toPromise()
           .then((response) => {
@@ -1419,12 +1451,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要驳回的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-				  this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
-				 return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
+              return
+            }
+          }
           this.$confirm('是否确定驳回?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -1518,12 +1550,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要通过的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-			     this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
-			     return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目,请重新勾选!')
+              return
+            }
+          }
           this.$confirm('是否确定通过?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',

+ 107 - 2
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -40,6 +40,7 @@
       <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
       <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
       <el-button size="small" @click="print('',1)">批量打印</el-button>
+        
       <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>
@@ -73,6 +74,8 @@
             <!-- <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 @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -141,6 +144,23 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
+     <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible"
+          width="30%"
+          :before-close="handleClose">
+          <div style="text-align:center">
+             <el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+              @change="binNumberChange">
+              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+                :value="item.binNumber" />
+            </el-select>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -148,7 +168,9 @@
     selectWarehouseSelf,
     getweighingList,
     getPrint,
-    returnInfo
+    returnInfo,
+    changeNo,
+    getweighingDelete
   } from '@/model/houseSelfCollect/index'
   import weightCheckPrint from './component/weightCheckPrint.vue'
   export default {
@@ -265,7 +287,13 @@
         printSeparately: false,
         onePrint: false,
         startDate:'',
-        endDate:''
+        endDate:'',
+        dialogVisible:false,
+        binNumber:'',
+        binnumberList:[],
+        cangweiNum:'',
+        positionId:'',
+        warehouseInOutDetail:{},
       }
     },
     activated() {
@@ -283,6 +311,56 @@
       this.getList()
     },
     methods: {
+      binNumberChange(e){
+        this.binNumber = e
+        for(let i = 0 ; i < this.binnumberList.length ; i++){
+          if(this.binNumber == this.binnumberList[i].binNumber){
+            this.positionId = this.binnumberList[i].id
+          }
+        }
+      },
+      handleClose(){
+        this.dialogVisible = false
+      },
+      dialogVisibleconfirm(){
+        if(this.binNumber == this.cangweiNum){
+          this.$message.error('已是该仓位无需修改')
+          return
+        }
+        this.$confirm(`确定修改仓位?`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+            // let _obj = JSON.parse(this.warehouseInOutDetail)
+            // _obj.binNumber = this.binNumber
+              changeNo({id:this.id,changePositionId:this.positionId,changeBinNumer:this.binNumber}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改仓位成功',
+                })
+                this.getList()
+                this.dialogVisible=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      
+        exchange(row){
+          for(let i = 0 ; i < this.warehouseList.length; i++ ){
+            if(this.warehouseName == this.warehouseList[i].warehouseName){
+              		this.binnumberList = this.warehouseList[i].positionInfos
+            }
+          }
+            this.id = row.id
+            this.binNumber = row.binNumber
+            this.cangweiNum = row.binNumber
+            this.dialogVisible = true
+       },
        backInfo(row){
            this.$confirm('确定要退回该信息?', '提示', {
             confirmButtonText: '确定',
@@ -304,6 +382,33 @@
             })
           })
       },
+      deleteInfo(row){
+            //删除
+        this.$confirm('确定删除检斤信息?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getweighingDelete({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
       typePrintCannelClick() {
         this.onePrint = false //单个打印标识
         this.dialogDataList = [] //打个打印取消时数组至空

+ 2 - 1
src/views/outboundManagement/component/weightCheckPrint.vue

@@ -5,7 +5,8 @@
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
-            <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</td>
+           <!-- <td class="col" colspan="2" v-if="tableData.customer">{{tableData.customer}}</td> -->
+           <td class="col" colspan="2">{{tableData.customer?tableData.customer:( tableData.contractManagement ? tableData.contractManagement.buyer:"")}}</td>
             <td class="col col-bgc">客户电话</td>
             <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
             <td class="col col-bgc">车牌号</td>

+ 24 - 0
src/views/outboundManagement/weighingManagementNew.vue

@@ -116,6 +116,14 @@
                         <ws-input :disabled="recheck" v-model="weighingList.storageNumber" placeholder="选填,1-10个字符"
                           maxlength="10" size="small" />
                       </ws-form-item>
+                      <ws-form-item label="价格" span="1" prop="contractPrice">
+                        <ws-input :disabled="recheck" v-model="weighingList.contractPrice" placeholder="请输入价格(元/每吨)"
+                          maxlength="10" size="small" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 2" label="备注" span="1" prop="customer">
+                        <ws-input :disabled="recheck" v-model="weighingList.customer" placeholder="请输入备注"
+                          maxlength="10" size="small" />
+                      </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 1" label="出库类型" span="1">
                         <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
                           placeholder="暂无" />
@@ -921,6 +929,12 @@
         //     return
         //   }
         // }
+        // for (var i = 0; i < this.outContractNo.length; i++) {
+        //   if (this.outContractNo[i].contractNo == this.weighingList.contractNo){
+        //       this.$set(this.weighingList,'customer',this.outContractNo[i].buyer)
+        //   }
+        // }debugger
+        // console.log(this.weighingList.customer)
         this.weighingList.carNumber = this.weighingList.carNo
         if (this.types == 1 || this.types == 2) {
           if (!this.weighingList.contractNo) {
@@ -944,6 +958,13 @@
             })
             return
           }
+          if (!this.weighingList.contractPrice) {
+            this.$message({
+              message: '价格不能为空',
+              type: 'warning',
+            })
+            return
+          }
           if (
             this.weighingList.storageNumber.length < 1 ||
             this.weighingList.storageNumber.length > 10
@@ -1647,6 +1668,9 @@
             } else {
               this.weighingList.type = '干粮'
             }
+            // this.weighingList.contractPrice = this.outContractNo[i].unitContractPrice
+            this.$set(this.weighingList,'contractPrice',this.outContractNo[i].unitContractPrice)
+            this.$set(this.weighingList,'customer',this.outContractNo[i].buyer)
             this.weighingList.goodsNameKey = this.outContractNo[i].goodsNameKey
             this.weighingList.grade = this.outContractNo[i].grade
             this.weighingList.inOutType = this.outContractNo[i].inOutType

+ 76 - 1
src/views/outboundManagement/weighingManagementrecord.vue

@@ -75,6 +75,7 @@
             v-hasPermission="`outbound.acquisitionWeightOut.view`">打印</el-button>
           <el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
             v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
+             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称皮重'">换仓</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -106,6 +107,23 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
+     <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible"
+          width="30%"
+          :before-close="handleClose1">
+          <div style="text-align:center">
+             <el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+              @change="binNumberChange">
+              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+                :value="item.binNumber" />
+            </el-select>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -113,7 +131,8 @@
     getweighingList,
     selectWarehouseSelf,
     delelteWeighing,
-    getweighing
+    getweighing,
+    changeNo
   } from '@/model/outboundManagement/index'
   import {
     EventBus
@@ -151,6 +170,12 @@
         appendixIdss: [],
         addressUrls: [],
         compId: localStorage.getItem('ws-pf_compId'),
+        dialogVisible:false,
+        binNumber:"",
+        binnumberList:[],
+        cangweiNum:"",
+        positionId:"",
+        warehouseList1:[]
       }
     },
     activated() {
@@ -158,6 +183,55 @@
       this.showType = this.isShow
     },
     methods: {
+       binNumberChange(e){
+        this.binNumber = e
+        for(let i = 0 ; i < this.binnumberList.length ; i++){
+          if(this.binNumber == this.binnumberList[i].binNumber){
+            this.positionId = this.binnumberList[i].id
+          }
+        }
+      },
+      handleClose1(){
+        this.dialogVisible = false
+      },
+      exchange(row){
+          for(let i = 0 ; i < this.warehouseList1.length; i++ ){
+            if(this.warehouseName == this.warehouseList1[i].warehouseName){
+              		this.binnumberList = this.warehouseList1[i].positionInfos
+            }
+          }
+            this.id = row.id
+            this.binNumber = row.binNumber
+            this.cangweiNum = row.binNumber
+            this.dialogVisible = true
+       },
+       dialogVisibleconfirm(){
+        if(this.binNumber == this.cangweiNum){
+          this.$message.error("已是该仓位无需修改")
+          return
+        }
+        this.$confirm(`确定修改仓位?`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+            // let _obj = JSON.parse(this.warehouseInOutDetail)
+            // _obj.binNumber = this.binNumber
+              changeNo({id:this.id,changePositionId:this.positionId,changeBinNumer:this.binNumber}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改仓位成功',
+                })
+                this.getList()
+                this.dialogVisible=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       warehouseNameChange(e) {
         // this.warehouseName = e
         console.log(this.warehouseList)
@@ -309,6 +383,7 @@
           })
           .toPromise()
           .then((response) => {
+            this.warehouseList1 = response
             this.warehouseList = []
             for (let i = 0; i < response.length; i++) {
               this.warehouseList.push({

+ 4 - 5
src/views/warehouse/warehouseManagementNoWeight.vue

@@ -281,7 +281,7 @@
       },
       binNumberChange(e){
 					for (let i = 0; i < this.binnumberList.length; i++) {
-						if(this.binnumberList[i].binNumber==e){
+						if(this.binnumberList[i].binNumber == e){
 							this.deptBudgetList.positionId=this.binnumberList[i].id
 						}
 					}
@@ -294,10 +294,9 @@
 							this.binnumberList = response.warehousePositionInfoList
               this.$forceUpdate()
 						})
-         this.id=row.id
-         this.warehouseInOutDetail= JSON.stringify(row.warehouseInOutDetail),
-         this.dialogVisible=true
-
+         this.id = row.id
+         this.warehouseInOutDetail = JSON.stringify(row.warehouseInOutDetail),
+         this.dialogVisible = true
        },
       datechange() {
         this.getList( this.$route.query.baseId,

+ 11 - 7
src/views/warehousenew/warehouseManagementList.vue

@@ -221,9 +221,13 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="截止日期">
-              <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择截止日期" v-model="parameter.endDate">
+              <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate">
               </el-date-picker>
             </el-form-item>
+              <!-- <el-form-item label="截止日期1">
+              <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate1">
+              </el-date-picker>
+            </el-form-item> -->
             <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName">
               <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable clearable>
@@ -354,7 +358,9 @@
         var strDate = date.getDate()
         var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
         this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
-        this.parameter.endDate = '' + year + '-' + month + '-' + strDate
+        // this.parameter.endDate = '' + year + '-' + month + '-' + strDate
+        this.parameter.endDate = Date.now()
+        // this.parameter.endDate1 = Date.now()
         this.$forceUpdate();
         this.isShowPrintType = true
       },
@@ -364,7 +370,6 @@
         this.isShowPrintType = false
       },
       async submitClick() {
-       
         if (!this.parameter.radio && this.headerText == '打印记录') {
           this.$message.error('请选择打印的类型')
           return
@@ -377,10 +382,6 @@
           this.$message.error('请选择打印的截止日期')
           return
         }
-        if (new Date(this.parameter.endDate).getTime() < new Date(this.parameter.startDate).getTime()) {
-          this.$message.error('截止日期输入错误')
-          return
-        }
         if (!this.parameter.warehouseName) {
           this.$message.error('请选择所要打印的仓库')
           return
@@ -388,7 +389,10 @@
          if(this.parameter.warehouseName == '全部仓库'){
           this.parameter.warehouseName = ''
         }
+        let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
+        this.parameter.endDate = enddate.split(' ')[0].replace('/' ,'-').replace('/','-')
         this.parameter.warehouseName = this.parameter.warehouseName.replace('(临)','')
+         this.isShowPrintType = false
         if (this.headerText == '导出记录') {
           if (this.parameter.radio == 3) {
             const {