Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/view/tiip/kanban/Finance.vue

@@ -44,9 +44,9 @@
             <div class="card">
                 <div>
                     <div class="num">
-                        <div><span>数量</span><span>{{v.nQty||0}}</span></div>
-                        <div><span>金额</span><span style="color:#5E9AFE;">{{v.nAmount||0}}</span></div>
-                        <div><span>余额</span><span style="color:#FF6633;">{{v.nCloseAmount||0}}</span></div>
+                        <div><span>数量</span><span>{{Number(v.nQty||0).toLocaleString()}}</span></div>
+                        <div><span>金额</span><span style="color:#5E9AFE;">{{Number(v.nAmount||0).toLocaleString()}}</span></div>
+                        <div><span>余额</span><span style="color:#FF6633;">{{Number(v.nCloseAmount||0).toLocaleString()}}</span></div>
                     </div>
                     <XCircle 
                         style="width: 70px;height: 70px;"

src/view/tiip/kanban/capital.vue

@@ -22,7 +22,7 @@
                 <div style="font-size:13px;margin-bottom:14px;">{{v.sName}}</div>
                 <div style="font-size: 28px;font-weight: 600;">{{Number(v.sValue)||0}}</div>
             </div>
-            <div style="align-self: flex-end;" v-if="v.rate!=0">
+            <div style="align-self: flex-end;" v-if="v.rate!=0&&dateMode<5">
                 <div>{{v.rate>0?'↑':'↓'}}{{v.rate}}%</div>
                 <div>比{{dateModeName}}{{v.rate>0?'上':'下'}}降</div>
             </div>

src/view/tiip/kanban/operate.vue

@@ -54,13 +54,13 @@
                     <div @click="routerToOperateDetail(v)" style="text-decoration:underline;">{{v.sType}}</div>
                 </td>
                 <td>
-                    <div>{{v.nQty||0}}</div>
+                    <div>{{Number(v.nQty||0).toLocaleString()}}</div>
                 </td>
                 <td>
-                    <div>{{v.nPieces||0}}</div>
+                    <div>{{Number(v.nPieces||0).toLocaleString()}}</div>
                 </td>
                 <td>
-                    <div>{{v.nAmount||0}}</div>
+                    <div>{{Number(v.nAmount||0).toLocaleString()}}</div>
                 </td>
             </tr>
         </table>