Skip to content

Administrator / project_progress

Go to a project
Commit 7ba7408a by bingobo
Options

开发互查

1 parent 367a645c
Inline Side-by-side
Showing with 133 additions and 44 deletions
src/views/assessChecks/auxiliaryInspection.vue
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
> >
<el-table-column prop="batchName" label="后评估批次名称"> </el-table-column> <el-table-column prop="batchName" label="后评估批次名称"> </el-table-column>
<el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column> <el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column>
<el-table-column prop="projectLeader" label="项目负责人" width="90"> </el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="130"> </el-table-column> <el-table-column prop="projectCode" label="项目编码" width="130"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
...@@ -218,9 +218,10 @@ ...@@ -218,9 +218,10 @@
></el-image> ></el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="问题响应" min-width="100"> <el-table-column label="是否申述" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <span>{{ scope.row.confirmStatus == 1 ? '是' : '否' }}</span>
<!-- <el-switch
v-model="scope.row.confirmStatus" v-model="scope.row.confirmStatus"
active-color="#C0C0C0" active-color="#C0C0C0"
inactive-color="#13ce66" inactive-color="#13ce66"
...@@ -237,11 +238,11 @@ ...@@ -237,11 +238,11 @@
<template v-slot:inactive> <template v-slot:inactive>
<span>关闭</span> <span>关闭</span>
</template> </template>
</el-switch> </el-switch> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="解释批注" label="整改说明"
prop="feedback" prop="feedback"
min-width="100" min-width="100"
show-overflow-tooltip show-overflow-tooltip
......
src/views/assessChecks/auxiliarySelection.vue
<!-- 评估批次发起 --> <!-- 互查 评估批次发起 -->
<template> <template>
<div class="main"> <div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName"> <el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
...@@ -80,7 +80,11 @@ ...@@ -80,7 +80,11 @@
<el-table-column label="批次年度" width="120" prop="batchYear"> <el-table-column label="批次年度" width="120" prop="batchYear">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template> <template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称" width="auto"> </el-table-column> <el-table-column prop="batchName" label="后评估批次名称" width="auto">
<template slot-scope="scope">
<div @click="routeToResultView(scope.row)" style="cursor: pointer;">{{ scope.row.batchName }}</div>
</template>
</el-table-column>
<el-table-column prop="expertName" label="后评估专家" width="auto"> </el-table-column> <el-table-column prop="expertName" label="后评估专家" width="auto"> </el-table-column>
<!-- <el-table-column prop="id" label="专家编号" width="auto"> <!-- <el-table-column prop="id" label="专家编号" width="auto">
...@@ -91,7 +95,7 @@ ...@@ -91,7 +95,7 @@
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto"> <!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="creator" label="发起人" width="120"> </el-table-column> <el-table-column prop="creatorName" label="发起人" width="120"> </el-table-column>
<el-table-column prop="createTime" label="发起时间" width="220"> </el-table-column> <el-table-column prop="createTime" label="发起时间" width="220"> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -275,6 +279,8 @@ ...@@ -275,6 +279,8 @@
<el-table-column label="单位" width="auto" prop="orgName"> </el-table-column> <el-table-column label="单位" width="auto" prop="orgName"> </el-table-column>
<el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column> <el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column>
<el-table-column prop="iscUserId" label="ISC账号" width="auto">
</el-table-column>
<!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> --> <!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> -->
<el-table-column prop="sex" label="性别" width="auto"> <el-table-column prop="sex" label="性别" width="auto">
<template slot-scope="scope">{{ scope.row.sex | filtergender }}</template> <template slot-scope="scope">{{ scope.row.sex | filtergender }}</template>
...@@ -369,11 +375,12 @@ ...@@ -369,11 +375,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrolldialog"> <div class="setscrolldialog">
<!-- @row-click="
(row, column, event) => handleRowClick(row, column, event, 'multipleTableZJ')
" -->
<el-table <el-table
@selection-change="handleSelectionChangeZJ" @selection-change="handleSelectionChangeZJ"
@row-click=" @current-change="currentChange"
(row, column, event) => handleRowClick(row, column, event, 'multipleTableZJ')
"
ref="multipleTableZJ" ref="multipleTableZJ"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
...@@ -389,6 +396,8 @@ ...@@ -389,6 +396,8 @@
<!-- <el-table-column type="selection"> </el-table-column> --> <!-- <el-table-column type="selection"> </el-table-column> -->
<el-table-column label="单位" width="auto" prop="orgName"> </el-table-column> <el-table-column label="单位" width="auto" prop="orgName"> </el-table-column>
<el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column> <el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column>
<el-table-column prop="iscUserId" label="ISC账号" width="auto">
</el-table-column>
<!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> --> <!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> -->
<el-table-column prop="sex" label="性别" width="auto"> <el-table-column prop="sex" label="性别" width="auto">
<template slot-scope="scope">{{ scope.row.sex | filtergender }}</template> <template slot-scope="scope">{{ scope.row.sex | filtergender }}</template>
...@@ -516,13 +525,15 @@ ...@@ -516,13 +525,15 @@
<el-table-column label="单位" width="auto" prop="orgName"> </el-table-column> <el-table-column label="单位" width="auto" prop="orgName"> </el-table-column>
<el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column> <el-table-column prop="talentName" label="专家姓名" width="auto"> </el-table-column>
<el-table-column prop="iscUserId" label="ISC账号" width="auto">
</el-table-column>
<!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> --> <!-- <el-table-column prop="id" label="专家编号" width="auto"> </el-table-column> -->
<el-table-column prop="sex" label="性别" width="auto"> <el-table-column prop="sex" label="性别" width="auto">
<template slot-scope="scope">{{ scope.row.sex | filtergender }}</template> <template slot-scope="scope">{{ scope.row.sex | filtergender }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="birthDay" label="出生日期" width="auto"> </el-table-column> <el-table-column prop="birthDay" label="出生日期" width="auto"> </el-table-column>
<el-table-column prop="education" label="学历" width="auto"> <el-table-column prop="education" label="学历" width="auto">
<template slot-scope="scope">{{ scope.row.seducation | filterexpert }}</template> <template slot-scope="scope">{{ scope.row.education | filterexpert }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="mobile" label="联系方式" width="auto"> </el-table-column> <el-table-column prop="mobile" label="联系方式" width="auto"> </el-table-column>
<el-table-column prop="email" label="邮箱" width="auto"> </el-table-column> <el-table-column prop="email" label="邮箱" width="auto"> </el-table-column>
...@@ -734,6 +745,20 @@ export default { ...@@ -734,6 +745,20 @@ export default {
}, },
methods: { methods: {
routeToResultView(row) {
console.log(66666, row);
const params = {
name: 'bingo'
}
this.$router.push({
path: '/mainLayout/assistedViewing',
query: {
// clqparams: JSON.stringify(params),
batchName: row.batchName,
}
})
},
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
...@@ -887,10 +912,25 @@ export default { ...@@ -887,10 +912,25 @@ export default {
}, },
//保存专家 //保存专家
saveZJ() { saveZJ() {
const iscUserIdEqualNull = this.addZJList.find(
(item) => item.iscUserId === null
);
// console.log('保存专家', iscUserIdEqualNull);
if (iscUserIdEqualNull !== undefined) {
this.$message("不能保存ISC账号为空的选项");
return;
}
if (this.addZJList.length < 1) { if (this.addZJList.length < 1) {
this.$message('请选择专家') this.$message('请选择专家')
return return
} }
if(this.dialogAdd === true) {
// 新增后评估批次信息 弹窗
// 只保留专家弹窗中选择的一条数据
this.addtableData = [];
}
if (this.dialogedit == true) { if (this.dialogedit == true) {
console.log('编辑专家') console.log('编辑专家')
this.addtableData = [] this.addtableData = []
...@@ -965,6 +1005,18 @@ export default { ...@@ -965,6 +1005,18 @@ export default {
cancelXZ() { cancelXZ() {
this.dialogAdd = false this.dialogAdd = false
}, },
//选中的专家
handleSelectionChangeZJ(val) {
if (val.length > 1) {
this.$refs.multipleTableZJ.clearSelection();
this.$refs.multipleTableZJ.toggleRowSelection(val[val.length - 1]);
}
this.addZJList = [val[val.length - 1]];
// console.log("选中的专家1-", this.addZJList);
},
currentChange(val) {
this.$refs.multipleTableZJ.toggleRowSelection(val);
},
saveBJ() { saveBJ() {
this.$refs.formNameBJ.validate((valid) => { this.$refs.formNameBJ.validate((valid) => {
if (!valid) { if (!valid) {
...@@ -993,10 +1045,7 @@ export default { ...@@ -993,10 +1045,7 @@ export default {
} }
}) })
}, },
//选中的专家
handleSelectionChangeZJ() {
this.addZJList = this.$refs.multipleTableZJ.selection
},
convertTimeFormat(isoTime) { convertTimeFormat(isoTime) {
const date = new Date(isoTime) const date = new Date(isoTime)
const year = date.getFullYear() const year = date.getFullYear()
...@@ -1380,6 +1429,13 @@ export default { ...@@ -1380,6 +1429,13 @@ export default {
height: 400px; height: 400px;
overflow: auto; overflow: auto;
} }
::v-deep thead {
.el-table-column--selection {
.cell {
display: none;
}
}
}
} }
.setscrolldialogx { .setscrolldialogx {
width: 100%; width: 100%;
......
src/views/assessChecks/confirmRelease.vue
...@@ -70,12 +70,17 @@ ...@@ -70,12 +70,17 @@
<el-table-column label="批次年度" prop="batchYear" width="120"> <el-table-column label="批次年度" prop="batchYear" width="120">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template> <template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> </el-table-column> <el-table-column prop="batchName" label="后评估批次名称">
<template slot-scope="scope">
<div @click="routeToResultView(scope.row)" style="cursor: pointer;">{{ scope.row.batchName }}</div>
</template>
</el-table-column>
<el-table-column prop="projectNum" label="项目数量" width="auto">
</el-table-column>
<el-table-column prop="expertName" label="评审专家" width="auto"> </el-table-column> <el-table-column prop="expertName" label="评审专家" width="auto"> </el-table-column>
<el-table-column prop="projectName" label="待评估项目" width="auto" show-overflow-tooltip> <!-- <el-table-column prop="projectName" label="待评估项目" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column> -->
<el-table-column prop="planReviewDate" label="计划评估日期" width="auto"> </el-table-column> <el-table-column prop="planReviewDate" label="计划评估日期" width="auto"> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="postEvalStateText" prop="postEvalStateText"
...@@ -308,7 +313,7 @@ ...@@ -308,7 +313,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectLeader" label="负责人" min-width="110"> </el-table-column> <el-table-column prop="projectLeader" label="负责人" min-width="110"> </el-table-column>
<el-table-column label="操作" min-width="130" fixed="right"> <el-table-column label="操作" min-width="130" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="handleClick(scope.row, scope.$index, addtableData)" @click="handleClick(scope.row, scope.$index, addtableData)"
...@@ -592,6 +597,15 @@ export default { ...@@ -592,6 +597,15 @@ export default {
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
routeToResultView(row) {
console.log(66666, row);
this.$router.push({
path: '/mainLayout/auxiliaryInspection',
query: {
batchName: row.batchName,
}
})
},
handleRowClickSelf(row, column, event) { handleRowClickSelf(row, column, event) {
if (!['1', '2', '3'].includes(row.zcstate) && row.contractNumber && row.projectCode) { if (!['1', '2', '3'].includes(row.zcstate) && row.contractNumber && row.projectCode) {
this.$refs['multipleTableZJ'].toggleRowSelection(row) this.$refs['multipleTableZJ'].toggleRowSelection(row)
......
src/views/assessChecks/materialAcquisition.vue
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> </el-table-column> <el-table-column prop="batchName" label="后评估批次名称"> </el-table-column>
<el-table-column prop="expertName" label="评审专家"> </el-table-column> <el-table-column prop="expertName" label="评审专家"> </el-table-column>
<el-table-column prop="projectLeader" label="项目负责人"> </el-table-column>
<el-table-column prop="projectCode" label="项目编码"> </el-table-column> <el-table-column prop="projectCode" label="项目编码"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
...@@ -282,9 +283,18 @@ ...@@ -282,9 +283,18 @@
></el-image> ></el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="问题响应" width="100"> <el-table-column label="是否申述" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-checkbox
v-if="scope.row.evalQues"
:disabled="scope.row.rectificationStatus == 2"
v-model="scope.row.confirmStatus"
true-label="1" false-label="2"
>
{{ '是' }}
<!-- {{ scope.row.confirmStatus == 1 ? '是' : '否' }} -->
</el-checkbox>
<!-- <el-switch
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
v-if="scope.row.evalQues" v-if="scope.row.evalQues"
v-model="scope.row.confirmStatus" v-model="scope.row.confirmStatus"
...@@ -302,7 +312,7 @@ ...@@ -302,7 +312,7 @@
<template v-slot:inactive> <template v-slot:inactive>
<span>关闭</span> <span>关闭</span>
</template> </template>
</el-switch> </el-switch> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上传档案材料" prop="dacl" width="120"> <el-table-column label="上传档案材料" prop="dacl" width="120">
...@@ -325,7 +335,7 @@ ...@@ -325,7 +335,7 @@
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="整改说明(选填)" width="220"> <el-table-column label="整改说明(申述必填)" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.feedback" v-model="scope.row.feedback"
...@@ -333,6 +343,7 @@ ...@@ -333,6 +343,7 @@
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
type="textarea" type="textarea"
:rows="3" :rows="3"
:class="{ 'is-empty': scope.row.confirmStatus == 1 && !scope.row.feedback?.trim() }"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
...@@ -352,12 +363,16 @@ ...@@ -352,12 +363,16 @@
</el-table-column> </el-table-column>
<el-table-column label="整改复核状态" prop="checkDesc"> <el-table-column label="整改复核状态" prop="checkDesc">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.rectificationStatus" placeholder="请选择" disabled> <span v-if="scope.row.rectificationStatus == null"></span>
<span v-if="scope.row.rectificationStatus == 0">问题未整改</span>
<span v-if="scope.row.rectificationStatus == 1">整改不合格</span>
<span v-if="scope.row.rectificationStatus == 2">整改完成</span>
<!-- <el-select v-model="scope.row.rectificationStatus" placeholder="请选择" disabled>
<el-option label="待复核" :value="null"></el-option> <el-option label="待复核" :value="null"></el-option>
<el-option label="问题未整改" :value="0"></el-option> <el-option label="问题未整改" :value="0"></el-option>
<el-option label="整改不合格" :value="1"></el-option> <el-option label="整改不合格" :value="1"></el-option>
<el-option label="整改完成" :value="2"></el-option> <el-option label="整改完成" :value="2"></el-option>
</el-select> </el-select> -->
</template> </template>
</el-table-column> </el-table-column>
...@@ -527,6 +542,9 @@ export default { ...@@ -527,6 +542,9 @@ export default {
}, },
mounted() { mounted() {
// this.submitForm(); // this.submitForm();
this.$nextTick(() => {
this.$refs.multipleTable.doLayout()
})
}, },
methods: { methods: {
timeChange(time) { timeChange(time) {
...@@ -746,6 +764,13 @@ export default { ...@@ -746,6 +764,13 @@ export default {
this.handleSelectionChange() this.handleSelectionChange()
}, },
async saveSS() { async saveSS() {
const confirmStatusArr = this.tableDataQR.filter(item => item.confirmStatus == 1)
const nullFeedBack = confirmStatusArr.filter(item => !item.feedback?.trim())
console.log('保存--this.tableDataQR', this.tableDataQR, confirmStatusArr, nullFeedBack);
if (nullFeedBack.length > 0) {
this.$message.warning('整改说明（申述必填）');
return
}
let res = await qrProblemAssistedFeedback(this.tableDataQR) let res = await qrProblemAssistedFeedback(this.tableDataQR)
if (res.code == '200') { if (res.code == '200') {
this.$message('保存成功') this.$message('保存成功')
...@@ -756,6 +781,13 @@ export default { ...@@ -756,6 +781,13 @@ export default {
} }
}, },
async saveSubmit() { async saveSubmit() {
const confirmStatusArr = this.tableDataQR.filter(item => item.confirmStatus == 1)
const nullFeedBack = confirmStatusArr.filter(item => !item.feedback?.trim())
console.log('提交--this.tableDataQR', this.tableDataQR, confirmStatusArr, nullFeedBack);
if (nullFeedBack.length > 0) {
this.$message.warning('整改说明（申述必填）');
return
}
let res = await wtzgxfProblemRectification(this.tableDataQR) let res = await wtzgxfProblemRectification(this.tableDataQR)
this.$refs.myTable.doLayout() // 解决表格错位 this.$refs.myTable.doLayout() // 解决表格错位
if (res.code == '200') { if (res.code == '200') {
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
<el-table-column prop="batchName" label="后评估批次名称"> </el-table-column> <el-table-column prop="batchName" label="后评估批次名称"> </el-table-column>
<el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column> <el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column>
<el-table-column prop="projectLeader" label="项目负责人" width="90"> </el-table-column> <el-table-column prop="projectLeader" label="项目负责人" width="90"> </el-table-column>
<el-table-column prop="projectNum" label="项目数量" width="90"> </el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="130"> </el-table-column> <el-table-column prop="projectCode" label="项目编码" width="130"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
......
src/views/assessZC/auxiliarySelection.vue
<!-- 评估批次发起 --> <!-- 自查 评估批次发起 -->
<template> <template>
<div class="main"> <div class="main">
<el-form <el-form
......
src/views/assessZC/confirmRelease.vue
...@@ -117,6 +117,8 @@ ...@@ -117,6 +117,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectNum" label="项目数量" width="auto">
</el-table-column>
<el-table-column prop="expertName" label="评审专家" width="auto"> <el-table-column prop="expertName" label="评审专家" width="auto">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectName" label="待评估项目" width="auto" show-overflow-tooltip></el-table-column> --> <!-- <el-table-column prop="projectName" label="待评估项目" width="auto" show-overflow-tooltip></el-table-column> -->
......
src/views/assessZC/materialAcquisition.vue
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<!-- 问题整改 -->
<el-dialog title="问题整改" :visible.sync="dialogQR" width="91%" :modal-append-to-body="false" :append-to-body="false" <el-dialog title="问题整改" :visible.sync="dialogQR" width="91%" :modal-append-to-body="false" :append-to-body="false"
@close="closed"> @close="closed">
<div class="dialog"> <div class="dialog">
...@@ -996,20 +995,6 @@ export default { ...@@ -996,20 +995,6 @@ export default {
}) })
}, },
methods: { methods: {
getProType(val) {
console.log(' | proType', val);
if (val == 1) {
return '咨询设计类'
} else if (val == 2) {
return '开发实施类'
} else if (val == 3) {
return '业务运营类'
} else if (val == 4) {
return '数据工程类'
} else if (val == 5) {
return '产品购置类'
}
},
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!