|
|
@@ -198,9 +198,9 @@
|
|
|
<div class="operations">
|
|
|
<el-button type="primary" @click="scheduleDetail(scope.row.courseId,scope.row.typeid)" size="mini" >进度详细</el-button>
|
|
|
<el-button type="primary" @click="fundStatus(scope.row.courseId)" size="mini" >资金情况</el-button>
|
|
|
- <el-button type="primary" v-show="scope.row.isupload==2" @click="finish(scope.row.courseId,scope.row.title)" size="mini">结项</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.isupload==2" @click="finish(scope.row.courseId,scope.row.title)" size="mini">结项申请</el-button>
|
|
|
<el-button type="primary" v-show="scope.row.isupload==3" @click="amendFinish(scope.row.courseId,scope.row.title)" size="mini">修改结项</el-button>
|
|
|
- <el-button type="primary" v-show="scope.row.isupload==4" disabled class="disa" size="mini">已结项</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.isupload==4" disabled class="disa" size="mini">已完结</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -235,8 +235,8 @@
|
|
|
<beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress"> </beUpload>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="ending" class="AllDialogBtn">确认提交</el-button>
|
|
|
+ <div slot="footer" class="dialog-footer" style="display: flex;justify-content: center;">
|
|
|
+ <el-button type="primary" @click="ending" class="AllDialogBtn">确认</el-button>
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -258,8 +258,8 @@
|
|
|
<span style="color: black;">未完结资金:</span>
|
|
|
<!-- <span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundFinishData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}（元）</span> -->
|
|
|
</div>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button>
|
|
|
+ <div slot="footer" class="dialog-footer" style="display: flex;justify-content: center;">
|
|
|
+ <!-- <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button> -->
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -371,16 +371,12 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
pid:val
|
|
|
}).then(res=>{
|
|
|
console.log(res);
|
|
|
- // this.checkFundEndData = res.data[1].filter(i=>{
|
|
|
- // return (i.fund !=i.usedFund)
|
|
|
- // })
|
|
|
-
|
|
|
- // this.checkFundEndData=res.data[1].filter(i=>{
|
|
|
- // return (i.fund != i.usedFund)
|
|
|
- // })
|
|
|
-
|
|
|
- let data=JSON.parse(res.data[0][0].endFile)
|
|
|
- this.file=data;
|
|
|
+ console.log(res.data);
|
|
|
+ if (!res.data[0]) {
|
|
|
+ let data=JSON.parse(res.data[0][0].endFile)
|
|
|
+ this.file=data;
|
|
|
+ }
|
|
|
+ // let data=JSON.parse(res.data[0][0].endFile)
|
|
|
this.tit=tit;
|
|
|
this.iid=val;
|
|
|
this.endDialog=true;
|
yuanyiming