Kaynağa Gözat

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

gjy 2 yıl önce
ebeveyn
işleme
e393e204f1

Dosya farkı çok büyük olduğundan ihmal edildi
+ 19 - 0
public/static/html2canvas.js


+ 117 - 67
public/static/weightCheck.html

@@ -13,16 +13,16 @@
             padding: 5px 0;
             height: 37px;
         }
-        
+
         body {
             margin: 0;
         }
-        
+
         #app {
             /* height: 98vh;
         position: relative; */
         }
-        
+
         .content {
             width: 1000px;
             padding: 30px 20px 20px 20px;
@@ -30,33 +30,34 @@
             height: 630px;
             /* height: 570px; */
             position: relative;
+            margin: auto;
         }
-        
+
         .a5-content {
             height: 130vh;
         }
-        
+
         table {
             width: 100%;
             text-align: center;
             border-collapse: collapse;
             border: 3px solid #333333;
         }
-        
+
         .col-bgc {
             background: #f6f7fb;
         }
-        
+
         .bottom-row1 {
             display: flex;
             /* justify-content: space-between; */
             margin-top: 5px 0;
         }
-        
+
         .bottom-row2 {
             display: flex;
         }
-        
+
         img,
         .left {
             width: 120px;
@@ -65,21 +66,21 @@
             left: 12px;
             top: 10px;
         }
-        
+
         .config {
             margin-top: 10px;
             margin-right: 240px;
         }
-        
+
         .autograph {
             margin-top: 10px;
             margin-right: 170px;
         }
-        
+
         .bottom-row3 {
             margin: 10px 0;
         }
-        
+
         .title {
             text-align: center;
             font-size: 36px;
@@ -87,17 +88,17 @@
             position: relative;
             /* margin-top: 47px; */
         }
-        
+
         .number {
             text-align: right;
             margin-bottom: 10px;
             margin-top: 30px;
         }
-        
+
         .small-row {
             display: flex;
         }
-        
+
         .small-content {
             width: 300px;
             /* margin: 0 auto;
@@ -110,7 +111,7 @@
         right: 0;
         margin: auto; */
         }
-        
+
         .small-title {
             text-align: center;
             font-size: 18px;
@@ -118,26 +119,26 @@
             justify-content: space-between;
             align-items: center;
         }
-        
+
         .numberNo {
             font-size: 36px;
             margin: auto;
         }
-        
+
         .small-row {
             display: flex;
             justify-content: space-between;
             margin: 10px;
         }
-        
+
         .small-img {
             margin-right: 0;
         }
-        
+
         .sign {
             margin-right: 100px;
         }
-        
+
         .small-code {
             position: relative;
             left: calc(50% - 55px)
@@ -179,37 +180,44 @@
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
                             <td class="col col-bgc">容量(克/升)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
                             </td>
                             <td class="col col-bgc">不完善粒(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
                             </td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">等级</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
                             </td>
                             <td class="col col-bgc">热损伤(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
                             <td class="col col-bgc">质检时间</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
                             </td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">杂质(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
                             <td class="col col-bgc">霉变粒(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
                             </td>
                             <td class="col col-bgc">扣杂</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
-                                <td class="col col-bgc">仓位号</td>
-                                <td class="col">
-                                    {{item.binNumber}}</td>
-                                <!-- <td class="col " colspan="2"></td> -->
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
+                            </td>
+                            <td class="col col-bgc">仓位号</td>
+                            <td class="col">{{item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重(公斤)</td>
@@ -268,7 +276,8 @@
                             <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户电话</td>
                             <td class="col" v-if="item.serviceManagementType == 3">{{item.customerPhone}}</td>
                             <td class="col col-bgc" v-if="item.serviceManagementType == 1">联系电话</td>
-                            <td class="col" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col" v-if="item.serviceManagementType == 1">{{item.contractManagement ?
+                                item.contractManagement.sellerPhone : ""}}</td>
                             <td class="col col-bgc">车牌号</td>
                             <td class="col" colspan="2">{{item.carNumber}}</td>
                         </tr>
@@ -286,38 +295,44 @@
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
                             <td class="col col-bgc">容量(克/升)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
                             </td>
                             <td class="col col-bgc">不完善粒(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
                             </td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">等级</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
                             </td>
                             <td class="col col-bgc">热损伤(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
                             <td class="col col-bgc">质检时间</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
                             </td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">杂质(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
                             <td class="col col-bgc">霉变粒(%)</td>
-                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
                             </td>
                             <td class="col col-bgc">扣杂</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
-                                
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
+                            </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">
-                                {{item.binNumber}}</td>
-                            <!-- <td class="col " colspan="2"></td> -->
+                            <td class="col">{{item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重(公斤)</td>
@@ -358,8 +373,9 @@
                 </div>
             </div>
         </div>
-        <div v-else>
-            <div class="content" v-if="bigContent" v-for="(_item,index) in tableData ">
+        <div v-else id="saveImg">
+            <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
+                <!-- //单个打印 -->
                 <!-- <div class="title">{{_item.compName}}</div> -->
                 <div class="title">入库检斤单</div>
                 <div class="left">
@@ -375,7 +391,8 @@
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户电话</td>
                         <td class="col" v-if="_item.serviceManagementType == 3">{{_item.customerPhone}}</td>
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 1">联系电话</td>
-                        <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
+                        <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ?
+                            _item.contractManagement.sellerPhone : ""}}</td>
                         <td class="col col-bgc">车牌号</td>
                         <td class="col" colspan="2">{{_item.carNumber}}</td>
                     </tr>
@@ -397,7 +414,8 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
                         <td class="col col-bgc">不完善粒(%)</td>
                         <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}
+                        </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">等级</td>
@@ -425,9 +443,7 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
                         </td>
                         <td class="col col-bgc">仓位号</td>
-                            <td class="col">
-                                {{_item.binNumber}}</td>
-                            <!-- <td class="col " colspan="2"></td> -->
+                        <td class="col">{{_item.binNumber}}</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">毛重(公斤)</td>
@@ -538,7 +554,8 @@
                 <div>皮检时间</div>
                 <div>{{tableData.tareDate}}</div>
             </div>
-            <div class="small-row" v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
+            <div class="small-row"
+                v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
                 <div>扣重(公斤)</div>
                 <div>{{tableData.buckleMiscellaneous}}</div>
             </div>
@@ -554,13 +571,14 @@
 </body>
 <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 <script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script src="../static/winseaview.min.js"></script>
+<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">
     new Vue({
         el: '#app',
         data: {
-            tableData: {
-                // qualityInspectionManagement:{}
-            },
+            tableData: {},
             tableData1: [],
             tableDataEW: [],
             selectPrint: false,
@@ -570,6 +588,7 @@
             pageType: '',
             isDDPrint: false,
             isEWPrint: false,
+            imgUrl: ""
         },
         computed: {},
         methods: {
@@ -595,15 +614,46 @@
                 }
                 return (false);
             },
-            printSmall() {},
-            printBig() {},
+            printSmall() { },
+            printBig() { },
+            closeDialog() {
+                if (this.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
+                    html2canvas(document.querySelector("#saveImg"), { foreignObjectRendering: true, allowTaint: true }).then((canvas) => {
+                        let dataURL = canvas.toDataURL('image/png')
+                        this.imgUrl = dataURL
+                        if (this.imgUrl !== '') {
+                            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
+                            let formdata = new FormData()
+                            formdata.append('file', b)
+                            axios({
+                                method: 'post',
+                                url: "http://192.168.110.9:9888/appendix/admin",
+                                data: formdata,
+                            }).then((response) => {
+                                // 编辑接口
+                                this.weighingList = this.tableData[0]
+                                this.weighingList.pictureAddress = response.data.data.url
+                                axios({//皮重检斤接口
+                                    method: 'post',
+                                    url: "http://192.168.110.9:9888/weighingManagement/api/editTare",
+                                    data: this.weighingList,
+                                }).then((response) => {//入库单截图上传成功
+                                })
+                            })
+                        }
+                    })
+                }
+            },
+        },
+        updated() {
+            this.closeDialog()
         },
         mounted() {
-            let _data  ={}
-            if(decodeURIComponent(localStorage.getItem('print_in_data'))){
-                _data=decodeURIComponent(localStorage.getItem('print_in_data'))
+            let _data = {}
+            if (decodeURIComponent(localStorage.getItem('print_in_data'))) {
+                _data = decodeURIComponent(localStorage.getItem('print_in_data'))
             }
-            else{
+            else {
                 _data = decodeURIComponent(this.getQueryVariable("tableData"))
             }
             // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
@@ -637,7 +687,7 @@
 
             document.title = "粮食检斤单"
             window.print()
-            window.onafterprint = function(event) {
+            window.onafterprint = function (event) {
                 window.history.back(-1)
             };
         },

Dosya farkı çok büyük olduğundan ihmal edildi
+ 6 - 0
public/static/winseaview.min.js


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor