Browse Source

Merge branch 'mergeBranch' into greenUrgent

# Conflicts:
#	src/HDrpManagement/dispatch/modules/productlist.vue
qymljy 4 months ago
parent
commit
221f97c49b

+ 1 - 1
src/Form/projectChange/edit.vue

@@ -373,7 +373,7 @@
                   <el-option
                     v-for="item in brandSelect"
                     :key="item.sa_brandid"
-                    :label="$t(item.value)"
+                    :label="$t(item.brandname)"
                     :value="item.sa_brandid"
                   >
                   </el-option>

+ 5 - 1
src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -10,6 +10,9 @@
       <el-descriptions-item :label="$t('状态')">
         <span :style="tool.getStatusColor(mainData.status)">{{ mainData.status?$t(mainData.status):"--" }}</span>
       </el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`检验报告数量`)">{{ mainData.count_jybg?mainData.count_jybg:mainData.count_jybg == 0?'0':"--" }}</el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`质保书数量`)">{{ mainData.count_zbs?mainData.count_zbs:mainData.count_zbs == 0?'0':"--" }}</el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`合格证数量`)">{{ mainData.count_hgz?mainData.count_hgz:mainData.count_hgz == 0?'0':"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('备注')">{{ mainData.remarks?mainData.remarks:"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('反审原因')">{{ mainData.uncheckreason?mainData.uncheckreason:"--" }}</el-descriptions-item>
     </el-descriptions>
@@ -45,7 +48,8 @@ export default {
     return {
       colorStyle:{
         color:''
-      }
+      },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   mounted() {

+ 18 - 15
src/HDrpManagement/dispatch/modules/productlist.vue

@@ -23,11 +23,14 @@
               <el-input v-if="data.status === '新建'" v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
               <p v-else>{{scope.column.data.remarks}}</p>
             </div>
-            <div v-else-if="scope.column.columnname === 'nominalpressure'">
-              {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
+            <div v-else-if="scope.column.columnname === 'undeliqty'">
+              {{tool.qtyShow(scope.column.data[scope.column.columnname])}}
             </div>
             <div v-else-if="scope.column.columnname === 'logisticsqty'">
-              {{scope.column.data.logisticsqty?scope.column.data.logisticsqty:scope.column.data.logisticsqty == 0?'0':'--'}}
+              {{tool.qtyShow(scope.column.data[scope.column.columnname])}}
+            </div>
+            <div v-else-if="scope.column.columnname === 'nominalpressure'">
+              {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
             <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           </template>
@@ -35,18 +38,18 @@
             <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)" :disabled="data.status !== '新建'">{{$t(`删 除`)}}</el-button>
           </template>
         </Table>
-        <div style="margin-top:16px;text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="param.content.pageNumber"
-              :page-sizes="[100, 50, 100, 200]"
-              :page-size="100"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="total">
-          </el-pagination>
-        </div>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="param.content.pageNumber"
+          :page-sizes="[100, 50, 100, 200]"
+          :page-size="100"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
       </el-col>
       <el-col :span="24 - setcol">
         <el-drawer

+ 5 - 1
src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -6,6 +6,9 @@
       <el-descriptions-item :label="$t('联系电话')">{{ mainData.phonenumber?$t(mainData.phonenumber):"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('地址')">{{`${mainData.province}${mainData.city}${mainData.county}${mainData.address}`}}</el-descriptions-item>
       <el-descriptions-item :label="$t(`收货时间`)">{{mainData.receivedate?$t(mainData.receivedate):"--"}}</el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`检验报告数量`)">{{ mainData.count_jybg?mainData.count_jybg:mainData.count_jybg == 0?'0':"--" }}</el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`质保书数量`)">{{ mainData.count_zbs?mainData.count_zbs:mainData.count_zbs == 0?'0':"--" }}</el-descriptions-item>
+      <el-descriptions-item v-if="siteid == 'YOSTEST1' || siteid == 'HY'" :label="$t(`合格证数量`)">{{ mainData.count_hgz?mainData.count_hgz:mainData.count_hgz == 0?'0':"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">{{$t(`物流信息`)}}</div>
@@ -36,7 +39,8 @@ export default {
     return {
       colorStyle:{
         color:''
-      }
+      },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   mounted() {

+ 14 - 9
src/HDrpManagement/orderManage/modules/edit.vue

@@ -463,21 +463,26 @@ export default {
     },
     async rebateUsedChange(){
       console.log(this.data)
-      if(this.data.status != '新建') return 1
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
-      let rebatebalance = this.data.rebatebalance; //返利金账户余额
+      if (this.data.status!='新建') return 1
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100;//最大可用金额
+      let rebatebalance = this.data.rebatebalance;//返利金账户余额
       const res = await this.$api.requested({
-        "id": 20230218225002,
-        "content": {
-          "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.checked, //是否使用
-          "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
+        "id": 20230218225002,
+        "content": {
+          "sa_orderid":this.data.sa_orderid,//订单金额
+          "isused":this.checked,//是否使用
+          "rebateamount":rebatebalance > amount ? amount : rebatebalance//返利金使用金额
         }
       })
       console.log(res)
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{})
+      }
       this.$emit('onSuccess')
       this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
       res.msg === '成功' ?this.data.rebateamount = res.data:''
+
+
     },
     onShow () {
       this.initPage()
@@ -584,7 +589,7 @@ export default {
       let that = this
       /* 修改返利金 */
       let rebateamount = e;
-      let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100;//最大可用金额
       const res = await this.$api.requested({
         "id":20230218225002,
         "content":{

+ 1 - 1
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):'--'
         }
       ]
     },

+ 8 - 3
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -840,7 +840,7 @@ export default {
       let that = this;
       /* 修改返利金 */
       let rebateamount = e;
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100; //最大可用金额
       const res = await this.$api.requested({
         id: 20230218225002,
         content: {
@@ -893,7 +893,7 @@ export default {
     async rebateUsedChange() {
       console.log(this.data);
       if (this.data.status != "新建") return 1;
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100; //最大可用金额
       let rebatebalance = this.data.rebatebalance; //返利金账户余额
       const res = await this.$api.requested({
         id: 20230218225002,
@@ -903,7 +903,12 @@ export default {
           rebateamount: rebatebalance > amount ? amount : rebatebalance, //返利金使用金额
         },
       });
-      this.$emit("onSuccess");
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{})
+      }else {
+        this.$emit("onSuccess");
+      }
+
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
     },
   },

+ 10 - 4
src/SDrpManagement/salerOrder/modules/edit.vue

@@ -700,7 +700,7 @@ export default {
     async rebateUsedChange() {
       console.log(this.data);
       if (this.data.status != "新建") return false;
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100; //最大可用金额
       let rebatebalance = this.data.rebatebalance; //返利金账户余额
       const res = await this.$api.requested({
         id: 20230218225002,
@@ -710,7 +710,13 @@ export default {
           rebateamount: rebatebalance > amount ? amount : rebatebalance, //返利金使用金额
         },
       });
-      this.$emit("onSuccess");
+
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{})
+      }else {
+        this.$emit("onSuccess");
+      }
+
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
     },
     onShow() {
@@ -838,7 +844,7 @@ export default {
       let that = this;
       /* 修改返利金 */
       let rebateamount = e;
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
+      let amount = Math.round((this.data.order_rebate_userate * this.data.defaultamount)*100)/100; //最大可用金额
       const res = await this.$api.requested({
         id: 20230218225002,
         content: {
@@ -847,7 +853,7 @@ export default {
           rebateamount: rebateamount > amount ? amount : rebateamount,
         },
       });
-      if (res.data == "成功") {
+      if (res.msg=='成功') {
         this.$emit("onSuccess");
         this.initPage();
         if (rebateamount > amount) {

+ 5 - 5
src/SManagement/user/user-info/components/PhoneEdit.vue

@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item :label="$t(`验证码`)">
         <el-input v-model="logCode" :placeholder="$t('请输入')" size="small"></el-input>
-        <el-button type="success" :disabled="count > 0" @click="countDown()" size="small">{{count == 0 ? $t("获取验证码") : count +'s'}}</el-button>
+        <el-button type="success" :disabled="count > 0" @click="countDown" size="small">{{count == 0 ? $t("获取验证码") : count +'s'}}</el-button>
       </el-form-item>
     </el-form>
     <div class="footer">
@@ -78,12 +78,12 @@ export default {
           }
       }).then( res => {
         const h = this.$createElement;
-        res.code === 1?this.$notify({
+        res.code == 0 && res.msgcode == '0016'?this.$notify.info({
           title: this.$t('获取验证码成功!'),
-          message: h('i', { style: 'color: teal'}, res.msg)
+          message: this.$t(res.msg)
         }):this.$notify({
-          title: '失败',
-          message: res.msg,
+          title: this.$t('失败'),
+          message: this.$t(res.msg),
           type: 'error'
         })
       })

+ 8 - 8
src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -51,10 +51,10 @@
               </div>
             </div>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`跟进类型`)}}:{{i.type}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`跟进对象`)}}:</span>
             <span  v-for="item in i.contacts" :key="item.index">
                     <span v-if="item.rowindex === i.contacts.length" class="span-style">
@@ -66,19 +66,19 @@
 
                   </span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`目的`)}}:{{i.target}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`过程`)}}:{{i.content}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`结果`)}}:{{i.results}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`下次跟进计划`)}}:{{i.nextplan}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
             <span class="span-style">{{$t(`营销费用`)}}:</span>
             <span v-if="i.salesfeesamount || i.salesfeesamount == 0">
                     <span style="color: red">¥ </span>
@@ -86,7 +86,7 @@
                   </span>
             <span v-else>--</span>
           </div>
-          <div class="padding-style" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">
+          <div class="padding-style" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/projectProjectDetail' && $route.path !== '/customerCustomerDetail'">
             <span class="span-style">{{$t(`跟进内容`)}}:{{i.content}}</span>
           </div>
           <div style="padding: 0 10px 10px 10px">

+ 1 - 1
src/components/normal-basic-layout/reportCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && status === '审核') || $route.name !== 'quotedprice'" class="inline-16">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
+    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && (status === '提交' || status === '审核')) || $route.name !== 'quotedprice'" class="inline-16">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
     <el-drawer
     :visible.sync="drawer"
     :with-header="false"

+ 7 - 0
src/utils/tool.js

@@ -346,6 +346,13 @@ export default {
       }
     })
     return newArr
+  },
+
+  /*数量展示*/
+  qtyShow(qty){
+    let newQty
+    qty?newQty = qty:qty == 0?newQty = '0':qty = '--'
+    return newQty
   }
 
 }

+ 1 - 1
src/views/clueData/modules/digitalSigns.vue

@@ -80,7 +80,7 @@
           <p class="title">{{ list.coverproject }}</p>
           <span class="content-font-new">{{$t('转化项目线索数')}}</span>
           <el-tooltip placement="top">
-            <div slot="content">{{$t('转化客户线索数:统计有转化项目操作的线索数')}}</div>
+            <div slot="content">{{$t('转化项目线索数:统计有转化项目操作的线索数')}}</div>
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>

+ 42 - 12
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