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-operate-ui/src/assets/styles/index.scss

@@ -11,7 +11,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  Microsoft YaHei, Arial, sans-serif;
 }
 
 label {
@@ -143,11 +143,11 @@ div:focus {
   padding-right: 20px;
   transition: 600ms ease position;
   background: linear-gradient(
-    90deg,
-    rgba(32, 182, 249, 1) 0%,
-    rgba(32, 182, 249, 1) 0%,
-    rgba(33, 120, 241, 1) 100%,
-    rgba(33, 120, 241, 1) 100%
+      90deg,
+      rgba(32, 182, 249, 1) 0%,
+      rgba(32, 182, 249, 1) 0%,
+      rgba(33, 120, 241, 1) 100%,
+      rgba(33, 120, 241, 1) 100%
   );
 
   .subtitle {
@@ -360,7 +360,7 @@ li {
     }
     .is-scrolling-left + .el-table__fixed,
     .is-scrolling-middle + .el-table__fixed,
-    .is-scrolling-right + .el-table__fixed,.el-table__fixed-right {
+    .is-scrolling-right + .el-table__fixed {
       box-shadow: 2px 0 8px -7px #202020;
       height: auto !important;
       bottom: 16px !important;
@@ -374,14 +374,14 @@ li {
     .el-table__body-wrapper {
       &::-webkit-scrollbar {
         width: 16px; //竖轴宽度
-        height: 6px; //横轴宽度
+        height: 16px; //横轴宽度
       }
       &::-webkit-scrollbar-track {
         background-color: #f3f4f5;
         border-radius: 0;
       }
       &::-webkit-scrollbar-thumb {
-        background: rgba(0,0,0,.2);
+        background-color: rgba(0,0,0,.2);
         border: 4px solid #f3f4f5;
         border-radius: 10px;
       }
@@ -438,7 +438,7 @@ li {
       }
     }
     .el-scrollbar {
-      height: 6px;
+      height: 16px;
       .el-scrollbar__bar.is-horizontal {
         height: 8px;
       }
@@ -529,7 +529,7 @@ li {
           border-radius: 0;
         }
         &::-webkit-scrollbar-thumb {
-          background: rgba(0,0,0,.2);
+          background-color: rgba(0,0,0,.2);
           border: 4px solid #f3f4f5;
           border-radius: 10px;
         }
@@ -686,7 +686,7 @@ li {
       border-radius: 0;
     }
     &::-webkit-scrollbar-thumb {
-      background: rgba(0,0,0,.2);
+      background-color: rgba(0,0,0,.2);
       border: 4px solid #f3f4f5;
       border-radius: 10px;
     }

dsk-operate-ui/src/views/consultingOrgManagement/enterpriseList.vue

@@ -72,5 +72,19 @@ export default {
       height: calc(100%);
     }
   }
+  .title_wrap{
+    padding: 20px;
+    background-color: #FFFFFF;
+    border-bottom: 1px solid #e0e0e0;
+  }
+  .enterprise_title{
+    border-left: 2px solid #445781;
+    padding-left: 8px;
+    font-size: 16px;
+    height: 16px;
+    line-height: 16px;
+    font-weight: 700;
+    color: #232323;
+  }
 }
 </style>

dsk-operate-ui/src/views/consultingOrgManagement/projectList.vue

@@ -67,5 +67,19 @@ export default {
       height: calc(100%);
     }
   }
+  .title_wrap{
+    padding: 20px;
+    background-color: #FFFFFF;
+    border-bottom: 1px solid #e0e0e0;
+  }
+  .enterprise_title{
+    border-left: 2px solid #445781;
+    padding-left: 8px;
+    font-size: 16px;
+    height: 16px;
+    line-height: 16px;
+    font-weight: 700;
+    color: #232323;
+  }
 }
 </style>

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

@@ -423,6 +423,7 @@ export default {
       tables.forEach(item=>{
         item.id = item.actualId
         item.month = this.expenseDate
+        item.monthCostRate = item.monthCostRate==''?'':parseInt(item.monthCostRate.replace('%',''))
       })
       saveBatch(JSON.stringify(tables)).then(res=>{
         if(res.code == 200){