浏览代码

商品价格-利润曲线显示修改

jwyu 11 月之前
父节点
当前提交
c2215518f5
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      src/views/dataEntry_manage/mixins/chartPublic.js

+ 6 - 3
src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1662,8 +1662,9 @@ export const chartSetMixin = {
             
             if(haveContract) {
               // 利润曲线指标名
+              const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
               let edb_name = chartInfo.Source === 5 
-                ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
+                ? (isEdb ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
                 : commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName;
               str+=`<b>${ edb_name }</b>`
   
@@ -1687,8 +1688,9 @@ export const chartSetMixin = {
             
             if(haveContract) {
               // 利润曲线指标名
+              const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
               let edb_name = chartInfo.Source === 5
-                ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
+                ? (isEdb? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
                 : commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName;
               str+=`<b>${ edb_name }</b>`
   
@@ -1712,8 +1714,9 @@ export const chartSetMixin = {
 
             if(haveContract) {
               // 利润曲线指标名
+              const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
               let edb_name = chartInfo.Source === 5
-                ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitNameEn}(${obj_item.NameList[index]})`)
+                ? (isEdb ? obj_item.NameList[index] : `${chartInfo.ProfitNameEn}(${obj_item.NameList[index]})`)
                 : commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbNameEn;
               str+=`<b>${ edb_name }</b>`