Skip to content

Administrator / project_progress

Go to a project
Commit 832d2f65 by liangzhen
Options

暂存一下

1 parent 024ad798
Inline Side-by-side
Showing with 208 additions and 30 deletions
src/api/index.js
...@@ -450,5 +450,9 @@ export function chpmProInitiation(params){ ...@@ -450,5 +450,9 @@ export function chpmProInitiation(params){
export function HistoryVersion(params){ export function HistoryVersion(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/HistoryVersion`, params) return post(`${ARCH_EVALUATION}/pmProInitiation/HistoryVersion`, params)
} }
//是否可以上传
export function postExist(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/postExist`, params)
}
src/api/indexzc.js
...@@ -107,6 +107,10 @@ export function qrscevaluationMaterials(params) { ...@@ -107,6 +107,10 @@ export function qrscevaluationMaterials(params) {
export function postEvalQuesInfo(params) { export function postEvalQuesInfo(params) {
return post(`${ARCH_EVALUATION}/postEvalQuesInfoZc/`, params) return post(`${ARCH_EVALUATION}/postEvalQuesInfoZc/`, params)
} }
//新增问题
export function xzwtpostEvalQuesInfo(params) {
return post(`${ARCH_EVALUATION}/postEvalQuesInfoZc/xzwt`, params)
}
//问题清单 //问题清单
export function selWtqdpostEvalQuesInfo(params) { export function selWtqdpostEvalQuesInfo(params) {
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -209,7 +209,12 @@ ...@@ -209,7 +209,12 @@
项目名称：{{ checkedList[0].projectName }} 项目名称：{{ checkedList[0].projectName }}
</h3> </h3>
<div class="continer"> <div class="continer">
<p class="xqtitle"><span></span>问题清单</p> <p class="xqtitle">
<span></span>问题清单
<el-button class="addbutton" @click="addpro()">
<i class="el-icon-plus"></i>添加问题</el-button
>
</p>
<div class="setTable"> <div class="setTable">
<el-table <el-table
:data="tableDataQR" :data="tableDataQR"
...@@ -227,7 +232,7 @@ ...@@ -227,7 +232,7 @@
width="120" width="120"
> >
</el-table-column> </el-table-column>
<el-table-column label="序号" width="50" type="index"> <el-table-column label="序号" width="70" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -276,10 +281,13 @@ ...@@ -276,10 +281,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="整改材料下载" width="200"> <el-table-column label="整改材料下载" width="200">
<template <template slot-scope="scope">
slot-scope="scope" <router-link
:to="{
path: '/assesszc/projectView',
query: { projectId: scope.row.projectId },
}"
> >
<router-link :to="{path:'/assesszc/projectView',query:{projectId:scope.row.projectId}}">
<el-button type="text" size="small">下载材料</el-button> <el-button type="text" size="small">下载材料</el-button>
</router-link> </router-link>
</template> </template>
...@@ -353,9 +361,13 @@ ...@@ -353,9 +361,13 @@
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="复核情况说明" prop="zgqkFileId" width="200"> <el-table-column
<template slot-scope="scope" > label="复核情况说明"
<el-input v-model="scope.row.zgqkFileId" ></el-input> prop="zgqkFileId"
width="200"
>
<template slot-scope="scope">
<el-input v-model="scope.row.zgqkFileId"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -383,6 +395,50 @@ ...@@ -383,6 +395,50 @@
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span <span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span
><span @click="savetj()">提交</span> ><span @click="savetj()">提交</span>
</p> </p>
<el-dialog
class="innerVisible"
width="50%"
title="添加问题"
:modal-append-to-body="false"
append-to-body
:visible.sync="innerVisible"
>
<!-- <p>问题检查项</p>
<p>检查说明</p>
<p>问题描述</p> -->
<el-form ref="form" :model="form" label-width="80px" class="addfrom">
<el-form-item label="项目环节">
<el-select v-model="form.projectStage" placeholder="请选择项目环节" @change="selectProjectStage">
<el-option label="可研" value="1"></el-option>
<!-- <el-option label="计划" value="2"></el-option> -->
<el-option label="采购" value="3"></el-option>
<el-option label="合同" value="4"></el-option>
<el-option label="执行" value="5"></el-option>
<el-option label="结决算及转资" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题检查项">
<el-select v-model="form.quesCheckItem" placeholder="请选择问题检查项" @change="selectCheckItem" >
<el-option
v-for="item in quesoptions"
:key="item.checkDesc"
:label="item.quesCheckItem"
:value="item.quesCheckItem">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查说明">
<el-input v-model="form.checkDesc" type="textarea" row="4" disabled></el-input>
</el-form-item>
<el-form-item label="问题描述" >
<el-input v-model="form.evalQues" type="textarea" row="4"></el-input>
</el-form-item>
</el-form>
<p class="midBtn addBtn">
<span @click="cancelpro()">取消</span><span @click="submitpro()">添加</span>
</p>
</el-dialog>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -397,11 +453,19 @@ import { ...@@ -397,11 +453,19 @@ import {
tjrectificationVerification, tjrectificationVerification,
MaterialWarehous, MaterialWarehous,
downloadObjectStr, downloadObjectStr,
selWtqdFZ,
xzwtpostEvalQuesInfo
} from "@/api/indexzc"; } from "@/api/indexzc";
import { generateYearOptions, constructionFormText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
quesoptions:[],
form: {
projectStage:'',
evalQues:''
},
innerVisible: false,
dialogFullScreen: false, dialogFullScreen: false,
yearsList: generateYearOptions(), yearsList: generateYearOptions(),
showButton: true, showButton: true,
...@@ -655,18 +719,20 @@ export default { ...@@ -655,18 +719,20 @@ export default {
} }
}, },
async savetj() { async savetj() {
this.tableDataQR.forEach(item=>{ this.tableDataQR.forEach((item) => {
console.log(item.rectificationStatus,'item.rectificationStatus') console.log(item.rectificationStatus, "item.rectificationStatus");
if(!item.rectificationStatus&&item.rectificationStatus!==0){ if (!item.rectificationStatus && item.rectificationStatus !== 0) {
this.$message({ this.$message({
message: '请完成所有整改复核后在进行提交', message: "请完成所有整改复核后在进行提交",
type: 'warning' type: "warning",
}); });
throw new Error() throw new Error();
} }
}) });
const isallwc = this.tableDataQR.every(element => element.rectificationStatus==2); const isallwc = this.tableDataQR.every(
if(isallwc){ (element) => element.rectificationStatus == 2
);
if (isallwc) {
this.$confirm( this.$confirm(
"若所有整改复核状态均为整改完成即为完成归档, 是否继续?", "若所有整改复核状态均为整改完成即为完成归档, 是否继续?",
"提示", "提示",
...@@ -685,8 +751,7 @@ export default { ...@@ -685,8 +751,7 @@ export default {
this.$message("提交失败"); this.$message("提交失败");
} }
}); });
} else {
}else{
let res = await tjrectificationVerification(this.tableDataQR); let res = await tjrectificationVerification(this.tableDataQR);
if (res.code == "200") { if (res.code == "200") {
this.dialogQR = false; this.dialogQR = false;
...@@ -695,11 +760,7 @@ export default { ...@@ -695,11 +760,7 @@ export default {
} else { } else {
this.$message("提交失败"); this.$message("提交失败");
} }
} }
}, },
async submitForm() { async submitForm() {
let params = { let params = {
...@@ -898,6 +959,62 @@ export default { ...@@ -898,6 +959,62 @@ export default {
closeDialog() { closeDialog() {
this.showButton = true; this.showButton = true;
}, },
async selectProjectStage(val){
this.form={
evalQues:''
}
this.form.projectStage=val
console.log(val,'333344444')
let params = {
projectStage: val,
hgx:"hgx",
batchId:this.checkedList[0].batchId,
contractNumber:this.checkedList[0].contractNumber,
projectId: this.checkedList[0].projectCode,
proType: this.checkedList[0].projectType,
};
let res=await selWtqdFZ(params)
this.quesoptions=res.data.records
},
selectCheckItem(val){
this.form.evalQues=''
this.quesoptions.forEach(ele=>{
if(ele.quesCheckItem==val){
this.form.checkDesc=ele.checkDesc
}
})
},
async submitpro(){
let isxt= this.tableDataQR.some(item=>{
return item.quesCheckItem== this.form.quesCheckItem;
})
if(isxt){
this.$message('已存在该问题检查项,请选择其他问题')
return
}
let params={
...this.form,
isProblem: "1",
batchId:this.checkedList[0].batchId,
projectId: this.checkedList[0].projectCode,
}
let res=await xzwtpostEvalQuesInfo(params)
if(res.code==200){
this.innerVisible=false
this.rectificationReview()
}
},
cancelpro(){
this.innerVisible=false
},
addpro(){
this.form={
evalQues:''
}
this.innerVisible = true
},
}, },
}; };
</script> </script>
...@@ -1223,4 +1340,33 @@ h3 { ...@@ -1223,4 +1340,33 @@ h3 {
::v-deep.el-table::before { ::v-deep.el-table::before {
display: none !important; display: none !important;
} }
.addbutton {
background-color: #23c6c8;
border-color: #23c6c8;
color: #fff;
}
.innerVisible {
left: 30vw;
top: 15vh;
// height: 600px;
}
.addfrom {
display: inline-block;
height: 300px;
/deep/.el-input__inner{
width: 450px !important;
}
/deep/.el-textarea__inner{
width: 450px !important;
}
/deep/ .el-select-dropdown {
margin-top: -55px !important; /* 调整与触发按钮的距离 */
margin-left: 20px; /* 也可以调整左边距，根据需要 */
}
}
.addBtn{
text-align: center;
margin-bottom: 0;
}
</style> </style>
\ No newline at end of file
src/views/assessZC/checkCompliance.vue
...@@ -232,7 +232,7 @@ export default { ...@@ -232,7 +232,7 @@ export default {
], ],
tabList: [ tabList: [
{ label: "可研", id: 0 }, { label: "可研", id: 0 },
{ label: "计划", id: 1 }, // { label: "计划", id: 1 },
{ label: "采购", id: 2 }, { label: "采购", id: 2 },
{ label: "合同", id: 3 }, { label: "合同", id: 3 },
{ label: "执行", id: 4 }, { label: "执行", id: 4 },
......
src/views/assessZC/projectView.vue
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
size="small" size="small"
type="primary" type="primary"
class="btn-search" class="btn-search"
@click="uploadFiles(scope.row)" @click="postExist(scope.row)"
>上传</el-button >上传</el-button
> >
<el-button <el-button
...@@ -408,6 +408,7 @@ import { ...@@ -408,6 +408,7 @@ import {
downloadObject, downloadObject,
HistoryVersion, HistoryVersion,
presignedUrl, presignedUrl,
postExist,
} from "@/api/index"; } from "@/api/index";
import { Loading } from "element-ui"; import { Loading } from "element-ui";
...@@ -471,9 +472,9 @@ export default { ...@@ -471,9 +472,9 @@ export default {
}, },
methods: { methods: {
noFullScreen(){ noFullScreen() {
console.log('关闭了') console.log("关闭了");
this.dialogFullScreen=false this.dialogFullScreen = false;
}, },
upload(row) { upload(row) {
this.ruleFormdialog = row; this.ruleFormdialog = row;
...@@ -844,6 +845,28 @@ export default { ...@@ -844,6 +845,28 @@ export default {
}; };
} }
}, },
postExist(row) {
let params = {
contractNumber: this.ruleFormdialog.contractNumber,
projectCode: this.ruleFormdialog.projectCode,
};
postExist(params).then((res) => {
if (res.data.exist) {
this.$alert("项目流程审批中，请勿上传新的文件", "提示", {
confirmButtonText: "确定",
callback: (action) => {
// this.$message({
// type: "info",
// message: `action: ${action}`,
// });
},
});
return;
} else {
this.uploadFiles(row);
}
});
},
uploadFiles(row) { uploadFiles(row) {
if (row.fullId) { if (row.fullId) {
this.$confirm("已有文件,本次上传将覆盖历史上传文件,是否继续?", "提示", { this.$confirm("已有文件,本次上传将覆盖历史上传文件,是否继续?", "提示", {
...@@ -1148,7 +1171,7 @@ export default { ...@@ -1148,7 +1171,7 @@ export default {
height: 610px; height: 610px;
overflow-y: auto; overflow-y: auto;
} }
} }
/deep/ .el-dialog { /deep/ .el-dialog {
width: 90%; width: 90%;
margin-top: 3vh !important; margin-top: 3vh !important;
...@@ -1181,7 +1204,7 @@ export default { ...@@ -1181,7 +1204,7 @@ export default {
/deep/ .el-icon-close:before { /deep/ .el-icon-close:before {
font-size: 20px !important; font-size: 20px !important;
} }
.histable{ .histable {
height: 630px; height: 630px;
overflow-y: auto; overflow-y: auto;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!