zhongtianhaoyuan 3 年 前
コミット
69e021a07f
2 ファイル変更13 行追加14 行削除
  1. 12 12
      public/static/payprint.html
  2. 1 2
      src/views/profitable/contractOtherMoney.vue

+ 12 - 12
public/static/payprint.html

@@ -441,11 +441,11 @@
                 </tr>
                 </tr>
                 <tr class="row">
                 <tr class="row">
                   <td class="col col-bgc">收货单位</td>
                   <td class="col col-bgc">收货单位</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col" colspan="2">{{printData1[index].compName}}</td>
                   <td class="col col-bgc">联系人</td>
                   <td class="col col-bgc">联系人</td>
-                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col">{{printData1[index].contacts}}</td>
                   <td class="col col-bgc">联系电话</td>
                   <td class="col col-bgc">联系电话</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                  <td class="col" colspan="2">{{printData1[index].contactsPhone}}</td>
                 </tr>
                 </tr>
                 <tr class="row">
                 <tr class="row">
                   <td class="col col-bgc">货名</td>
                   <td class="col col-bgc">货名</td>
@@ -454,43 +454,43 @@
                   <td class="col">{{printData1[index].weighingManagement.type}}</td>
                   <td class="col">{{printData1[index].weighingManagement.type}}</td>
                   <td class="col col-bgc">容量(克/升)</td>
                   <td class="col col-bgc">容量(克/升)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">不完善粒(%)</td>
                   <td class="col col-bgc">不完善粒(%)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.imperfectGrain:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
                   </td>
                   </td>
                 </tr>
                 </tr>
                 <tr class="row">
                 <tr class="row">
                   <td class="col col-bgc">等级</td>
                   <td class="col col-bgc">等级</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.grade:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">水分(%)</td>
                   <td class="col col-bgc">水分(%)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.waterContent:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">热损伤(%)</td>
                   <td class="col col-bgc">热损伤(%)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.jiaorenli:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">质检时间</td>
                   <td class="col col-bgc">质检时间</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.qualityDate:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
                   </td>
                   </td>
                 </tr>
                 </tr>
                 <tr class="row">
                 <tr class="row">
                   <td class="col col-bgc">杂质(%)</td>
                   <td class="col col-bgc">杂质(%)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.impurity:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">霉变粒(%)</td>
                   <td class="col col-bgc">霉变粒(%)</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.mildewGrain:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
                   </td>
                   </td>
                   <td class="col col-bgc">扣杂</td>
                   <td class="col col-bgc">扣杂</td>
                   <td class="col">
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.buckleMiscellaneous:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
                   </td>
                   </td>
                   <td class="col " colspan="2"></td>
                   <td class="col " colspan="2"></td>
                 </tr>
                 </tr>

+ 1 - 2
src/views/profitable/contractOtherMoney.vue

@@ -352,8 +352,7 @@
         if (Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney) > 100000000) {
         if (Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney) > 100000000) {
           this.$message.error("金额输入错误!")
           this.$message.error("金额输入错误!")
         }
         }
-        
-        if (this.formData.amountMoney.indexOf(".") != -1 && this.formData.amountMoney.split(".")[1].length > 2) {
+        if (this.formData.amountMoney.toString().indexOf(".") != -1 && this.formData.amountMoney.split(".")[1].length > 2) {
           this.$message.error("金额请保留两位小数!")
           this.$message.error("金额请保留两位小数!")
           return
           return
         }
         }