lilei 2 years ago
parent
commit
c83c524cc4
41 changed files with 73 additions and 72 deletions
  1. 2 1
      public/version.json
  2. 2 2
      src/libs/tools.js
  3. 1 1
      src/views/chainReportData/chainCallReport/detailList.vue
  4. 1 1
      src/views/chainReportData/chainCallReport/list.vue
  5. 2 2
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue
  6. 2 2
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue
  7. 3 3
      src/views/chainReportData/chainSalesDetailReport/list.vue
  8. 3 3
      src/views/chainReportData/chainSalesReport/list.vue
  9. 1 1
      src/views/chainReportData/chainStockExpenditureReport/list.vue
  10. 1 1
      src/views/chainReportData/chainStockIncomeReport/list.vue
  11. 2 2
      src/views/chainReportData/chainStockReport/detailModal.vue
  12. 2 2
      src/views/chainReportData/chainStockReport/list.vue
  13. 1 1
      src/views/chainReportData/chainTransferReport/detailList.vue
  14. 1 1
      src/views/chainReportData/chainTransferReport/list.vue
  15. 1 1
      src/views/numsGoodsShelves/settlementManagement/list.vue
  16. 1 1
      src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue
  17. 1 1
      src/views/reportData/bulkReturnReport/detailList.vue
  18. 1 1
      src/views/reportData/bulkReturnReport/list.vue
  19. 1 1
      src/views/reportData/bulkWarehousingReport/detailList.vue
  20. 1 1
      src/views/reportData/bulkWarehousingReport/list.vue
  21. 4 4
      src/views/reportData/customerReport/list.vue
  22. 1 1
      src/views/reportData/inventoryReport/inventoryDetail.vue
  23. 4 4
      src/views/reportData/inventoryReport/inventoryOrder.vue
  24. 2 2
      src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue
  25. 2 2
      src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue
  26. 1 1
      src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue
  27. 1 1
      src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue
  28. 3 3
      src/views/reportData/salesDetailReport/list.vue
  29. 3 3
      src/views/reportData/salesReport/list.vue
  30. 4 4
      src/views/reportData/salesReturnReport/detailList.vue
  31. 4 4
      src/views/reportData/salesReturnReport/list.vue
  32. 1 1
      src/views/reportData/stockExpenditureReport/list.vue
  33. 1 1
      src/views/reportData/stockImportReport/detailList.vue
  34. 1 1
      src/views/reportData/stockImportReport/list.vue
  35. 1 1
      src/views/reportData/stockIncomeReport/list.vue
  36. 4 4
      src/views/reportData/storeReceivedSendStorageReport/list.vue
  37. 1 1
      src/views/reportData/storeTransferOutReport/detailList.vue
  38. 1 1
      src/views/reportData/storeTransferOutReport/list.vue
  39. 1 1
      src/views/reportData/urgentItemsOffsetReport/detailList.vue
  40. 1 1
      src/views/reportData/urgentItemsOffsetReport/list.vue
  41. 2 2
      src/views/salesManagement/salesQuery/edit.vue

+ 2 - 1
public/version.json

@@ -1,4 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
-  "version": 1675125874010
+  "vendorJsVersion": "",
+  "version": 1675127590348
 }
 }

+ 2 - 2
src/libs/tools.js

@@ -223,7 +223,7 @@ export const formatDecimal = function (num, decimal) {
   } else {
   } else {
     num = num.substring(0)
     num = num.substring(0)
   }
   }
-  return parseFloat(num).toFixed(index !== -1 ? decimal : 0)
+  return parseFloat(num).toFixed(decimal)
 }
 }
 // 处理数字千位分隔符  num 数值,decimal要保留的小数位数
 // 处理数字千位分隔符  num 数值,decimal要保留的小数位数
 export const toThousands = (num, decimal) => {
 export const toThousands = (num, decimal) => {
@@ -231,7 +231,7 @@ export const toThousands = (num, decimal) => {
     return '--'
     return '--'
   }
   }
   num = formatDecimal(num, decimal||decimal==0 ? decimal : 2)
   num = formatDecimal(num, decimal||decimal==0 ? decimal : 2)
-  return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
+  return '¥' + num.toString().replace(/\d+/, function (n) { // 先提取整数部分
     return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
     return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
       return $1 + ','
       return $1 + ','
     })
     })

+ 1 - 1
src/views/chainReportData/chainCallReport/detailList.vue

@@ -91,7 +91,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调入总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? ('¥'+toThousands(totalData.outCost)) : '--' }}</strong>;
+          调入总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/chainReportData/chainCallReport/list.vue

@@ -72,7 +72,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? ('¥'+toThousands(totalData.productTotalCost)) : '--' }}</strong>;
+          调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 2 - 2
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -78,9 +78,9 @@
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         采购总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
-        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
-        入库总成本:<strong>{{ (totalData && (totalData.putAmount || totalData.putAmount==0)) ? '¥'+toThousands(totalData.putAmount) : '--' }}</strong>;
+        入库总成本:<strong>{{ (totalData && (totalData.putAmount || totalData.putAmount==0)) ? toThousands(totalData.putAmount) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 2 - 2
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -53,9 +53,9 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         总单数:<strong>{{ (totalData && (totalData.totalPutCategory || totalData.totalPutCategory==0)) ? totalData.totalPutCategory : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalPutCategory || totalData.totalPutCategory==0)) ? totalData.totalPutCategory : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
-        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}</strong>;
-        入库总成本:<strong>{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? '¥'+toThousands(totalData.totalPutAmount) : '--' }}</strong>;
+        入库总成本:<strong>{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? toThousands(totalData.totalPutAmount) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 3 - 3
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -145,11 +145,11 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+toThousands(totalData.totalCost) : '--' }}</strong>;
+          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
         </div>
         </div>
-        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? '¥'+toThousands(totalData.totalPrice) : '--' }}</strong>;
+        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? '¥'+toThousands(totalData.totalProfit) : '--' }}</strong>。
+          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? toThousands(totalData.totalProfit) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 3 - 3
src/views/chainReportData/chainSalesReport/list.vue

@@ -112,11 +112,11 @@
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+toThousands(totalData.totalCost) : '--' }}</strong>;
+          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
         </div>
         </div>
-        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? '¥'+toThousands(totalData.totalPrice) : '--' }}</strong>;
+        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? '¥'+toThousands(totalData.totalProfit) : '--' }}</strong>。
+          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? toThousands(totalData.totalProfit) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/chainReportData/chainStockExpenditureReport/list.vue

@@ -47,7 +47,7 @@
             <div class="chart-hj">
             <div class="chart-hj">
               库存总出数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               库存总出数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               &nbsp;&nbsp;&nbsp;&nbsp;
               &nbsp;&nbsp;&nbsp;&nbsp;
-              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
+              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
             </div>
             </div>
             <div id="con1" class="chart"></div>
             <div id="con1" class="chart"></div>
           </div>
           </div>

+ 1 - 1
src/views/chainReportData/chainStockIncomeReport/list.vue

@@ -47,7 +47,7 @@
             <div class="chart-hj">
             <div class="chart-hj">
               库存总入数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               库存总入数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               &nbsp;&nbsp;&nbsp;&nbsp;
               &nbsp;&nbsp;&nbsp;&nbsp;
-              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
+              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
             </div>
             </div>
             <div id="con1" class="chart"></div>
             <div id="con1" class="chart"></div>
           </div>
           </div>

+ 2 - 2
src/views/chainReportData/chainStockReport/detailModal.vue

@@ -12,8 +12,8 @@
       <!-- 合计 -->
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
         <div class="ftext" slot="message">
-          可用库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
-          可用库存总成本(¥):<strong> {{ (currentStock && toThousands(currentStock.totalCost)) || 0 }} </strong>。
+          可用库存总数量:<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
+          可用库存总成本:<strong> {{ (currentStock && toThousands(currentStock.totalCost)) || 0 }} </strong>。
         </div>
         </div>
       </a-alert>
       </a-alert>
       <!-- 详情 -->
       <!-- 详情 -->

+ 2 - 2
src/views/chainReportData/chainStockReport/list.vue

@@ -105,8 +105,8 @@
       <!-- 合计 -->
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
         <div class="ftext" slot="message">
-          可用库存总数量(个):<strong> {{ (totalData && (totalData.currentStockQty || totalData.currentStockQty==0)) ? totalData.currentStockQty : '--' }} </strong>;
-          可用库存总成本(¥):<strong> {{ (totalData && (totalData.currentStockCost || totalData.currentStockCost==0)) ? toThousands(totalData.currentStockCost) : '--' }} </strong>。
+          可用库存总数量:<strong> {{ (totalData && (totalData.currentStockQty || totalData.currentStockQty==0)) ? totalData.currentStockQty : '--' }} </strong>;
+          可用库存总成本:<strong> {{ (totalData && (totalData.currentStockCost || totalData.currentStockCost==0)) ? toThousands(totalData.currentStockCost) : '--' }} </strong>。
         </div>
         </div>
       </a-alert>
       </a-alert>
       <!-- 列表 -->
       <!-- 列表 -->

+ 1 - 1
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -86,7 +86,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调入总成本:<strong>{{ (totalData && (totalData.putCost || totalData.putCost==0)) ? ('¥'+toThousands(totalData.putCost)) : '--' }}</strong>;
+          调入总成本:<strong>{{ (totalData && (totalData.putCost || totalData.putCost==0)) ? toThousands(totalData.putCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/chainReportData/chainTransferReport/list.vue

@@ -61,7 +61,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -63,7 +63,7 @@
       <a-alert type="info" style="margin:10px 0">
       <a-alert type="info" style="margin:10px 0">
         <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
         <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
           共:<strong>{{ count }}</strong>条记录;
           共:<strong>{{ count }}</strong>条记录;
-          待结算金额合计<strong>{{ toThousands(total,2) }}</strong>
+          待结算金额合计<strong>{{ toThousands(total,2) }}</strong>
         </div>
         </div>
       </a-alert>
       </a-alert>
       <s-table
       <s-table

+ 1 - 1
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -67,7 +67,7 @@
         <a-alert type="info" style="margin:10px 0">
         <a-alert type="info" style="margin:10px 0">
           <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
           <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
             共<strong>{{ count }}</strong>条记录;
             共<strong>{{ count }}</strong>条记录;
-            待结算金额合计<strong>{{ toThousands(priceTotal,2) }}</strong>
+            待结算金额合计<strong>{{ toThousands(priceTotal,2) }}</strong>
           </div>
           </div>
         </a-alert>
         </a-alert>
         <s-table
         <s-table

+ 1 - 1
src/views/reportData/bulkReturnReport/detailList.vue

@@ -84,7 +84,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.purchaseQty || totalData.purchaseQty==0)) ? totalData.purchaseQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.purchaseQty || totalData.purchaseQty==0)) ? totalData.purchaseQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货总成本:<strong>{{ (totalData && (totalData.purchaseTotalCost || totalData.purchaseTotalCost==0)) ? '¥'+toThousands(totalData.purchaseTotalCost) : '--' }}</strong>;
+          退货总成本:<strong>{{ (totalData && (totalData.purchaseTotalCost || totalData.purchaseTotalCost==0)) ? toThousands(totalData.purchaseTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/bulkReturnReport/list.vue

@@ -59,7 +59,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          退货总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/bulkWarehousingReport/detailList.vue

@@ -86,7 +86,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          散件总成本:<strong>{{ (totalData && (totalData.putTotalCost || totalData.putTotalCost==0)) ? '¥'+toThousands(totalData.putTotalCost) : '--' }}</strong>;
+          散件总成本:<strong>{{ (totalData && (totalData.putTotalCost || totalData.putTotalCost==0)) ? toThousands(totalData.putTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/bulkWarehousingReport/list.vue

@@ -67,7 +67,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          散件总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          散件总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 4 - 4
src/views/reportData/customerReport/list.vue

@@ -81,9 +81,9 @@
       <!-- 合计 -->
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
         <div class="ftext" slot="message">
-          总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+          总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-            总毛利:<strong>{{ (totalData && totalData.totalGrossProfit) ? '¥'+toThousands(totalData.totalGrossProfit) : '--' }}</strong>;
+            总毛利:<strong>{{ (totalData && totalData.totalGrossProfit) ? toThousands(totalData.totalGrossProfit) : '--' }}</strong>;
             总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage+'%' : '--' }}</strong>;
             总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage+'%' : '--' }}</strong>;
           </div>
           </div>
         </div>
         </div>
@@ -192,10 +192,10 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '35%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true, sorter: true },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '35%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true, sorter: true },
         { title: '客户类型', dataIndex: 'customerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户类型', dataIndex: 'customerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '交易金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('¥' + _this.toThousands(text)) : '--') }, sorter: true }
+        { title: '交易金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') }, sorter: true }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(4, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('¥' + _this.toThousands(text)) : '--') } })
+        arr.splice(4, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(5, 0, { title: '毛利率', dataIndex: 'percentageUnit', width: '15%', align: 'right', customRender: function (text) { return text || '--' }, sorter: true })
         arr.splice(5, 0, { title: '毛利率', dataIndex: 'percentageUnit', width: '15%', align: 'right', customRender: function (text) { return text || '--' }, sorter: true })
       }
       }
       return arr
       return arr

+ 1 - 1
src/views/reportData/inventoryReport/inventoryDetail.vue

@@ -58,7 +58,7 @@
         盘盈总数量:<strong>{{ (totalData && (totalData.checkProfitQty || totalData.checkProfitQty==0)) ? totalData.checkProfitQty : '--' }}</strong>;
         盘盈总数量:<strong>{{ (totalData && (totalData.checkProfitQty || totalData.checkProfitQty==0)) ? totalData.checkProfitQty : '--' }}</strong>;
         盘亏总数量:<strong>{{ (totalData && (totalData.checkLossQty || totalData.checkLossQty==0)) ? totalData.checkLossQty : '--' }}</strong>;
         盘亏总数量:<strong>{{ (totalData && (totalData.checkLossQty || totalData.checkLossQty==0)) ? totalData.checkLossQty : '--' }}</strong>;
         盈亏总数量:<strong>{{ (totalData && (totalData.checkProfitLossQty || totalData.checkProfitLossQty==0)) ? totalData.checkProfitLossQty : '--' }}</strong>;
         盈亏总数量:<strong>{{ (totalData && (totalData.checkProfitLossQty || totalData.checkProfitLossQty==0)) ? totalData.checkProfitLossQty : '--' }}</strong>;
-        盈亏总成本:<strong>{{ (totalData && (totalData.checkProfitLossCost || totalData.checkProfitLossCost==0)) ? '¥'+toThousands(totalData.checkProfitLossCost) : '--' }}</strong>;
+        盈亏总成本:<strong>{{ (totalData && (totalData.checkProfitLossCost || totalData.checkProfitLossCost==0)) ? toThousands(totalData.checkProfitLossCost) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 4 - 4
src/views/reportData/inventoryReport/inventoryOrder.vue

@@ -29,13 +29,13 @@
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         库存总数量:<strong>{{ (totalData && (totalData.totalStockQty || totalData.totalStockQty==0)) ? totalData.totalStockQty : '--' }}</strong>;
         库存总数量:<strong>{{ (totalData && (totalData.totalStockQty || totalData.totalStockQty==0)) ? totalData.totalStockQty : '--' }}</strong>;
-        库存总成本:<strong>{{ (totalData && (totalData.totalStockCost || totalData.totalStockCost==0)) ? '¥'+toThousands(totalData.totalStockCost) : '--' }}</strong>;
+        库存总成本:<strong>{{ (totalData && (totalData.totalStockCost || totalData.totalStockCost==0)) ? toThousands(totalData.totalStockCost) : '--' }}</strong>;
         盘盈总数量:<strong>{{ (totalData && (totalData.totalProfitQty || totalData.totalProfitQty==0)) ? totalData.totalProfitQty : '--' }}</strong>;
         盘盈总数量:<strong>{{ (totalData && (totalData.totalProfitQty || totalData.totalProfitQty==0)) ? totalData.totalProfitQty : '--' }}</strong>;
-        盘盈总成本:<strong>{{ (totalData && (totalData.totalProfitCost || totalData.totalProfitCost==0)) ? '¥'+toThousands(totalData.totalProfitCost) : '--' }}</strong>;
+        盘盈总成本:<strong>{{ (totalData && (totalData.totalProfitCost || totalData.totalProfitCost==0)) ? toThousands(totalData.totalProfitCost) : '--' }}</strong>;
         盘亏总数量:<strong>{{ (totalData && (totalData.totalLossQty || totalData.totalLossQty==0)) ? totalData.totalLossQty : '--' }}</strong>;
         盘亏总数量:<strong>{{ (totalData && (totalData.totalLossQty || totalData.totalLossQty==0)) ? totalData.totalLossQty : '--' }}</strong>;
-        盘亏总成本:<strong>{{ (totalData && (totalData.totalLossCost || totalData.totalLossCost==0)) ? '¥'+toThousands(totalData.totalLossCost) : '--' }}</strong>;
+        盘亏总成本:<strong>{{ (totalData && (totalData.totalLossCost || totalData.totalLossCost==0)) ? toThousands(totalData.totalLossCost) : '--' }}</strong>;
         盈亏总数量:<strong>{{ (totalData && (totalData.totalProfitLossQty || totalData.totalProfitLossQty==0)) ? totalData.totalProfitLossQty : '--' }}</strong>;
         盈亏总数量:<strong>{{ (totalData && (totalData.totalProfitLossQty || totalData.totalProfitLossQty==0)) ? totalData.totalProfitLossQty : '--' }}</strong>;
-        盈亏总成本:<strong>{{ (totalData && (totalData.totalProfitLossCost || totalData.totalProfitLossCost==0)) ? '¥'+toThousands(totalData.totalProfitLossCost) : '--' }}</strong>;
+        盈亏总成本:<strong>{{ (totalData && (totalData.totalProfitLossCost || totalData.totalProfitLossCost==0)) ? toThousands(totalData.totalProfitLossCost) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 2 - 2
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue

@@ -64,9 +64,9 @@
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         采购总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
-        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
-        入库总成本:<strong>{{ (totalData && (totalData.putAmount || totalData.putAmount==0)) ? '¥'+toThousands(totalData.putAmount) : '--' }}</strong>;
+        入库总成本:<strong>{{ (totalData && (totalData.putAmount || totalData.putAmount==0)) ? toThousands(totalData.putAmount) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 2 - 2
src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue

@@ -39,9 +39,9 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         总单数:<strong>{{ (totalData && (totalData.totalPutCategory || totalData.totalPutCategory==0)) ? totalData.totalPutCategory : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalPutCategory || totalData.totalPutCategory==0)) ? totalData.totalPutCategory : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         采购总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
-        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+        采购总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}</strong>;
         入库总数量:<strong>{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}</strong>;
-        入库总成本:<strong>{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? '¥'+toThousands(totalData.totalPutAmount) : '--' }}</strong>;
+        入库总成本:<strong>{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? toThousands(totalData.totalPutAmount) : '--' }}</strong>;
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->

+ 1 - 1
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue

@@ -84,7 +84,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+          退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -60,7 +60,7 @@
         总单数:<strong>{{ dataList?dataList.length :'--' }}</strong>;
         总单数:<strong>{{ dataList?dataList.length :'--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
+          退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 3 - 3
src/views/reportData/salesDetailReport/list.vue

@@ -150,11 +150,11 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+toThousands(totalData.totalCost) : '--' }}</strong>;
+          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
         </div>
         </div>
-        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? '¥'+toThousands(totalData.totalPrice) : '--' }}</strong>;
+        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? '¥'+toThousands(totalData.totalProfit) : '--' }}</strong>。
+          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? toThousands(totalData.totalProfit) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 3 - 3
src/views/reportData/salesReport/list.vue

@@ -117,11 +117,11 @@
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+toThousands(totalData.totalCost) : '--' }}</strong>;
+          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
         </div>
         </div>
-        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? '¥'+toThousands(totalData.totalPrice) : '--' }}</strong>;
+        总售价:<strong>{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? '¥'+toThousands(totalData.totalProfit) : '--' }}</strong>。
+          总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? toThousands(totalData.totalProfit) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 4 - 4
src/views/reportData/salesReturnReport/detailList.vue

@@ -76,11 +76,11 @@
         总退货数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         总退货数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         废品数量:<strong>{{ (totalData && (totalData.celQty || totalData.celQty==0)) ? totalData.celQty : '--' }}</strong>;
         废品数量:<strong>{{ (totalData && (totalData.celQty || totalData.celQty==0)) ? totalData.celQty : '--' }}</strong>;
         入库数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         入库数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
-        退货金额:<strong>{{ (totalData && (totalData.price || totalData.price==0)) ? '¥'+toThousands(totalData.price) : '--' }}</strong>;
-        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? '¥'+toThousands(totalData.discountAmount) : '--' }}</strong>;
-        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? '¥'+toThousands(totalData.discountedAmount) : '--' }}</strong>;
+        退货金额:<strong>{{ (totalData && (totalData.price || totalData.price==0)) ? toThousands(totalData.price) : '--' }}</strong>;
+        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</strong>;
+        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? '¥'+toThousands(totalData.cost) : '--' }}</strong>。
+          退货成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? toThousands(totalData.cost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 4 - 4
src/views/reportData/salesReturnReport/list.vue

@@ -51,11 +51,11 @@
         总退货数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         总退货数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         废品数量:<strong>{{ (totalData && (totalData.totalCelQty || totalData.totalCelQty==0)) ? totalData.totalCelQty : '--' }}</strong>;
         废品数量:<strong>{{ (totalData && (totalData.totalCelQty || totalData.totalCelQty==0)) ? totalData.totalCelQty : '--' }}</strong>;
         入库数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         入库数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
-        退货金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+toThousands(totalData.totalAmount) : '--' }}</strong>;
-        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? '¥'+toThousands(totalData.discountAmount) : '--' }}</strong>;
-        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? '¥'+toThousands(totalData.discountedAmount) : '--' }}</strong>;
+        退货金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</strong>;
+        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+toThousands(totalData.totalCost) : '--' }}</strong>。
+          退货成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/stockExpenditureReport/list.vue

@@ -33,7 +33,7 @@
             <div class="chart-hj">
             <div class="chart-hj">
               库存总出数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               库存总出数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               &nbsp;&nbsp;&nbsp;&nbsp;
               &nbsp;&nbsp;&nbsp;&nbsp;
-              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
+              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
             </div>
             </div>
             <div id="con1" class="chart"></div>
             <div id="con1" class="chart"></div>
           </div>
           </div>

+ 1 - 1
src/views/reportData/stockImportReport/detailList.vue

@@ -93,7 +93,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          总成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? '¥'+toThousands(totalData.cost) : '--' }}</strong>。
+          总成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? toThousands(totalData.cost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/stockImportReport/list.vue

@@ -45,7 +45,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+toThousands(totalData.productTotalCost) : '--' }}</strong>。
+          总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/stockIncomeReport/list.vue

@@ -33,7 +33,7 @@
             <div class="chart-hj">
             <div class="chart-hj">
               库存总入数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               库存总入数量:{{ (totalData&&totalData.totalQty) ? toThousands(totalData.totalQty,0) : '--' }}
               &nbsp;&nbsp;&nbsp;&nbsp;
               &nbsp;&nbsp;&nbsp;&nbsp;
-              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
+              总成本:{{ (totalData&&totalData.totalCost) ? toThousands(totalData.totalCost) : '--' }}
             </div>
             </div>
             <div id="con1" class="chart"></div>
             <div id="con1" class="chart"></div>
           </div>
           </div>

+ 4 - 4
src/views/reportData/storeReceivedSendStorageReport/list.vue

@@ -54,7 +54,7 @@
         bordered>
         bordered>
         <!-- 结存余额-成本 -->
         <!-- 结存余额-成本 -->
         <template slot="endAmount" slot-scope="text, record">
         <template slot="endAmount" slot-scope="text, record">
-          <span v-if="record.endDetail" :style="{background: text ? 'chartreuse':'', display: 'block'}">{{ text ? '¥' + toThousands(text) : '--' }}</span>
+          <span v-if="record.endDetail" :style="{background: text ? 'chartreuse':'', display: 'block'}">{{ text ? toThousands(text) : '--' }}</span>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>
@@ -107,7 +107,7 @@ export default {
                 let str
                 let str
                 if (record.beginDetail) {
                 if (record.beginDetail) {
                   if (text) {
                   if (text) {
-                    str = '¥' + _this.toThousands(text)
+                    str = _this.toThousands(text)
                   } else {
                   } else {
                     str = '--'
                     str = '--'
                   }
                   }
@@ -137,7 +137,7 @@ export default {
                 let str
                 let str
                 if (record.putDetail) {
                 if (record.putDetail) {
                   if (text) {
                   if (text) {
-                    str = '¥' + _this.toThousands(text)
+                    str = _this.toThousands(text)
                   } else {
                   } else {
                     str = '--'
                     str = '--'
                   }
                   }
@@ -167,7 +167,7 @@ export default {
                 let str
                 let str
                 if (record.outDetail) {
                 if (record.outDetail) {
                   if (text) {
                   if (text) {
-                    str = '¥' + _this.toThousands(text)
+                    str = _this.toThousands(text)
                   } else {
                   } else {
                     str = '--'
                     str = '--'
                   }
                   }

+ 1 - 1
src/views/reportData/storeTransferOutReport/detailList.vue

@@ -87,7 +87,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调出总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? '¥'+toThousands(totalData.outCost) : '--' }}</strong>;
+          调出总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/storeTransferOutReport/list.vue

@@ -62,7 +62,7 @@
         总单数:<strong>{{ (totalData && (totalData.productTotalCategory || totalData.productTotalCategory==0)) ? totalData.productTotalCategory : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.productTotalCategory || totalData.productTotalCategory==0)) ? totalData.productTotalCategory : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调出总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          调出总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -91,7 +91,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? ('¥'+toThousands(totalData.totalCost)) : '--' }}</strong>。
+          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 1 - 1
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -66,7 +66,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? ('¥'+toThousands(totalData.totalCost)) : '--' }}</strong>。
+          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -35,7 +35,7 @@
         <a-alert v-if="detailData" style="margin-bottom: 10px;" type="info">
         <a-alert v-if="detailData" style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
           <div slot="message" class="total-bar">
             <div>
             <div>
-              总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? '¥'+toThousands(detailData.totalAmount) : '--' }}</strong>;
+              总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
               总款数:<strong>{{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>;
               总款数:<strong>{{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>;
               总数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
               总数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
               赠品总数量:<strong>{{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }}</strong>;
               赠品总数量:<strong>{{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }}</strong>;
@@ -58,7 +58,7 @@
               </div>
               </div>
               <div>
               <div>
                 折扣:<strong>{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</strong>;
                 折扣:<strong>{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</strong>;
-                折后总售价:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? '¥'+toThousands(detailData.discountedAmount) : '--' }}</strong>;
+                折后总售价:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>;
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>