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/jsk/domain/EnterpriseBusinessSkyProjectDetailBody.java

@@ -16,6 +16,6 @@ public class EnterpriseBusinessSkyProjectDetailBody {
      * id
      */
     @NotNull(message = "id不能为空")
-    private Long sourceId;
+    private String sourceId;
 
 }

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit.vue

@@ -41,7 +41,7 @@
               <router-link :to="`/biddetail/${scope.row.sourceId}`" tag="a" class="a-link" v-if="scope.row.sourceId" v-html="scope.row.projectName"></router-link>
               <div v-else v-html="scope.row.projectName || '--'"></div>
             </template>
-            <template>
+            <template v-else>
               <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
               <span v-else>-</span>
             </template>

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue

@@ -41,7 +41,7 @@
               <router-link :to="`/biddetail/${scope.row.sourceId}`" tag="a" class="a-link" v-if="scope.row.sourceId" v-html="scope.row.projectName"></router-link>
               <div v-else v-html="scope.row.projectName || '--'"></div>
             </template>
-            <template>
+            <template v-else>
               <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
               <span v-else>-</span>
             </template>

dsk-operate-ui/src/views/detail/party-a/internalCooperation/consultingAgencyCooperation.vue

@@ -176,7 +176,7 @@ export default {
     },
     // 跳转项目详情
     viewProjectDetail(row) {
-
+      this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
     },
     viewEnterprise(row) {
 

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

@@ -9,7 +9,7 @@
       <div class="directCost-cont">
         <div class="left">
           <div class="left-side-menu">
-            <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive"  @select="handleSelect">
+            <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" v-model="defaultActive"  @select="handleSelect">
               <template :slot="`${menuDetails.menuName}-${menuDetails.menuLevel}`">
                 <img src="@/assets/images/projectCostLedger/icon_cost_detail_1.svg" alt="">
                 <div class="project-sub-menu-title-text">{{menuDetails.menuName}}</div>
@@ -17,14 +17,16 @@
             </project-side-menu>
           </div>
         </div>
-        <div class="right-table">
+        <div class="right-table" ref="rightTable">
+          <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
           <div class="table-item">
             <el-table
+              v-if="!isSkeleton"
               element-loading-text="Loading"
+              :maxHeight="maxHeight"
               :data="tableData"
               :row-class-name="tableRowClassName"
               row-key="id"
-              v-horizontal-scroll="'hover'"
               default-expand-all
               :tree-props="{children: 'childrenList', hasChildren: 'hasChildren'}"
               border
@@ -60,7 +62,6 @@
               </el-table-column>
             </el-table>
           </div>
-
         </div>
       </div>
     </div>
@@ -101,6 +102,7 @@
 <script>
   import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
   import { getCbDirectExpenseMenuTreeApi,getCbDirectExpenseList,cbDirectExpenseAdd,cbDirectExpenseDelete } from "@/api/projectCostLedger";
+  import skeleton from '../../../../component/skeleton'
 export default {
   name: "directCost",
   props: {
@@ -116,10 +118,11 @@ export default {
       default: () => ({})
     }
   },
-  components: {ProjectSideMenu},
+  components: {ProjectSideMenu,skeleton},
   data() {
     return {
       date:'2023年11月',
+      isSkeleton: true,
       datelist:[
         {
           dictValue:'2023年11月',
@@ -162,7 +165,8 @@ export default {
         children : "childrenList"
       },
       detailsId:'',
-      menuId:''
+      menuId:'',
+      maxHeight:''
     };
   },
   watch: {
@@ -184,7 +188,6 @@ export default {
       immediate: true
     }
   },
-  //可访问data属性
   created() {
 
   },
@@ -217,7 +220,6 @@ export default {
     },
     async getCbDirectExpenseList(params) {
       try {
-
         const result = await getCbDirectExpenseList(params);
         if (result.code == 200) {
           const _dataArray = result.data;
@@ -226,6 +228,8 @@ export default {
           this.tableData.forEach((item,index)=>{
             item.index=index+1
           })
+          this.maxHeightInit();
+          this.isSkeleton = false;
         }
       } catch (error) {
 
@@ -295,6 +299,11 @@ export default {
         }
       }
     },
+    async maxHeightInit() {
+      const divHeight = this.$refs.rightTable.clientHeight-32;
+      this.maxHeight=divHeight;
+      console.log('DIV的高度是：', divHeight);
+    }
   },
 }
 </script>
@@ -352,6 +361,35 @@ export default {
         .color2{
           background: #FFFFFF;
         }
+        .el-table__fixed-right {
+          z-index: 9;
+          right: 16px !important;
+          bottom: 15px !important;
+          .el-table__fixed-header-wrapper {
+            position: absolute;
+          }
+        }
+        .el-table__fixed-right-patch {
+          width: 16px !important;
+          z-index: 9;
+          top: 0px;
+          background: #f0f3fa;
+          border: 1px solid #e6eaf1;
+          border-left: unset;
+          border-top: unset;
+        }
+        // 自动适配下 减去滚动条高度
+        .el-table__fixed {
+          height: calc(100% - 15px) !important;
+        }
+        .el-table__fixed-right {
+          height: calc(100% - 15px) !important;
+        }
+        .el-table__fixed-body-wrapper {
+          .el-table__body {
+            padding-bottom: 10px!important;
+          }
+        }
       }
     }
   }

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" @select="select">
+          <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" v-model="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>
@@ -12,7 +12,8 @@
         </div>
       </div>
       <div class="right-table">
-        <div class="table-item" v-if="defaultActive ==='费用汇总'">
+        <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+        <div class="table-item" v-if="defaultActiveTitle ==='费用汇总'">
           <tables
             v-if="!isSkeleton"
             :tableLoading="tableLoading"
@@ -62,10 +63,11 @@
   import Tables from "../../../../component/Tables"
   import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
   import { getProjectOtherMenuTreeApi,getProjectOtherStatistics,getProjectOtherList } from "@/api/projectCostLedger";
+  import skeleton from '../../../../component/skeleton'
 export default {
   name: "directCost",
   components: {
-    Tables,ProjectSideMenu
+    Tables,ProjectSideMenu,skeleton
   },
   props: {
     // 项目ID
@@ -83,8 +85,9 @@ export default {
   data() {
     return {
       comProjectId:'',
-      isSkeleton:false,
-      tableLoading:false,
+      // 加载数据列表
+      isSkeleton: true,
+      tableLoading: false,
       tableData:[],
       tableDataTotal:0,
       forData: [
@@ -109,6 +112,7 @@ export default {
         pageNum:1,
         pageSize:10,
       },
+      defaultActiveTitle: "费用汇总",
       defaultActive: "",
       menuTreeList: [
         {
@@ -145,11 +149,7 @@ export default {
       immediate: true
     }
   },
-  //可访问data属性
-  created() {
 
-
-  },
   //计算集
   computed: {
 
@@ -177,6 +177,7 @@ export default {
           const _dataArray = result.data;
           this.tableDataTotal=_dataArray.length;
           this.tableData = _dataArray;
+          this.isSkeleton = false;
         }
       } catch (error) {
 
@@ -184,14 +185,19 @@ export default {
     },
     select(menuPath, menuPathArray){
       this.defaultActive=menuPath;
+      this.defaultActiveTitle=menuPathArray.nodeName;
       let param = {
         projectId:this.comProjectDetailInfo.projectId,
         parentId:menuPathArray.originData.id
       }
-      getProjectOtherList(param).then(res=>{
-        this.tableData1 = res.data;
-        this.tableDataTotal1=res.data.length;
-      })
+      if(menuPathArray.nodeName === '费用汇总'){
+        this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
+      }else {
+        getProjectOtherList(param).then(res=>{
+          this.tableData1 = res.data;
+          this.tableDataTotal1=res.data.length;
+        })
+      }
     },
     //分页
     handleCurrentChange(e){

dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue

@@ -49,7 +49,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                  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"
                   ref="theOwnerListTable">
 

dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue

@@ -55,7 +55,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                  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"
                   ref="theOwnerListTable">
 

dsk-operate-ui/src/views/supplier/supplierRating/result.vue

@@ -234,7 +234,7 @@
           {name1:'山东胜峰建筑工程有限公司',name2:'中建一局集团第二建筑有限公司江苏分公司', name3:'济宁复兴之路文化科技项目办公及配套区工程',name4:'--', name5:'物资-周转材料',name6:'2024年3月',name7:'刘叔旺', name8:'采购方录入', name9:'云智评',name10:'2024-09-18 10:39:46', name11:'已生效'},
           {name1:'山东胜峰建筑工程有限公司',name2:'中建一局集团第二建筑有限公司江苏分公司', name3:'济宁复兴之路文化科技项目办公及配套区工程',name4:'--', name5:'物资-周转材料',name6:'2024年3月',name7:'刘叔旺', name8:'采购方录入', name9:'云智评',name10:'2024-09-18  13:22:02', name11:'已生效'},
         ],
-        toDetail:true,
+        toDetail:false,
       }
     },
     methods:{
@@ -242,7 +242,6 @@
         this.toDetail = true
       },
       closedetail(){
-        console.log(888)
         this.toDetail = false
       },
       getSearch(){

dsk-operate-ui/src/views/supplier/supplierRating/resultdetail.vue

@@ -43,8 +43,84 @@
       <div class="enterprise_title">
         评价详情
       </div>
-
+    </div>
+    <div style="padding: 0 16px 16px">
       <div class="acc-title i"><strong>结算及时性-结算相应</strong></div>
+      <div class="table-item" >
+        <el-table :data="datatable1" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="指标规则" align="center">
+            <el-table-column label="规则类型" prop="name1"></el-table-column>
+            <el-table-column label="指标规则" prop="name2"></el-table-column>
+            <el-table-column label="考核周期" prop="name3"></el-table-column>
+            <el-table-column label="评分说明" prop="name4">
+              <template slot-scope="scope">
+                <div v-html="scope.row.name4"></div>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        <el-table style="margin-top: -1px" :data="datatable2" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="供应商表现" align="center">
+            <el-table-column label="结算及时类型" prop="name1"></el-table-column>
+            <el-table-column label="规则得分" prop="name2"></el-table-column>
+            <el-table-column label="实际得分" prop="name3"></el-table-column>
+            <el-table-column label="评价说明" prop="name4"></el-table-column>
+            <el-table-column label="证明材料" prop="name5"></el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div style="padding: 0 16px 16px">
+      <div class="acc-title i"><strong>卸货配合度-结算相应</strong></div>
+      <div class="table-item" >
+        <el-table :data="datatable1" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="指标规则" align="center">
+            <el-table-column label="规则类型" prop="name1"></el-table-column>
+            <el-table-column label="指标规则" prop="name2"></el-table-column>
+            <el-table-column label="考核周期" prop="name3"></el-table-column>
+            <el-table-column label="评分说明" prop="name4">
+              <template slot-scope="scope">
+                <div v-html="scope.row.name4"></div>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        <el-table style="margin-top: -1px" :data="datatable2" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="供应商表现" align="center">
+            <el-table-column label="结算及时类型" prop="name1"></el-table-column>
+            <el-table-column label="规则得分" prop="name2"></el-table-column>
+            <el-table-column label="实际得分" prop="name3"></el-table-column>
+            <el-table-column label="评价说明" prop="name4"></el-table-column>
+            <el-table-column label="证明材料" prop="name5"></el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div style="padding: 0 16px 16px">
+      <div class="acc-title i"><strong>退场配合度-现场配合</strong></div>
+      <div class="table-item" >
+        <el-table :data="datatable1" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="指标规则" align="center">
+            <el-table-column label="规则类型" prop="name1"></el-table-column>
+            <el-table-column label="指标规则" prop="name2"></el-table-column>
+            <el-table-column label="考核周期" prop="name3"></el-table-column>
+            <el-table-column label="评分说明" prop="name4">
+              <template slot-scope="scope">
+                <div v-html="scope.row.name4"></div>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        <el-table style="margin-top: -1px" :data="datatable2" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
+          <el-table-column type="index" label="供应商表现" align="center">
+            <el-table-column label="结算及时类型" prop="name1"></el-table-column>
+            <el-table-column label="规则得分" prop="name2"></el-table-column>
+            <el-table-column label="实际得分" prop="name3"></el-table-column>
+            <el-table-column label="评价说明" prop="name4"></el-table-column>
+            <el-table-column label="证明材料" prop="name5"></el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
     </div>
   </div>
 </div>
@@ -55,7 +131,9 @@
     name: 'resultdetail',
     data(){
       return{
-        custmerInfo:[]
+        custmerInfo:[],
+        datatable1:[{name1:'履约',name2:'1.发起结算后，分供方在24小时内确认结算，则为结算及时；',name3:'实时',name4:'1. 结算及时加0.5<br>2. 结算不及时扣5分'}],
+        datatable2:[{name1:'结算及时',name2:'0.5',name3:'0.5',name4:'--',name5:'--'}]
       }
     },
     methods:{
@@ -75,6 +153,18 @@
   border-radius: 4px;
 }
   .acc-title.i{
-    margin-top: 16px;
+    font-size: 14px;
+    color: #232323;
+    margin-bottom: 16px;
+  }
+ ::v-deep .table-item .el-table .is-group{
+    tr:first-child{
+      .cell{
+        font-weight: 700;
+      }
+    }
   }
+  /*.el-table::before{*/
+    /*display: none;*/
+  /*}*/
 </style>

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

@@ -120,13 +120,13 @@
                 <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
                   <div slot="content">{{scope.row.customerText}}</div>
                   <div class="renling">
-                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerText}&ctmId=${scope.row.customerId}`" tag="a"
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?companyName=${scope.row.customerText}&ctmId=${scope.row.customerId}`" tag="a"
                                  class="wordprimary" v-html="scope.row.customerName"></router-link>
                     <span v-else v-html="scope.row.customerName"></span>
                   </div>
                 </el-tooltip>
                 <div class="renling" v-else>
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerText}&ctmId=${scope.row.customerId}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?companyName=${scope.row.customerText}&ctmId=${scope.row.customerId}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>