ccj vor 9 Monaten
Ursprung
Commit
e5d1fedab1
5 geänderte Dateien mit 316 neuen und 1999 gelöschten Zeilen
  1. 283 1974
      package-lock.json
  2. 3 3
      public/static/payprint1.html
  3. 2 2
      public/static/payprint3.html
  4. 1 1
      public/static/printdry.html
  5. 27 19
      public/static/weightCheck.html

Datei-Diff unterdrückt, da er zu groß ist
+ 283 - 1974
package-lock.json


+ 3 - 3
public/static/payprint1.html

@@ -277,7 +277,7 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">上海首农投资控股有限公司</td>
                                 <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
@@ -695,7 +695,7 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">上海首农投资控股有限公司</td>
                         <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">
@@ -897,7 +897,7 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">上海首农投资控股有限公司</td>
                         <td v-if="!pengyuPrint" class="col" colspan="3">
                             {{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-洮南安定自管仓':printData.warehouseName}}</td>
                         <td class="col col-bgc">身份证号</td>

+ 2 - 2
public/static/payprint3.html

@@ -264,7 +264,7 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">上海首农投资控股有限公司</td>
                                 <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
@@ -652,7 +652,7 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">上海首农投资控股有限公司</td>
                         <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">

+ 1 - 1
public/static/printdry.html

@@ -167,7 +167,7 @@
                     <td class="col" colspan="5"
                         v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江省包谷粮食购销有限责任公司'">
                         {{print_company_name}}</td>
-                    <td class="col" colspan="5" v-else>北京天维康油脂调销中心有限公司</td>
+                    <td class="col" colspan="5" v-else>上海首农投资控股有限公司</td>
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">货名</td>

+ 27 - 19
public/static/weightCheck.html

@@ -167,7 +167,7 @@
                             <td class="col" colspan="2">{{item.carNumber}}</td>
                         </tr>
                         <tr class="row">
-                            <td  class="col col-bgc">收货单位</td>
+                            <td class="col col-bgc">收货单位</td>
                             <td class="col" colspan="2">{{item.compName}}</td>
                             <td class="col col-bgc">联系人</td>
                             <td class="col">{{item.person}}</td>
@@ -185,7 +185,8 @@
                             </td>
                             <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率(%)' : '不完善粒(%)'}}</td>
                             <td class="col">
-                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
+                                {{item.goodsName ==
+                                '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -217,7 +218,8 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") !=
+                                -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重(公斤)</td>
@@ -300,7 +302,8 @@
                             </td>
                             <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率(%)' : '不完善粒(%)'}}</td>
                             <td class="col">
-                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
+                                {{item.goodsName ==
+                                '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -332,7 +335,8 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") !=
+                                -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重(公斤)</td>
@@ -343,7 +347,7 @@
                             <td class="col">{{item.buckleMiscellaneous}}</td>
                             <td class="col col-bgc">净重(公斤)</td>
                             <td class="col">{{item.netWeight}}</td>
-                            <!-- <td class="col " colspan="2"></td> --> 
+                            <!-- <td class="col " colspan="2"></td> -->
 
                         </tr>
                         <tr class="row">
@@ -403,7 +407,8 @@
                         <td class="col" colspan="2">{{_item.compName}}</td> -->
                         <td v-if='_item.customer!="白城市鹏羽粮食贸易有限公司"' class="col col-bgc">收货单位</td>
                         <td v-else class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="2">{{_item.customer!="白城市鹏羽粮食贸易有限公司"?_item.compName:'北京天维康油脂调销中心有限公司'}}</td>
+                        <td class="col" colspan="2">{{_item.customer!="白城市鹏羽粮食贸易有限公司"?_item.compName:'上海首农投资控股有限公司'}}
+                        </td>
                         <td class="col col-bgc">联系人</td>
                         <td class="col">{{_item.person}}</td>
                         <td class="col col-bgc">联系电话</td>
@@ -415,13 +420,14 @@
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
                         <td class="col col-bgc">{{_item.goodsName == '大豆' ? '蛋白' : '容重(克/升)'}}</td>
-                            <td class="col">
-                                {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
-                            </td>
-                            <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率(%)' : '不完善粒(%)'}}</td>
-                            <td class="col">
-                                {{_item.goodsName == '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
-                            </td>
+                        <td class="col">
+                            {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
+                        </td>
+                        <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率(%)' : '不完善粒(%)'}}</td>
+                        <td class="col">
+                            {{_item.goodsName ==
+                            '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
+                        </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">等级</td>
@@ -449,7 +455,8 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
                         </td>
                         <td class="col col-bgc">仓位号</td>
-                        <td class="col">{{_item.binNumber.indexOf("托盘") != -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
+                        <td class="col">{{_item.binNumber.indexOf("托盘") !=
+                            -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">毛重(公斤)</td>
@@ -522,7 +529,8 @@
             </div>
             <div class="small-row">
                 <div>仓位号:</div>
-                <div>{{tableData.binNumber.indexOf("托盘")!= -1?tableData.binNumber.replace("托盘",""):tableData.binNumber}}</div> 
+                <div>{{tableData.binNumber.indexOf("托盘")!= -1?tableData.binNumber.replace("托盘",""):tableData.binNumber}}
+                </div>
             </div>
             <div class="small-row">
                 <div>收货单位</div>
@@ -581,8 +589,8 @@
 <script type="text/javascript" src="../static/html2canvas.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 <script type="text/javascript">
-    
-// import  API_CONFIG from "../../../vue.config.js"
+
+    // import  API_CONFIG from "../../../vue.config.js"
     new Vue({
         el: '#app',
         data: {
@@ -631,7 +639,7 @@
                 } else {
                     that.serverIp = localStorage.getItem("serverIp")
                 }
-                if (that.tableData&&that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
+                if (that.tableData && that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
                     html2canvas(document.querySelector("#saveImg"), { foreignObjectRendering: true, allowTaint: true }).then((canvas) => {
                         let dataURL = canvas.toDataURL('image/png')
                         that.imgUrl = dataURL

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.