xiaohaizhao 1 年之前
父節點
當前提交
f6babd2f6d
共有 24 個文件被更改,包括 71 次插入72 次删除
  1. 1 1
      src/HDrpManagement/contactProfile/modules/detail.vue
  2. 1 1
      src/HDrpManagement/contactProfile/modules/myNewCrad.vue
  3. 1 1
      src/HDrpManagement/customerPortrait/modules/detail.vue
  4. 4 4
      src/HDrpManagement/dataanalysis/modules/performanceData.vue
  5. 12 12
      src/HDrpManagement/dataanalysis/modules/salesData.vue
  6. 2 2
      src/HDrpManagement/invoicePredictionManage/details/index.vue
  7. 2 2
      src/HDrpManagement/invoicePredictionManage/details/modules/subordinate.vue
  8. 1 1
      src/HDrpManagement/projectPortrait/modules/detail.vue
  9. 2 2
      src/HDrpManagement/projectPredictionManage/details/index.vue
  10. 2 2
      src/HDrpManagement/projectPredictionManage/details/modules/projectList.vue
  11. 2 2
      src/HDrpManagement/projectPredictionManage/details/modules/projectListDetail.vue
  12. 1 1
      src/HDrpManagement/projectPredictionManage/details/modules/subordinate.vue
  13. 1 1
      src/HDrpManagement/salerPortrait/modules/detail.vue
  14. 1 1
      src/HDrpManagement/salerpriceData/index.vue
  15. 1 1
      src/HManagement/marketing2/saler/area/detail/modules/Prortraitdetail.vue
  16. 2 2
      src/SDrpManagement/invoicePrediction/detail/customDetail.vue
  17. 4 4
      src/SDrpManagement/invoicePrediction/detail/orderDetail.vue
  18. 2 2
      src/SDrpManagement/invoicePrediction/detail/projectDetail.vue
  19. 1 1
      src/SDrpManagement/projectPrediction/detail/projectListDetail.vue
  20. 11 11
      src/views/salesData/components/boxLine.vue
  21. 13 13
      src/views/salesData/index.vue
  22. 0 1
      src/views/salesData/modules/digitalSigns.vue
  23. 2 2
      src/views/salesData/modules/orderProductCategory.vue
  24. 2 2
      src/views/salesData/modules/orderType.vue

+ 1 - 1
src/HDrpManagement/contactProfile/modules/detail.vue

@@ -483,7 +483,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num, 0, '¥')
       } else {
-        return this.tool.formatAmount(num / 10000, 2, '¥') + '万'
+        return this.tool.formatAmount(num / 10000, 2, '¥') +this.$t('万')
       }
     },
   },

+ 1 - 1
src/HDrpManagement/contactProfile/modules/myNewCrad.vue

@@ -45,7 +45,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num, 0, '¥')
       } else {
-        return this.tool.formatAmount(num / 10000, 2, '¥') + '万'
+        return this.tool.formatAmount(num / 10000, 2, '¥') +this.$t('万')
       }
     },
   }

+ 1 - 1
src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -601,7 +601,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num,0,'¥')
       } else {
-        return this.tool.formatAmount(num / 10000,2,'¥') + '万'
+        return this.tool.formatAmount(num / 10000,2,'¥') +this.$t('万')
       }
     },
     /* 渲染表格 */

+ 4 - 4
src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -242,8 +242,8 @@
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
 <!--                      {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}-->
-<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
-                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
+<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) +this.$t('万'):listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
+                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) +this.$t('万')}}-->
                        <span>
                        ¥ {{listbj.outamount>100000000 ?tool.formatAmount(listbj.outamount/100000000,2) + ' ' + $t('亿'):listbj.outamount>10000?tool.formatAmount(listbj.outamount/10000,2)+ ' '+$t('万'):tool.formatAmount(listbj.outamount,2)}}
                       </span>
@@ -293,8 +293,8 @@
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
 <!--                      {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}-->
-<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
-                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
+<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) +this.$t('万'):listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
+                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) +this.$t('万')}}-->
                       <span>
                        ¥ {{listbj.invoiceamount>100000000 ?tool.formatAmount(listbj.invoiceamount/100000000,2) + ' ' + $t('亿'):listbj.invoiceamount>10000?tool.formatAmount(listbj.invoiceamount/10000,2)+ ' '+$t('万'):tool.formatAmount(listbj.invoiceamount,2)}}
                       </span>

+ 12 - 12
src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -30,7 +30,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bzxsje > 10000">
-                    {{tool.formatAmount(list.bzxsje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bzxsje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bzxsje,2)}}
@@ -40,7 +40,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bzchje > 10000">
-                    {{tool.formatAmount(list.bzchje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bzchje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bzchje,2)}}
@@ -51,7 +51,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bzkpje > 10000">
-                    {{tool.formatAmount(list.bzkpje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bzkpje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bzkpje,2)}}
@@ -62,7 +62,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                    <span v-if="list.bzskje > 10000">
-                    {{tool.formatAmount(list.bzskje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bzskje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bzskje,2)}}
@@ -102,7 +102,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.byxsje > 10000">
-                    {{tool.formatAmount(list.byxsje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.byxsje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.byxsje,2)}}
@@ -112,7 +112,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bychje > 10000">
-                    {{tool.formatAmount(list.bychje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bychje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bychje,2)}}
@@ -123,7 +123,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bykpje > 10000">
-                    {{tool.formatAmount(list.bykpje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bykpje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bykpje,2)}}
@@ -134,7 +134,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.byskje > 10000">
-                    {{tool.formatAmount(list.byskje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.byskje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.byskje,2)}}
@@ -174,7 +174,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                   <span v-if="list.bnxsje > 10000">
-                    {{tool.formatAmount(list.bnxsje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bnxsje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bnxsje,2)}}
@@ -184,7 +184,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                    <span v-if="list.bnchje > 10000">
-                    {{tool.formatAmount(list.bnchje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bnchje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bnchje,2)}}
@@ -195,7 +195,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                    <span v-if="list.bnkpje > 10000">
-                    {{tool.formatAmount(list.bnkpje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bnkpje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bnkpje,2)}}
@@ -205,7 +205,7 @@
               <el-col :span="6">
                 <span class="title-font" style="color: #333"><span style="font-size: 12px">¥</span>
                    <span v-if="list.bnskje > 10000">
-                    {{tool.formatAmount(list.bnskje / 10000,2) + '万'}}
+                    {{tool.formatAmount(list.bnskje / 10000,2) +this.$t('万')}}
                   </span>
                   <span v-else>
                     {{tool.formatAmount(list.bnskje,2)}}

+ 2 - 2
src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -235,7 +235,7 @@ export default {
         },
         {
           label:'出货预测金额',
-          value: this.mainData.orderoutamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderoutamount/10000,2)+'万':'¥'+this.tool.formatAmount(this.mainData.orderoutamount,2),
+          value: this.mainData.orderoutamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderoutamount/10000,2)+this.$t('万'):'¥'+this.tool.formatAmount(this.mainData.orderoutamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style
@@ -243,7 +243,7 @@ export default {
         },
         {
           label:'开票预测金额',
-          value: this.mainData.orderinvoamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderinvoamount/10000,2)+'万':'¥'+this.tool.formatAmount(this.mainData.orderinvoamount,2),
+          value: this.mainData.orderinvoamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderinvoamount/10000,2)+this.$t('万'):'¥'+this.tool.formatAmount(this.mainData.orderinvoamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style

+ 2 - 2
src/HDrpManagement/invoicePredictionManage/details/modules/subordinate.vue

@@ -90,7 +90,7 @@ export default {
         },
         {
           label:'出货预测金额',
-          value: this.mainData.orderoutamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderoutamount/10000,2)+'万':'¥'+this.tool.formatAmount(this.mainData.orderoutamount,2),
+          value: this.mainData.orderoutamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderoutamount/10000,2)+this.$t('万'):'¥'+this.tool.formatAmount(this.mainData.orderoutamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style
@@ -98,7 +98,7 @@ export default {
         },
         {
           label:'开票预测金额',
-          value: this.mainData.orderinvoamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderinvoamount/10000,2)+'万':this.tool.formatAmount(this.mainData.orderinvoamount,2),
+          value: this.mainData.orderinvoamount > 10000 ? '¥'+this.tool.formatAmount(this.mainData.orderinvoamount/10000,2)+this.$t('万'):this.tool.formatAmount(this.mainData.orderinvoamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style

+ 1 - 1
src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -691,7 +691,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num,0,'¥')
       } else {
-        return this.tool.formatAmount(num / 10000,2,'¥') + '万'
+        return this.tool.formatAmount(num / 10000,2,'¥') +this.$t('万')
       }
     },
   },

+ 2 - 2
src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -49,7 +49,7 @@
                  </el-col>
                  <el-col :span="11">
                    <span class="title">{{$t(`预测总金额`)}}:</span>
-                   <span class="amount">¥{{allprojectamount>10000?tool.formatAmount(allprojectamount/10000,2)+'万':tool.formatAmount(allprojectamount,2)}}</span>
+                   <span class="amount">¥{{allprojectamount>10000?tool.formatAmount(allprojectamount/10000,2)+this.$t('万'):tool.formatAmount(allprojectamount,2)}}</span>
                  </el-col>
                </el-row>
              </div>
@@ -215,7 +215,7 @@ export default {
         },
         {
           label:'预测金额',
-          value: this.mainData.projectamount > 10000?'¥'+this.tool.formatAmount(this.mainData.projectamount/10000,2)+'万':'¥'+this.tool.formatAmount(this.mainData.projectamount,2),
+          value: this.mainData.projectamount > 10000?'¥'+this.tool.formatAmount(this.mainData.projectamount/10000,2)+this.$t('万'):'¥'+this.tool.formatAmount(this.mainData.projectamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style

+ 2 - 2
src/HDrpManagement/projectPredictionManage/details/modules/projectList.vue

@@ -25,7 +25,7 @@
       </tableList>
       <div style="display: flex;justify-content: space-between;padding: 10px">
         <div style="line-height: 30px;vertical-align: middle">
-          <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{projectPrice > 10000?tool.formatAmount(projectPrice/10000,2)+'万':tool.formatAmount(projectPrice,2)}}</span>
+          <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{projectPrice > 10000?tool.formatAmount(projectPrice/10000,2)+this.$t('万'):tool.formatAmount(projectPrice,2)}}</span>
         </div>
         <div  >
           <el-pagination
@@ -88,7 +88,7 @@
       </tableList>
       <div style="display: flex;justify-content: space-between;padding: 10px">
         <div style="line-height: 30px;vertical-align: middle">
-          <span style="font-size: 14px">{{$t(``)}}预测金额: ¥{{productPrice > 10000?tool.formatAmount(productPrice/10000,2)+'万':tool.formatAmount(productPrice,2)}}</span>
+          <span style="font-size: 14px">{{$t(``)}}预测金额: ¥{{productPrice > 10000?tool.formatAmount(productPrice/10000,2)+this.$t('万'):tool.formatAmount(productPrice,2)}}</span>
         </div>
         <div  >
           <el-pagination

+ 2 - 2
src/HDrpManagement/projectPredictionManage/details/modules/projectListDetail.vue

@@ -24,7 +24,7 @@
         </template>
       </tableList>
       <div class=" container "  style="text-align:left;float: left">
-        <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{projectPrice > 10000 ?tool.formatAmount(projectPrice/10000,2)+'万':tool.formatAmount(projectPrice,2)}}</span>
+        <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{projectPrice > 10000 ?tool.formatAmount(projectPrice/10000,2)+this.$t('万'):tool.formatAmount(projectPrice,2)}}</span>
       </div>
       <div  class="container " style="text-align:right;float: right">
         <el-pagination
@@ -84,7 +84,7 @@
         </template>
       </tableList>
       <div class=" container "  style="text-align:left;float: left">
-        <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{productPrice > 10000 ?tool.formatAmount(productPrice/10000,2)+'万':tool.formatAmount(productPrice,2)}}</span>
+        <span style="font-size: 14px">{{$t(`预测金额`)}}: ¥{{productPrice > 10000 ?tool.formatAmount(productPrice/10000,2)+this.$t('万'):tool.formatAmount(productPrice,2)}}</span>
       </div>
       <div  class="container " style="text-align:right;float: right">
         <el-pagination

+ 1 - 1
src/HDrpManagement/projectPredictionManage/details/modules/subordinate.vue

@@ -82,7 +82,7 @@ export default {
         },
         {
           label:'预测金额',
-          value: this.mainData.projectamount > 10000?'¥'+this.tool.formatAmount(this.mainData.projectamount/10000,2)+'万':'¥'+this.tool.formatAmount(this.mainData.projectamount,2),
+          value: this.mainData.projectamount > 10000?'¥'+this.tool.formatAmount(this.mainData.projectamount/10000,2)+this.$t('万'):'¥'+this.tool.formatAmount(this.mainData.projectamount,2),
           style: ()=> {
             let style = {color:'#ff0000'}
             return style

+ 1 - 1
src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -1397,7 +1397,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num, 0, "¥");
       } else {
-        return this.tool.formatAmount(num / 10000, 2, "¥") + "万";
+        return this.tool.formatAmount(num / 10000, 2, "¥") +this.$t("万");
       }
     },
     /*订单明细排序*/

+ 1 - 1
src/HDrpManagement/salerpriceData/index.vue

@@ -121,7 +121,7 @@
                   <p>
                     <span v-if="dataAll.amount > 10000"
                       >{{ tool.formatAmount(dataAll.amount / 10000, 2)
-                      }}<span style="font-size: 14px">万</span></span
+                      }}<span style="font-size: 14px">{{$t('')}}</span></span
                     >
                     <span v-else>{{
                       tool.formatAmount(dataAll.amount, 2)

+ 1 - 1
src/HManagement/marketing2/saler/area/detail/modules/Prortraitdetail.vue

@@ -576,7 +576,7 @@ export default {
       if (num == 0) {
         return this.tool.formatAmount(num,0,'¥')
       } else {
-        return this.tool.formatAmount(num / 10000,2,'¥') + '万'
+        return this.tool.formatAmount(num / 10000,2,'¥') +this.$t('万')
       }
     },
   },

+ 2 - 2
src/SDrpManagement/invoicePrediction/detail/customDetail.vue

@@ -170,14 +170,14 @@
       <span style="font-size: 14px"
         >{{$t('出货预测金额')}}: ¥{{
           alloutamount > 10000
-            ? tool.formatAmount(alloutamount / 10000, 2) + "万"
+            ? tool.formatAmount(alloutamount / 10000, 2) +this.$t("万")
             : tool.formatAmount(alloutamount, 2)
         }}</span
       >
       <span style="font-size: 14px; margin-left: 10px"
         >{{$t('开票预测金额')}}: ¥{{
           allinvoiceamount > 10000
-            ? tool.formatAmount(allinvoiceamount / 10000, 2) + "万"
+            ? tool.formatAmount(allinvoiceamount / 10000, 2) +this.$t("万")
             : tool.formatAmount(allinvoiceamount, 2)
         }}</span
       >

+ 4 - 4
src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -181,14 +181,14 @@
         <span style="font-size: 14px"
           >{{ $t("出货预测金额") }}: ¥{{
             alloutamount > 10000
-              ? tool.formatAmount(alloutamount / 10000, 2) + "万"
+              ? tool.formatAmount(alloutamount / 10000, 2) +this.$t("万")
               : tool.formatAmount(alloutamount, 2)
           }}</span
         >
         <span style="font-size: 14px; margin-left: 10px"
           >{{ $t("开票预测金额") }}: ¥{{
             allinvoiceamount > 10000
-              ? tool.formatAmount(allinvoiceamount / 10000, 2) + "万"
+              ? tool.formatAmount(allinvoiceamount / 10000, 2) +this.$t("万")
               : tool.formatAmount(allinvoiceamount, 2)
           }}</span
         >
@@ -428,14 +428,14 @@
           <span style="font-size: 14px; margin-left: 10px"
             >{{ $t("总金额") }}: ¥{{
               totalamount > 10000
-                ? tool.formatAmount(totalamount / 10000, 2) + "万"
+                ? tool.formatAmount(totalamount / 10000, 2) +this.$t("万")
                 : tool.formatAmount(totalamount, 2)
             }}</span
           >
           <span style="font-size: 14px; margin-left: 10px"
             >{{ $t("折后金额") }}: ¥{{
               totaldefaultamount > 10000
-                ? tool.formatAmount(totaldefaultamount / 10000, 2) + "万"
+                ? tool.formatAmount(totaldefaultamount / 10000, 2) +this.$t("万")
                 : tool.formatAmount(totaldefaultamount, 2)
             }}</span
           >

+ 2 - 2
src/SDrpManagement/invoicePrediction/detail/projectDetail.vue

@@ -134,14 +134,14 @@
       <span style="font-size: 14px"
         >{{$t('出货预测金额')}}: ¥{{
           alloutamount > 10000
-            ? tool.formatAmount(alloutamount / 10000, 2) + "万"
+            ? tool.formatAmount(alloutamount / 10000, 2) +this.$t("万")
             : tool.formatAmount(alloutamount, 2)
         }}</span
       >
       <span style="font-size: 14px; margin-left: 10px"
         >{{$t('开票预测金额')}}: ¥{{
           allinvoiceamount > 10000
-            ? tool.formatAmount(allinvoiceamount / 10000, 2) + "万"
+            ? tool.formatAmount(allinvoiceamount / 10000, 2) +this.$t("万")
             : tool.formatAmount(allinvoiceamount, 2)
         }}</span
       >

+ 1 - 1
src/SDrpManagement/projectPrediction/detail/projectListDetail.vue

@@ -103,7 +103,7 @@
         <span style="font-size: 14px"
           >{{$t('预测金额')}}: ¥{{
             projectPrice > 10000
-              ? tool.formatAmount(projectPrice / 10000, 2) + "万"
+              ? tool.formatAmount(projectPrice / 10000, 2) +this.$t("万")
               : tool.formatAmount(projectPrice, 2)
           }}</span
         >

+ 11 - 11
src/views/salesData/components/boxLine.vue

@@ -22,10 +22,10 @@
         </div>
         <div style="width: 20%;height: 150px;margin-left: 16px;">
           <div style="display: inline-block;height: 120px;margin-top: 16px">
-            <p class="box-title">{{$t('')}}实际金额</p>
+            <p class="box-title">{{$t('实际金额')}}</p>
             <p style="font-size: 26px;color: #4F7BFD"><span style="font-size: 14px">¥</span>
-<!--              {{list.amount > 10000?tool.formatAmount(list.amount/10000,2) + '万':tool.formatAmount(list.amount,2)}}</p>-->
-              <span v-if="list.amount > 10000">{{tool.formatAmount(list.amount/10000,2)}}<span style="font-size: 14px">万</span></span>
+<!--              {{list.amount > 10000?tool.formatAmount(list.amount/10000,2) +this.$t('万'):tool.formatAmount(list.amount,2)}}</p>-->
+              <span v-if="list.amount > 10000">{{tool.formatAmount(list.amount/10000,2)}}<span style="font-size: 14px">{{$t('')}}</span></span>
               <span v-else>{{tool.formatAmount(list.amount/10000,2)}}</span>
 
             <p class="box-title" style="color: #929292" v-if="list.tbxsje > 0">
@@ -70,17 +70,17 @@
           <div style="display: inline-block;height: 120px;margin-top: 16px">
             <p class="box-title">{{$t('目标金额')}}</p>
             <p style="font-size: 26px;color: #0c0c0c"><span style="font-size: 14px">¥</span>
-<!--              {{list.target_l > 10000?tool.formatAmount(list.target_l/10000,2) + '万':tool.formatAmount(list.target_l,2)}}</p>-->
+<!--              {{list.target_l > 10000?tool.formatAmount(list.target_l/10000,2) +this.$t('万'):tool.formatAmount(list.target_l,2)}}</p>-->
               <span v-if="list.target_l > 10000">{{tool.formatAmount(list.target_l/10000,2)}}<span style="font-size: 14px">{{$t('万')}}</span></span>
               <span v-else>{{tool.formatAmount(list.target_l/10000,2)}}</span>
             <p class="box-title" style="color: #929292">
               {{$t('目标达成率')}}<span class="box-size-color" style="margin-left: 40px">{{Math.round((list.wcamount * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.unamount >= 0">
-              {{$t('实际与目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unamount > 10000?tool.formatAmount((list.unamount/10000),2)+'万':tool.formatAmount((list.unamount),2)}}</span>
+              {{$t('实际与目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unamount > 10000?tool.formatAmount((list.unamount/10000),2)+this.$t('万'):tool.formatAmount((list.unamount),2)}}</span>
             </p>
             <p class="box-title" style="color: #929292" v-else>
-              {{$t('实际与目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unamount < 10000?tool.formatAmount((list.unamount/10000),2)+'万':tool.formatAmount((list.unamount),2)}}</span>
+              {{$t('实际与目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unamount < 10000?tool.formatAmount((list.unamount/10000),2)+this.$t('万'):tool.formatAmount((list.unamount),2)}}</span>
             </p>
           </div>
         </div>
@@ -88,17 +88,17 @@
           <div style="display: inline-block;height: 120px;margin-top: 16px">
             <p class="box-title">{{$t('累计目标金额')}}</p>
             <p style="font-size: 26px;color: #0c0c0c"><span style="font-size: 16px">¥</span>
-<!--              {{list.target_l > 10000?tool.formatAmount(list.nowTarget_l/10000,2) + '万':tool.formatAmount(list.nowTarget_l,2)}}</p>-->
-              <span v-if="list.nowTarget_l > 10000">{{tool.formatAmount(list.nowTarget_l/10000,2)}}<span style="font-size: 14px">万</span></span>
+<!--              {{list.target_l > 10000?tool.formatAmount(list.nowTarget_l/10000,2) +this.$t('万'):tool.formatAmount(list.nowTarget_l,2)}}</p>-->
+              <span v-if="list.nowTarget_l > 10000">{{tool.formatAmount(list.nowTarget_l/10000,2)}}<span style="font-size: 14px">{{$t('')}}</span></span>
               <span v-else>{{tool.formatAmount(list.nowTarget_l/10000,2)}}</span>
             <p class="box-title" style="color: #929292">
               {{$t('累计目标达成率')}}<span class="box-size-color" style="margin-left: 40px">{{Math.round((list.wcnowTarget_l * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.unnowTarget_l >= 0">
-              {{$t('实际与累计目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unnowTarget_l > 10000?tool.formatAmount((list.unnowTarget_l/10000),2)+'万':tool.formatAmount((list.unnowTarget_l),2)}}</span>
+              {{$t('实际与累计目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unnowTarget_l > 10000?tool.formatAmount((list.unnowTarget_l/10000),2)+this.$t('万'):tool.formatAmount((list.unnowTarget_l),2)}}</span>
             </p>
             <p class="box-title" style="color: #929292" v-else>
-              {{$t('实际与累计目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unnowTarget_l < 10000?tool.formatAmount((list.unnowTarget_l/10000),2)+'万':tool.formatAmount((list.unnowTarget_l),2)}}</span>
+              {{$t('实际与累计目标差额')}}<span class="box-size-color"  style="margin-left: 10px">¥{{list.unnowTarget_l < 10000?tool.formatAmount((list.unnowTarget_l/10000),2)+this.$t('万'):tool.formatAmount((list.unnowTarget_l),2)}}</span>
             </p>
           </div>
         </div>
@@ -131,7 +131,7 @@ export default {
   },
   methods:{
     format(percentage){
-      return  '目标达成率' + '\n\n' + percentage + '%'
+      return  this.$t('目标达成率') + '\n\n' + percentage + '%'
     },
     async listData(){
       this.title === '订单' ? this.param.content.datatype = 1:this.title === '出货' ? this.param.content.datatype = 2 : this.title === '开票' ? this.param.content.datatype = 3 : this.param.content.datatype = 4

+ 13 - 13
src/views/salesData/index.vue

@@ -34,9 +34,9 @@
           <!--  数字看板      -->
           <digitalSigns ref="digitalSigns" :windowWidth="windowWidth"></digitalSigns>
           <!--  客户账户余额分析      -->
-          <customerAccountBalanceAnalysis ref="customerAccountBalanceAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull" ></customerAccountBalanceAnalysis>
+          <!-- <customerAccountBalanceAnalysis ref="customerAccountBalanceAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull" ></customerAccountBalanceAnalysis> -->
           <!--  客户业务员销售      -->
-          <div class="div-box-new-margin" >
+          <!-- <div class="div-box-new-margin" >
             <div class="div-border-box">
               <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane :label="$t(`客户销售TOP10`)" name="客户销售">
@@ -47,27 +47,27 @@
                 </el-tab-pane>
               </el-tabs>
             </div>
-          </div>
+          </div> -->
           <!--  报价分析      -->
-          <quotationAnalysis ref="quotationAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></quotationAnalysis>
+          <!-- <quotationAnalysis ref="quotationAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></quotationAnalysis> -->
           <!--  订单趋势分析      -->
-          <orderTrendAnalysis ref="orderTrendAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></orderTrendAnalysis>
+          <!-- <orderTrendAnalysis ref="orderTrendAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></orderTrendAnalysis> -->
           <!--  订单类型占比分析      -->
-          <orderType ref="orderType" :dataid="departmentid" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></orderType>
+          <!-- <orderType ref="orderType" :dataid="departmentid" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></orderType> -->
           <!--订单产品类别占比分析-->
-          <orderProductCategory ref="orderProductCategory" :dataid="departmentid" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></orderProductCategory>
+          <!-- <orderProductCategory ref="orderProductCategory" :dataid="departmentid" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></orderProductCategory> -->
           <!--  出货趋势分析      -->
-          <shippingTrendAnalysis ref="shippingTrendAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></shippingTrendAnalysis>
+          <!-- <shippingTrendAnalysis ref="shippingTrendAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></shippingTrendAnalysis> -->
           <!--  近12月延期出货情况分析      -->
-          <delayedShipmentAnalysis ref="delayedShipmentAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></delayedShipmentAnalysis>
+          <!-- <delayedShipmentAnalysis ref="delayedShipmentAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></delayedShipmentAnalysis> -->
           <!--  开票金额趋势分析      -->
-          <invoiceAmountAnalysis ref="invoiceAmountAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></invoiceAmountAnalysis>
+          <!-- <invoiceAmountAnalysis ref="invoiceAmountAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></invoiceAmountAnalysis> -->
           <!--  近12月出货未开票金额趋势分析      -->
-          <uninvoiceAmountAnalysis ref="uninvoiceAmountAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></uninvoiceAmountAnalysis>
+          <!-- <uninvoiceAmountAnalysis ref="uninvoiceAmountAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></uninvoiceAmountAnalysis> -->
           <!--  出货未开票分析      -->
-          <shippingUninvoiceAnalysis ref="shippingUninvoiceAnalysis" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></shippingUninvoiceAnalysis>
+          <!-- <shippingUninvoiceAnalysis ref="shippingUninvoiceAnalysis" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></shippingUninvoiceAnalysis> -->
           <!--  财务回款分析      -->
-          <financialCollectionAnalysis ref="financialCollectionAnalysis" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></financialCollectionAnalysis>
+          <!-- <financialCollectionAnalysis ref="financialCollectionAnalysis" :scrollHeight="scrollData" :windowWidth="windowWidth" @backFull="backFull"></financialCollectionAnalysis> -->
         </div>
 
       </template>

+ 0 - 1
src/views/salesData/modules/digitalSigns.vue

@@ -28,7 +28,6 @@ export default {
   data(){
     return {
       dataType:'本年',
-
     }
   },
 

+ 2 - 2
src/views/salesData/modules/orderProductCategory.vue

@@ -209,7 +209,7 @@ export default {
         sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
-        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
+        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+this.$t('万')
       }else {
         this.totalamount = res.data[0].ratio[0].total
       }
@@ -251,7 +251,7 @@ export default {
         sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
-        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
+        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+this.$t('万')
       }else {
         this.totalamount = res.data[0].ratio[0].total
       }

+ 2 - 2
src/views/salesData/modules/orderType.vue

@@ -170,7 +170,7 @@ export default {
       }
 
       if (this.type === '金额'){
-        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
+        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+this.$t('万')
       }else {
         this.totalamount = res.data[0].ratio[0].total
       }
@@ -212,7 +212,7 @@ export default {
         sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
-        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
+        this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+this.$t('万')
       }else {
         this.totalamount = res.data[0].ratio[0].total
       }