Skip to content

Administrator / project_progress

Go to a project
Commit b53edf76 by liangzhen
Options

暂存一版

1 parent be71b77c
Expand all
Inline Side-by-side
Showing with 131 additions and 107 deletions
package-lock.json 0 → 100644
This diff could not be displayed because it is too large.
package.json
......@@ -12,6 +12,7 @@
"axios": "^1.6.2",
"core-js": "^3.8.3",
"echarts": "^5.5.0",
"el-table-horizontal-scroll": "^1.2.5",
"element-ui": "^2.15.14",
"jquery": "^3.7.1",
"scss": "^0.2.4",
......
src/main.js
......@@ -9,6 +9,8 @@ import './styles/common.scss'
import '@/assets/icon/iconfont.css'
import initDirective from './directive'
import horizontalScroll from 'el-table-horizontal-scroll'
import { postRequest, postRequestShared } from '@/api/index'
initDirective(Vue)
Vue.prototype.$echarts = echarts
......@@ -16,7 +18,7 @@ Vue.prototype.$echarts = echarts
Vue.config.productionTip = false
Vue.prototype.$postRequest = postRequest
Vue.prototype.$postRequestShared = postRequestShared
Vue.use(horizontalScroll)
Vue.use(ElementUI)
Date.prototype.format = function (fmt) {
if (!fmt) {
......
src/views/assessChecks/assistedConfirm.vue
......@@ -44,9 +44,9 @@
<el-option label="已整改" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申诉状态:" prop="appealStatus" class="fromItem">
<!-- <el-form-item label="申诉状态:" prop="appealStatus" class="fromItem">
<el-select
v-model="ruleForm.reviewStatus"
v-model="ruleForm.appealStatus"
placeholder="请选择"
clearable
>
......@@ -56,7 +56,7 @@
<el-option label="申诉通过" value="3"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
......@@ -626,6 +626,7 @@ export default {
let res = await wtfhappealAssistanceConfirmatio(this.tableDataQR);
if (res.code == "200") {
this.$message('保存成功')
this.dialogQR = false;
this.resetForm();
}
......@@ -1071,6 +1072,7 @@ h3 {
// margin-top: 3vh;
}
}
// ::-webkit-scrollbar {
// width: 6px; // 横向滚动条
......
src/views/assessChecks/assistedViewing.vue
......@@ -150,7 +150,7 @@
<p class="title"><span></span>项目基本信息</p>
<div class="content">
<p><label>项目编号:</label>{{ listData.projectId }}</p>
<p><label>项目下达年度:</label>{{ listData.projectYear }}</p>
<p><label>项目下达年度:</label>{{ listData.projectYear }}年</p>
<p>
<label>项目名称:</label>
<span>{{ listData.projectName }}</span>
......@@ -165,10 +165,10 @@
>{{ listData.capitalAmountTotal }}
</p>
<p><label>部门:</label>{{ listData.department }}</p>
<p><label>创建人:</label>{{ listData.inputuser }}</p>
<!-- <p><label>创建人:</label>{{ listData.inputuser }}</p>
<p><label>创建时间:</label>{{ listData.inputuser }}</p>
<p><label>修改人:</label>{{ listData.lastUpdatedby }}</p>
<p><label>修改时间:</label>{{ listData.lastUpdateTime }}</p>
<p><label>修改时间:</label>{{ listData.lastUpdateTime }}</p> -->
</div>
<div class="table">
<p>项目后评估资料:</p>
......@@ -223,7 +223,7 @@
</div>
<p class="title"><span></span>批次详情</p>
<div class="content">
<p><label>批次年度:</label>{{ listData.batchYear }}</p>
<p><label>批次年度:</label>{{ listData.batchYear }}年</p>
<p><label>后评估批次名称:</label>{{ listData.batchName }}</p>
<p><label>计划评审日期:</label>{{ listData.planReviewDate }}</p>
</div>
......@@ -263,10 +263,19 @@
>
</el-table-column>
<el-table-column label="评估问题" prop="evalQues">
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.evalQues"></el-input>
</template> -->
</el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="评审流程" name="third">
......@@ -303,6 +312,7 @@ import {
wtqdqselect,
clqdselect,
selLcb,
presignedUrl,
downloadObject
} from "@/api/index";
import { generateYearOptions ,projectCategoryText} from "@/utils/cache";
......@@ -394,12 +404,10 @@ export default {
projectId: this.checkedList[0].projectId,
};
Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => {
console.log(res[0], res[1], "2222222");
this.listData = res[0].data.records[0];
this.listData.projectCategory=projectCategoryText(this.listData.projectCategory)
this.qdtableData = JSON.parse(JSON.stringify(this.tableDataNew));
if (res[1].data.records.length > 0) {
// this.qdtableData = res[1].data.records;
this.qdtableData = this.qdtableData
.concat(res[1].data.records)
.reduce((accumulator, currentObj) => {
......@@ -412,9 +420,7 @@ export default {
accumulator.push(currentObj);
}
return accumulator;
}, []);
console.log(this.tableDataQD, " mergedArray mergedArray mergedArray");
}, []);
}
});
},
......@@ -494,6 +500,30 @@ export default {
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
let urlStr = item.url;
let arrUrl = [];
let showUrlList = [];
// 有url拆分调接口换预览
if (urlStr) {
console.log(urlStr, "urlStr");
if (urlStr.includes(",")) {
arrUrl = item.url.split(",");
} else {
arrUrl.push(urlStr);
}
console.log(arrUrl, "arrUrlarrUrl");
arrUrl.forEach(async (showUrl) => {
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg);
});
console.log(showUrlList, "showUrlList");
this.$set(item, "images", showUrlList);
}
});
this.dataPretreatment();
} else if (this.activeName == "third") {
......@@ -530,6 +560,7 @@ export default {
cancel() {
this.dialog = false;
},
handleImageClick() {},
async handleClickXZ(scope) {
console.log(scope.fileId);
let response = await downloadObject({
......@@ -814,4 +845,10 @@ h3 {
overflow: auto;
}
}
.imgList {
/deep/ .el-image__inner {
width: 60px;
height: 60px;
}
}
</style>
\ No newline at end of file
src/views/assessChecks/checkCompliance.vue
......@@ -83,7 +83,7 @@
<p class="tips">问题描述:</p>
<div
v-for="(items, index) in item.evalList"
:key="items.ideval"
:key="index"
class="inputDiv"
>
<el-input
......@@ -204,7 +204,6 @@ export default {
fileList: [],
evalList: [
{
ideval: "",
evalQues: "",
hideUploadEdit: false,
},
......@@ -305,6 +304,7 @@ export default {
async init(type) {
let params = {
projectStage: this.active * 1 + 1,
hgx:"hgx",
...type,
};
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
......@@ -351,7 +351,6 @@ export default {
} else {
this.$set(item, "evalList", [
{
ideval: "",
evalQues: "",
hideUploadEdit: false,
},
......@@ -481,7 +480,6 @@ export default {
// })
} else {
item.evalList.push({
ideval: "id" + item.Id++,
evalQues: items.checkDesc,
hideUploadEdit: false,
});
......@@ -494,11 +492,9 @@ export default {
}
console.log(item, "22");
item.evalList.push({
ideval: "id" + item.Id++,
data: "",
evalQues: "",
});
console.log(item.evalList, "item.evalList");
},
changeChecked(item) {
console.log(item, "2222");
......
src/views/assessChecks/confirmRelease.vue
......@@ -40,10 +40,10 @@
<el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
>
<el-button @click="resetForm('ruleForm')">
<el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
>
<el-button @click="detailsForm('ruleForm')">
<el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="configs()"
......@@ -72,8 +72,8 @@
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope">
{{ scope.row.batchYear }}年
</template></el-table-column
>
</template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -148,11 +148,6 @@
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
<el-input
v-model="ruleFormdialogBJ.prjsOfExpert" disabled
></el-input>
</el-form-item> -->
<el-form-item label="工作组织情况:" class="textarea">
<el-input
type="textarea"
......@@ -201,22 +196,14 @@
width="auto"
>
</el-table-column>
<!-- <el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column> -->
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> -->
<el-table-column prop="department" label="部门" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage"
@size-change="handleSizeChangXQ"
@current-change="handleCurrentChangeXQ"
:current-page="currentPageXQ"
:page-sizes="[5, 10, 20, 50]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
......@@ -261,18 +248,8 @@
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
<el-select
v-model="ruleFormdialogBJ.prjsOfExpert"
placeholder="请选择"
clearable
>
<el-option label="100" value="100"></el-option>
<el-option label="200" value="200"></el-option>
<el-option label="300" value="300"></el-option>
<el-option label="不限" value="不限"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="工作组织情况:" class="textarea">
<el-input
type="textarea"
......@@ -288,7 +265,11 @@
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
:data="addtableData.slice(
(addcurrentPage - 1) * pageSizeAdd,
addcurrentPage * pageSizeAdd
)
"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
......@@ -323,14 +304,6 @@
width="auto"
>
</el-table-column>
<!-- <el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column> -->
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> -->
<el-table-column prop="department" label="部门" width="auto">
</el-table-column>
<el-table-column label="操作" width="130">
......@@ -513,7 +486,7 @@
</el-table-column> -->
<el-table-column label="总投资计划（万元）" width="300">
<el-table-column
prop=" costAmountTotal"
prop="costAmountTotal"
label="成本金"
width="auto"
>
......@@ -525,7 +498,7 @@
>
</el-table-column>
</el-table-column>
<el-table-column label="当年投资计划（万元）" width="300">
<!-- <el-table-column label="当年投资计划（万元）" width="300">
<el-table-column
prop="costAmountCurrentMfdel"
label="成本金"
......@@ -538,7 +511,7 @@
width="200"
>
</el-table-column>
</el-table-column>
</el-table-column> -->
<el-table-column prop="department" label="部门" width="200">
</el-table-column>
......@@ -552,10 +525,10 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
<!-- <el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
<el-table-column prop="inputtime" label="创建时间" width="200">
</el-table-column>
</el-table-column> -->
</el-table>
</div>
......@@ -649,6 +622,8 @@ export default {
pageSize: 10,
current: 1,
pageSizeZJ: 5,
pageSizeXQ:5,
currentPageXQ:1,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
......@@ -723,12 +698,12 @@ export default {
return;
}
console.log("222", this.checkedList);
this.dialogXQ = true;
this.ruleFormdialogBJ = this.checkedList[0];
let params = {
current: this.addcurrentPage,
pageSize: this.pageSizeAdd,
current: this.currentPageXQ,
pageSize: this.pageSizeXQ,
batchId: this.checkedList[0].batchId,
};
Object.assign(params, this.ruleFormdialogAdd);
......@@ -740,6 +715,8 @@ export default {
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
});
this.addtotal = res.data.total * 1;
console.log(this.addtableData,'this.addtableData')
this.dialogXQ = true;
}
},
//确认评估项目
......@@ -819,10 +796,22 @@ export default {
},
handleSizeChangeAdd(val) {
this.pageSizeAdd = val;
this.detailsForm();
// this.detailsForm();
console.log(val,this.addcurrentPage,'1111')
},
handleCurrentChangeAdd(val) {
this.currentAdd = val;
console.log(val,this.addcurrentPage,'0000')
this.addcurrentPage=val
// this.detailsForm();
},
handleSizeChangXQ(val) {
this.pageSizeXQ = val;
this.detailsForm();
console.log(val,this.addcurrentPage,'1111')
},
handleCurrentChangeXQ(val) {
console.log(val,this.addcurrentPage,'0000')
this.currentPageXQ=val
this.detailsForm();
},
......@@ -840,6 +829,8 @@ export default {
});
console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length;
this.handleCurrentChangeZJ(1)
this.handleSizeChangeAdd(5)
this.dialogAddzj = false;
},
cancelZJ() {
......@@ -865,20 +856,18 @@ export default {
},
saveXZ() {
console.log("保存验证", this.$refs);
this.$refs.formNames.validate((valid) => {
if (!valid) {
console.log("error submit!!");
return false;
} else {
console.log("保存验证", this.addtableData);
if (this.addtableData.length < 1) {
this.$message("请选择待评估项目");
}
console.log(this.addZJList, "this.addZJList");
// 确认发布入参
let expertIdList = "";
if (this.addZJList.length > 0) {
this.addZJList.forEach((item) => {
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
expertIdList = expertIdList.concat(item.projectId + ",");
});
}
......@@ -889,17 +878,14 @@ export default {
params.batchId = this.ruleFormdialogBJ.batchId;
params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
console.log(params, "222");
// return
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList = expertIdList;
this.resetForm();
});
}
});
// this.$emit("listenToChildEvent", "reset");
// }
},
cancelXZ() {
this.dialogAdd = false;
......@@ -912,13 +898,14 @@ export default {
},
//点击删除
async handleClick(row, index, rows) {
console.log("删除", row);
console.log("删除", row, rows);
rows.splice(index, 1);
let params = {
projectId: row.projectId,
batchId: this.checkedList[0].batchId,
};
let res = await delProjectInfo(params);
this.addtotal=rows.length
// this.configs()
},
//点击撤回
......@@ -1152,7 +1139,7 @@ export default {
}
}
.midBtn {
margin: 0 auto;
margin: 20px auto;
span {
display: inline-block;
width: 80px;
......
src/views/assessChecks/correctiveAssistanceVerification.vue
......@@ -46,9 +46,10 @@
placeholder="请选择"
clearable
>
<el-option label="整改提交" value="5"></el-option>
<el-option label="整改未完成" value="6"></el-option>
<el-option label="整改已完成" value="7"></el-option>
<el-option label="问题未整改" value="0"></el-option>
<el-option label="已整改" value="1"></el-option>
<el-option label="整改不合格" value="2"></el-option>
<el-option label="整改已完成" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
......@@ -309,23 +310,18 @@
</el-table-column>
<el-table-column
label="上传整改材料"
prop="zgFileId"
width="400"
>
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.zgFileId">
<template slot-scope="scope" v-if="scope.row.zgFileId">
{{
scope.row.zgName
}} <el-button @click="handleClickXZ(scope.row.zgFileId,scope.row.zgName)">下载</el-button>
</template>
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'zgFileId')" />
</template> -->
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'zgqkFileId')" />
</template> -->
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.zgqkFileId">
<template slot-scope="scope" v-if="scope.row.zgqkFileId">
{{
scope.row.zgqkFileName
}} <el-button @click="handleClickXZ(scope.row.zgqkFileId,scope.row.zgqkFileName)">下载</el-button>
......@@ -336,7 +332,7 @@
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<template slot-scope="scope" v-if="scope.row.evalQues">
<el-select
v-model="scope.row.rectificationStatus"
placeholder="请选择"
......
src/views/assessChecks/materialAcquisition.vue
......@@ -78,9 +78,11 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> <template slot-scope="scope">
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope">
{{scope.row.batchYear}}年
</template></el-table-column>
</template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
<el-table-column
......
vue.config.js
......@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true,
proxy: {
'/arch-evaluation':{
target: `http://192.168.50.1:18101`, // pin
target: `http://192.168.91.1:18101`, // pin
changeOrigin: true,
pathRewrite:{
"^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!