Skip to content

Administrator / project_progress

Go to a project
Commit ed4c149a by liangzhen
Options

自查互查替换

1 parent 832d2f65
Inline Side-by-side
Showing with 466 additions and 134 deletions
src/api/index.js
...@@ -436,7 +436,7 @@ export function projectInfoSy(params){ ...@@ -436,7 +436,7 @@ export function projectInfoSy(params){
} }
//项目列表页面 //项目列表页面
export function pmProInitiation(params){ export function pmProInitiation(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/`, params) return post(`${ARCH_EVALUATION}/projectInfoZc/getProjectInfo`, params)
} }
//项目清单 //项目清单
export function MaterialWarehous(params){ export function MaterialWarehous(params){
......
src/api/indexzc.js
...@@ -440,7 +440,7 @@ export function projectInfoSy(params){ ...@@ -440,7 +440,7 @@ export function projectInfoSy(params){
} }
//项目列表页面 //项目列表页面
export function pmProInitiation(params){ export function pmProInitiation(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/`, params) return post(`${ARCH_EVALUATION}/projectInfoZc/getProjectInfo`, params)
} }
//项目清单 //项目清单
export function MaterialWarehous(params){ export function MaterialWarehous(params){
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-dialog <el-dialog
title="复核情况" title="复核情况"
:visible.sync="dialogQR" :visible.sync="dialogQR"
width="79%" width="91%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
@close="closed" @close="closed"
...@@ -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"
...@@ -224,10 +229,10 @@ ...@@ -224,10 +229,10 @@
<el-table-column <el-table-column
label="项目环节" label="项目环节"
prop="projectStagetext" prop="projectStagetext"
width="150" width="120"
> >
</el-table-column> </el-table-column>
<el-table-column label="序号" width="100" type="index"> <el-table-column label="序号" width="70" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -243,9 +248,9 @@ ...@@ -243,9 +248,9 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="300"> <el-table-column label="评估问题" prop="evalQues" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="问题确认" width="auto"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.confirmStatus" v-model="scope.row.confirmStatus"
...@@ -275,7 +280,20 @@ ...@@ -275,7 +280,20 @@
<el-input v-model="scope.row.feedback" disabled></el-input> <el-input v-model="scope.row.feedback" disabled></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400"> <el-table-column label="整改材料下载" width="200">
<template slot-scope="scope">
<router-link
:to="{
path: '/assesszc/projectView',
query: { projectId: scope.row.projectId },
}"
>
<el-button type="text" size="small">下载材料</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="300">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.fileId" v-if="scope.row.confirmStatus == '1' && scope.row.fileId"
...@@ -286,11 +304,6 @@ ...@@ -286,11 +304,6 @@
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)" @click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>{{ scope.row.fileName }}</el-tag >{{ scope.row.fileName }}</el-tag
> >
<!-- {{ scope.row.fileName }}
<el-button
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>下载</el-button
> -->
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
...@@ -315,7 +328,7 @@ ...@@ -315,7 +328,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column <!-- <el-table-column
label="整改材料" label="整改材料"
width="600" width="600"
show-overflow-tooltip show-overflow-tooltip
...@@ -339,8 +352,7 @@ ...@@ -339,8 +352,7 @@
class="btn-search btnTop" class="btn-search btnTop"
@click="downloadObjectStr(item)" @click="downloadObjectStr(item)"
v-if=" v-if="
scope.row.prob.indexOf(scope.row.projectStage) != scope.row.prob.indexOf(scope.row.projectStage) != -1
-1
" "
>下载</el-button >下载</el-button
> >
...@@ -348,30 +360,14 @@ ...@@ -348,30 +360,14 @@
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column
<template slot-scope="scope" v-if="scope.row.zgqkFileId"> label="复核情况说明"
<el-tag prop="zgqkFileId"
v-if="scope.row.zgqkFileName" width="200"
size="small"
@click="
handleClickXZ(
scope.row.zgqkFileId,
scope.row.zgqkFileName
)
"
>{{ scope.row.zgqkFileName }}</el-tag
> >
<!-- {{ scope.row.zgqkFileName }} <template slot-scope="scope">
<el-button <el-input v-model="scope.row.zgqkFileId"></el-input>
@click="
handleClickXZ(
scope.row.zgqkFileId,
scope.row.zgqkFileName
)
"
>下载</el-button
> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -384,7 +380,7 @@ ...@@ -384,7 +380,7 @@
v-model="scope.row.rectificationStatus" v-model="scope.row.rectificationStatus"
placeholder="请选择" placeholder="请选择"
> >
<el-option label="请选择" value=""></el-option> <!-- <el-option label="请选择" value=""></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>
...@@ -399,6 +395,50 @@ ...@@ -399,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>
...@@ -413,11 +453,19 @@ import { ...@@ -413,11 +453,19 @@ import {
tjrectificationVerification, tjrectificationVerification,
MaterialWarehous, MaterialWarehous,
downloadObjectStr, downloadObjectStr,
selWtqdFZ,
xzwtpostEvalQuesInfo
} from "@/api/index"; } from "@/api/index";
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,
...@@ -642,7 +690,7 @@ export default { ...@@ -642,7 +690,7 @@ export default {
this.handleSelectionChange(); this.handleSelectionChange();
}, },
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0 || columnIndex === 8) { if (columnIndex === 0) {
//第一列 //第一列
const _row = this.mergingRows[rowIndex]; const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
...@@ -671,6 +719,20 @@ export default { ...@@ -671,6 +719,20 @@ export default {
} }
}, },
async savetj() { async savetj() {
this.tableDataQR.forEach((item) => {
console.log(item.rectificationStatus, "item.rectificationStatus");
if (!item.rectificationStatus && item.rectificationStatus !== 0) {
this.$message({
message: "请完成所有整改复核后在进行提交",
type: "warning",
});
throw new Error();
}
});
const isallwc = this.tableDataQR.every(
(element) => element.rectificationStatus == 2
);
if (isallwc) {
this.$confirm( this.$confirm(
"若所有整改复核状态均为整改完成即为完成归档, 是否继续?", "若所有整改复核状态均为整改完成即为完成归档, 是否继续?",
"提示", "提示",
...@@ -689,12 +751,22 @@ export default { ...@@ -689,12 +751,22 @@ export default {
this.$message("提交失败"); this.$message("提交失败");
} }
}); });
} else {
let res = await tjrectificationVerification(this.tableDataQR);
if (res.code == "200") {
this.dialogQR = false;
this.$message("提交成功");
this.resetForm();
} else {
this.$message("提交失败");
}
}
}, },
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0, module: 0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
...@@ -887,6 +959,62 @@ export default { ...@@ -887,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>
...@@ -1164,8 +1292,8 @@ h3 { ...@@ -1164,8 +1292,8 @@ h3 {
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 190%; width: 100%;
min-width: 190%; min-width: 100%;
} }
/deep/.el-table__fixed-body-wrapper .el-table__body { /deep/.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 6px; // 6px为横向滚动条高度 padding-bottom: 6px; // 6px为横向滚动条高度
...@@ -1206,10 +1334,39 @@ h3 { ...@@ -1206,10 +1334,39 @@ h3 {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
.btn-search{ .btn-search {
vertical-align: top; vertical-align: top;
} }
::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/assessChecks/auxiliarySelection.vue
...@@ -1077,6 +1077,7 @@ export default { ...@@ -1077,6 +1077,7 @@ export default {
}; };
Object.assign(params, this.ruleFormZJ); Object.assign(params, this.ruleFormZJ);
console.log("查询专家", params); console.log("查询专家", params);
// this.zjtableData = []
let res = await expertInfo(params); let res = await expertInfo(params);
this.zjtableData = res.data.records; this.zjtableData = res.data.records;
this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
...@@ -1181,8 +1182,6 @@ export default { ...@@ -1181,8 +1182,6 @@ export default {
} }
this.addtableData = []; this.addtableData = [];
this.checkedList[0].planReviewDate =this.convertTimeFormat(this.checkedList[0].planReviewDate) this.checkedList[0].planReviewDate =this.convertTimeFormat(this.checkedList[0].planReviewDate)
// this.checkedList[0].planReviewDate =
// new Date(this.checkedList[0].planReviewDate) + "";
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
this.dialogedit = true; this.dialogedit = true;
let params = { let params = {
......
src/views/assessChecks/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 },
...@@ -254,7 +254,23 @@ export default { ...@@ -254,7 +254,23 @@ export default {
oldQuestionList: [], //对比列表 oldQuestionList: [], //对比列表
blobType:'pdf',//bolb类型 blobType:'pdf',//bolb类型
projectName:"", projectName:"",
valuesel:"" valuesel:"",
docxOptions: {
className: "kaimo-docx-666", // string：默认和文档样式类的类名/前缀
inWrapper: false, // boolean：启用围绕文档内容的包装器渲染
ignoreWidth:false, // boolean：禁用页面的渲染宽度
ignoreHeight: false, // boolean：禁止渲染页面高度
ignoreFonts:false, // boolean：禁用字体渲染
breakPages: false, // boolean：在分页符上启用分页
ignoreLastRenderedPageBreak: true, // boolean：在 lastRenderedPageBreak 元素上禁用分页
experimental: false, // boolean：启用实验功能（制表符停止计算）
trimXmlDeclaration: true, // boolean：如果为true，解析前会从 xml 文档中移除 xml 声明
useBase64URL: false, // boolean：如果为true，图片、字体等会转为base 64 URL，否则使用URL.createObjectURL
useMathMLPolyfill: false, // boolean：包括用于 chrome、edge 等的 MathML polyfill。
showChanges: false, // boolean：启用文档更改的实验性渲染（插入/删除）
debug: false, // boolean：启用额外的日志记录
}
}; };
}, },
mounted() { mounted() {
...@@ -471,7 +487,7 @@ export default { ...@@ -471,7 +487,7 @@ export default {
if(this.blobType=='docx'||this.blobType=='doc'){ if(this.blobType=='docx'||this.blobType=='doc'){
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(()=>{ this.$nextTick(()=>{
docx.renderAsync(resUrl,document.getElementById(`word${code}`)) // 渲染到页面预览 docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览
}) })
} }
...@@ -600,10 +616,25 @@ export default { ...@@ -600,10 +616,25 @@ export default {
}); });
evals = evals.slice(0, -1); evals = evals.slice(0, -1);
item.evalQues = evals; item.evalQues = evals;
if(item.evalList.length>=1&&item.evalList[0].evalQues){
item.isProblem=1
}
});
this.questionList.forEach((item) => {
if(!item.evalQues&&item.isProblem!=0){
console.log(item.evalQues,item.isProblem,'2222')
this.$message({
message: '请完成录入全部问题或选择未发现问题',
type: 'warning'
});
throw new Error()
}
}); });
console.log(this.questionList, "questionList"); console.log(this.questionList, "questionList");
// return
let params = { let params = {
list: this.questionList, list: this.questionList,
...this.clqparams, ...this.clqparams,
...@@ -904,4 +935,16 @@ export default { ...@@ -904,4 +935,16 @@ export default {
width:600px; width:600px;
} }
} }
/deep/ .docx-wrapper {
padding: 0 !important;
}
/deep/ .docx {
width: 100% !important;
display: table !important;
padding: 2em 1em 0 !important;
}
.kaimo-docx-666{
text-align: center;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/checkComplianceFZ.vue
...@@ -26,16 +26,15 @@ ...@@ -26,16 +26,15 @@
<el-table-column label="问题检查项" prop="quesCheckItem" width="auto"> <el-table-column label="问题检查项" prop="quesCheckItem" width="auto">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="检查说明" label="是否有问题"
prop="checkDesc" prop="isProblem"
show-overflow-tooltip width="100"
width="auto"
> >
<template slot-scope="scope"> {{ scope.row.isProblem|isProblemFilter }} </template>
</el-table-column> </el-table-column>
<el-table-column label="评估问题" width="auto" prop="evalQues" > <el-table-column label="评估问题" width="auto" prop="evalQues" >
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto"> <el-table-column label="问题截图" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -49,6 +48,13 @@ ...@@ -49,6 +48,13 @@
></el-image> ></el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
width="auto"
>
</el-table-column>
</el-table> </el-table>
</div> </div>
<p class="Btn" v-if="!ishow"> <p class="Btn" v-if="!ishow">
...@@ -62,7 +68,6 @@ ...@@ -62,7 +68,6 @@
<script> <script>
import { import {
selWtqdpostEvalQuesInfo, selWtqdpostEvalQuesInfo,
bcpostEvalQuesInfo,
tjpostEvalQuesInfo, tjpostEvalQuesInfo,
presignedUrl, presignedUrl,
} from "@/api/index"; } from "@/api/index";
...@@ -78,6 +83,15 @@ export default { ...@@ -78,6 +83,15 @@ export default {
projectName:"" projectName:""
}; };
}, },
filters: {
isProblemFilter(val) {
if (val == 1) {
return "是";
} else {
return "否";
}
},
},
mounted() { mounted() {
this.clqparams = JSON.parse(this.$route.query.clqparams); this.clqparams = JSON.parse(this.$route.query.clqparams);
...@@ -307,7 +321,7 @@ export default { ...@@ -307,7 +321,7 @@ export default {
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
background: #f0ffff; background: #f0ffff;
color: #2785e6; // color: #2785e6;
} }
.eltable { .eltable {
......
src/views/assessChecks/confirmRelease.vue
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
<p class="zjBtn"> <p class="zjBtn">
待评估项目 <span @click="xzExperts()">手动选择待评估项目</span> 待评估项目 <span @click="xzExperts()">手动选择待评估项目</span>
</p> </p>
<div class="setscrolldialog"> <div class="setscrolldialogxz">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data=" :data="
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable hide-selection"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
...@@ -563,6 +563,9 @@ ...@@ -563,6 +563,9 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope"> {{ scope.row.zcstate|zcstatefilter }}</template>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110"> <el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column> </el-table-column>
...@@ -650,15 +653,15 @@ export default { ...@@ -650,15 +653,15 @@ export default {
dialogAddzj: false, dialogAddzj: false,
pageSize: 10, pageSize: 10,
current: 1, current: 1,
pageSizeZJ: 5, pageSizeZJ: 10,
pageSizeXQ: 5, pageSizeXQ:10,
currentPageXQ: 1, currentPageXQ: 1,
currentZJ: 1, currentZJ: 1,
addtotal: 0, addtotal: 0,
currentAdd: 1, currentAdd: 1,
pageSizeAdd: 5, pageSizeAdd: 10,
currentedit: 1, currentedit: 1,
pageSizeedit: 5, pageSizeedit:10,
xfParam: "", xfParam: "",
dialogedit: false, dialogedit: false,
expertIdList: [], expertIdList: [],
...@@ -674,6 +677,19 @@ export default { ...@@ -674,6 +677,19 @@ export default {
message: {}, message: {},
}; };
}, },
filters: {
zcstatefilter(val) {
if (val == 1) {
return "待评估";
} else if (val == 2) {
return "需整改";
} else if (val == 3) {
return "已整改";
} else if (val == 4) {
return "已归档";
}
},
},
watch: { watch: {
// 监听路由对象中的参数部分 // 监听路由对象中的参数部分
"$route.params": { "$route.params": {
...@@ -703,7 +719,7 @@ export default { ...@@ -703,7 +719,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0, module:0
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
...@@ -797,7 +813,7 @@ export default { ...@@ -797,7 +813,7 @@ export default {
this.oldid = ""; this.oldid = "";
if (this.addtableData.length > 0) { if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => { this.addtableData.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ","); this.oldid = this.oldid.concat(item.projectCode + ",");
}); });
} }
} }
...@@ -961,10 +977,21 @@ export default { ...@@ -961,10 +977,21 @@ export default {
this.dialogAdd = false; this.dialogAdd = false;
}, },
//选中的专家 //选中的项目
handleSelectionChangeZJ() { handleSelectionChangeZJ(selection) {
if(selection.length<1){
return
}
let info=selection[selection.length-1].zcstate
if(info==1||info==2||info==3){
this.$refs.multipleTableZJ.toggleRowSelection(selection[selection.length-1], false);
this.$message('该项目在流程中，请选择其他项目')
console.log('不让点')
return
}
this.addZJList = this.$refs.multipleTableZJ.selection; this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222"); console.log(this.$refs.multipleTableZJ.selection, "2222222");
}, },
//点击删除 //点击删除
async handleClick(row, index, rows) { async handleClick(row, index, rows) {
...@@ -1294,7 +1321,25 @@ export default { ...@@ -1294,7 +1321,25 @@ export default {
} }
.setscrolldialog { .setscrolldialog {
// width: 100%; // width: 100%;
height: 300px; height: 400px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
overflow: auto;
.eltable {
box-sizing: border-box;
text-align: center;
width: 190%;
min-width: 190%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
}
.setscrolldialogxz {
// width: 100%;
height: 350px;
overflow-y: auto; overflow-y: auto;
overflow-x: scroll; overflow-x: scroll;
position: relative; position: relative;
...@@ -1305,6 +1350,7 @@ export default { ...@@ -1305,6 +1350,7 @@ export default {
width: 190%; width: 190%;
min-width: 190%; min-width: 190%;
} }
/deep/.el-table--scrollable-x .el-table__body-wrapper { /deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
...@@ -1323,7 +1369,7 @@ export default { ...@@ -1323,7 +1369,7 @@ export default {
// } // }
// } // }
.setscrolldialogx { .setscrolldialogx {
height: 300px; height: 430px;
overflow-y: auto; overflow-y: auto;
overflow-x: scroll; overflow-x: scroll;
position: relative; position: relative;
...@@ -1357,6 +1403,9 @@ export default { ...@@ -1357,6 +1403,9 @@ export default {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
} }
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
}
</style> </style>
<style> <style>
...@@ -1368,4 +1417,5 @@ export default { ...@@ -1368,4 +1417,5 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
} }
</style> </style>
\ No newline at end of file
src/views/assessChecks/materialAcquisition.vue
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
<el-dialog <el-dialog
title="问题整改" title="问题整改"
:visible.sync="dialogQR" :visible.sync="dialogQR"
width="79%" width="91%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
@close="closed" @close="closed"
...@@ -304,10 +304,10 @@ ...@@ -304,10 +304,10 @@
<el-table-column <el-table-column
label="项目环节" label="项目环节"
prop="projectStagetext" prop="projectStagetext"
width="150" width="110"
> >
</el-table-column> </el-table-column>
<el-table-column label="序号" width="100" type="index"> <el-table-column label="序号" width="50" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -316,19 +316,15 @@ ...@@ -316,19 +316,15 @@
width="200" width="200"
> >
</el-table-column> </el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column <el-table-column
label="评估问题" label="评估问题"
prop="evalQues" prop="evalQues"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="问题确认" width="auto"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-if="scope.row.evalQues" v-if="scope.row.evalQues"
...@@ -350,6 +346,17 @@ ...@@ -350,6 +346,17 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="上传档案材料"
prop="dacl"
width="120"
>
<template slot-scope="scope">
<router-link :to="{path:'/assesszc/projectView',query:{projectId:scope.row.projectId}}">
<el-button type="text" size="small">上传材料</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column label="解释批注"> <el-table-column label="解释批注">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
...@@ -358,7 +365,7 @@ ...@@ -358,7 +365,7 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="auto"> <el-table-column label="附加其他情况说明" prop="fileId" width="300">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.evalQues && scope.row.confirmStatus == '1'" v-if="scope.row.evalQues && scope.row.confirmStatus == '1'"
...@@ -369,8 +376,35 @@ ...@@ -369,8 +376,35 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="复核情况说明" prop="zgqkFileId" width="auto" >
</el-table-column>
<el-table-column
label="整改复核状态"
prop="checkDesc"
<el-table-column label="材料整改" prop="filed" width="600"> >
<template slot-scope="scope" >
<el-select
v-model="scope.row.rectificationStatus"
placeholder="请选择"
disabled
>
<el-option label="待复核" :value="null"></el-option>
<el-option label="问题未整改" :value="0"></el-option>
<el-option label="整改不合格" :value="1"></el-option>
<el-option label="整改完成" :value="2"></el-option>
</el-select>
</template>
</el-table-column>
<!-- <el-table-column label="材料整改" prop="filed" width="600">
<template slot-scope="scope" v-if="scope.row.filed"> <template slot-scope="scope" v-if="scope.row.filed">
<div v-for="(item, index) in scope.row.filed" :key="index"> <div v-for="(item, index) in scope.row.filed" :key="index">
<el-tooltip <el-tooltip
...@@ -411,8 +445,8 @@ ...@@ -411,8 +445,8 @@
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<!--
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.evalQues"> <template slot-scope="scope" v-if="scope.row.evalQues">
<input <input
...@@ -422,7 +456,7 @@ ...@@ -422,7 +456,7 @@
" "
/> />
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -559,7 +593,7 @@ export default { ...@@ -559,7 +593,7 @@ export default {
contractNumber: this.checkedList[0].contractNumber, contractNumber: this.checkedList[0].contractNumber,
prjId: this.checkedList[0].projectCode, prjId: this.checkedList[0].projectCode,
}; };
let resMat = await MaterialWarehous(paramsMat); // let resMat = await MaterialWarehous(paramsMat);
this.tableDataQR = res.data.records; this.tableDataQR = res.data.records;
let arr=[] let arr=[]
this.tableDataQR.forEach((item) => { this.tableDataQR.forEach((item) => {
...@@ -571,51 +605,51 @@ export default { ...@@ -571,51 +605,51 @@ export default {
} }
switch (item.projectStage) { switch (item.projectStage) {
case "1": case "1":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(1, resMat.data.records) // this.filtersTable(1, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
break; break;
case "2": case "2":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(2, resMat.data.records) // this.filtersTable(2, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "2.计划"); this.$set(item, "projectStagetext", "2.计划");
break; break;
case "3": case "3":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(3, resMat.data.records) // this.filtersTable(3, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "3.采购"); this.$set(item, "projectStagetext", "3.采购");
break; break;
case "4": case "4":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(4, resMat.data.records) // this.filtersTable(4, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "4.合同"); this.$set(item, "projectStagetext", "4.合同");
break; break;
case "5": case "5":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(5, resMat.data.records) // this.filtersTable(5, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "5.执行"); this.$set(item, "projectStagetext", "5.执行");
break; break;
case "6": case "6":
this.$set( // this.$set(
item, // item,
"filed", // "filed",
this.filtersTable(6, resMat.data.records) // this.filtersTable(6, resMat.data.records)
); // );
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
...@@ -740,7 +774,7 @@ export default { ...@@ -740,7 +774,7 @@ export default {
this.dialogQR = false; this.dialogQR = false;
}, },
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0 || columnIndex === 8) { if (columnIndex === 0 ) {
//第一列 //第一列
const _row = this.mergingRows[rowIndex]; const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
...@@ -758,7 +792,7 @@ export default { ...@@ -758,7 +792,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0, module: 0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
...@@ -1340,8 +1374,8 @@ h3 { ...@@ -1340,8 +1374,8 @@ h3 {
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 250%; width: 100%;
min-width: 250%; // min-width: 150%;
} }
/deep/.el-table--scrollable-x .el-table__body-wrapper { /deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important; overflow-x: hidden !important;
......
src/views/assessZC/checkCompliance.vue
...@@ -258,10 +258,10 @@ export default { ...@@ -258,10 +258,10 @@ export default {
docxOptions: { docxOptions: {
className: "kaimo-docx-666", // string：默认和文档样式类的类名/前缀 className: "kaimo-docx-666", // string：默认和文档样式类的类名/前缀
inWrapper: true, // boolean：启用围绕文档内容的包装器渲染 inWrapper: false, // boolean：启用围绕文档内容的包装器渲染
ignoreWidth: true, // boolean：禁用页面的渲染宽度 ignoreWidth:false, // boolean：禁用页面的渲染宽度
ignoreHeight: false, // boolean：禁止渲染页面高度 ignoreHeight: false, // boolean：禁止渲染页面高度
ignoreFonts: true, // boolean：禁用字体渲染 ignoreFonts:false, // boolean：禁用字体渲染
breakPages: false, // boolean：在分页符上启用分页 breakPages: false, // boolean：在分页符上启用分页
ignoreLastRenderedPageBreak: true, // boolean：在 lastRenderedPageBreak 元素上禁用分页 ignoreLastRenderedPageBreak: true, // boolean：在 lastRenderedPageBreak 元素上禁用分页
experimental: false, // boolean：启用实验功能（制表符停止计算） experimental: false, // boolean：启用实验功能（制表符停止计算）
...@@ -487,7 +487,7 @@ docxOptions: { ...@@ -487,7 +487,7 @@ docxOptions: {
if(this.blobType=='docx'||this.blobType=='doc'){ if(this.blobType=='docx'||this.blobType=='doc'){
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(()=>{ this.$nextTick(()=>{
docx.renderAsync(resUrl,document.getElementById(`word${code}`)) // 渲染到页面预览 docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览
}) })
} }
......
src/views/assessZC/confirmRelease.vue
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable hide-selection"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
...@@ -563,6 +563,9 @@ ...@@ -563,6 +563,9 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope"> {{ scope.row.zcstate|zcstatefilter }}</template>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110"> <el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column> </el-table-column>
...@@ -674,6 +677,19 @@ export default { ...@@ -674,6 +677,19 @@ export default {
message: {}, message: {},
}; };
}, },
filters: {
zcstatefilter(val) {
if (val == 1) {
return "待评估";
} else if (val == 2) {
return "需整改";
} else if (val == 3) {
return "已整改";
} else if (val == 4) {
return "已归档";
}
},
},
watch: { watch: {
// 监听路由对象中的参数部分 // 监听路由对象中的参数部分
"$route.params": { "$route.params": {
...@@ -797,7 +813,7 @@ export default { ...@@ -797,7 +813,7 @@ export default {
this.oldid = ""; this.oldid = "";
if (this.addtableData.length > 0) { if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => { this.addtableData.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ","); this.oldid = this.oldid.concat(item.projectCode + ",");
}); });
} }
} }
...@@ -961,10 +977,21 @@ export default { ...@@ -961,10 +977,21 @@ export default {
this.dialogAdd = false; this.dialogAdd = false;
}, },
//选中的专家 //选中的项目
handleSelectionChangeZJ() { handleSelectionChangeZJ(selection) {
if(selection.length<1){
return
}
let info=selection[selection.length-1].zcstate
if(info==1||info==2||info==3){
this.$refs.multipleTableZJ.toggleRowSelection(selection[selection.length-1], false);
this.$message('该项目在流程中，请选择其他项目')
console.log('不让点')
return
}
this.addZJList = this.$refs.multipleTableZJ.selection; this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222"); console.log(this.$refs.multipleTableZJ.selection, "2222222");
}, },
//点击删除 //点击删除
async handleClick(row, index, rows) { async handleClick(row, index, rows) {
...@@ -1376,6 +1403,9 @@ export default { ...@@ -1376,6 +1403,9 @@ export default {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
} }
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
}
</style> </style>
<style> <style>
...@@ -1387,4 +1417,5 @@ export default { ...@@ -1387,4 +1417,5 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
} }
</style> </style>
\ No newline at end of file
src/views/assessZC/projectView.vue
...@@ -813,7 +813,7 @@ export default { ...@@ -813,7 +813,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$set(this.tabListYL[index], "iframeUrl", URL + "#view=FitH,top"); this.$set(this.tabListYL[index], "iframeUrl", URL + "#view=FitH,top");
}); });
} else if (this.tabListYL[index].url.slice(-4) == "docx") { } else if (this.tabListYL[index].url.slice(-4) == "docx"||this.tabListYL[index].url.slice(-3) == "doc") {
this.blobType = "docx"; this.blobType = "docx";
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(() => { this.$nextTick(() => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!