角色管理详情，销售数据调整

src/HManagement/roleManage/modules/role_details.vue

@@ -142,7 +142,7 @@ export default {
         },
         {
           label:this.$t('字段限制'),
-          value:this.mainData.fielddatatypelimit.length == '0'?'--':this.tool.ArrDataShow(this.mainData.fielddatatypelimit)
+          value:this.mainData.fielddatatypelimit && this.mainData.fielddatatypelimit.length > '0'?this.tool.ArrDataShow(this.mainData.fielddatatypelimit):'--'
         }
       ]
     },

src/views/salesData/components/boxLine.vue

@@ -70,17 +70,22 @@
             <p class="box-title" style="color: #929292" v-if="list.tbxsje > 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年同比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年同比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季同比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月同比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月同比")
+                }}</span>
               <i class="el-icon-caret-top" style="color: #2ad72a"></i
               ><span class="box-size-color"
                 >{{ Math.round(list.tbxsje * 100 * 100) / 100 }}%</span
@@ -89,17 +94,22 @@
             <p class="box-title" style="color: #929292" v-if="list.tbxsje == 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年同比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年同比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季同比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月同比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月同比")
+                }}</span>
               <span class="box-size-color" style="margin-left: 10px"
                 >{{ Math.round(list.tbxsje * 100 * 100) / 100 }}%</span
               >
@@ -107,17 +117,22 @@
             <p class="box-title" style="color: #929292" v-if="list.tbxsje < 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年同比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年同比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季同比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月同比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月同比")
+                }}</span>
               <i class="el-icon-caret-bottom" style="color: red"></i
               ><span class="box-size-color"
                 >{{ Math.round(list.tbxsje * 100 * 100) / 100 }}%</span
@@ -126,17 +141,22 @@
             <p class="box-title" style="color: #929292" v-if="list.hbxsje > 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年环比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年环比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月环比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月环比")
+                }}</span>
               <i class="el-icon-caret-top" style="color: #2ad72a"></i
               ><span class="box-size-color"
                 >{{ Math.round(list.hbxsje * 100 * 100) / 100 }}%</span
@@ -145,17 +165,22 @@
             <p class="box-title" style="color: #929292" v-if="list.hbxsje == 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年环比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年环比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月环比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月环比")
+                }}</span>
               <span class="box-size-color" style="margin-left: 10px"
                 >{{ Math.round(list.hbxsje * 100 * 100) / 100 }}%</span
               >
@@ -163,17 +188,22 @@
             <p class="box-title" style="color: #929292" v-if="list.hbxsje < 0">
               <span
                 v-if="
-                  param.content.dateType == '本年' ||
-                  param.content.dateType == '去年'
+                  param.content.dateType == '本年'
                 "
                 >{{ $t("年环比") }}</span
               >
+              <span v-else-if="param.content.dateType == '去年'">{{
+                  $t("去年环比")
+                }}</span>
               <span v-else-if="param.content.dateType == '本季'">{{
                 $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
                 $t("月环比")
               }}</span>
+              <span v-else-if="param.content.dateType == '上月'">{{
+                  $t("上月环比")
+                }}</span>
               <i class="el-icon-caret-bottom" style="color: red"></i
               ><span class="box-size-color"
                 >{{ Math.round(list.hbxsje * 100 * 100) / 100 }}%</span