Skip to content

Administrator / project_progress

Go to a project
Commit ed4c149a by liangzhen
Options

自查互查替换

1 parent 832d2f65
Expand all
Inline Side-by-side
Showing with 264 additions and 90 deletions
src/api/index.js
......@@ -436,7 +436,7 @@ export function projectInfoSy(params){
}
//项目列表页面
export function pmProInitiation(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/`, params)
return post(`${ARCH_EVALUATION}/projectInfoZc/getProjectInfo`, params)
}
//项目清单
export function MaterialWarehous(params){
......
src/api/indexzc.js
......@@ -440,7 +440,7 @@ export function projectInfoSy(params){
}
//项目列表页面
export function pmProInitiation(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/`, params)
return post(`${ARCH_EVALUATION}/projectInfoZc/getProjectInfo`, params)
}
//项目清单
export function MaterialWarehous(params){
......
src/views/assessChecks/auxiliarySelection.vue
......@@ -1077,6 +1077,7 @@ export default {
};
Object.assign(params, this.ruleFormZJ);
console.log("查询专家", params);
// this.zjtableData = []
let res = await expertInfo(params);
this.zjtableData = res.data.records;
this.zjtotal = res.data.total * 1;
......@@ -1181,8 +1182,6 @@ export default {
}
this.addtableData = [];
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.dialogedit = true;
let params = {
......
src/views/assessChecks/checkCompliance.vue
......@@ -232,7 +232,7 @@ export default {
],
tabList: [
{ label: "可研", id: 0 },
{ label: "计划", id: 1 },
// { label: "计划", id: 1 },
{ label: "采购", id: 2 },
{ label: "合同", id: 3 },
{ label: "执行", id: 4 },
......@@ -254,7 +254,23 @@ export default {
oldQuestionList: [], //对比列表
blobType:'pdf',//bolb类型
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() {
......@@ -471,7 +487,7 @@ export default {
if(this.blobType=='docx'||this.blobType=='doc'){
let docx = require("docx-preview");
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 {
});
evals = evals.slice(0, -1);
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");
// return
let params = {
list: this.questionList,
...this.clqparams,
......@@ -904,4 +935,16 @@ export default {
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>
\ No newline at end of file
src/views/assessChecks/checkComplianceFZ.vue
......@@ -26,16 +26,15 @@
<el-table-column label="问题检查项" prop="quesCheckItem" width="auto">
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
width="auto"
label="是否有问题"
prop="isProblem"
width="100"
>
<template slot-scope="scope"> {{ scope.row.isProblem|isProblemFilter }} </template>
</el-table-column>
<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 label="问题截图" width="auto">
<template slot-scope="scope">
......@@ -49,6 +48,13 @@
></el-image>
</template>
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
width="auto"
>
</el-table-column>
</el-table>
</div>
<p class="Btn" v-if="!ishow">
......@@ -62,7 +68,6 @@
<script>
import {
selWtqdpostEvalQuesInfo,
bcpostEvalQuesInfo,
tjpostEvalQuesInfo,
presignedUrl,
} from "@/api/index";
......@@ -78,6 +83,15 @@ export default {
projectName:""
};
},
filters: {
isProblemFilter(val) {
if (val == 1) {
return "是";
} else {
return "否";
}
},
},
mounted() {
this.clqparams = JSON.parse(this.$route.query.clqparams);
......@@ -307,7 +321,7 @@ export default {
}
/deep/ .el-table .warning-row {
background: #f0ffff;
color: #2785e6;
// color: #2785e6;
}
.eltable {
......
src/views/assessChecks/confirmRelease.vue
......@@ -325,7 +325,7 @@
<p class="zjBtn">
待评估项目 <span @click="xzExperts()">手动选择待评估项目</span>
</p>
<div class="setscrolldialog">
<div class="setscrolldialogxz">
<el-table
@selection-change="handleSelectionChange"
:data="
......@@ -501,7 +501,7 @@
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
class="eltable hide-selection"
:row-class-name="tableRowClassName"
border
>
......@@ -563,6 +563,9 @@
show-overflow-tooltip
>
</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>
......@@ -650,15 +653,15 @@ export default {
dialogAddzj: false,
pageSize: 10,
current: 1,
pageSizeZJ: 5,
pageSizeXQ: 5,
pageSizeZJ: 10,
pageSizeXQ:10,
currentPageXQ: 1,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
pageSizeAdd: 5,
pageSizeAdd: 10,
currentedit: 1,
pageSizeedit: 5,
pageSizeedit:10,
xfParam: "",
dialogedit: false,
expertIdList: [],
......@@ -674,6 +677,19 @@ export default {
message: {},
};
},
filters: {
zcstatefilter(val) {
if (val == 1) {
return "待评估";
} else if (val == 2) {
return "需整改";
} else if (val == 3) {
return "已整改";
} else if (val == 4) {
return "已归档";
}
},
},
watch: {
// 监听路由对象中的参数部分
"$route.params": {
......@@ -703,7 +719,7 @@ export default {
let params = {
current: this.currentPage,
pageSize: this.pageSize,
module:0,
module:0
};
Object.assign(params, this.ruleForm);
console.log(params);
......@@ -797,7 +813,7 @@ export default {
this.oldid = "";
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ",");
this.oldid = this.oldid.concat(item.projectCode + ",");
});
}
}
......@@ -961,10 +977,21 @@ export default {
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;
console.log(this.$refs.multipleTableZJ.selection, "2222");
console.log(this.$refs.multipleTableZJ.selection, "2222222");
},
//点击删除
async handleClick(row, index, rows) {
......@@ -1294,7 +1321,25 @@ export default {
}
.setscrolldialog {
// 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-x: scroll;
position: relative;
......@@ -1305,6 +1350,7 @@ export default {
width: 190%;
min-width: 190%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
......@@ -1323,7 +1369,7 @@ export default {
// }
// }
.setscrolldialogx {
height: 300px;
height: 430px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
......@@ -1357,6 +1403,9 @@ export default {
overflow-x: hidden !important;
}
}
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
}
</style>
<style>
......@@ -1368,4 +1417,5 @@ export default {
position: absolute;
right: 0;
}
</style>
\ No newline at end of file
src/views/assessChecks/materialAcquisition.vue
......@@ -277,7 +277,7 @@
<el-dialog
title="问题整改"
:visible.sync="dialogQR"
width="79%"
width="91%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closed"
......@@ -304,10 +304,10 @@
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
width="110"
>
</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
......@@ -316,19 +316,15 @@
width="200"
>
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="评估问题"
prop="evalQues"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="问题确认" width="auto">
<el-table-column label="问题响应" width="100">
<template slot-scope="scope">
<el-switch
v-if="scope.row.evalQues"
......@@ -350,6 +346,17 @@
</el-switch>
</template>
</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="解释批注">
<template slot-scope="scope">
<el-input
......@@ -358,7 +365,7 @@
></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="auto">
<el-table-column label="附加其他情况说明" prop="fileId" width="300">
<template
slot-scope="scope"
v-if="scope.row.evalQues && scope.row.confirmStatus == '1'"
......@@ -369,8 +376,35 @@
/>
</template>
</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">
<div v-for="(item, index) in scope.row.filed" :key="index">
<el-tooltip
......@@ -411,8 +445,8 @@
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table-column> -->
<!--
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.evalQues">
<input
......@@ -422,7 +456,7 @@
"
/>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</div>
</div>
......@@ -559,7 +593,7 @@ export default {
contractNumber: this.checkedList[0].contractNumber,
prjId: this.checkedList[0].projectCode,
};
let resMat = await MaterialWarehous(paramsMat);
// let resMat = await MaterialWarehous(paramsMat);
this.tableDataQR = res.data.records;
let arr=[]
this.tableDataQR.forEach((item) => {
......@@ -571,51 +605,51 @@ export default {
}
switch (item.projectStage) {
case "1":
this.$set(
item,
"filed",
this.filtersTable(1, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(1, resMat.data.records)
// );
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(
item,
"filed",
this.filtersTable(2, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(2, resMat.data.records)
// );
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(
item,
"filed",
this.filtersTable(3, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(3, resMat.data.records)
// );
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(
item,
"filed",
this.filtersTable(4, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(4, resMat.data.records)
// );
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(
item,
"filed",
this.filtersTable(5, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(5, resMat.data.records)
// );
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(
item,
"filed",
this.filtersTable(6, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(6, resMat.data.records)
// );
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
......@@ -740,7 +774,7 @@ export default {
this.dialogQR = false;
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0 || columnIndex === 8) {
if (columnIndex === 0 ) {
//第一列
const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0;
......@@ -758,7 +792,7 @@ export default {
let params = {
current: this.currentPage,
pageSize: this.pageSize,
module:0,
module: 0,
};
Object.assign(params, this.ruleForm);
console.log(params);
......@@ -1340,8 +1374,8 @@ h3 {
.eltable {
box-sizing: border-box;
text-align: center;
width: 250%;
min-width: 250%;
width: 100%;
// min-width: 150%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
......
src/views/assessZC/checkCompliance.vue
......@@ -258,10 +258,10 @@ export default {
docxOptions: {
className: "kaimo-docx-666", // string：默认和文档样式类的类名/前缀
inWrapper: true, // boolean：启用围绕文档内容的包装器渲染
ignoreWidth: true, // boolean：禁用页面的渲染宽度
inWrapper: false, // boolean：启用围绕文档内容的包装器渲染
ignoreWidth:false, // boolean：禁用页面的渲染宽度
ignoreHeight: false, // boolean：禁止渲染页面高度
ignoreFonts: true, // boolean：禁用字体渲染
ignoreFonts:false, // boolean：禁用字体渲染
breakPages: false, // boolean：在分页符上启用分页
ignoreLastRenderedPageBreak: true, // boolean：在 lastRenderedPageBreak 元素上禁用分页
experimental: false, // boolean：启用实验功能（制表符停止计算）
......@@ -487,7 +487,7 @@ docxOptions: {
if(this.blobType=='docx'||this.blobType=='doc'){
let docx = require("docx-preview");
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 @@
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
class="eltable hide-selection"
:row-class-name="tableRowClassName"
border
>
......@@ -563,6 +563,9 @@
show-overflow-tooltip
>
</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>
......@@ -674,6 +677,19 @@ export default {
message: {},
};
},
filters: {
zcstatefilter(val) {
if (val == 1) {
return "待评估";
} else if (val == 2) {
return "需整改";
} else if (val == 3) {
return "已整改";
} else if (val == 4) {
return "已归档";
}
},
},
watch: {
// 监听路由对象中的参数部分
"$route.params": {
......@@ -797,7 +813,7 @@ export default {
this.oldid = "";
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ",");
this.oldid = this.oldid.concat(item.projectCode + ",");
});
}
}
......@@ -961,10 +977,21 @@ export default {
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;
console.log(this.$refs.multipleTableZJ.selection, "2222");
console.log(this.$refs.multipleTableZJ.selection, "2222222");
},
//点击删除
async handleClick(row, index, rows) {
......@@ -1376,6 +1403,9 @@ export default {
overflow-x: hidden !important;
}
}
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
}
</style>
<style>
......@@ -1387,4 +1417,5 @@ export default {
position: absolute;
right: 0;
}
</style>
\ No newline at end of file
src/views/assessZC/projectView.vue
......@@ -813,7 +813,7 @@ export default {
this.$nextTick(() => {
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";
let docx = require("docx-preview");
this.$nextTick(() => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!