Commit d50bc085 authored by huangjie's avatar huangjie

*

parent 946a6314
...@@ -66,10 +66,11 @@ export function importData(projectId) { ...@@ -66,10 +66,11 @@ export function importData(projectId) {
} }
//获取草稿箱列表 //获取草稿箱列表
export function getDraftDialogList(projectId) { export function getDraftDialogList(data) {
return request({ return request({
url: '/cbProjectRecord/getDraftDialogList', url: '/cbProjectRecord/getDraftDialogList',
method: 'get', method: 'get',
params:data
}); });
} }
......
...@@ -70,15 +70,15 @@ ...@@ -70,15 +70,15 @@
<div style="display:flex;align-items:center"> <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>20">
<div class="renling"> <div class="renling">
<router-link v-if="scope.row.isGetProjectDetail" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a" <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> class="wordprimary" v-html="scope.row.projectName"></router-link>
<span v-else v-html="scope.row.projectName"></span> <span v-else v-html="scope.row.projectName||'--'"></span>
</div> </div>
</el-tooltip> </el-tooltip>
<div class="renling" v-else> <div class="renling" v-else>
<router-link v-if="scope.row.isGetProjectDetail" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a" <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> class="wordprimary" v-html="scope.row.projectName"></router-link>
<span v-else v-html="scope.row.projectName"></span> <span v-else v-html="scope.row.projectName||'--'"></span>
</div> </div>
</div> </div>
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
</el-dialog> </el-dialog>
<!--新增、修改弹窗--> <!--新增、修改弹窗-->
<el-dialog <el-dialog
:close-on-click-modal="false"
class="pro-news" class="pro-news"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="480px"> width="480px">
...@@ -231,7 +232,7 @@ ...@@ -231,7 +232,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>cgPagesize"> <div class="pagination clearfix" v-show="cgxtotal>cgPagesize">
<el-pagination background :page-size="cgPagesize" :current-page.sync="cgPagenum" <el-pagination background :page-size="cgPagesize" :current-page.sync="cgPagenum"
@current-change="getCGXlist" layout="prev, pager, next" @current-change="getCGXlist" layout="prev, pager, next"
:total="cgxtotal"> :total="cgxtotal">
...@@ -468,7 +469,7 @@ ...@@ -468,7 +469,7 @@
pageSize:50, pageSize:50,
pageNum:1, pageNum:1,
} }
// this.customerAll() this.getlist()
}, },
//添加项目 //添加项目
insertPro(){ insertPro(){
...@@ -507,7 +508,7 @@ ...@@ -507,7 +508,7 @@
}, },
handleCurrentChange(val){ handleCurrentChange(val){
this.formdata.pageNum = val this.formdata.pageNum = val
this.customerAll() this.getlist()
}, },
setHeaderRow() { setHeaderRow() {
return "owner-table-list-header"; return "owner-table-list-header";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment