Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-operate-ui/src/layout/components/Sidebar/Logo.vue

@@ -6,7 +6,7 @@
       visible-arrow="true"
       trigger="hover">
       <div>
-        <img :src="logo" class="tips_logo" />
+        <!--<img :src="logo" class="tips_logo" />-->
         <div class="tips_title">{{title}}</div>
       </div>
       <transition name="sidebarLogoFade" slot="reference">
@@ -46,7 +46,8 @@ export default {
   data() {
     return {
       title: '中建一局集团第二建筑有限公司',
-      logo: logoImg
+      // logo: logoImg
+      logo: ''
     }
   }
 }
@@ -123,7 +124,7 @@ export default {
       font-size:22px;
       transform:scale(0.5);
       -webkit-transform:scale(0.5);
-      padding: 0 16px;
+      padding: 16px 16px 0;
       float: left;
       margin-top: -14px;
       margin-left: -48px;

dsk-operate-ui/src/views/login.vue

@@ -70,7 +70,7 @@
           <!--<div class="on" @click="isDXlogin = false">密码登录</div>-->
           <!--<div @click="isDXlogin = true">快捷登录</div>-->
         <!--</div>-->
-        <div class="loginname"><img src="../assets/images/login/ztlogo.png">中建一局集团第二建筑有限公司</div>
+        <div class="loginname"><!--<img src="../assets/images/login/ztlogo.png">-->中建一局集团第二建筑有限公司</div>
         <el-form-item prop="username" >
           <el-input
             v-model="loginForm.username"

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

@@ -89,7 +89,7 @@
               <template slot-scope="scope">{{scope.row.taxType || '--'}}</template>
             </el-table-column>
 
-            <el-table-column label="本月发生成本比例" width="150" prop="monthCostRate">
+            <el-table-column label="本月成本发生比例" width="150" prop="monthCostRate">
               <template slot-scope="scope">
                 <template v-if="isinput"><el-input v-model="scope.row.monthCostRate "></el-input></template>
                 <template v-else>{{scope.row.monthCostRate || '--'}}</template>
@@ -107,7 +107,7 @@
             <el-table-column label="截止本月工程量" width="130" prop="currentProjectVolume">
               <template slot-scope="scope">{{scope.row.suncurrentProjectVolume || '--'}}</template>
             </el-table-column>
-            <el-table-column label="本月推送工作量" width="130" prop="submitProjectVolume">
+            <el-table-column label="本月推送工程量" width="130" prop="submitProjectVolume">
               <template slot-scope="scope">{{scope.row.submitProjectVolume || '--'}}</template>
             </el-table-column>
 
@@ -160,7 +160,7 @@
         </div>
       </el-dialog>
       <!--添加实际成本-->
-      <el-dialog class="pro-news" :visible.sync="cbVisible" width="480px">
+      <el-dialog class="pro-news" :visible.sync="cbVisible" width="480px" :close-on-click-modal="false" >
         <div class="poptitle">
           <span>填写实际成本</span>
         </div>

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

@@ -68,7 +68,8 @@
               <el-table-column label="工程名称" width="416" :resizable="false">
                 <template slot-scope="scope">
                   <div style="display:flex;align-items:center">
-                    <el-tooltip placement="top" v-if="scope.row.projectText.length>20">
+                    <el-tooltip placement="top" v-if="scope.row.projectText.length>26">
+                      <div slot="content">{{scope.row.projectText}}</div>
                       <div class="renling">
                         <router-link v-if="scope.row.projectFileStatus==2" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a"
                                      class="wordprimary" v-html="scope.row.projectName"></router-link>
@@ -100,9 +101,13 @@
                   {{scope.row.ipmProjectNo||"--"}}
                 </template>
               </el-table-column>
-              <el-table-column label="文件名称" min-width="286" :resizable="false">
+              <el-table-column label="文件名称" min-width="310" :resizable="false">
                 <template slot-scope="scope">
-                  {{scope.row.projectFileName||"--"}}
+                  <el-tooltip placement="top" v-if="scope.row.projectFileName.length>20">
+                    <div slot="content">{{scope.row.projectFileName}}</div>
+                    <div class="renling">{{scope.row.projectFileName||"--"}}</div>
+                  </el-tooltip>
+                  <div v-else class="renling">{{scope.row.projectFileName||"--"}}</div>
                 </template>
               </el-table-column>
               <el-table-column label="成本阶段" prop="customerCode"  width="90" :resizable="false">
@@ -112,7 +117,7 @@
                   </template>
                 </template>
               </el-table-column>
-              <el-table-column label="上传人" prop="updateBy"  width="90" :resizable="false">
+              <el-table-column label="上传人" prop="updateBy"  width="140" :resizable="false">
               </el-table-column>
 
               <el-table-column label="上传时间" min-width="180" :resizable="false">

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

@@ -61,7 +61,7 @@
                     <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,0)" v-if="prodetail == false">删除</div>
                     </div>
@@ -89,7 +89,7 @@
                       <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,1)" v-if="prodetail == false">删除</div>
                     </div>
@@ -117,7 +117,7 @@
                       <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,2)" v-if="prodetail == false">删除</div>
                     </div>
@@ -145,7 +145,7 @@
                       <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,3)" v-if="prodetail == false">删除</div>
                     </div>
@@ -173,7 +173,7 @@
                       <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,4)" v-if="prodetail == false">删除</div>
                     </div>
@@ -201,7 +201,7 @@
                       <div class="prostatus i3" v-if="item.fileParseStatus == 3">解析失败</div>
                     </template>
                     <div class="cz" v-if="item.fileParseStatus != 1">
-                      <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
+                      <div><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
                       <div class="i" @click="deletefille(item.id,5)" v-if="prodetail == false">删除</div>
                     </div>