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

public/static/inspection.html

@@ -51,13 +51,15 @@
         margin: 10px 0;
 
       }
-      img,.left {
+
+      img,
+      .left {
         width: 110px;
         height: 110px;
         /* margin-right: 118px; */
         position: absolute;
-          right: 20px;
-          top: 12px;
+        right: 20px;
+        top: 12px;
       }
 
       .config {
@@ -70,8 +72,8 @@
 
       .title {
         text-align: center;
-    font-size: 36px;
-    font-weight: 500;
+        font-size: 36px;
+        font-weight: 500;
       }
 
       .number {
@@ -86,7 +88,7 @@
 
       .small-content {
         width: 300px;
-     /*   margin: 0 auto;
+        /*   margin: 0 auto;
         border: 1px solid #ccc;
         padding: 20px 20px 160px 20px;
         position: absolute;
@@ -106,7 +108,8 @@
         justify-content: space-between;
         align-items: center;
       }
-      .numberNo{
+
+      .numberNo {
         font-size: 36px;
       }
 
@@ -119,12 +122,14 @@
       .small-img {
         margin-right: 0;
       }
-      .sign{
+
+      .sign {
         margin-right: 100px;
       }
-      .small-code{
+
+      .small-code {
         position: relative;
-        left:calc(50% - 55px)
+        left: calc(50% - 55px)
       }
     </style>
   </head>
@@ -133,11 +138,11 @@
       <div class="content" v-if="bigContent">
         <div>
 
-        <div class="title">{{tableData.compName}}</div>
-        <div class="title">粮食质检单</div>
-        <div class="left">
-          <img :src="tableData.codeUrl " alt="">
-        </div>
+          <div class="title">{{tableData.compName}}</div>
+          <div class="title">粮食质检单</div>
+          <div class="left">
+            <img :src="tableData.codeUrl " alt="">
+          </div>
         </div>
 
         <div class="number">{{tableData.qualityNo}}</div>
@@ -189,8 +194,8 @@
             <td class="col">{{tableData.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.mildewGrain}}</td>
-            <td v-if="tableData.paramType == '1'"  class="col col-bgc">扣杂</td>
-            <td v-if="tableData.paramType == '1'"  class="col">{{tableData.buckleMiscellaneous}}</td>
+            <td v-if="tableData.paramType == '1'" class="col col-bgc">扣杂</td>
+            <td v-if="tableData.paramType == '1'" class="col">{{tableData.buckleMiscellaneous}}</td>
             <td v-if="tableData.paramType == '1'" class="col col-bgc" colspan="1">购粮性质</td>
             <td v-else class="col col-bgc" colspan="2">购粮性质</td>
             <td v-if="tableData.paramType == '1'" class="col" colspan="1">{{ tableData.natureOfGrainPurchase }}</td>
@@ -225,7 +230,7 @@
           <div class="numberNo">{{tableData.qualityNo.substring(tableData.qualityNo.length - 3)}}</div>
           <div>粮食质检单</div>
         </div>
-         <img :src="tableData.codeUrl " alt="" class="small-code">
+        <img :src="tableData.codeUrl " alt="" class="small-code">
         <div class="small-row">
           <div>编号：</div>
           <div>{{tableData.qualityNo}}</div>
@@ -285,7 +290,7 @@
         <div class="small-row">
           <div v-if="tableData.confirm == '1'">单价（元/公斤）：</div>
           <div v-else>待定单价（元/公斤）：</div>
-          <div  v-if="tableData.type == '潮粮'">
+          <div v-if="tableData.type == '潮粮'">
             {{tableData.tidalGrainPrice}}
           </div>
           <div v-if="tableData.type == '干粮'">
@@ -321,12 +326,12 @@
           <div>收货单位签名或盖章:</div>
         </div>
         <div class="small-row">
-         <div class="sign">客户签名:</div>
+          <div class="sign">客户签名:</div>
         </div>
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
@@ -336,7 +341,7 @@
         name: "",
         bigContent: false,
         smallContent: false,
-        printData :{},
+        printData: {},
       },
       computed: {},
       methods: {
@@ -378,7 +383,7 @@
         console.log(_data)
         this.tableData = JSON.parse(_data)
         console.log(this.tableData)
-        document.title="粮食质检单"
+        document.title = "粮食质检单"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

public/static/payprint.html

@@ -14,9 +14,11 @@
         height: 88vh;
         position: relative;
       }
-      .simple{
+
+      .simple {
         height: 120vh !important;
       }
+
       .content {
         width: 1000px;
         margin: auto;
@@ -48,7 +50,8 @@
         height: 80px;
         /* margin-right: 118px; */
       }
-      .leftimg{
+
+      .leftimg {
         width: 80px;
         height: 80px;
         position: absolute;
@@ -73,11 +76,12 @@
         text-align: right;
         margin-bottom: 10px;
       }
+
       .number1 {
-    text-align: right;
-    margin-bottom: 10px;
-    margin-top: 60px;
-}
+        text-align: right;
+        margin-bottom: 10px;
+        margin-top: 60px;
+      }
 
       .small-row {
         display: flex;
@@ -292,7 +296,9 @@
                   <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].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">
@@ -416,14 +422,14 @@
             </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 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>
@@ -744,13 +750,13 @@
 
         <div v-if="isShowPrintType4" class="part2">
           <div>
-        
-          <div class="title">入库检斤单</div>
-          <div class="leftimg">
-            <img :src="tableData.codeUrl" alt="">
+
+            <div class="title">入库检斤单</div>
+            <div class="leftimg">
+              <img :src="tableData.codeUrl" alt="">
+            </div>
+            <div class="number1">{{tableData.number}}</div>
           </div>
-          <div class="number1">{{tableData.number}}</div>
-        </div>
           <table class="table">
             <tr class="row">
               <td class="col col-bgc">客户姓名</td>
@@ -1064,7 +1070,7 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
@@ -1074,7 +1080,7 @@
         isShowPrintType2: false,
         isShowPrintType3: false,
         isShowPrintType4: false,
-        isShowPrintType5:false,
+        isShowPrintType5: false,
         showType: [],
         printData: {},
         printData1: [],
@@ -1135,7 +1141,8 @@
           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) this.printData1[i]
+              .identityAuthenticationInfo.compAddress = ''
             if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
               this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
                 .identityAuthenticationInfo
@@ -1211,9 +1218,9 @@
               case '打印检斤单':
                 this.isShowPrintType4 = !this.isShowPrintType4
                 break
-                case '打印回执单':
-                  this.isShowPrintType5 = !this.isShowPrintType5
-                  break
+              case '打印回执单':
+                this.isShowPrintType5 = !this.isShowPrintType5
+                break
             }
           }
         } else {

public/static/print.html

@@ -1,41 +1,41 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-  <meta charset="utf-8">
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-  <title></title>
-  <style>
-    .content {
-      text-align: center;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-    }
+  <head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <title></title>
+    <style>
+      .content {
+        text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+      }
 
-    .title {
-      width: 600px;
-      position: relative;
-      /* border-top: 1px solid #EBEEF5;
+      .title {
+        width: 600px;
+        position: relative;
+        /* border-top: 1px solid #EBEEF5;
       border-left: 1px solid #EBEEF5;
       border-right: 1px solid #EBEEF5; */
-      /* padding: 20px; */
-      box-sizing: border-box;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
+        /* padding: 20px; */
+        box-sizing: border-box;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
 
-    .name {
-      font-size: 16px;
-      font-weight: 500;
-      color: #323233;
-      margin: 10px;
-    }
+      .name {
+        font-size: 16px;
+        font-weight: 500;
+        color: #323233;
+        margin: 10px;
+      }
 
-    .price {
-      /* position: absolute;
+      .price {
+        /* position: absolute;
       right: 10px;
       bottom: 0;
       margin: auto;
@@ -43,177 +43,193 @@
       top: 0;
       display: flex;
     align-items: center; */
-    }
-    .tableBox {
-      width: 80px;
-      border-left: 1px solid #ccc;
-      /* border-right: 1px solid #ccc; */
-    }
-    .tableBox tr {
-      font-size: 12px;
-      padding: 0 !important;
-      display: flow-root;
-      /* border-left:1px solid #ccc; */
-      /* border-right:1px solid #ccc;*/
-      border-bottom:1px solid #ccc; 
-      display: flex;
-      justify-content: space-between;
-      padding-right: 10px;
-    }
+      }
 
-    .tableBox td {
-      font-size: 12px;
-      padding: 0 !important;
-    }
+      .tableBox {
+        width: 80px;
+        border-left: 1px solid #ccc;
+        /* border-right: 1px solid #ccc; */
+      }
 
-    .tableBox .cell {
-      text-align: center;
-      padding: 0!important;
-      line-height: 22px;
-      /* margin:0 2px!important; */
-    }
-    .table-row{
-      display: flex;
-      border-top: 1px solid #ccc;
-    }
-    .el-table--scrollable-x .el-table__body-wrapper{
-      overflow: hidden!important;
-    }
-    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-    border: 0;
-    padding: 0;
-    text-overflow: initial;
-    border-right: 1px solid #ccc;
-}
-.el-table__row td:nth-of-type(1){
-  width: 40%;
-  /* border-right: 1px solid #ccc!important; */
-  background: #cccccc3d;
-}
-.el-table__row td:nth-of-type(2){
-  width: 60%;
-}
-.el-table::before {
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 0px;
-}
-.content0{
-  /* margin-bottom: 30vh; */
-  /* padding-top: 5vh; */
-  /* background-color: powderblue; */
-}
-.content1{
-  /* margin-bottom: 20vh; */
-  /* padding-top: 5vh; */
-  margin-top: 15vh;
-/* background: palegreen; */
-}
-.content2{
-  /* padding-top: 5vh; */
-  /* margin-bottom: 30vh; */
-  margin-top: 15vh;
-  /* background: yellow; */
-}
-.content3{
-  /* padding-top: 10px; */
-  margin-top: 15vh;
-  /* background-color: red; */
-}
-.has-gutter th:nth-of-type(1){
-  width: 40%;
-}
-.has-gutter th:nth-of-type(2){
-  width: 60%;
-}
-.tableBox7 tr{
-border-right: 1px solid #ccc!important;
-}
-  </style>
-</head>
+      .tableBox tr {
+        font-size: 12px;
+        padding: 0 !important;
+        display: flow-root;
+        /* border-left:1px solid #ccc; */
+        /* border-right:1px solid #ccc;*/
+        border-bottom: 1px solid #ccc;
+        display: flex;
+        justify-content: space-between;
+        padding-right: 10px;
+      }
 
-<body>
-  <div id="app">
-    <div class="content" :class="'content'+index" v-for="(item,index) in 4">
-      <div class="title">
-        <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
-        <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
-        <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
-        <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
-        <div class="price">价格单位：元/公斤</div>
-      </div>
-      <div class="table-row" >
-        <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
-          <el-table-column prop="waterMin" label="水分" header-align="center">
-          </el-table-column>
-          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
+      .tableBox td {
+        font-size: 12px;
+        padding: 0 !important;
+      }
+
+      .tableBox .cell {
+        text-align: center;
+        padding: 0 !important;
+        line-height: 22px;
+        /* margin:0 2px!important; */
+      }
+
+      .table-row {
+        display: flex;
+        border-top: 1px solid #ccc;
+      }
+
+      .el-table--scrollable-x .el-table__body-wrapper {
+        overflow: hidden !important;
+      }
+
+      .el-table td.el-table__cell,
+      .el-table th.el-table__cell.is-leaf {
+        border: 0;
+        padding: 0;
+        text-overflow: initial;
+        border-right: 1px solid #ccc;
+      }
+
+      .el-table__row td:nth-of-type(1) {
+        width: 40%;
+        /* border-right: 1px solid #ccc!important; */
+        background: #cccccc3d;
+      }
+
+      .el-table__row td:nth-of-type(2) {
+        width: 60%;
+      }
+
+      .el-table::before {
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        height: 0px;
+      }
+
+      .content0 {
+        /* margin-bottom: 30vh; */
+        /* padding-top: 5vh; */
+        /* background-color: powderblue; */
+      }
+
+      .content1 {
+        /* margin-bottom: 20vh; */
+        /* padding-top: 5vh; */
+        margin-top: 15vh;
+        /* background: palegreen; */
+      }
+
+      .content2 {
+        /* padding-top: 5vh; */
+        /* margin-bottom: 30vh; */
+        margin-top: 15vh;
+        /* background: yellow; */
+      }
+
+      .content3 {
+        /* padding-top: 10px; */
+        margin-top: 15vh;
+        /* background-color: red; */
+      }
+
+      .has-gutter th:nth-of-type(1) {
+        width: 40%;
+      }
+
+      .has-gutter th:nth-of-type(2) {
+        width: 60%;
+      }
+
+      .tableBox7 tr {
+        border-right: 1px solid #ccc !important;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="app">
+      <div class="content" :class="'content'+index" v-for="(item,index) in 4">
+        <div class="title">
+          <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
+          <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
+          <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
+          <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
+          <div class="price">价格单位：元/公斤</div>
+        </div>
+        <div class="table-row">
+          <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
+            <el-table-column prop="waterMin" label="水分" header-align="center">
+            </el-table-column>
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
             </el-table-column> -->
-          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
-          </el-table-column>
-          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
-          </el-table-column>
-        </el-table>
-        <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
-          <el-table-column prop="waterMin" label="水分" header-align="center">
-          </el-table-column>
-          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
+            </el-table-column>
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
+            <el-table-column prop="waterMin" label="水分" header-align="center">
+            </el-table-column>
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
            </el-table-column> -->
-          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
-          </el-table-column>
-          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
-          </el-table-column>
-        </el-table>
-        <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
-          <el-table-column prop="waterMin" label="水分" header-align="center">
-          </el-table-column>
-          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
+            </el-table-column>
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
+            <el-table-column prop="waterMin" label="水分" header-align="center">
+            </el-table-column>
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
            </el-table-column> -->
-          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
-          </el-table-column>
-          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
-          </el-table-column>
-        </el-table>
-        <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
-          <el-table-column prop="waterMin" label="水分" header-align="center">
-          </el-table-column>
-          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
+            </el-table-column>
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
+            <el-table-column prop="waterMin" label="水分" header-align="center">
+            </el-table-column>
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
            </el-table-column> -->
-          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
-          </el-table-column>
-          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
-          </el-table-column>
-        </el-table>
-        <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
-          <el-table-column prop="waterMin" label="水分" header-align="center">
-          </el-table-column>
-          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
+            </el-table-column>
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
+            <el-table-column prop="waterMin" label="水分" header-align="center">
+            </el-table-column>
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
            </el-table-column> -->
-          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
-          </el-table-column>
-          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
-          </el-table-column>
-          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
-          </el-table-column>
-        </el-table>
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
+            </el-table-column>
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
+            </el-table-column>
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
+            </el-table-column>
+          </el-table>
           <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
             <el-table-column prop="waterMin" label="水分" header-align="center">
             </el-table-column>
@@ -242,97 +258,91 @@ border-right: 1px solid #ccc!important;
             <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
             </el-table-column>
           </el-table>
+        </div>
+
       </div>
 
     </div>
-
-  </div>
-</body>
-<script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-<script src="https://unpkg.com/element-ui/lib/index.js"></script>
-<script type="text/javascript">
-  new Vue({
-    el: '#app',
-    data: {
-      tableData: [],
-      tableData1: [],
-      tableData2: [],
-      tableData3: [],
-      tableData4: [],
-      tableData5: [],
-      tableData6: [],
-      tableData7: [],
-      name: "",
-      waterMin: '',
-      waterMax: ''
-    },
-    computed: {},
-    methods: {
-      tableRowClassName({
-        row,
-        rowIndex
-      }) {
-        if (rowIndex === 1) {
-          return 'warning-row';
-        } else if (rowIndex === 3) {
-          return 'success-row';
-        }
-        return '';
+  </body>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script type="text/javascript">
+    new Vue({
+      el: '#app',
+      data: {
+        tableData: [],
+        tableData1: [],
+        tableData2: [],
+        tableData3: [],
+        tableData4: [],
+        tableData5: [],
+        tableData6: [],
+        tableData7: [],
+        name: "",
+        waterMin: '',
+        waterMax: ''
       },
-      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];
+      computed: {},
+      methods: {
+        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);
         }
-        return (false);
-      }
-    },
-    mounted() {
-      let _data = localStorage.getItem("pricePrintList")
-      this.name = decodeURIComponent(this.getQueryVariable("name"))
-      console.log(_data)
-      this.tableData = JSON.parse(_data)
-      // 构造显示数据
-      this.waterMin = this.tableData[0].waterMin
-      this.waterMax = this.tableData[0].waterMax
-      document.title = this.name + '价格对照表（按水分）'
-      for (let i = 0; i < this.tableData.length; i++) {
-        // if(!this.tableData[i].waterMin.toString().split(".")[1]){
-        //   this.tableData[i].waterMin = this.tableData[i].waterMin+'.0'
-        // }
-        if (i <= 39) {
-          this.tableData1.push(this.tableData[i])
-        } else if (i <= 79 && i > 39) {
-          this.tableData2.push(this.tableData[i])
-        }
-        else if (i <= 119 && i > 79) {
-          this.tableData3.push(this.tableData[i])
-        }
-        else if (i <= 159 && i > 119) {
-          this.tableData4.push(this.tableData[i])
-        }
-        else if (i <= 199 && i > 159) {
-          this.tableData5.push(this.tableData[i])
-        }
-        else if (i <= 239 && i > 199) {
-          this.tableData6.push(this.tableData[i])
-        }
-        else if (i <= 279 && i > 239) {
-          this.tableData7.push(this.tableData[i])
+      },
+      mounted() {
+        let _data = localStorage.getItem("pricePrintList")
+        this.name = decodeURIComponent(this.getQueryVariable("name"))
+        console.log(_data)
+        this.tableData = JSON.parse(_data)
+        // 构造显示数据
+        this.waterMin = this.tableData[0].waterMin
+        this.waterMax = this.tableData[0].waterMax
+        document.title = this.name + '价格对照表（按水分）'
+        for (let i = 0; i < this.tableData.length; i++) {
+          // if(!this.tableData[i].waterMin.toString().split(".")[1]){
+          //   this.tableData[i].waterMin = this.tableData[i].waterMin+'.0'
+          // }
+          if (i <= 39) {
+            this.tableData1.push(this.tableData[i])
+          } else if (i <= 79 && i > 39) {
+            this.tableData2.push(this.tableData[i])
+          } else if (i <= 119 && i > 79) {
+            this.tableData3.push(this.tableData[i])
+          } else if (i <= 159 && i > 119) {
+            this.tableData4.push(this.tableData[i])
+          } else if (i <= 199 && i > 159) {
+            this.tableData5.push(this.tableData[i])
+          } else if (i <= 239 && i > 199) {
+            this.tableData6.push(this.tableData[i])
+          } else if (i <= 279 && i > 239) {
+            this.tableData7.push(this.tableData[i])
+          }
         }
-      }
-      // window.print()
-      window.onafterprint = function (event) {
-        window.history.back(-1)
-      };
-    },
-    watch: {
-    }
-  })
-</script>
+        // window.print()
+        window.onafterprint = function(event) {
+          window.history.back(-1)
+        };
+      },
+      watch: {}
+    })
+  </script>
 
-</html>
+</html>

public/static/tradeServicesPrint.html

@@ -49,6 +49,7 @@
         display: flex;
         margin: 10px 0;
       }
+
       .config {
         margin-right: 240px;
       }
@@ -66,6 +67,7 @@
         text-align: right;
         margin-bottom: 10px;
       }
+
       .sign {
         margin-right: 100px;
       }
@@ -76,214 +78,215 @@
         font-size: 16px;
         margin: 10px 0;
       }
+
       .header-top {
         display: flex;
         justify-content: space-between;
       }
+
       .center {
-       height: calc(100vh - 8px);
+        height: calc(100vh - 8px);
       }
     </style>
   </head>
   <body>
     <div id="app">
-      <div v-for="(item,index) in printData" >
+      <div v-for="(item,index) in printData">
         <div class="center">
-            <div class="title">磅码单</div>
-            <div class="title">{{item.code}}</div>
-            <table class="table">
-              <tr class="row">
-                <td class="col col-bgc">单位</td>
-                <td class="col" colspan="4">{{item.companyName}}</td>
-                <td class="col col-bgc">类型</td>
-                <td class="col" colspan="1">{{item.inOutType}}</td>
-                <td class="col col-bgc">车牌号</td>
-                <td class="col" colspan="1">{{item.carNo}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">仓库</td>
-                <td class="col" colspan="4">{{item.warehouseName}}</td>
-                <td class="col col-bgc">仓位</td>
-                <td class="col" colspan="1">{{item.binNumber}}</td>
-                <td class="col col-bgc">货名</td>
-                <td class="col" colspan="1">{{item.goodsName}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">毛重（公斤）</td>
-                <td class="col" colspan="1">{{item.grossWeight}}</td>
-                <td class="col col-bgc">皮重（公斤）</td>
-                <td class="col" colspan="2">{{item.tare}}</td>
-                <td class="col col-bgc">扣重（公斤）</td>
-                <td class="col" colspan="1">{{item.weight}}</td>
-                <td class="col col-bgc">净重（公斤）</td>
-                <td class="col" colspan="1">{{item.netWeight}}</td>
-              </tr>
-            </table> 
-            <div class="bottom">
-              <div style='justify-content: space-between;' class="bottom-row1">
-                <div class="config">毛检：{{item.secretaryWeigher}}皮检：{{item.skinInspector}}</div>
-                <div class="autograph">日期：{{item.inOutDate}}</div>
-              </div>
+          <div class="title">磅码单</div>
+          <div class="title">{{item.code}}</div>
+          <table class="table">
+            <tr class="row">
+              <td class="col col-bgc">单位</td>
+              <td class="col" colspan="4">{{item.companyName}}</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col" colspan="1">{{item.inOutType}}</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col" colspan="1">{{item.carNo}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">仓库</td>
+              <td class="col" colspan="4">{{item.warehouseName}}</td>
+              <td class="col col-bgc">仓位</td>
+              <td class="col" colspan="1">{{item.binNumber}}</td>
+              <td class="col col-bgc">货名</td>
+              <td class="col" colspan="1">{{item.goodsName}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">毛重（公斤）</td>
+              <td class="col" colspan="1">{{item.grossWeight}}</td>
+              <td class="col col-bgc">皮重（公斤）</td>
+              <td class="col" colspan="2">{{item.tare}}</td>
+              <td class="col col-bgc">扣重（公斤）</td>
+              <td class="col" colspan="1">{{item.weight}}</td>
+              <td class="col col-bgc">净重（公斤）</td>
+              <td class="col" colspan="1">{{item.netWeight}}</td>
+            </tr>
+          </table>
+          <div class="bottom">
+            <div style='justify-content: space-between;' class="bottom-row1">
+              <div class="config">毛检：{{item.secretaryWeigher}}皮检：{{item.skinInspector}}</div>
+              <div class="autograph">日期：{{item.inOutDate}}</div>
             </div>
+          </div>
         </div>
       </div>
       <div v-for="(item,index) in printData1" :key="index">
-      <div class="center">
-        <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
-        <div class="header">
-           <div>单位名称：{{item.compName}}</div>
-        </div>
-        <div class="header-top">
-          <div>单位：公斤/元</div>
-          <div>No.</div>
-        </div>
-        <div class="header-top">
-          <div>开票日期：{{item.createDate}}</div>
-          <div class="number">{{item.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">{{ item.compName}}</td>
-            <td rowspan="4" class="col col-bgc">卖方</td>
-            <td class="col col-bgc">姓名</td>
-            <td class="col" colspan="4">{{ item.customerName}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc">税务登记号</td>
-            <td class="col" colspan="3">{{ item.taxRegistrationNo}}</td>
-            <td class="col col-bgc">身份证号</td>
-            <td class="col" colspan="4">{{ item.identityAuthenticationInfo.customerNumberCard}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc">业务编号</td>
-            <td class="col" colspan="3">{{ item.paymentNo}}</td>
-            <td class="col col-bgc">卡号</td>
-            <td class="col" colspan="4">{{item.identityAuthenticationInfo.bankDeposit}}{{item.identityAuthenticationInfo.bankCard}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc">收货仓库</td>
-            <td class="col" colspan="3">{{item.warehouseName}}</td>
-            <td class="col col-bgc">地址</td>
-            <td class="col" colspan="4">{{item.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">{{ item.goodsName}}</td>
-            <td class="col">{{ item.type}}</td>
-            <td class="col">{{ item.qualityInspectionManagement.grade}}</td>
-            <td class="col">{{ item.qualityInspectionManagement.waterContent}}</td>
-            <td class="col">{{ item.qualityInspectionManagement.impurity}}</td>
-            <td class="col">{{ item.grossWeight}}</td>
-            <td class="col">{{ item.tare}}</td>
-            <td class="col" v-if="item.type == '干粮'">{{item.weighingManagement.buckleMiscellaneous}}</td>
-            <td class="col" v-if="item.type == '潮粮'">0</td>
-            <td class="col" v-if="item.type == '干粮'">0</td>
-            <td class="col" v-if="item.type == '潮粮'">{{item.netWeight}}</td>
-            <td class="col">{{item.pureWeight}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc"  v-if="item.type == '潮粮'">净重单价</td>
-            <td class="col col-bgc" v-if="item.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">卸车扣款</td>
-          </tr>
-          <tr class="row">
-            <td class="col " v-if="item.type == '潮粮'">{{item.tidalGrainPrice}}</td>
-            <td class="col " v-if="item.type == '干粮'">{{item.qualityInspectionManagement.dryGrainPrice}}</td>
-            <td class="col ">{{ item.unitDeduction}}</td>
-            <td class="col ">{{ item.grainMoney}}</td>
-            <td class="col ">{{ item.weighingSubsidy}}</td>
-            <td class="col ">{{ item.freightSubsidy}}</td>
-            <td class="col ">{{ item.unloadSubsidy}}</td>
-            <td class="col ">{{ item.otherSubsidy}}</td>
-            <td class="col ">{{ item.weighingDeduction}}</td>
-            <td class="col ">{{ item.freightDeduction}}</td>
-            <td class="col ">{{ item.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">购粮性质</td>
-            <td class="col col-bgc">车牌号</td>
-            <td class="col col-bgc" colspan="5">记事</td>
-          </tr>
-          <tr class="row">
-            <td class="col ">{{ item.qualityDeduction}}</td>
-            <td class="col ">{{ item.otherDeduction}}</td>
-            <td class="col ">{{ item.calculationPayable}}</td>
-            <td class="col ">{{ item.qualityInspectionManagement.natureOfGrainPurchase}}</td>
-            <td class="col ">{{ item.carNo}}</td>
-            <td class="col " colspan="5">{{ item.remarks}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc" colspan="3">人民币（大写）</td>
-            <td class="col " colspan="7">{{item.capitalize}}</td>
-    
-          </tr>
-        </table>
-        <div class="bottom">
-          <div class="bottom-row1">
-            <div>质检：{{ item.qualityInspectionManagement.qualityInspector}}</div>
-            <div>毛检：{{ item.weighingManagement.secretaryWeigher}}</div>
-            <div>皮检：{{ item.weighingManagement.skinInspector}}</div>
-            <div>结算：{{ item.settlementClerk}}</div>
-            <div>付款：{{ item.cashier}}</div>
-            <div>复点：{{ }}</div>
-            <div></div>
+        <div class="center">
+          <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
+          <div class="header">
+            <div>单位名称：{{item.compName}}</div>
           </div>
-          <div class="bottom-row2">
-            <!-- <div class="left">
+          <div class="header-top">
+            <div>单位：公斤/元</div>
+            <div>No.</div>
+          </div>
+          <div class="header-top">
+            <div>开票日期：{{item.createDate}}</div>
+            <div class="number">{{item.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">{{ item.compName}}</td>
+              <td rowspan="4" class="col col-bgc">卖方</td>
+              <td class="col col-bgc">姓名</td>
+              <td class="col" colspan="4">{{ item.customerName}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">税务登记号</td>
+              <td class="col" colspan="3">{{ item.taxRegistrationNo}}</td>
+              <td class="col col-bgc">身份证号</td>
+              <td class="col" colspan="4">{{ item.identityAuthenticationInfo.customerNumberCard}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">业务编号</td>
+              <td class="col" colspan="3">{{ item.paymentNo}}</td>
+              <td class="col col-bgc">卡号</td>
+              <td class="col" colspan="4">
+                {{item.identityAuthenticationInfo.bankDeposit}}{{item.identityAuthenticationInfo.bankCard}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货仓库</td>
+              <td class="col" colspan="3">{{item.warehouseName}}</td>
+              <td class="col col-bgc">地址</td>
+              <td class="col" colspan="4">{{item.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">{{ item.goodsName}}</td>
+              <td class="col">{{ item.type}}</td>
+              <td class="col">{{ item.qualityInspectionManagement.grade}}</td>
+              <td class="col">{{ item.qualityInspectionManagement.waterContent}}</td>
+              <td class="col">{{ item.qualityInspectionManagement.impurity}}</td>
+              <td class="col">{{ item.grossWeight}}</td>
+              <td class="col">{{ item.tare}}</td>
+              <td class="col" v-if="item.type == '干粮'">{{item.weighingManagement.buckleMiscellaneous}}</td>
+              <td class="col" v-if="item.type == '潮粮'">0</td>
+              <td class="col" v-if="item.type == '干粮'">0</td>
+              <td class="col" v-if="item.type == '潮粮'">{{item.netWeight}}</td>
+              <td class="col">{{item.pureWeight}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc" v-if="item.type == '潮粮'">净重单价</td>
+              <td class="col col-bgc" v-if="item.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">卸车扣款</td>
+            </tr>
+            <tr class="row">
+              <td class="col " v-if="item.type == '潮粮'">{{item.tidalGrainPrice}}</td>
+              <td class="col " v-if="item.type == '干粮'">{{item.qualityInspectionManagement.dryGrainPrice}}</td>
+              <td class="col ">{{ item.unitDeduction}}</td>
+              <td class="col ">{{ item.grainMoney}}</td>
+              <td class="col ">{{ item.weighingSubsidy}}</td>
+              <td class="col ">{{ item.freightSubsidy}}</td>
+              <td class="col ">{{ item.unloadSubsidy}}</td>
+              <td class="col ">{{ item.otherSubsidy}}</td>
+              <td class="col ">{{ item.weighingDeduction}}</td>
+              <td class="col ">{{ item.freightDeduction}}</td>
+              <td class="col ">{{ item.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">购粮性质</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col col-bgc" colspan="5">记事</td>
+            </tr>
+            <tr class="row">
+              <td class="col ">{{ item.qualityDeduction}}</td>
+              <td class="col ">{{ item.otherDeduction}}</td>
+              <td class="col ">{{ item.calculationPayable}}</td>
+              <td class="col ">{{ item.qualityInspectionManagement.natureOfGrainPurchase}}</td>
+              <td class="col ">{{ item.carNo}}</td>
+              <td class="col " colspan="5">{{ item.remarks}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc" colspan="3">人民币（大写）</td>
+              <td class="col " colspan="7">{{item.capitalize}}</td>
+
+            </tr>
+          </table>
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>质检：{{ item.qualityInspectionManagement.qualityInspector}}</div>
+              <div>毛检：{{ item.weighingManagement.secretaryWeigher}}</div>
+              <div>皮检：{{ item.weighingManagement.skinInspector}}</div>
+              <div>结算：{{ item.settlementClerk}}</div>
+              <div>付款：{{ item.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> 
+              <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>
     </div>
-    </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',
       data: {
-        printData: [
-            {
-                identityAuthenticationInfo:{},
-                qualityInspectionManagement:{},
-                weighingManagement:{},
-                customerNumberCard:{},
-            }
-        ],
+        printData: [{
+          identityAuthenticationInfo: {},
+          qualityInspectionManagement: {},
+          weighingManagement: {},
+          customerNumberCard: {},
+        }],
         printData1: [],
         date: '',
       },
@@ -321,8 +324,8 @@
         this.date = new Date().toLocaleString()
         this.printData = JSON.parse(sessionStorage.getItem('inOutRecord_printBD'))
         this.printData1 = JSON.parse(sessionStorage.getItem('inOutRecord_printJSD'))
-        console.log("磅单",this.printData)
-        console.log("结算单",this.printData1)
+        console.log("磅单", this.printData)
+        console.log("结算单", this.printData1)
         // document.title = this.printData.compName + '结算凭证'
         window.print()
         window.onafterprint = function(event) {

public/static/warehouseBatchPrint.html

@@ -14,15 +14,15 @@
       }
 
       #app {
-         /* height: 98vh;  */
-        position: relative; 
+        /* height: 98vh;  */
+        position: relative;
       }
 
       .content {
         width: 1000px;
         padding: 70px 20px 20px 20px;
         font-size: 22px;
-        height: calc(100vh - 7.5vh) ;
+        height: calc(100vh - 7.5vh);
         top: 0;
         bottom: 0;
         left: 0;
@@ -49,13 +49,15 @@
       .bottom-row2 {
         display: flex;
       }
+
       .config {
         margin-top: 10px;
         margin-right: 240px;
       }
-      .autograph{
+
+      .autograph {
         margin-top: 10px;
-     }
+      }
 
       .title {
         text-align: center;
@@ -67,15 +69,17 @@
   </head>
   <body>
     <div id="app">
-      <div class="content"  v-for="(item,index) in tableData">
+      <div class="content" v-for="(item,index) in tableData">
         <div v-if="item.inOutFlag == '2'" class="title">{{item.companyName}}</div>
-        <div v-else  class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}</div>
+        <div v-else class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}
+        </div>
         <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">送货单位</td>
-            <td class="col" colspan="4">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.warehouseName}}</td>
+            <td class="col" colspan="4">
+              {{item.contractManagementInfo?item.contractManagementInfo.seller:item.warehouseName}}</td>
             <td class="col col-bgc">车牌号</td>
             <td class="col" colspan="1">{{item.carNo}}</td>
             <td class="col col-bgc">货名</td>
@@ -83,9 +87,10 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
-            <td class="col" colspan="4">{{item.contractManagementInfo?item.contractManagementInfo.buyer:item.receiveWarehouse}}</td>
+            <td class="col" colspan="4">
+              {{item.contractManagementInfo?item.contractManagementInfo.buyer:item.receiveWarehouse}}</td>
             <td class="col col-bgc">类型</td>
-            <td class="col"colspan="1">{{item.type}}</td>
+            <td class="col" colspan="1">{{item.type}}</td>
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="1">{{item.updateDate}}</td>
           </tr>
@@ -110,14 +115,13 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',
       data: {
-        tableData: {
-        },
+        tableData: {},
         name: "",
       },
       computed: {},

public/static/warehousePrint.html

@@ -238,7 +238,7 @@
 
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
@@ -301,7 +301,7 @@
         this.type = decodeURIComponent(this.getQueryVariable('type'))
         this.warehouseName = decodeURIComponent(this.getQueryVariable('warehouseName'))
         this.startDate = this.getQueryVariable('startDate')
-        this.endDate =this.getQueryVariable('endDate')
+        this.endDate = this.getQueryVariable('endDate')
         this.printData = JSON.parse(sessionStorage.getItem('inOutWarehouse_Print'))
         for (var count = 0; count < this.printData.length; count++) {
           this.maoZhong += this.printData[count].grossWeight

public/static/weightCheck.html

@@ -65,6 +65,7 @@
 
       .autograph {
         margin-top: 10px;
+        margin-right: 170px;
       }
 
       .bottom-row3 {
@@ -219,6 +220,7 @@
               </div> -->
                 <div class="config">收货单位签名或盖章：</div>
                 <div class="autograph">客户签名：</div>
+                <div class="autograph">司机签名：</div>
               </div>
               <!-- <div class="bottom-row3">扫一扫</div> -->
             </div>
@@ -311,6 +313,7 @@
               </div> -->
               <div class="config">收货单位签名或盖章：</div>
               <div class="autograph">客户签名：</div>
+              <div class="autograph">司机签名：</div>
             </div>
             <!-- <div class="bottom-row3">扫一扫</div> -->
           </div>
@@ -390,10 +393,11 @@
         <div class="small-row">
           <div class="sign">客户签名:</div>
         </div>
+       
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({

public/static/weightCheckInOut.html

@@ -60,9 +60,11 @@
         margin-top: 10px;
         margin-right: 240px;
       }
-      .autograph{
-    margin-top: 10px;
-     }
+
+      .autograph {
+        margin-top: 10px;
+      }
+
       .bottom-row3 {
         margin: 10px 0;
       }
@@ -115,7 +117,8 @@
       .small-img {
         margin-right: 0;
       }
-      .sign{
+
+      .sign {
         margin-right: 100px;
       }
     </style>
@@ -123,14 +126,16 @@
   <body>
     <div id="app">
       <div class="content" v-if="true">
-        <div v-if="tableData.inOutFlag == '2'"  class="title">{{tableData.companyName}}</div>
-        <div v-else  class="title">{{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.companyName}}</div>
+        <div v-if="tableData.inOutFlag == '2'" class="title">{{tableData.companyName}}</div>
+        <div v-else class="title">
+          {{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.companyName}}</div>
         <div v-if="tableData.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">送货单位</td>
-            <td class="col" colspan="4">{{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.warehouseName}}</td>
+            <td class="col" colspan="4">
+              {{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.warehouseName}}</td>
             <td class="col col-bgc">车牌号</td>
             <td class="col" colspan="1">{{tableData.carNo}}</td>
             <td class="col col-bgc">货名</td>
@@ -138,9 +143,11 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
-            <td class="col" colspan="4">{{tableData.contractManagementInfo?tableData.contractManagementInfo.buyer:tableData.receiveWarehouse}}</td>
+            <td class="col" colspan="4">
+              {{tableData.contractManagementInfo?tableData.contractManagementInfo.buyer:tableData.receiveWarehouse}}
+            </td>
             <td class="col col-bgc">类型</td>
-            <td class="col"colspan="1">{{tableData.type}}</td>
+            <td class="col" colspan="1">{{tableData.type}}</td>
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="1">{{tableData.updateDate}}</td>
           </tr>
@@ -150,9 +157,9 @@
             <td class="col col-bgc">皮重（吨）</td>
             <td class="col">{{tableData.tare}}</td>
             <td class="col col-bgc">扣重（吨）</td>
-            <td class="col" >{{tableData.deductionWeight}}</td>
+            <td class="col">{{tableData.deductionWeight}}</td>
             <td class="col col-bgc" colspan="2">净重（吨）</td>
-            <td class="col" >{{tableData.netWeight}}</td>
+            <td class="col">{{tableData.netWeight}}</td>
           </tr>
         </table>
         <div class="bottom">
@@ -167,7 +174,7 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
@@ -209,7 +216,7 @@
         // console.log("sssss",this.getQueryVariable("tableData"))
         // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
         // console.log("dfddd",_data)
-        let _data= JSON.parse(localStorage.getItem('ck_bd_printData'))            
+        let _data = JSON.parse(localStorage.getItem('ck_bd_printData'))
         let _type = this.getQueryVariable("type")
         if (_type == 2) {
           this.bigContent = true
@@ -218,7 +225,7 @@
           this.smallContent = true
           this.bigContent = false
         }
-        console.log(_data,"sddsd")
+        console.log(_data, "sddsd")
         this.tableData = _data
         console.log(this.tableData)
         document.title = "粮食检斤单"

public/static/weightCheckOut.html

@@ -163,9 +163,11 @@
             <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
             <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
             <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
-              {{tableData.boxNo}},{{tableData.boxNoOther}}</td>
+              {{tableData.boxNo}},{{tableData.boxNoOther}}
+            </td>
             <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
-              {{tableData.wingNumber}},{{tableData.wingNumberOther}}</td>
+              {{tableData.wingNumber}},{{tableData.wingNumberOther}}
+            </td>
             <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
           </tr>
         </table>
@@ -178,7 +180,7 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script type="text/javascript">
     new Vue({
@@ -221,7 +223,7 @@
       mounted() {
         // console.log(decodeURIComponent(this.getQueryVariable("tableData")))
         // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
-        let _data= JSON.parse(localStorage.getItem('ck_bd_printData1'))            
+        let _data = JSON.parse(localStorage.getItem('ck_bd_printData1'))
         let _type = this.getQueryVariable("type")
         if (_type == 2) {
           this.bigContent = true

src/views/contractManagement/salesContractAdd.vue

@@ -1159,7 +1159,7 @@
         //   return
         // }
         if (
-          this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+          this.deptBudgetList.contractGoodsInfo.mildewGrain &&
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
               '.'
             ) != -1 &&
@@ -1186,7 +1186,7 @@
         //   return
         // }
         if (
-          this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+          this.deptBudgetList.contractGoodsInfo.jiaorenli &&
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
             -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
@@ -1212,7 +1212,7 @@
         //   return
         // }
         if (
-          this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+          this.deptBudgetList.contractGoodsInfo.imperfectGrain &&
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
               '.'
             ) != -1 &&

src/views/home/index.vue

@@ -28,13 +28,13 @@
         <div class="content2">
           <el-row class="content2-aside">
             <h3 class="title" @click="contract(0)">采购合同完成进度</h3>
-            <el-col :span="12" class="chart-card" >
+            <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;" class="">
                 <div ref="myEchart1" style="height: 288px;" class="roseChart"></div>
                 <div class="bottom-tip">统计单位：吨</div>
               </div>
             </el-col>
-            <el-col :span="12" class="chart-card" >
+            <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart2" style="height: 288px;" class="roseChart"></div>
                 <div class="bottom-tip">统计单位：元</div>
@@ -80,19 +80,28 @@
               </div>
             </el-row>
             <el-row>
-              <h3>库存成本</h3>
+              <div style="display: flex;">
+                  <h3>头寸</h3>
+                   <h3 style="margin-left: 30px;">{{position}}吨</h3>
+              </div>
               <div class="content3">
                 <div class="left">
-                  <img src="../../../public/img/1637204557176-s4AMbBA8.png" alt="">
-                  <span>总库存量</span>
-                  <span class="content3-number blue">{{inventoryCost}}</span>
+                  <!-- <img src="../../../public/img/1637204557176-s4AMbBA8.png" alt=""> -->
+                  <span>实际库存</span>
+                  <span class="content3-number blue">{{physicalInventory}}</span>
+                  <span style="margin-top: 10px;">吨</span>
+                </div>
+                <div class="left">
+                  <!-- <img src="../../../public/img/1637204557176-s4AMbBA8.png" alt=""> -->
+                  <span>采购待执行（吨）</span>
+                  <span class="content3-number blue">{{procurementPending}}</span>
                   <span style="margin-top: 10px;">吨</span>
                 </div>
                 <div class="right">
-                  <img src="../../../public/img/1637204768818-70JRjz0H.png" alt="">
-                  <span>库存价值</span>
-                  <span class="content3-number yellow">{{inventoryValue}}</span>
-                  <span style="margin-top: 10px;">元</span>
+                  <!-- <img src="../../../public/img/1637204768818-70JRjz0H.png" alt=""> -->
+                  <span>销售待执行（吨）</span>
+                  <span class="content3-number yellow">{{salesPending}}</span>
+                  <span style="margin-top: 10px;">吨</span>
                 </div>
               </div>
             </el-row>
@@ -111,7 +120,7 @@
                 <div class="bottom-tip">统计单位：元</div>
               </div>
             </el-col>
-            <el-col :span="12" class="chart-card" >
+            <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart6" style="height: 288px;" class="roseChart" @click="contract(1)"></div>
                 <div class="bottom-tip">统计单位：元</div>
@@ -214,10 +223,12 @@
 
     data() {
       return {
+        physicalInventory :0,
+        procurementPending:0,
+        salesPending:0,
+        position:0,
         mapInfo: [],
         totalReserves: '',
-        inventoryCost: '',
-        inventoryValue: '',
         carCount1: '',
         carCount2: '',
         carCount3: '',
@@ -328,7 +339,7 @@
       },
 
     },
-    activated(){
+    activated() {
       // var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
       //      if ('WebSocket' in window) {
       //             if (process.env.NODE_ENV === 'production') {
@@ -358,18 +369,17 @@
       }
     },
     async mounted() {
-      var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
+      var staffId = JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
       // getAdminId().toPromise().then(response => {console.log(11111)})
       this.loading = false
       // WebSocket
       // this.$store.dispatch('setAdminId', response.data.data)
       if ('WebSocket' in window) {
         if (process.env.NODE_ENV === 'production') {
-          this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/'+staffId )
-        }
-        else {
+          this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + staffId)
+        } else {
           //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
-          this.websocket = new WebSocket('ws://192.168.1.119:9100/websocket/'+staffId )
+          this.websocket = new WebSocket('ws://192.168.1.119:9100/websocket/' + staffId)
         }
         this.initWebSocket()
       } else {
@@ -395,16 +405,18 @@
       //获取新闻列表
       // this.getNewList()
       gChartsData({
-        compId:localStorage.getItem('ws-pf_compId'),
-		seachMoth:'2021'
+        compId: localStorage.getItem('ws-pf_compId'),
+        seachMoth: '2021'
       }).toPromise().then(res => {
-        console.log('··············',res)
+        console.log('··············', res)
         this.chartsData = res
         this.carCount1 = res[6].biViewInfoList[0].count
         this.carCount2 = res[6].biViewInfoList[1].count
         this.carCount3 = res[6].biViewInfoList[2].count
-        this.inventoryCost = parseInt(res[7].biViewInfoList[0].count).toFixed(0)
-        this.inventoryValue = parseInt(res[7].biViewInfoList[1].count).toFixed(0)
+        this.physicalInventory = Number(res[7].biViewInfoList[0].count).toFixed(2)
+        this.procurementPending= Number(res[7].biViewInfoList[1].count).toFixed(2)
+        this.salesPending =  Number(res[7].biViewInfoList[2].count).toFixed(2)
+        this.position = Number(Number(this.physicalInventory)+Number(this.procurementPending) - Number(this.salesPending)).toFixed(2)
         this.totalReserves = res[8].biViewInfoList
         this.mapInfo = res[9]
         this.initCharts()
@@ -451,67 +463,72 @@
           this.number.news = news
         })
       },
-         initWebSocket () {
-           console.log(this.websocket)
-      // 连接错误
-      this.websocket.onerror = this.setErrorMessage
-      // 连接成功
-      this.websocket.onopen = this.setOnopenMessage
+      initWebSocket() {
+        console.log(this.websocket)
+        // 连接错误
+        this.websocket.onerror = this.setErrorMessage
+        // 连接成功
+        this.websocket.onopen = this.setOnopenMessage
 
-      // 收到消息的回调
-      this.websocket.onmessage = this.setOnmessageMessage
+        // 收到消息的回调
+        this.websocket.onmessage = this.setOnmessageMessage
 
-      // 连接关闭的回调
-      this.websocket.onclose = this.setOncloseMessage
+        // 连接关闭的回调
+        this.websocket.onclose = this.setOncloseMessage
 
-      // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
-      window.onbeforeunload = this.onbeforeunload
-    },
-    setErrorMessage () {
-      console.log('WebSocket连接发生错误   状态码：' +this.websocket.readyState)
-    },
-    setOnopenMessage () {
-      // console.log(this.websocket)
-      console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
-    },
-    setOnmessageMessage (event) {
-      // console.log(3333)
-      // 根据服务器推送的消息做自己的业务处理
-      console.log('服务端返回：' + event.data)
-      var msg = event.data.split('$')
-      var that = this
-      this.$notify.warning({
-        title: '新消息提醒',
-        message: msg[0],
-        duration: 0,
-        onClick() {
-          that.$router.push({
-            path: msg[1] }) // 你要跳转的路由 还可以传参 当然也可以通过其他方式跳转
-        }
-      })
-      var currentPage = that.$router.history.current.path
-      that.$router.push({ path: '/' })
-      that.$router.push({ path: currentPage })
-    },
-    setOncloseMessage () {
-      // console.log(this.websocket)
-      console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
-    },
-      //跳转
-      contract(index){
-         if(index == 0){
-            this.$router.push({
-              name:'buyContract'
-            })
-          }else if(index == 1){
-            this.$router.push({
-              name:'salesContract'
-            })
-          }else if(index == 3){
-            this.$router.push({
-              name:'warehouseManagementList'
-            })
+        // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
+        window.onbeforeunload = this.onbeforeunload
+      },
+      setErrorMessage() {
+        console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
+      },
+      setOnopenMessage() {
+        // console.log(this.websocket)
+        console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
+      },
+      setOnmessageMessage(event) {
+        // console.log(3333)
+        // 根据服务器推送的消息做自己的业务处理
+        console.log('服务端返回：' + event.data)
+        var msg = event.data.split('$')
+        var that = this
+        this.$notify.warning({
+          title: '新消息提醒',
+          message: msg[0],
+          duration: 0,
+          onClick() {
+            that.$router.push({
+              path: msg[1]
+            }) // 你要跳转的路由 还可以传参 当然也可以通过其他方式跳转
           }
+        })
+        var currentPage = that.$router.history.current.path
+        that.$router.push({
+          path: '/'
+        })
+        that.$router.push({
+          path: currentPage
+        })
+      },
+      setOncloseMessage() {
+        // console.log(this.websocket)
+        console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
+      },
+      //跳转
+      contract(index) {
+        if (index == 0) {
+          this.$router.push({
+            name: 'buyContract'
+          })
+        } else if (index == 1) {
+          this.$router.push({
+            name: 'salesContract'
+          })
+        } else if (index == 3) {
+          this.$router.push({
+            name: 'warehouseManagementList'
+          })
+        }
       },
       getTime() {
         const date = new Date();
@@ -551,12 +568,12 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已完成量',
-                value:Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2) ,
-                type:'采购合同'
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                type: '采购合同'
               }, {
                 name: '待完成量',
-                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2) ,
-                type:'采购合同'
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                type: '采购合同'
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
@@ -569,12 +586,12 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已开票',
-                value:Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
-                type:'采购合同'
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                type: '采购合同'
               }, {
                 name: '待开票',
-                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
-                type:'采购合同'
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                type: '采购合同'
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -590,8 +607,8 @@
                 type: '采购合同'
               }, {
                 name: '待付款',
-                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
-                   type: '采购合同'
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                type: '采购合同'
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -604,15 +621,15 @@
               data = [{
                 name: '已完成量',
                 value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
-                  type: '销售合同'
+                type: '销售合同'
               }, {
                 name: '待完成量',
-                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
               graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
-                break;
+              break;
             case 4:
               // 圆环图各环节的颜色
               color = ['#247ef4', '#3a3b40'];
@@ -725,7 +742,7 @@
             //  var a = params.dataIndex
             // console.log(params, '我被点击了');
             // app.dialogVisible = true
-           return
+            return
           })
         }
         console.log(this.totalReserves)
@@ -1892,7 +1909,8 @@
     .content2-middle {
       width: calc(100% - 720px);
       margin: 0 20px 0 15px;
-      min-width:910px ;
+      min-width: 910px;
+
       .left-card {
         display: flex;
         // background: green;
@@ -1950,7 +1968,7 @@
     justify-content: space-between;
     align-items: center;
     background: #2a2a2a;
-    padding: 10px 60px;
+    padding: 10px;
 
     .content3-number {
       margin-left: 40px;

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -51,7 +51,8 @@
             <td class="col">{{tableData.grossWeight}}</td>
             <td class="col col-bgc">皮重（公斤）</td>
             <td class="col">{{tableData.tare}}</td>
-            <!-- <td class="col " colspan="2"></td> -->
+            <td class="col ">扣重（公斤）</td>
+            <td class="col">{{tableData.buckleMiscellaneous}}</td>
             <td class="col col-bgc">净重（公斤）</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>
@@ -74,6 +75,7 @@
             </div>
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
+            <div class="autograph">司机签名：</div>
           </div>
           <div class="bottom-row3">扫一扫</div>
            <!-- <div class="bottom-row4">
@@ -164,6 +166,7 @@ export default{
     }
     .autograph{
         margin-top: 20px;
+        margin-right:240px;
     }
   }
 

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -591,6 +591,7 @@
             }
             this.amountNotPayable += this.modification[i].amountNotPayable
           }
+          this.amountNotPayable =this.amountNotPayable.toFixed(3)
           this.dialogFormVisible1 = true
         }
       },
@@ -600,6 +601,7 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择一条要付款的条目')
         } else {
+          this.money = Number(this.money).toFixed(2)
           if (
             this.money < 0 ||
             (String(this.money).indexOf('.') != -1 &&
@@ -628,7 +630,7 @@
             })
             return
           }
-          if (this.money > this.modification[0].amountNotPayable) {
+          if (Number(this.money) > Number(this.modification[0].amountNotPayable)) {
             this.$message({
               message: '付款金额不能大于未付金额！',
               type: 'warning',
@@ -1358,4 +1360,4 @@
     width: 430px;
     margin-left: 15px;
   }
-</style>
+  </style>

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -151,6 +151,8 @@
         <el-table-column width='120' class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column width='120' class="table_td" prop="amountEdReceivable" label="已收金额（元）">
         </el-table-column>
+        <el-table-column width='120' class="table_td" prop="amountNotReceivable" label="未收金额（元）">
+        </el-table-column>
         <el-table-column width='120' class="table_td" prop="alreadyInvoice" label=" 已开发票（元）">
           <template slot-scope="scope">
             <div class="inputChenge">
@@ -287,7 +289,8 @@
 
       <!-- 页数 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"></el-pagination>
     </div>
     <!-- 定金弹窗 -->
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
@@ -313,7 +316,8 @@
           <span>{{ uncollectedAmount1 }}</span>
         </el-form-item>
         <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
-          <el-input type='number' v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
+          <el-input type='number' step="0.01" v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal">
+          </el-input>
         </el-form-item>
         <el-form-item label="收款日期" prop="collectionDate" :label-width="formLabelWidth" class="deal">
           <ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
@@ -511,6 +515,8 @@
         accessoryTFs2: false,
         addressUrlArray: [],
         addressUrlArray1: [],
+        money: "",
+        weight: ""
       }
     },
     activated() {
@@ -519,8 +525,8 @@
       var month = now.getMonth(); //得到月份
       var date = now.getDate(); //得到日期
       month = month + 1;
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
+      month = month.toString().padStart(2, '0');
+      date = date.toString().padStart(2, '0');
       this.collectionDate = `${year}-${month}-${date}`;
       this.getList()
       this.showType = this.isShow
@@ -562,15 +568,15 @@
             type: 'warning',
           })
         } else {
-          var num = ''
+          var num = 0
           for (let i = 0; i < this.modification.length; i++) {
-            if (this.modification[i].status != '全部收款' && this.modification[i].status != '部分收款') {
-              this.$message({
-                message: '请选择已付款的条目',
-                type: 'warning',
-              })
-              return
-            }
+            // if (this.modification[i].status != '全部收款' && this.modification[i].status != '部分收款') {
+            //   this.$message({
+            //     message: '请选择已付款的条目',
+            //     type: 'warning',
+            //   })
+            //   return
+            // }
             num = (Number(this.modification[i].amountEdReceivable) - Number(this.modification[i].alreadyInvoice)) +
               Number(num)
           }
@@ -655,6 +661,7 @@
         this.currentPage = 1
         this.pageSize = 10
         this.tranProcessInfo = []
+        this.activeName = ""
         console.log('type', this.activeName)
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
@@ -670,11 +677,11 @@
                   })
                 }
               }
-              this.activeName = this.tranProcessInfo[0].name
-              this.tranType = this.tranProcessInfo[0].tranType
+              if (this.tranProcessInfo.length > 0) {
+                this.activeName = this.tranProcessInfo[0].name
+                this.tranType = this.tranProcessInfo[0].tranType
+              }
             }
-
-
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
@@ -837,7 +844,8 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (
-              index === 10 ||
+              // index === 10 ||
+              index === 8 ||
               index === 11 ||
               index === 13 ||
               index === 12
@@ -852,9 +860,24 @@
                     return prev
                   }
                 }, 0)
+                if (index == 11) {
+                  this.money = sums[index]
+                }
+                if (index == 8) {
+                  this.weight = sums[index]
+                }
               } else {
                 sums[index] = '元'
               }
+            } else if (index === 10) {
+              const values = data.map((item) => Number(item[column.property]))
+              if (!values.every((value) => isNaN(value))) {
+                if (this.money == 0 || this.weight == 0) {
+                  sums[index] = 0
+                } else {
+                  sums[index] = Number(this.money / this.weight).toFixed(2)
+                }
+              }
             } else {
               sums[index] = '--'
             }
@@ -864,7 +887,7 @@
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 9 ||
+                // index === 9 ||
                 index === 10 ||
                 index === 8
               ) {
@@ -878,9 +901,25 @@
                       return prev
                     }
                   }, 0)
+                  if (index == 8) {
+                    this.weight = sums[index]
+                  }
+                  if (index == 10) {
+                    this.money = sums[index]
+                  }
                 } else {
                   sums[index] = '元'
                 }
+              } else if (index === 9) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  if (this.money == 0 || this.weight == 0) {
+                    sums[index] = 0
+                  } else {
+                    sums[index] = Number(this.money / this.weight).toFixed(2)
+                  }
+                }
+
               } else {
                 sums[index] = '--'
               }
@@ -889,7 +928,9 @@
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 10 ||
+                index === 7 ||
+                index === 8 ||
+                // index === 10 ||
                 index === 13 ||
                 index === 12
               ) {
@@ -903,9 +944,24 @@
                       return prev
                     }
                   }, 0)
+                  if (index == 8) {
+                    this.weight = sums[index]
+                  }
+                  if (index == 11) {
+                    this.money = sums[index]
+                  }
                 } else {
                   sums[index] = '元'
                 }
+              } else if (index === 10) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  if (this.money == 0 || this.weight == 0) {
+                    sums[index] = 0
+                  } else {
+                    sums[index] = Number(this.money / this.weight).toFixed(2)
+                  }
+                }
               } else {
                 sums[index] = '--'
               }
@@ -915,7 +971,7 @@
               } else if (
                 index === 11 ||
                 index === 12 ||
-                index === 10 ||
+                // index === 10 ||
                 index === 9
               ) {
                 const values = data.map((item) => Number(item[column.property]))
@@ -928,9 +984,25 @@
                       return prev
                     }
                   }, 0)
+                  if (index == 9) {
+                    this.weight = sums[index]
+                  }
+                  if (index = 11) {
+                    this.money = sums[index]
+                  }
                 } else {
                   sums[index] = '元'
                 }
+              } else if (index == 10) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  if (this.money == 0 || this.weight == 0) {
+                    sums[index] = 0
+                  } else {
+                    sums[index] = Number(this.money / this.weight).toFixed(2)
+                  }
+
+                }
               } else {
                 sums[index] = '--'
               }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -630,7 +630,7 @@
 				if (this.dataList.taskTypeKey != 3) {
 					for (let i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == e) {
-							if(this.contractNoList[i].priceType == "随行就市"){
+							if(this.contractNoList[i].priceType == '随行就市'){
 								this.Pricetype = false
 							}else{
 								this.Pricetype = true
@@ -711,7 +711,7 @@
 				if (this.dataList1.taskTypeKey != 3) {
 					for (let i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == e) {
-							if(this.contractNoList[i].priceType == "随行就市"){
+							if(this.contractNoList[i].priceType == '随行就市'){
 								this.Pricetype = false
 							}else{
 								this.Pricetype = true
@@ -813,61 +813,61 @@
 						})
 						return
 					}
-					if (!this.dataList.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList.bulkDensity < 0 ||
-						this.dataList.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList.bulkDensity).length -
-						(String(this.dataList.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList.waterContent).indexOf('.') != -1 &&
-						String(this.dataList.waterContent).length -
-						(String(this.dataList.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
+					// if (!this.dataList.bulkDensity) {
+					// 	this.$message({
+					// 		message: '容重不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	this.dataList.bulkDensity < 0 ||
+					// 	this.dataList.bulkDensity > 1000
+					// ) {
+					// 	this.$message({
+					// 		message: '容重输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList.bulkDensity).indexOf('.') != -1 &&
+					// 	String(this.dataList.bulkDensity).length -
+					// 	(String(this.dataList.bulkDensity).indexOf('.') + 1) >
+					// 	0
+					// ) {
+					// 	this.$message({
+					// 		message: '容重需输入整数',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (!this.dataList.waterContent) {
+					// 	this.$message({
+					// 		message: '水分不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList.waterContent).indexOf('.') != -1 &&
+					// 	String(this.dataList.waterContent).length -
+					// 	(String(this.dataList.waterContent).indexOf('.') + 1) >
+					// 	1
+					// ) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					if(this.Pricetype){
 						if (!this.dataList.unitPrice) {
 						this.$message({
@@ -961,64 +961,64 @@
 						})
 						return
 					}
-					if (!this.dataList1.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.bulkDensity < 500 ||
-						this.dataList1.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList1.bulkDensity).length -
-						(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.waterContent < 0 ||
-						this.dataList1.waterContent > 40
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.waterContent).indexOf('.') != -1 &&
-						String(this.dataList1.waterContent).length -
-						(String(this.dataList1.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
+					// if (!this.dataList1.bulkDensity) {
+					// 	this.$message({
+					// 		message: '容重不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	this.dataList1.bulkDensity < 500 ||
+					// 	this.dataList1.bulkDensity > 1000
+					// ) {
+					// 	this.$message({
+					// 		message: '容重输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+					// 	String(this.dataList1.bulkDensity).length -
+					// 	(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
+					// 	0
+					// ) {
+					// 	this.$message({
+					// 		message: '容重需输入整数',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (!this.dataList1.waterContent) {
+					// 	this.$message({
+					// 		message: '水分不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	this.dataList1.waterContent < 0 ||
+					// 	this.dataList1.waterContent > 40
+					// ) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList1.waterContent).indexOf('.') != -1 &&
+					// 	String(this.dataList1.waterContent).length -
+					// 	(String(this.dataList1.waterContent).indexOf('.') + 1) >
+					// 	1
+					// ) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					if(this.Pricetype){
 						if (!this.dataList1.unitPrice) {
 						this.$message({
@@ -1212,64 +1212,64 @@
 						})
 						return
 					}
-					if (!this.dataList1.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.bulkDensity < 500 ||
-						this.dataList1.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList1.bulkDensity).length -
-						(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.waterContent < 0 ||
-						this.dataList1.waterContent > 40
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.waterContent).indexOf('.') != -1 &&
-						String(this.dataList1.waterContent).length -
-						(String(this.dataList1.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
+					// if (!this.dataList1.bulkDensity) {
+					// 	this.$message({
+					// 		message: '容重不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	this.dataList1.bulkDensity < 500 ||
+					// 	this.dataList1.bulkDensity > 1000
+					// ) {
+					// 	this.$message({
+					// 		message: '容重输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+					// 	String(this.dataList1.bulkDensity).length -
+					// 	(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
+					// 	0
+					// ) {
+					// 	this.$message({
+					// 		message: '容重需输入整数',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (!this.dataList1.waterContent) {
+					// 	this.$message({
+					// 		message: '水分不能为空！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	this.dataList1.waterContent < 0 ||
+					// 	this.dataList1.waterContent > 40
+					// ) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
+					// if (
+					// 	String(this.dataList1.waterContent).indexOf('.') != -1 &&
+					// 	String(this.dataList1.waterContent).length -
+					// 	(String(this.dataList1.waterContent).indexOf('.') + 1) >
+					// 	1
+					// ) {
+					// 	this.$message({
+					// 		message: '水分输入错误',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					if(this.Pricetype){
 						if (!this.dataList1.unitPrice) {
 						this.$message({
@@ -1602,7 +1602,7 @@
 							})
 							.toPromise()
 							.then(response => {
-								console.log("查仓库sss",response)
+								console.log('查仓库sss',response)
 								for (var i = 0; i < response.length; i++) {
 									this.warehouseNameList.push(response[i])
 								}

src/views/warehouse/warehouseManagementGross.vue

@@ -251,7 +251,7 @@
                   deptBudgetList.outType == '汽运' ||
                   deptBudgetList.outType == '集装箱船'
                 ">
-                <ws-input v-if="options2.length == 0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
+                <ws-input v-if="options2.length == 0 && deptBudgetList.inOutType != '移库入库'" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />
                 <el-select v-if="carstatus && options2.length == 0&&deptBudgetList.inOutType=='移库入库'" filterable clearable :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">