*

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

@@ -7,3 +7,26 @@ export function checkProjectCodeExist (data) {
     method: 'get',
   })
 }
+//新增项目
+export function addProject (data) {
+  return request({
+    url: '/cbProjectRecord/addProject',
+    method: 'post',
+    data:data,
+  })
+}
+//获取当前项目文件上传
+export function getProjectFileUploadDetail (projectId) {
+  return request({
+    url: '/cbProjectFile/getProjectFileUploadDetail/'+projectId,
+    method: 'get',
+  })
+}
+
+//获取草稿箱列表
+export function getDraftDialogList (projectId) {
+  return request({
+    url: '/cbProjectRecord/getDraftDialogList',
+    method: 'get',
+  })
+}

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

@@ -46,7 +46,7 @@
             <div class="totals">共{{total}}条</div>
             <div class="btns">
               <div class="btn btn_primary h32" @click="addPro">导入项目</div>
-              <div class="btn btn_default h32" @click="getcgx">草稿箱 (0)</div>
+              <div class="btn btn_default h32" @click="getcgx">草稿箱 ({{cgxtotal}})</div>
             </div>
           </div>
           <div class="table-item-jf table-item">
@@ -126,7 +126,7 @@
         :visible.sync="dialogVisible"
         width="480px">
         <div class="poptitle">
-          <span>新建商机</span>
+          <span>{{protitle}}</span>
         </div>
         <el-form class="popform" label-width="97px" :model="queryParam" :rules="rules" ref="ruleForm">
           <el-form-item label="项目名称" class="row">
@@ -153,14 +153,14 @@
       </el-dialog>
 
     </div>
-    <proupload v-if="isupload"></proupload>
+    <proupload v-if="isupload" :uploadData=uploadData></proupload>
 
     <el-dialog title="草稿箱" :visible.sync="cgxVisible" width="960px" custom-class='dialog-supplier'>
       <el-divider></el-divider>
       <div style="padding: 24px 20px;">
         <skeleton v-if="cgxSkeleton"></skeleton>
         <div class="table-item-jf table-item" v-if="!cgxSkeleton">
-          <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+          <el-table :data="cgxlist" :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>
 
@@ -171,22 +171,24 @@
             <!--</el-table-column>-->
             <el-table-column label="项目名称" width="451px" >
               <template slot-scope="scope">
-                <span>{{scope.row.legalPerson||'--'}}</span>
+                <span>{{scope.row.projectName||'--'}}</span>
               </template>
             </el-table-column>
             <el-table-column label="成本阶段" width="105px">
               <template slot-scope="scope">
-                <span>{{scope.row.legalPerson||'--'}}</span>
+                <div v-for="item in cbStagelist">
+                  <span v-if="scope.row.cbStage == item.dictValue">{{item.dictLabel}}</span>
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="更新时间" width="205px" :resizable="false">
               <template slot-scope="scope">
-                <span>{{scope.row.legalPerson||'--'}}</span>
+                <span>{{scope.row.updateTime||'--'}}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
-                <span class="wordprimary">继续编辑</span>
+                <span class="wordprimary" @click="jxbj(scope.row)">继续编辑</span>
                 <span class="worddel">删除</span>
               </template>
             </el-table-column>
@@ -204,7 +206,7 @@
 </template>
 <script>
   import '@/assets/styles/public.scss'
-  import { checkProjectCodeExist } from '@/api/projectCostLedger/index'
+  import { checkProjectCodeExist,addProject,getDraftDialogList } from '@/api/projectCostLedger/index'
   import { getDicts } from '@/api/system/dict/data'
   import proupload from '@/views/projectCostLedger/upload/index'
   import skeleton from '@/views/project/projectList/component/skeleton'
@@ -217,6 +219,7 @@
       formdata:{},
       isSkeleton:false,
       total:10,
+      protitle:'',
       dialogVisible:false,
       cbStagelist:[],
       ztStagelist:[],
@@ -233,9 +236,11 @@
       },
       isupload:false,
       tableData:[],
-      cgxVisible:true,
+      cgxVisible:false,
       cgxSkeleton:false,
-      cgxtotal:10,
+      cgxtotal:0,
+      cgxlist:[],
+      uploadData:{},//新增项目返回的数据
     };
   },
   //可访问data属性
@@ -249,7 +254,8 @@
     getDicts('pro_ztstage').then(res=>{
       this.ztStagelist = res.data
     })
-
+    //获取草稿箱
+    this.getCGXlist()
   },
   //计算集
   computed: {
@@ -266,6 +272,7 @@
         projectFileName: '',//	文件名称
         cbStage: ''//成本阶段
       }
+      this.protitle = '新增项目'
     },
     getSearch(){
       this.formdata.pageNum = 1
@@ -301,8 +308,20 @@
     },
     //添加项目
     insertPro(){
-      let id = ''
+      addProject(JSON.stringify(this.queryParam)).then(res=>{
+        if(res.code == 200){
+          this.uploadData = res.data
+          this.isupload = true
+        }
+      })
+    },
+    //继续编辑
+    jxbj(data){
+      console.log(this.cgxlist)
+      console.log(data)
+      this.uploadData = data
       this.isupload = true
+      this.cgxVisible = false
     },
     handleCurrentChange(val){
       this.formdata.pageNum = val
@@ -320,8 +339,18 @@
       return "enterprise-name-row";
     },
     getcgx(){
+      this.getCGXlist()
       this.cgxVisible = true
     },
+    getCGXlist(){
+
+      this.cgxSkeleton = true
+      getDraftDialogList().then(res=>{
+        this.cgxtotal = res.data.length
+        this.cgxlist = res.data
+        this.cgxSkeleton = false
+      })
+    }
   },
 }
 </script>
@@ -548,5 +577,6 @@
   }
 .worddel{
   color: #FA5351;
+  padding-left: 12px;
 }
 </style>

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

@@ -14,10 +14,10 @@
               <el-input v-model="formdata.customerName" disabled placeholder="请输入工程名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="IPM项目编码" label-width="100px">
-              <el-input v-model="formdata.customerName" disabled placeholder="请输入IPM项目编码" clearable></el-input>
+              <el-input v-model="formdata.ipmProjectNo" disabled placeholder="请输入IPM项目编码" clearable></el-input>
             </el-form-item>
             <el-form-item label="文件名称" label-width="100px">
-              <el-input v-model="formdata.customerName" disabled placeholder="请输入文件名称" clearable></el-input>
+              <el-input v-model="formdata.projectFileName" disabled placeholder="请输入文件名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="成本阶段" prop="cbStage">
               <el-select v-model="formdata.cbStage" disabled multiple placeholder="请选择" :collapse-tags="true"
@@ -202,9 +202,11 @@
 
 <script>
   import { getDicts } from '@/api/system/dict/data'
+  import { getProjectFileUploadDetail } from '@/api/projectCostLedger/index'
 
   export default {
     name: 'upload',
+    props:{uploadData:null},
     data(){
       return{
         formdata:{
@@ -224,6 +226,14 @@
           cbhz:[{ required: true, trigger: 'blur' },],
         },
         fileList:[],
+
+
+        directExpense:[],
+        quantitySummary:[],
+        measureProject:[],
+        otherProject:[],
+        sceneExpense:[],
+        cbSummary:[],
       }
     },
     created() {
@@ -231,6 +241,27 @@
       getDicts('pro_cbstage').then(res => {
         this.cbStagelist = res.data
       })
+      getProjectFileUploadDetail(this.uploadData.id).then(res=>{
+        if(res.code == 200){
+          if(res.data){
+            this.directExpense=res.data.directExpense
+            this.quantitySummary=res.data.quantitySummary
+            this.measureProject=res.data.measureProject
+            this.otherProject=res.data.otherProject
+            this.sceneExpense=res.data.sceneExpense
+            this.cbSummary=res.data.cbSummary
+          }else{
+            this.directExpense=[]
+            this.quantitySummary=[]
+            this.measureProject=[]
+            this.otherProject=[]
+            this.sceneExpense=[]
+            this.cbSummary=[]
+          }
+        }
+      })
+      this.formdata = this.uploadData
+      console.log(this.uploadData)
     },
     methods:{
       handleRemove(file, fileList) {