金额过滤，补齐两位小数

src/filters/index.js

@@ -59,6 +59,23 @@ export function toThousandFilter(num) {
   return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
 }
 
+/**
+ * 10000 => "10,000.00"
+ * @param {number} num
+ */
+export function toThousandFloatFilter(num) {
+  let result = toThousandFilter(num)
+  const temp = result.split('.')
+  if (temp.length === 1) {
+    result += '.00'
+  } else if (temp.length > 1) {
+    if (temp[1].length < 2) {
+      result += '0'
+    }
+  }
+  return result
+}
+
 /**
  * Upper case first char
  * @param {String} string

src/views/dashboard/admin/components/TransactionTable.vue

@@ -7,7 +7,7 @@
     </el-table-column>
     <el-table-column label="Price" width="195" align="center">
       <template slot-scope="scope">
-        ¥{{ scope.row.price | toThousandFilter }}
+        ¥{{ scope.row.price | toThousandFloatFilter }}
       </template>
     </el-table-column>
     <el-table-column label="Status" width="100" align="center">

src/views/dashboard/admin/index.vue

@@ -26,7 +26,7 @@
           </div>
           <div class="chartText">
             <p>应收金额</p>
-            <p class="money">￥{{ payTotalFee | toThousandFilter }}元</p>
+            <p class="money">￥{{ payTotalFee | toThousandFloatFilter }}元</p>
           </div>
           <raddar-chart v-if="isRequest" :receivab="ReceivableData" />
         </div>

src/views/goods/list-select.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" style="padding: 0 20px;">
 
-    <el-menu :default-active="moduleId" class="el-menu-demo" mode="horizontal">
-      <el-menu-item v-if="moduleId===1 && modules && modules.firstModulesName" index="1">{{ modules.firstModulesName }}</el-menu-item>
-      <el-menu-item v-if="moduleId===2 && modules && modules.secondModulesName" index="2">{{ modules.secondModulesName }}</el-menu-item>
-      <el-menu-item v-if="moduleId===3 && modules && modules.thirdModulesName" index="3">{{ modules.thirdModulesName }}</el-menu-item>
+    <el-menu :default-active="moduleId+''" class="el-menu-demo" mode="horizontal">
+      <el-menu-item v-if="moduleId===1 && modules && modules.firstModulesName" index="1">添加【{{ modules.firstModulesName }}】</el-menu-item>
+      <el-menu-item v-if="moduleId===2 && modules && modules.secondModulesName" index="2">添加【{{ modules.secondModulesName }}】</el-menu-item>
+      <el-menu-item v-if="moduleId===3 && modules && modules.thirdModulesName" index="3">添加【{{ modules.thirdModulesName }}】</el-menu-item>
     </el-menu>
 
     <div class="filter-container" style="margin-top:20px;">

src/views/order/detail.vue

@@ -59,13 +59,13 @@
           <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-          <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFilter }})</span></el-col>
+          <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+          <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
           <el-col :span="6"><b>已收金额:</b>
             <template v-if="order.receiptStatus*1===1">¥0</template>
-            <template v-else>¥{{ receiptAmount | toThousandFilter }}</template>
+            <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
           </el-col>
-          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFilter }}
+          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
             <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
           </el-col>
         </el-row>
@@ -90,7 +90,7 @@
           <el-row :gutter="22" class="box-row">
             <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
             <el-col :span="5"><b>下单时间:</b> {{ shopOrder.orderTime }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="5"><b>发货状态:</b>
               <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
               <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
@@ -113,8 +113,8 @@
               <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
               <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>

src/views/order/list.vue

@@ -146,7 +146,7 @@
       </el-table-column>
       <el-table-column label="订单金额" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
-          ¥{{ row.payTotalFee | toThousandFilter }}
+          ¥{{ row.payTotalFee | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="下单时间" prop="orderTime">

src/views/order/refund-detail.vue

@@ -12,7 +12,7 @@
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
           <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
           <el-col :span="6"><b>退款状态:</b>
             <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
             <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
@@ -23,9 +23,9 @@
           <el-col :span="20"><b>退款方式:</b>
             <template v-if="refund.returnedWay*1===4">未支付无退款</template>
             <template v-else-if="refund.returnedWay*1===1">
-              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFloatFilter }}</span>
+              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFloatFilter }}</span>
+              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFloatFilter }}</span>
             </template>
             <template v-else>----</template>
           </el-col>
@@ -68,14 +68,14 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>订单金额:</b>¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-            <el-col :span="6"><b>应收总额:</b>¥{{ order.payableAmount | toThousandFilter }}</el-col>
-            <el-col :span="6"><b>经理折扣:</b>¥{{ order.discountFee | toThousandFilter }}</el-col>
+            <el-col :span="6"><b>订单金额:</b>¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>应收总额:</b>¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>经理折扣:</b>¥{{ order.discountFee | toThousandFloatFilter }}</el-col>
             <el-col :span="6"><b>运费:</b>
               <template v-if="order.freight*1===0">包邮</template>
               <template v-else-if="order.freight*1===-1">到付</template>
               <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-              <template v-else>¥{{ order.freight | toThousandFilter }}</template>
+              <template v-else>¥{{ order.freight | toThousandFloatFilter }}</template>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -112,7 +112,7 @@
         <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
           <el-row :gutter="22" class="box-row">
             <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="5"><b>付款状态:</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
@@ -133,14 +133,14 @@
             </el-col>
             <el-col :span="6">{{ op.name }}</el-col>
             <el-col :span="4">
-              <div class="op-item"><b>折后单价:</b> ¥{{ op.discountPrice | toThousandFilter }}</div>
+              <div class="op-item"><b>折后单价:</b> ¥{{ op.discountPrice | toThousandFloatFilter }}</div>
               <div class="op-item"><b>数量(赠品数):</b> x{{ op.num }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
             </el-col>
             <el-col :span="4">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
               <div class="op-item"><b>折扣:</b> {{ op.discount }}</div>
-              <div class="op-item"><b>税费(税率):</b> ¥{{ op.totalAddedValueTax | toThousandFilter }} ({{ op.taxRate }})</div>
+              <div class="op-item"><b>税费(税率):</b> ¥{{ op.totalAddedValueTax | toThousandFloatFilter }} ({{ op.taxRate }})</div>
             </el-col>
             <el-col :span="4">
               <div class="op-item"><b>已发货:</b> {{ op.num - op.notOutStore }}</div>
@@ -194,7 +194,7 @@
       </div>
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
           <el-col :span="6"><b>财务签名:</b></el-col>
           <el-col :span="6"><b>总经理签名:</b></el-col>
         </el-row>

src/views/order/refund-record.vue

@@ -38,9 +38,9 @@
         <el-col :span="6"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>应收总额:</b> ¥{{ order.payableAmount | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>应收总额:</b> ¥{{ order.discountFee | toThousandFilter }}</el-col>
+        <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+        <el-col :span="6"><b>应收总额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
+        <el-col :span="6"><b>应收总额:</b> ¥{{ order.discountFee | toThousandFloatFilter }}</el-col>
         <el-col :span="6"><b>运费:</b>
           <template v-if="order.freight*1===0">包邮</template>
           <template v-else-if="order.freight*1===-1">到付</template>
@@ -49,7 +49,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
-        <el-col><b>退款总额:</b> ¥{{ refundFee | toThousandFilter }}</el-col>
+        <el-col><b>退款总额:</b> ¥{{ refundFee | toThousandFloatFilter }}</el-col>
       </el-row>
     </el-card>
 
@@ -73,7 +73,7 @@
       <el-table-column label="收款方式" align="center" prop="payType" />
       <el-table-column label="金额" align="center" prop="associateAmount">
         <template slot-scope="{row}">
-          ¥{{ row.associateAmount | toThousandFilter }}
+          ¥{{ row.associateAmount | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column label="收款时间" align="center" prop="receiptDate">
@@ -103,7 +103,7 @@
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
       <el-table-column label="退款金额" align="center" prop="refundFee">
         <template slot-scope="{row}">
-          ¥{{ row.refundFee | toThousandFilter }}
+          ¥{{ row.refundFee | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="returnTime">

src/views/order/refund-return.vue

@@ -49,7 +49,7 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
             <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-            <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+            <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
             <el-col :span="6"><b>退款状态:</b>
               <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
               <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
@@ -60,9 +60,9 @@
             <el-col :span="20"><b>退款方式:</b>
               <template v-if="refund.returnedWay*1===4">未支付无退款</template>
               <template v-else-if="refund.returnedWay*1===1">
-                <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-                <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-                <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+                <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFloatFilter }}</span>
+                <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFloatFilter }}</span>
+                <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFloatFilter }}</span>
               </template>
               <template v-else>----</template>
             </el-col>
@@ -132,7 +132,7 @@
         <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
           <el-row :gutter="22" class="box-row">
             <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="5"><b>付款状态:</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
@@ -157,8 +157,8 @@
               <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
               <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>

src/views/order/refund.vue

@@ -75,15 +75,15 @@
         <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderID + ')' }}</template>
       </el-table-column>
       <el-table-column label="退款金额" align="center" prop="refundFee">
-        <template slot-scope="{row}">{{ row.refundFee | toThousandFilter }}</template>
+        <template slot-scope="{row}">{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
       <el-table-column label="退款方式" align="center" prop="returnedWay">
         <template slot-scope="{row}">
           <template v-if="row.returnedWay*1===4">未支付无退款</template>
           <template v-else-if="row.returnedWay*1===1">
-            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFilter }}</span>
-            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFilter }}</span>
-            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFilter }}</span>
+            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</span>
+            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</span>
+            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</span>
           </template>
           <template v-else>----</template>
         </template>