Skip to content

Administrator / project_progress

Go to a project
Commit b9308e7b by liangzhen
Options

评估确认发布修改

1 parent 9a5ca2af
Inline Side-by-side
Showing with 49 additions and 22 deletions
src/views/assessChecks/assistedFeedback.vue
......@@ -129,6 +129,7 @@
<el-table-column label="问题确认" width="auto">
<template slot-scope="scope">
<el-switch
v-show="scope.row.evalQues"
v-model="scope.row.confirmStatus"
active-color="#C0C0C0"
inactive-color="#13ce66"
......
src/views/assessChecks/assistedVerif.vue
......@@ -320,7 +320,7 @@
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem" >
<el-input
v-model="ruleFormZJ.projectInfo"
placeholder="请输入"
......@@ -413,7 +413,7 @@
</el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200">
</el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200">
<el-table-column prop="projectInfo" label="项目内容" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
......
src/views/assessChecks/assistedViewing.vue
......@@ -337,15 +337,17 @@ export default {
}
},
dataPretreatment() {
for (let i = 0; i < this.qdtableData.length; i++) {
this.mergingRows=[]
this.mergingPos = 0;
for (let i = 0; i < this.xxtableData.length; i++) {
// tabledata 表格数据源
if (i == 0) {
this.mergingRows.push(1);
this.mergingPos = 0;
} else {
if (
this.qdtableData[i].projectStage ===
this.qdtableData[i - 1].projectStage
this.xxtableData[i].projectStage ===
this.xxtableData[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRows[this.mergingPos] += 1;
......@@ -364,6 +366,7 @@ export default {
batchId: this.checkedList[0].batchId,
projectId: this.checkedList[0].projectId,
};
this.xxtableData=[]
let res = await wtqdqselect(params);
if (res.code == "200") {
this.xxtableData = res.data.records;
......
src/views/assessChecks/attachSynchronousArchiving.vue
......@@ -36,7 +36,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="项目内容:" prop="projectContent" class="fromItem">
<el-form-item label="项目内容:" prop="projectContent" class="fromItem" show-overflow-tooltip>
<el-input
v-model="ruleForm.projectContent"
placeholder="请输入"
......@@ -146,7 +146,7 @@
</el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200">
</el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200">
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
......@@ -239,7 +239,7 @@
<el-tab-pane label="问题清单" name="second">
<p class="title"><span></span>项目基本信息</p>
<el-table
:data="qdtableData"
:data="xxtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
......@@ -307,6 +307,7 @@ import {
export default {
data() {
return {
xxtableData:[],
qdtableData: [],
listData: {},
ruleForm: {
......@@ -381,6 +382,7 @@ export default {
alert("归档");
},
async handleClick() {
this.xxtableData=[]
console.log(this.activeName, "this.activeName");
if (this.activeName == "second") {
let params = {
......@@ -389,11 +391,11 @@ export default {
};
let res = await wtqdqselect(params);
if (res.code == "200") {
this.qdtableData = res.data.records;
this.xxtableData = res.data.records;
this.qdtotal = res.data.total * 1;
}
this.qdtableData.forEach((item) => {
this.xxtableData.forEach((item) => {
switch (item.projectStage) {
case 1:
this.$set(item, "projectStagetext", "1.可研");
......@@ -439,15 +441,17 @@ export default {
}
},
dataPretreatment() {
for (let i = 0; i < this.qdtableData.length; i++) {
this.mergingRows=[]
this.mergingPos = 0;
for (let i = 0; i < this.xxtableData.length; i++) {
// tabledata 表格数据源
if (i == 0) {
this.mergingRows.push(1);
this.mergingPos = 0;
} else {
if (
this.qdtableData[i].projectStage ===
this.qdtableData[i - 1].projectStage
this.xxtableData[i].projectStage ===
this.xxtableData[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRows[this.mergingPos] += 1;
......
src/views/assessChecks/auxiliaryInspection.vue
......@@ -44,9 +44,9 @@
<el-button @click="resetForm('ruleForm')">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
>
<!-- <el-button @click="detailsForm('ruleForm')">
<el-button @click="detailsForm('ruleForm')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> -->
>
<el-button @click="inspectNexts()"
><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button
>
......@@ -193,6 +193,24 @@ export default {
path: "/mainLayout/Compliance",
});
},
//详情
async detailsForm(){
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
let params = {
projectId:this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId
};
this.$router.push({
path: "/mainLayout/Compliancefz",
query:{
"clqparams":JSON.stringify(params),
"ishow":false
}
});
},
//提交问题清单
async submitNexts() {
if (this.checkedList.length != 1) {
......@@ -201,7 +219,7 @@ export default {
}
// if(this.checkedList[0].postEvalState=='待评估'){
// this.$message("该项目还未评估");
// return;
// return;
// }
if(this.checkedList[0].postEvalState=='已提交'){
this.$message("该项目已提交");
......
src/views/assessChecks/checkComplianceFZ.vue
......@@ -26,16 +26,16 @@
<el-table-column label="检查说明" prop="checkDesc"> </el-table-column>
<el-table-column label="评估问题" >
<template slot-scope="scope">
<el-input v-model="scope.row.evalQues"></el-input>
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template>
</el-table-column>
</el-table>
</div>
<p class="Btn">
<p class="Btn" v-if="!ishow">
<span @click="cancel()">取消</span
><span @click="save('add')">确定</span>
<span @click="save('upLoad')">上传</span>
<span @click="save('upLoad')">提交</span>
</p>
</div>
</template>
......@@ -49,12 +49,13 @@ export default {
mergingRows: [],
mergingPos: 0,
clqparams:{},
ishow:true
};
},
mounted() {
this.clqparams=JSON.parse(this.$route.query.clqparams)
console.log(this.clqparams,'this.clqparams')
this.ishow=this.$route.query.ishow
this.init(this.clqparams);
},
methods: {
......
src/views/assessChecks/confirmRelease.vue
......@@ -420,7 +420,7 @@
</el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200">
</el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200">
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
......@@ -714,7 +714,7 @@ export default {
let params = {
current: this.currentZJ,
pageSize: this.pageSizeZJ,
projectStr:this.oldid
prjStr:this.oldid
};
Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!