Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerSearchBo.java

@@ -54,5 +54,9 @@ public class DCustomerSearchBo {
      * 是否队伍 0：否 1：是
      */
     private Integer isTeam;
+    /**
+     * 涉诉限用/涉诉禁用
+     */
+    private String badnessState;
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbDirectExpenseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.excel.ExcelUtils;
@@ -65,7 +66,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
         //校验项目是否存在
         this.checkProjectExist(projectId);
 
-        //查询清单/费用项分类标识为数字的数字
+        //查询清单/费用项分类标识为数字123的数据
         List<CbDirectExpenseMenuVo> menuVoList = baseMapper.selectMenuData(projectId, regx, CbProjectConstants.DELETE_FLAG_EXIST);
         Assert.isFalse(menuVoList.isEmpty(), "当前项目不存在直接费菜单");
 
@@ -241,19 +242,28 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
      */
     @Override
     public List<CbDirectExpenseDataDetailVo> getDataDetail(Long menuId) {
-        //查询该菜单下的清
-        List<CbDirectExpenseDataDetailVo> qingList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+        //查询该菜单下的子集
+        List<CbDirectExpenseDataDetailVo> level4List = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
                 .eq(CbDirectExpense::getParentId, menuId)
-                //.eq(CbDirectExpense::getExpenseCategoryTag, CbProjectConstants.DIRECT_EXPENSE_CATEGORY_TAG_QING)
         ), CbDirectExpenseDataDetailVo.class);
-        Assert.isFalse(qingList.isEmpty(), "该菜单下无数据");
+        Assert.isFalse(level4List.isEmpty(), "该菜单下无数据");
 
         //生成数据树形
-        qingList.forEach(qing -> {
-            qing.getChildrenList().addAll(BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
-                    .eq(CbDirectExpense::getParentId, qing.getId())), CbDirectExpenseDataDetailVo.class));
+        this.generateDataDetailTree(level4List);
+        return level4List;
+    }
+
+    //生成数据详情树形
+    public void generateDataDetailTree(List<CbDirectExpenseDataDetailVo> level4List) {
+        level4List.forEach(item -> {
+            if (ReUtil.isMatch(regx, item.getExpenseCategoryTag())) {
+                item.setExpenseCategoryTag(null);
+            }
+            List<CbDirectExpenseDataDetailVo> childrenList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+                    .eq(CbDirectExpense::getParentId, item.getId())), CbDirectExpenseDataDetailVo.class);
+            item.getChildrenList().addAll(childrenList);
+            generateDataDetailTree(childrenList);
         });
-        return qingList;
     }
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -73,10 +73,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 if(!ObjectUtils.isEmpty(bo.getCustomerName())){
                     item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
                 }
-                //关键字标红
-                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
-                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
-                }
                 try {
                     Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
                     if (!ObjectUtils.isEmpty(map.get("data"))) {
@@ -87,6 +83,10 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 }catch (Exception e){
                     log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
                 }
+                //关键字标红
+                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
+                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
+                }
             });
         }
         return TableDataInfo.build(page);

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

@@ -77,6 +77,7 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         PageQuery query = new PageQuery();
         List<DCustomerListVo> records = baseMapper.allSearchList(query.build(), bo).getRecords();
         if (CollectionUtils.isNotEmpty(records)) {
+            for (int i = 0; i < records.size(); i++) records.get(i).setNum(i);
             records.parallelStream().forEach(item -> {
                 DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
                 //企业合作数量

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/FSupplierLimitedServiceImpl.java

@@ -21,9 +21,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 供应商限制信息表(FSupplierLimited)表服务实现类
@@ -136,5 +134,7 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
             }
         }
         return TableDataInfo.build(page);
+
     }
+
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryMapper.xml

@@ -134,12 +134,12 @@
 
     <select id="getGainLossAnalysisById" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
         where csu.id = #{id} and csu.del_flag = 0
         group by csu.id
         order by csu.sort
@@ -147,12 +147,12 @@
 
     <select id="getGainLossAnalysisByParentId" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
         where csu.parent_id = #{parentId} and csu.del_flag = 0
         group by csu.id
         order by csu.sort

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml

@@ -6,64 +6,66 @@
 
     <select id="allSearchList" resultType="com.dsk.cscec.domain.vo.DCustomerListVo">
         select
-            @row_number:=@row_number + 1 AS num,
-            customer_key, customer_id, customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business,
-            paytax_type, tax_rate, customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality,
-            construct_job_scope, credential, register_capital, contact_person, contact_phone, approve_date2, credit_level, group_specialty
-        from d_customer , (SELECT @row_number:=0) AS t
-        where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
-        <if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
+            dc.customer_key, dc.customer_id, dc.customer_code, dc.customer_name, dc.recommend_org, dc.register_region, dc.register_province, dc.register_city, dc.customer_class, dc.primary_business,
+            dc.paytax_type, dc.tax_rate, dc.customer_state, dc.leader_name, dc.labor_captain_phone, dc.labor_captain_idcard, dc.service_team_personnum, dc.service_team_speciality,
+            dc.construct_job_scope, dc.credential, dc.register_capital, dc.contact_person, dc.contact_phone, dc.approve_date2, dc.credit_level, dc.group_specialty, fsl.fstate badnessState
+        from d_customer dc
+        left join f_supplier_limited fsl on (fsl.flaowufbid = dc.customer_id
+                or fsl.fzhuanyefbid = dc.customer_id or fsl.ffgid = dc.customer_id or fsl.fzlid = dc.customer_id)
+        where dc.recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
+        <if test="bo.customerName != null and bo.customerName != '' "> and dc.customer_name like concat('%',#{bo.customerName},'%')</if>
         <if test="bo.province != null and bo.province.size > 0 and (bo.city == null or bo.city.size == 0) ">
-            and register_province in
+            and dc.register_province in
             <foreach collection="bo.province" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="bo.city != null and bo.city.size > 0 and (bo.province == null or bo.province.size == 0) ">
-            and register_city in
+            and dc.register_city in
             <foreach collection="bo.city" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="bo.province != null and bo.province.size > 0 and bo.city != null and bo.city.size > 0 " >
-            and ( register_province in
+            and ( dc.register_province in
             <foreach collection="bo.province" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            or register_city in
+            or dc.register_city in
             <foreach collection="bo.city" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
             )
         </if>
         <if test="bo.customerClass != null and bo.customerClass.size > 0 ">
-            and customer_class in
+            and dc.customer_class in
             <foreach collection="bo.customerClass" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="bo.customerState != null and bo.customerState.size > 0 ">
-            and customer_state in
+            and dc.customer_state in
             <foreach collection="bo.customerState" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="bo.creditLevel != null and bo.creditLevel.size > 0 ">
-            and credit_level in
+            and dc.credit_level in
             <foreach collection="bo.creditLevel" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="bo.credential != null and bo.credential.size > 0 ">
-            and credential in
+            and dc.credential in
             <foreach collection="bo.credential" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        <if test="bo.approveDateBegion != null and bo.approveDateBegion != '' ">and approve_date2 &gt;= #{bo.approveDateBegion}</if>
-        <if test="bo.approveDateEnd != null and bo.approveDateEnd != '' ">and approve_date2 &lt;= #{bo.approveDateEnd} </if>
-        <if test="bo.isTeam != null"> and leader_name is <if test="bo.isTeam == 1">not</if> null </if>
-        order by approve_date2 desc
+        <if test="bo.approveDateBegion != null and bo.approveDateBegion != '' ">and dc.approve_date2 &gt;= #{bo.approveDateBegion}</if>
+        <if test="bo.approveDateEnd != null and bo.approveDateEnd != '' ">and dc.approve_date2 &lt;= #{bo.approveDateEnd} </if>
+        <if test="bo.isTeam != null"> and dc.leader_name is <if test="bo.isTeam == 1">not</if> null </if>
+        <if test="bo.badnessState != null and bo.badnessState != ''"> and fsl.fstate = #{bo.badnessState}  </if>
+        order by dc.approve_date2 desc
     </select>
 
     <sql id="allColumn">

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -387,14 +387,14 @@
           }
         }
         if(key === '2'){
+          this.queryParams.maxStockPercent=''
+          // this.paramsData.maxStockPercent=''
           if(name === this.cgblName){
             this.cgblName=''
+            this.queryParams.minStockPercent=''
+            this.queryParams.maxStockPercent=''
           }else {
             this.cgblName=name;
-          }
-          this.queryParams.maxStockPercent=''
-          this.paramsData.maxStockPercent=''
-          if(this.cgblName){
             if(name === '100%'){
               this.queryParams.minStockPercent=1
             }
@@ -411,14 +411,11 @@
               this.queryParams.minStockPercent=0.01
               this.queryParams.maxStockPercent=0.05
             }
-          }else {
-            this.queryParams.minStockPercent=''
-            this.queryParams.maxStockPercent=''
           }
           if(this.paramsData){
-            if(!this.paramsData.combineId){
-              this.paramsData=this.queryParams
-            }
+            // if(!this.paramsData.combineId){
+            this.paramsData=this.queryParams
+            // }
             this.paramsData.pageNum =1
             this.queryParams.pageNum =1
           }

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

@@ -267,20 +267,48 @@
       cbVisible:false,
       chooseDate:"",
       isinput:false,//是否填写
-      tableHeight: window.innerHeight - 355
+      tableHeight: window.innerHeight - 355,
+      nowheight:null,
+      resizeTimer:null,
     };
   },
   //可访问data属性
   created() {
     this.init(this.comProjectId);
-    // this.createResizeObserver();
+    this.getHeight()
   },
   //计算集
-  computed: {
-
-  },
-  //方法集
-  methods: {
+  computed: {},
+    beforeDestroy() {
+      this.clearResizeTimer()
+      if (this.observer) {
+        this.observer.disconnect()
+      }
+    },
+    //方法集
+    methods: {
+      async getHeight(list){
+      this.nowheight = new ResizeObserver(entries => {
+        this.clearResizeTimer();
+        this.resizeTimer = setTimeout(() => {
+          this.maxHeight();
+        }, 1000);
+      });
+      await this.$nextTick();
+      this.nowheight.observe(document.querySelector('.profitloss'));
+    },
+    maxHeight(){
+      const domhei = document.querySelector('.profitloss').offsetHeight - 36 - 16 - 32
+      const conhei = document.querySelector('.meafixed-table').offsetHeight - 32
+      // const height = window.getComputedStyle(dom).height;
+      console.log(domhei)
+      this.tableHeight = domhei
+      // console.log(height)
+    },
+    clearResizeTimer() {
+      clearTimeout(this.resizeTimer);
+      this.resizeTimer = null;
+    },
     getGDT(){
       let gdt = document.querySelector('.el-table__body-wrapper')
       let w1 = document.querySelector('.el-table__fixed-right-patch')

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue

@@ -36,39 +36,43 @@
               <template slot-scope="scope">{{scope.row.cbName || '--'}}</template>
             </el-table-column>
             <el-table-column label="招标控制价" align="center">
-              <el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="不含税招标合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{scope.row.taxIncludeTenderSumPrice || '--'}}</template></el-table-column>
+              <el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice">
+                <template slot-scope="scope">{{changevalue(scope.row.tenderSumPrice)}}</template>
+              </el-table-column>
+              <el-table-column label="不含税招标合价" width="180" prop="taxExcludeTenderSumPrice">
+                <template slot-scope="scope">{{changevalue(scope.row.taxExcludeTenderSumPrice)}}</template>
+              </el-table-column>
+              <el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludeTenderSumPrice)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="投标报价" align="center">
-              <el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{scope.row.bidSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{scope.row.taxExcludeBidSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{scope.row.taxIncludebBidSumPrice || '--'}}</template></el-table-column>
+              <el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.bidSumPrice)}}</template></el-table-column>
+              <el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxExcludeBidSumPrice)}}</template></el-table-column>
+              <el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludebBidSumPrice)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="成本汇总" align="center">
-              <el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{scope.row.taxExclusiveTotal || '--'}}</template></el-table-column>
-              <el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{scope.row.cbTaxesTotal || '--'}}</template></el-table-column>
-              <el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{scope.row.taxInclusiveTotal || '--'}}</template></el-table-column>
+              <el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveTotal)}}</template></el-table-column>
+              <el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{changevalue(scope.row.cbTaxesTotal)}}</template></el-table-column>
+              <el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveTotal)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="造价指标（元/㎡）" align="center">
-              <el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{scope.row.costTender || '--'}}</template></el-table-column>
-              <el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{scope.row.costBid || '--'}}</template></el-table-column>
-              <el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{scope.row.costExpense || '--'}}</template></el-table-column>
+              <el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{changevalue(scope.row.costTender )}}</template></el-table-column>
+              <el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{changevalue(scope.row.costBid )}}</template></el-table-column>
+              <el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{changevalue(scope.row.costExpense)}}</template></el-table-column>
             </el-table-column>
-            <el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{scope.row.taxInclusiveExpenseProportion || '--'}}</template></el-table-column>
+            <el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpenseProportion)}}</template></el-table-column>
             <el-table-column label="控制盈亏对比情况" align="center">
-              <el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{scope.row.tenderSumPriceDeviation || '--'}}</template></el-table-column>
-              <el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{scope.row.tenderProfitLossRatio || '--'}}</template></el-table-column>
+              <el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.tenderSumPriceDeviation )}}</template></el-table-column>
+              <el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.tenderProfitLossRatio)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="投标报价盈亏对比情况" align="center">
-              <el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{scope.row.bidSumPriceDeviation || '--'}}</template></el-table-column>
-              <el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{scope.row.bidProfitLossRatio || '--'}}</template></el-table-column>
+              <el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.bidSumPriceDeviation)}}</template></el-table-column>
+              <el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.bidProfitLossRatio )}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="实际成本费用" align="center">
-              <el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{scope.row.taxInclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{scope.row.taxExclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxInclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxExclusiveExpense || '--'}}</template></el-table-column>
+              <el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxInclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxExclusiveExpense)}}</template></el-table-column>
             </el-table-column>
           </el-table>
         </div>
@@ -154,6 +158,10 @@
     },
     //方法集
     methods: {
+      changevalue(value){
+        let str = parseFloat(value)?value:'--'
+        return str
+      },
       select(menuPath){
         this.id = menuPath
         this.defaultActive = menuPath

dsk-operate-ui/src/views/projectCostLedger/index.vue

@@ -37,7 +37,7 @@
       <div class="table-project">
         <div class="table-item-jf1" v-if="total == 0 && !isSkeleton">
           <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
-          <div class="item-jf-titel">暂无数据，点击按钮导入项目成本数据</div>
+          <div class="item-jf-titel">暂无数据，点击按钮新增项目成本数据</div>
           <el-button type="primary" class="jf-btn" size="small" @click="addPro">新增项目</el-button>
         </div>
         <div style="padding: 16px;" v-if="isSkeleton">
@@ -47,11 +47,11 @@
           <div class="total-title">
             <div class="totals">共{{total}}条</div>
             <div class="btns">
-              <div class="btn btn_primary h32" @click="addPro">导入项目</div>
+              <div class="btn btn_primary h32" @click="addPro">新增项目</div>
               <div class="btn btn_default h32" @click="getcgx">草稿箱 ({{cgxtotal}})</div>
             </div>
           </div>
-          <div class="table-item-jf table-item">
+          <div class="table-item-jf table-item prolegder">
             <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                       v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
                       :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
@@ -855,4 +855,9 @@
     &.zt2{background: #0CBC6D}
     &.zt3{background: #FF3C3C}
   }
+  ::v-deep .prolegder{
+    .fixed-table .el-table__fixed-header-wrapper{
+      display: none;
+    }
+  }
 </style>

dsk-operate-ui/src/views/projectCostLedger/upload/index.vue

@@ -10,11 +10,10 @@
       :auto-upload="false"
       :on-change="handleFileListChange"
       :headers="headers">
-
     </el-upload>
     <div class="pro-upload">
     <div class="title_wrap i">
-      <div class="title-small"><span>项目成本台账 <i class="el-icon-arrow-right"></i> </span>导入项目</div>
+      <div class="title-small"><span style="cursor: pointer" @click="goback">项目成本台账 <i class="el-icon-arrow-right"></i> </span>导入项目</div>
       <div class="enterprise_title">
         项目信息
       </div>

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -71,7 +71,7 @@
             </el-col>
             <el-col :span="8">
             <el-form-item label="涉诉状态">
-              <el-select multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select placeholder="请选择" :collapse-tags="true"  v-model="formdata.badnessState" clearable>
                 <el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
@@ -190,7 +190,7 @@
             </template>
           </el-table-column>
           <el-table-column label="限用/禁用状态" min-width="120" :resizable="false">
-            <template slot-scope="scope">--</template>
+            <template slot-scope="scope">{{scope.row.badnessState||'--'}}</template>
           </el-table-column>
           <el-table-column label="劳务队长" min-width="120" :resizable="false">
             <template slot-scope="scope">
@@ -333,12 +333,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import {customerAll,areaAll,customerExport} from '@/api/supplier/supplier';
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, customerAll, customerExport } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+
   export default {
     name: 'ledger',
     components:{skeleton},