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/component/DataAnalysisComponent.java

@@ -54,71 +54,69 @@ public class DataAnalysisComponent {
         if (ObjectUtils.isEmpty(fileList)) return;
         //文件处理
         for (CbProjectFile file : fileList) {
-//            if (file.getDelFlag() == 0) {
-
-                //文件下载
-                InputStream inputStream = ossService.downFileIO(file.getFileOssId());
-                if (ObjectUtil.isNull(inputStream)) {
-                    file.setFileParseStatus(3);
-                    file.setFailRemark("文件数据不存在");
-                    projectFileService.updateById(file);
-                    break;
-                }
-                //解析数据
-                List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(inputStream, 1);
-                if (importList.isEmpty()) {
+            //文件下载
+            InputStream inputStream = ossService.downFileIO(file.getFileOssId());
+            if (ObjectUtil.isNull(inputStream)) {
+                file.setFileParseStatus(3);
+                file.setFailRemark("文件数据不存在");
+                projectFileService.updateById(file);
+                break;
+            }
+            //解析数据
+            List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(inputStream, 1);
+            if (importList.isEmpty()) {
+                file.setFileParseStatus(3);
+                file.setFailRemark("表格中不存在待导入数据!");
+                projectFileService.updateById(file);
+                break;
+            }
+            List<CbQuantitySummary> quantitySummaryList = importList.stream().parallel()
+                    .filter(item -> !ObjectUtils.isEmpty(item.getCbName()))
+                    .peek(item -> {
+                        item.setProjectId(bo.getProjectId());
+                        item.setCbStage(bo.getCbStage());
+                        item.setCbProjectFileId(file.getId());
+                    }).collect(Collectors.toList());
+            if (quantitySummaryList.isEmpty()) {
+                throw new ServiceException("表格中不存在有效数据!");
+            }
+            transactionTemplate.execute(status -> {
+                try {
+//                    //分批次插入
+//                    if (quantitySummaryList.size() > 1000) {
+//                        int index = 0;
+//                        int sum = quantitySummaryList.size();
+//                        while (index < sum) {
+//                            List<CbQuantitySummary> divideList = quantitySummaryList.subList(index, Math.min(index + 1000, sum));
+//                            boolean b = quantitySummaryService.saveBatch(divideList);
+//                            if (!b) {
+//                                throw new ServiceException("数据插入失败！");
+//                            }
+//                            index += 1000;
+//                        }
+//                    } else {
+//                        boolean b = quantitySummaryService.saveBatch(quantitySummaryList);
+//                        if (!b) {
+//                            throw new ServiceException("数据插入失败！");
+//                        }
+//                    }
+                    boolean a = quantitySummaryService.batchInsert(quantitySummaryList);
+                    if (!a) {
+                        throw new ServiceException("数据插入失败！");
+                    }
+                    file.setFileParseStatus(2);
+                    boolean b = projectFileService.updateById(file);
+                    if (!b) {
+                        throw new ServiceException("文件状态更新失败！");
+                    }
+                } catch (Exception e) {
+                    status.setRollbackOnly();
                     file.setFileParseStatus(3);
-                    file.setFailRemark("表格中不存在待导入数据!");
+                    file.setFailRemark(e.getMessage());
                     projectFileService.updateById(file);
-                    break;
                 }
-                List<CbQuantitySummary> quantitySummaryList = importList.stream().parallel()
-                        .filter(item -> !ObjectUtils.isEmpty(item.getCbName()))
-                        .peek(item -> {
-                            item.setProjectId(bo.getProjectId());
-                            item.setCbStage(bo.getCbStage());
-                            item.setCbProjectFileId(file.getId());
-                        }).collect(Collectors.toList());
-                if (quantitySummaryList.isEmpty()) {
-                    throw new ServiceException("表格中不存在有效数据!");
-                }
-                transactionTemplate.execute(status -> {
-                    try {
-                        //分批次插入
-                        if (quantitySummaryList.size() > 1000) {
-                            int index = 0;
-                            int sum = quantitySummaryList.size();
-                            while (index < sum) {
-                                List<CbQuantitySummary> divideList = quantitySummaryList.subList(index, Math.max((index + 1) * 1000, sum));
-                                boolean b = quantitySummaryService.saveBatch(divideList);
-                                if (!b) {
-                                    throw new ServiceException("数据插入失败！");
-                                }
-                                index += 1000;
-                            }
-                        } else {
-                            boolean b = quantitySummaryService.saveBatch(quantitySummaryList);
-                            if (!b) {
-                                throw new ServiceException("数据插入失败！");
-                            }
-                        }
-                        file.setFileParseStatus(2);
-                        boolean b = projectFileService.updateById(file);
-                        if (!b) {
-                            throw new ServiceException("文件状态更新失败！");
-                        }
-                    } catch (Exception e) {
-                        status.setRollbackOnly();
-                        file.setFileParseStatus(3);
-                        file.setFailRemark(e.getMessage());
-                        projectFileService.updateById(file);
-                    }
-                    return Boolean.TRUE;
-                });
-//            } else {
-//                quantitySummaryService.remove(Wrappers.<CbQuantitySummary>lambdaQuery().eq(CbQuantitySummary::getCbProjectFileId, file.getId()));
-//                projectFileService.removeById(file);
-//            }
+                return Boolean.TRUE;
+            });
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.dsk.cscec.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -10,6 +11,7 @@ import java.io.Serializable;
 
 import com.dsk.common.annotation.Excel;
 import lombok.Data;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 成本-工料汇总基本表(CbQuantitySummary)表实体类
@@ -32,7 +34,6 @@ public class CbQuantitySummary implements Serializable {
     /**
      * 序号
      */
-    @Excel(name = "序号")
     private Integer number;
     /**
      * 成本阶段(0：标前成本 1：标后成本 2：转固成本)
@@ -141,5 +142,12 @@ public class CbQuantitySummary implements Serializable {
     @TableLogic(value = "0", delval = "2")
     private Integer delFalg;
 
+    @Excel(name = "序号")
+    @TableField(exist = false)
+    private String num;
+
+    public void setNum(String num) {
+        this.number = ObjectUtils.isEmpty(num) ? null : Integer.valueOf(num);
+    }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbQuantitySummaryMapper.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 public interface CbQuantitySummaryMapper extends BaseMapperPlus<CbQuantitySummaryMapper,CbQuantitySummary,CbQuantitySummary> {
 
+    int batchInsert(@Param("list") List<CbQuantitySummary> list);
 
     List<Map<String, Object>> selectSubject(CbProjectBaseBo bo);
 
@@ -29,5 +30,7 @@ public interface CbQuantitySummaryMapper extends BaseMapperPlus<CbQuantitySummar
 
     List<CbQuantitySummaryListVo> selectListBySubject(CbQuantitySummaryListBo bo);
 
+
+
 }
 

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

@@ -28,5 +28,7 @@ public interface ICbQuantitySummaryService extends IService<CbQuantitySummary> {
 
     void pushData(CbQuantitySummaryActual bo);
 
+    boolean batchInsert(List<CbQuantitySummary> list);
+
 }
 

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

@@ -139,5 +139,11 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
         //TODO 推送数据
 
     }
+
+    @Override
+    public boolean batchInsert(List<CbQuantitySummary> list) {
+        int i = baseMapper.batchInsert(list);
+        return i == list.size();
+    }
 }
 

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.CbQuantitySummaryMapper">
+    <insert id="batchInsert" parameterType="com.dsk.cscec.domain.CbQuantitySummary">
+        INSERT INTO cscec_bms.cb_quantity_summary
+        (project_id, `number`, cb_stage, cb_subject_name, company_no, org_no, cb_name, job_content,
+        calculation_rule, unit, material_description, guide_price, bid_unit_price, unit_price_difference, quantity,
+        combined_price, combined_price_tax, brand_name, bid_source, remark, cb_project_file_id)
+        VALUES
+        <foreach collection="list" item="item" separator="," >
+            (#{item.projectId}, #{item.number}, #{item.cbStage}, #{item.cbSubjectName}, #{item.companyNo}, #{item.orgNo}, #{item.cbName},
+            #{item.jobContent},#{item.calculationRule},#{item.unit},#{item.materialDescription},#{item.guidePrice},
+            #{item.bidUnitPrice},#{item.unitPriceDifference},#{item.quantity},#{item.combinedPrice},#{item.combinedPriceTax},
+            #{item.brandName},#{item.bidSource},#{item.remark},#{item.cbProjectFileId})
+        </foreach>
+     </insert>
 
     <select id="selectSubject" resultType="java.util.Map">
         select

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -239,6 +239,14 @@ export const getFeedSummaryListApi = (params = {}) => request({
   params
 });
 
+
+
+//工程项目信息
+export const getCbProjectInfo = (relatedId) => request({
+  url: '/cbProjectRecord/getCbProjectInfo/' + relatedId,
+  method: "get",
+});
+
 // 其他项目
 
 //其他项目左侧菜单
@@ -252,3 +260,10 @@ export const getProjectOtherStatistics = (relatedId) => request({
   url: '/cb/projectOther/statistics/' + relatedId,
   method: "get",
 });
+
+//其他费用-其他费用列表
+export const getProjectOtherList = (params = {}) => request({
+  url: "/cb/projectOther/list",
+  method: "get",
+  params
+});

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

@@ -44,33 +44,33 @@
 </template>
 <script>
   import InfoTable from '../../../../component/infoTable';
+  import { getCbProjectInfo } from "@/api/projectCostLedger";
 export default {
   name: "projectInformation",
   components: {InfoTable},
   data() {
     return {
+      comProjectId:'',
       labelWidth: 250,
-      forInfo: {
-        name:'宝安中学（集团）初中部改扩建工程施工总承包（二次公告）',
-      },
+      forInfo: { },
       defaultList1: [
         // { name: '工程名称', prop: 'name', slot: true  },
-        { name: '工程名称', prop: 'name', style: true },
-        { name: '工程所在地', prop: 'creditNo' },
-        { name: '工程详细地址', prop: 'operName' },
+        { name: '工程名称', prop: 'projectName', style: true },
+        { name: '工程所在地', prop: 'areaName' },
+        { name: '工程详细地址', prop: 'projectAddress' },
         { name: '业态', prop: 'status' },
-        { name: '工程类型', prop: 'startDate' },
+        { name: '工程类型', prop: 'projectType1' },
         { name: '计价模式（清单/定额）', prop: 'registCapi' },
         { name: '承包形式（EPC/DB/EP/PC）', prop: 'actualCapi'},
         { name: '合同类型', prop: 'checkDate' },
         { name: '建设单位', prop: 'orgNo' },
-        { name: '设计单位', prop: 'regNo' },
+        { name: '设计单位', prop: 'designOrgName' },
         { name: '勘察单位', prop: 'creditNo' },
-        { name: '监理单位', prop: 'econKind' },
+        { name: '监理单位', prop: 'supervisorOrgName' },
         { name: '代理公司（或工料测量师）', prop: 'term'},
         { name: '招标形式', prop: 'qualification' },
         { name: '承包方式', prop: 'provinceCode'},
-        { name: '资金来源', prop: 'belongOrg' },
+        { name: '资金来源', prop: 'moneySource' },
         { name: '分包标准费用项价格库', prop: 'colleguesNum'},
         { name: '材料机械标准费用价格库', prop: 'colleguesNum'},
         { name: '专业类别', prop: 'scope'},
@@ -87,9 +87,9 @@ export default {
         { name: '结构类型', prop: 'registCapi' },
         { name: '基础类型', prop: 'actualCapi'},
         { name: '单体个数', prop: 'checkDate', style: true  },
-        { name: '地上层数', prop: 'orgNo' },
-        { name: '地下层数', prop: 'regNo' },
-        { name: '建筑高度', prop: 'creditNo' },
+        { name: '地上层数', prop: 'noOfOverfloor' },
+        { name: '地下层数', prop: 'noOfUnderfloor' },
+        { name: '建筑高度', prop: 'constructHeight' },
         { name: '地下深度', prop: 'econKind' },
         { name: '首层（m）', prop: 'term'},
         { name: '标准层（m）', prop: 'qualification' },
@@ -146,9 +146,9 @@ export default {
         time:'2023-10-20'
       },
       defaultListYd4: [
-        { name: '计划开工日期', prop: 'time' },
-        { name: '计划竣工日期', prop: 'operName' },
-        { name: '总工期（天）', prop: 'status' },
+        { name: '计划开工日期', prop: 'planStartDate' },
+        { name: '计划竣工日期', prop: 'planEndDate' },
+        { name: '总工期（天）', prop: 'contractWorkDays' },
         { name: '缺陷责任', prop: 'startDate' },
       ],
       forInfoYd5:{
@@ -191,9 +191,40 @@ export default {
       ],
     };
   },
+  props: {
+    // 项目ID
+    // projectId: {
+    //   type: String,
+    //   required: true,
+    //   default: ""
+    // },
+    // 详情信息
+    projectDetailInfo: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  watch: {
+    projectDetailInfo: {
+      handler(newValue) {
+        this.comProjectDetailInfo = newValue ? newValue : {};
+        // this.getCbProjectInfo(this.comProjectDetailInfo.projectId)
+        this.getCbProjectInfo('1759507630130479106')
+        // this.init(this.comProjectDetailInfo);
+      },
+      deep: true,
+      immediate: true
+    },
+    projectId: {
+      handler(newValue) {
+        this.comProjectId = newValue;
+      },
+      immediate: true
+    }
+  },
   //可访问data属性
   created() {
-
+    // this.getCbProjectInfo()
   },
   //计算集
   computed: {
@@ -201,7 +232,17 @@ export default {
   },
   //方法集
   methods: {
+    async getCbProjectInfo(params) {
+      try {
+        const result = await getCbProjectInfo(params);
+        if (result.code == 200) {
+          console.log(result.data)
+          this.forInfo=result.data;
+        }
+      } catch (error) {
 
+      }
+    },
   },
 }
 </script>

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

@@ -3,7 +3,7 @@
     <div class="otherProjects-cont">
       <div class="left">
         <div class="left-side-menu">
-          <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive">
+          <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive" @select="select">
             <template slot="其他费-1">
               <img src="@/assets/images/projectCostLedger/icon_cost_detail_5.svg" alt="">
               <div class="project-sub-menu-title-text">其他费</div>
@@ -36,10 +36,10 @@
           <tables
             v-if="!isSkeleton"
             :tableLoading="tableLoading"
-            :tableData="tableData"
+            :tableData="tableData1"
             :forData="forData1"
             :MaxPage=500
-            :tableDataTotal="tableDataTotal"
+            :tableDataTotal="tableDataTotal1"
             :queryParams="queryParams"
             @handle-current-change="handleCurrentChange"
             @sort-change="sortChange"
@@ -56,7 +56,7 @@
     </div>
 
     <el-dialog :visible.sync="dialogVisible" width="720px" append-to-body class="dialogVisible" title="单位换算">
-      <el-tabs v-model="currentList">
+      <el-tabs v-model="currentList" @tab-click="handleClickTab">
         <el-tab-pane
           :key="index"
           v-for="(item, index) in toggleTabs"
@@ -71,8 +71,8 @@
               <el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
             </el-select>
             <i class="el-icon-sort icon"></i>
-            <el-select v-model="type1" placeholder="请选择">
-              <el-option v-for="(item,index) in typeList1" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+            <el-select v-model="type2" placeholder="请选择">
+              <el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
             </el-select>
           </div>
           <el-table
@@ -106,65 +106,54 @@
 <script>
   import Tables from "../../../../component/Tables"
   import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
-  import { getProjectOtherMenuTreeApi,getProjectOtherStatistics } from "@/api/projectCostLedger";
+  import { getProjectOtherMenuTreeApi,getProjectOtherStatistics,getProjectOtherList } from "@/api/projectCostLedger";
 export default {
   name: "directCost",
   components: {
     Tables,ProjectSideMenu
   },
   props: {
-    // // 项目ID
+    // 项目ID
     // projectId: {
     //   type: String,
     //   required: true,
     //   default: ""
     // },
-    // // 详情信息
-    // projectDetailInfo: {
-    //   type: Object,
-    //   default: () => ({})
-    // }
+    // 详情信息
+    projectDetailInfo: {
+      type: Object,
+      default: () => ({})
+    }
   },
   data() {
     return {
       comProjectId:'',
       isSkeleton:false,
       tableLoading:false,
-      tableData:[
-        {
-          name:'技术质量管理类',
-          number:'236',
-          proportion:'64'
-        },
-        {
-          name:'工程保险类',
-          number:'336',
-          proportion:'64'
-        },
-      ],
+      tableData:[],
+      tableDataTotal:0,
       forData: [
         {label: '其他项目费用', prop: 'expenseName'},
         {label: '数量', prop: 'expenseValue'},
         {label: '占比', prop: 'proportion', slot: true},
       ],
       forData1: [
-        {label: '清单内容', prop: 'name',minWidth:'215'},
-        {label: '工作内容、做法/规格型号/施工现场配置说明', prop: 'number',minWidth:'302'},
-        {label: '单位', prop: 'proportion',minWidth:'215'},
-        {label: '不含税单价', prop: 'proportion',minWidth:'215'},
-        {label: '不含税合价', prop: 'proportion',minWidth:'215'},
-        {label: '税率（%）', prop: 'proportion',minWidth:'215'},
-        {label: '含税合价', prop: 'proportion',minWidth:'215'},
-        {label: '税金（元）', prop: 'proportion',minWidth:'215'},
-        {label: '成本科目', prop: 'proportion',minWidth:'215'},
-        {label: '税金类型', prop: 'proportion',minWidth:'215'},
-        {label: '备注', prop: 'proportion',minWidth:'215'},
+        {label: '清单内容', prop: 'itemContent',minWidth:'220'},
+        {label: '工作内容、做法/规格型号/施工现场配置说明', prop: 'workContent',minWidth:'302'},
+        {label: '单位', prop: 'unit',minWidth:'115'},
+        {label: '不含税单价', prop: 'unitPriceExcludingTax',minWidth:'115'},
+        {label: '不含税合价', prop: 'totalPriceExcludeTax',minWidth:'115'},
+        {label: '税率（%）', prop: 'taxRate',minWidth:'115'},
+        {label: '含税合价', prop: 'totalPriceIncludingTax',minWidth:'115'},
+        {label: '税金（元）', prop: 'taxAmount',minWidth:'115'},
+        {label: '成本科目', prop: 'costSubject',minWidth:'160'},
+        {label: '税金类型', prop: 'taxType',minWidth:'115'},
+        {label: '备注', prop: 'remarks',minWidth:'200'},
       ],
       queryParams:{
         pageNum:1,
         pageSize:10,
       },
-      tableDataTotal:2,
       defaultActive: "费用汇总",
       menuTreeList: [
         {
@@ -192,63 +181,69 @@ export default {
           value: "type3",
           name: "体积",
         },
+        // {
+        //   value: "type4",
+        //   name: "质量",
+        // },
+        // {
+        //   value: "type5",
+        //   name: "密度",
+        // },
+      ],
+      tableData1:[],
+      tableDataTotal1:0,
+      type1:'',
+      type2:'',
+      typeList:[
         {
-          value: "type4",
-          name: "质量",
+          dictLabel:'千米',
+          dictValue:'千米'
         },
         {
-          value: "type5",
-          name: "密度",
+          dictLabel:'米',
+          dictValue:'米'
         },
-      ],
-      tableData1:[
         {
-          cbkm:'标前成本',
-          wlyl:'42000KG',
-          hsyl:'42T'
+          dictLabel:'分米',
+          dictValue:'分米'
         },
         {
-          cbkm:'标前成本',
-          wlyl:'42000KG',
-          hsyl:'42T'
+          dictLabel:'厘米',
+          dictValue:'厘米'
         },
         {
-          cbkm:'标前成本',
-          wlyl:'42000KG',
-          hsyl:'42T'
+          dictLabel:'毫米',
+          dictValue:'毫米'
         },
         {
-          cbkm:'标前成本',
-          wlyl:'42000KG',
-          hsyl:'42T'
+          dictLabel:'微米',
+          dictValue:'微米'
         },
       ],
-      type1:'',
-      type2:'',
-      typeList:[],
-      typeList1:[],
     };
   },
   watch: {
-    // projectDetailInfo: {
-    //   handler(newValue) {
-    //     this.comProjectDetailInfo = newValue ? newValue : {};
-    //     // this.init(this.comProjectDetailInfo);
-    //   },
-    //   deep: true,
-    //   immediate: true
-    // },
-    // projectId: {
-    //   handler(newValue) {
-    //     this.comProjectId = newValue;
-    //   },
-    //   immediate: true
-    // }
+    projectDetailInfo: {
+      handler(newValue) {
+        this.comProjectDetailInfo = newValue ? newValue : {};
+        this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
+        // this.getProjectOtherStatistics('1762014527685136385')
+        // this.init(this.comProjectDetailInfo);
+      },
+      deep: true,
+      immediate: true
+    },
+    projectId: {
+      handler(newValue) {
+        this.comProjectId = newValue;
+      },
+      immediate: true
+    }
   },
   //可访问data属性
   created() {
     this.getProjectOtherMenuTreeApi('1762014527685136385')
-    this.getProjectOtherStatistics('1762014527685136385')
+
   },
   //计算集
   computed: {
@@ -261,6 +256,7 @@ export default {
         const result = await getProjectOtherStatistics(params);
         if (result.code == 200) {
           const _dataArray = result.data;
+          this.tableDataTotal=_dataArray.length;
           this.tableData = _dataArray;
         }
       } catch (error) {
@@ -280,9 +276,18 @@ export default {
 
       }
     },
-    open(menuPath, menuPathArray){
+    select(menuPath, menuPathArray){
       console.log(menuPath)
       console.log(menuPathArray)
+      this.defaultActive=menuPath;
+      let param = {
+        projectId:this.comProjectDetailInfo.projectId,
+        parentId:menuPathArray.originData.id
+      }
+      getProjectOtherList(param).then(res=>{
+        this.tableData1 = res.data;
+        this.tableDataTotal1=res.data.length;
+      })
     },
     //分页
     handleCurrentChange(e){
@@ -293,7 +298,119 @@ export default {
     },
     sortChange(){
 
-    }
+    },
+    handleClickTab(v){
+      this.type1='';
+      this.type2='';
+      if(v.label === '长度'){
+        this.typeList=[
+          {
+            dictLabel:'千米',
+            dictValue:'千米'
+          },
+          {
+            dictLabel:'米',
+            dictValue:'米'
+          },
+          {
+            dictLabel:'分米',
+            dictValue:'分米'
+          },
+          {
+            dictLabel:'厘米',
+            dictValue:'厘米'
+          },
+          {
+            dictLabel:'毫米',
+            dictValue:'毫米'
+          },
+          {
+            dictLabel:'微米',
+            dictValue:'微米'
+          },
+        ]
+      }
+      if(v.label === '面积'){
+        this.typeList=[
+          {
+            dictLabel:'平方千米',
+            dictValue:'平方千米'
+          },
+          {
+            dictLabel:'公顷',
+            dictValue:'公顷'
+          },
+          {
+            dictLabel:'公亩',
+            dictValue:'公亩'
+          },
+          {
+            dictLabel:'平方米',
+            dictValue:'平方米'
+          },
+          {
+            dictLabel:'平方分米',
+            dictValue:'平方分米'
+          },
+          {
+            dictLabel:'平方厘米',
+            dictValue:'平方厘米'
+          },
+          {
+            dictLabel:'平方毫米',
+            dictValue:'平方毫米'
+          },
+        ]
+      }
+      if(v.label === '体积'){
+        this.typeList=[
+          {
+            dictLabel:'立方千米',
+            dictValue:'立方千米'
+          },
+          {
+            dictLabel:'立方米',
+            dictValue:'立方米'
+          },
+          {
+            dictLabel:'立方分米',
+            dictValue:'立方分米'
+          },
+          {
+            dictLabel:'立方厘米',
+            dictValue:'立方厘米'
+          },
+          {
+            dictLabel:'立方毫米',
+            dictValue:'立方毫米'
+          },
+          {
+            dictLabel:'升',
+            dictValue:'升'
+          },
+          {
+            dictLabel:'分升',
+            dictValue:'分升'
+          },
+          {
+            dictLabel:'毫升',
+            dictValue:'毫升'
+          },
+          {
+            dictLabel:'微升',
+            dictValue:'微升'
+          },
+          {
+            dictLabel:'厘升',
+            dictValue:'厘升'
+          },
+          {
+            dictLabel:'公石',
+            dictValue:'公石'
+          },
+        ]
+      }
+    },
   },
 }
 </script>

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

@@ -9,10 +9,10 @@
         <!-- 放入组件 v-if current == ‘xxxx’ 详情变量 this.detailInfo 需要深度监听-->
 
         <!-- 工程项目信息 -->
-        <engineering-information v-if="current == 'basicEngineeringInformation'"></engineering-information>
+        <engineering-information v-if="current == 'basicEngineeringInformation'" :project-detail-info="detailInfo"></engineering-information>
 
         <!-- 直接费成本 -->
-        <direct-cost v-if="current == 'directCost'"></direct-cost>
+        <direct-cost v-if="current == 'directCost'" :project-detail-info="detailInfo"></direct-cost>
 
         <!-- 工料汇总 -->
         <feed-summary v-if="current == 'feedSummary'" :project-id="projectId" :project-detail-info="detailInfo"></feed-summary>
@@ -21,7 +21,7 @@
         <measure-items v-if="current == 'measureItem'" :project-id="projectId" :project-detail-info="detailInfo"></measure-items>
 
         <!-- 其他项目 -->
-        <other-projects v-if="current == 'otherItems'"></other-projects>
+        <other-projects v-if="current == 'otherItems'" :project-detail-info="detailInfo"></other-projects>
 
         <!-- 盈亏分析对比 -->
         <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectId" :project-detail-info="detailInfo"></profit-Loss>