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/service/impl/CbSummaryServiceImpl.java

@@ -83,12 +83,11 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
 //                cbProjectFileMapper.removeById(cbProjectFile.getId());
 //            } else {
                 try {
-                    if (cbProjectFile.getFileName().contains("项目")) {
+                    if (cbProjectFile.getFileName().equals("成本汇总项目结构汇总")) {
                         saveCbSummaryProject(projectId, cbProjectFile);
-                    } else if (cbProjectFile.getFileName().contains("成本科目")) {
+                    } else if (cbProjectFile.getFileName().equals("成本汇总按成本科目")) {
                         saveCbSummaryCostAccount(projectId, cbProjectFile);
                     } else {
-
                         throw new ServiceException("文件名错误");
                     }
                 } catch (Exception e) {

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

@@ -245,8 +245,8 @@ export default {
       return '';
     },
     handleDialogVisible(row){
+      this.ruleForm={}
       this.dialogVisible=true;
-      console.log(row)
       this.detailsId=row.id;
     },
     handleAdd(){
@@ -254,7 +254,11 @@ export default {
       this.ruleForm.qingId = this.detailsId
       cbDirectExpenseAdd(JSON.stringify(this.ruleForm)).then(res=>{
         if(res.code == 200){
-          this.dialogVisible = false
+          this.dialogVisible = false;
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          });
           this.getCbDirectExpenseList(this.menuId)
         }
       })