ccjgmwz 3 年 前
コミット
16658ba286

+ 2 - 0
package.json

@@ -52,10 +52,12 @@
     "echarts": "4.2.1",
     "element-china-area-data": "^5.0.2",
     "element-ui": "^2.13.2",
+    "file-saver": "^2.0.5",
     "form-making-advanced": "^1.2.6",
     "html2canvas": "^1.3.2",
     "js-base64": "^3.7.2",
     "js-cookie": "2.2.0",
+    "jszip": "^3.7.1",
     "lodash": "^4.17.20",
     "node-gyp": "^5.0.6",
     "nprogress": "0.2.0",

+ 6 - 3
public/static/weightCheck.html

@@ -169,15 +169,18 @@
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
             <td class="col col-bgc">扣杂</td>
             <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
-            <td class="col col-bgc">净重(公斤)</td>
-            <td class="col">{{tableData.netWeight}}</td>
+            <td class="col " colspan="2"></td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">毛重(公斤)</td>
             <td class="col">{{tableData.grossWeight}}</td>
             <td class="col col-bgc">皮重(公斤)</td>
             <td class="col">{{tableData.tare}}</td>
-            <td class="col " colspan="4"></td>
+            <td class="col col-bgc">扣重(公斤)</td>
+            <td class="col">{{tableData.buckleMiscellaneous}}</td>
+            <td class="col col-bgc">净重(公斤)</td>
+            <td class="col">{{tableData.netWeight}}</td>
+            <td class="col " colspan="2"></td>
            
           </tr>
           <tr class="row">

+ 1 - 1
src/views/houseSelfCollect/inspectInfo.vue

@@ -476,7 +476,7 @@
           })
           return
         }
-         if (this.inspect.waterContent < 0 || this.inspect.waterContent > 40) {
+         if (this.inspect.waterContent < 0 || this.inspect.waterContent > 50) {
           this.$message({
             message: '水分输入错误',
             type: 'warning',