Browse Source

修改采购申请和销售出库打印

BUG 4 năm trước cách đây
mục cha
commit
07dff00a1e
2 tập tin đã thay đổi với 10 bổ sung6 xóa
  1. 8 4
      src/views/purchaseIssue/index.vue
  2. 2 2
      src/views/purchaseRequest/index.vue

+ 8 - 4
src/views/purchaseIssue/index.vue

@@ -146,8 +146,8 @@
               <td class="column"></td>
               <td class="column">{{item.fFeeunitName}}</td>
               <td class="column">{{ item.fQty }}</td>
-              <td class="column">{{ item.fUnitprice }}</td>
-              <td class="column">{{ item.fAmount }}</td>
+              <td class="column">{{ item.fUnitprice?item.fUnitprice.toFixed(2):item.fUnitprice }}</td>
+              <td class="column">{{ item.fAmount?item.fAmount.toFixed(2):item.fAmount }}</td>
               <td class="column">{{ item.remark }}</td>
             </tr>
             <!--          <tr>-->
@@ -162,7 +162,7 @@
               <td class="column" colspan="2" style="border-top: none;width: 15%;">大写总金额:</td>
               <td class="column" colspan="2" style="text-align: left;border-top: none;width: 40%;">{{chineseStr}}</td>
               <td class="column" style="border-top: none; width: 15%;">小写总金额:</td>
-              <td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">{{formList.fMoney}}</td>
+              <td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">{{formList.fMoney?formList.fMoney.toFixed(2):formList.fMoney}}</td>
             </tr>
           </table>
           <div style="display: flex;justify-content: space-between;margin-top: 20px">
@@ -932,7 +932,11 @@ export default {
       } else if (decimalNum === "") {
         chineseStr += cnInteger;
       }
-      this.chineseStr = chineseStr
+      if (chineseStr[chineseStr.length-1] !== '整'){
+        this.chineseStr = chineseStr + '整'
+      }else {
+        this.chineseStr = chineseStr
+      }
       // return chineseStr;
     },
     change(scope) {

+ 2 - 2
src/views/purchaseRequest/index.vue

@@ -139,10 +139,10 @@
           </tr>
           <tr v-for="(item,index) in contentList" :key="index">
             <td class="column">{{item.feeName}}</td>
-            <td class="column">{{item.fUnitprice}}</td>
+            <td class="column">{{item.fUnitprice?item.fUnitprice.toFixed(2):item.fUnitprice}}</td>
             <td class="column">{{item.fPurchase}}({{item.fFeeunitName}})</td>
             <td class="column">{{item.fQty}}({{item.fFeeunitName}})</td>
-            <td class="column">{{item.fAmount}}</td>
+            <td class="column">{{item.fAmount?item.fAmount.toFixed(2):item.fAmount}}</td>
             <td class="column">{{item.remark}}</td>
           </tr>
         </table>