Skip to content

Administrator / project_progress

Go to a project
Commit b495441d by liangzhen
Options

存下

1 parent ba87c981
Expand all
Inline Side-by-side
Showing with 188 additions and 131 deletions
src/App.vue
......@@ -20,6 +20,9 @@
height: 100%;
text-align: center;
}
body .el-table th.gutter{
display: table-cell!important;
}
......
src/utils/leftBarRules.js
......@@ -120,22 +120,22 @@ export function trendsRules(type) {
// children: [],
// },
{
name: "申诉确认",
url: "/mainLayout/assistedConfirm",
children: [],
},
// {
// name: "申诉确认",
// url: "/mainLayout/assistedConfirm",
// children: [],
// },
{
name: "整改核验",
url: "/mainLayout/correctiveAssistanceVerification",
children: [],
},
{
name: "同步归档",
url: "/mainLayout/attachSynchronousArchiving",
children: [],
},
// {
// name: "整改核验",
// url: "/mainLayout/correctiveAssistanceVerification",
// children: [],
// },
// {
// name: "同步归档",
// url: "/mainLayout/attachSynchronousArchiving",
// children: [],
// },
],
},
],
......@@ -154,25 +154,25 @@ export function trendsRules(type) {
url: "",
children: [
{
name: "评估材料获取",
name: "评估材料提交",
url: "/mainLayout/materialAcquisition",
children: [],
},
{
name: "问题反馈",
url: "/mainLayout/assistedFeedback",
children: [],
},
// {
// name: "问题反馈",
// url: "/mainLayout/assistedFeedback",
// children: [],
// },
// {
// name: "问题整改",
// url: "/mainLayout/assistedRect",
// children: [],
// },
{
name: "同步归档",
url: "/mainLayout/attachSynchronousArchiving",
children: [],
},
// {
// name: "同步归档",
// url: "/mainLayout/attachSynchronousArchiving",
// children: [],
// },
],
},
],
......@@ -220,7 +220,7 @@ export function trendsRules(type) {
children: [],
},
{
name: "自查评估材料获取",
name: "自查评估材料提交",
url: "/assesszc/materialAcquisition",
children: [],
},
......@@ -282,7 +282,7 @@ export function trendsRules(type) {
children: [],
},
{
name: "评估材料获取",
name: "评估材料提交",
url: "/mainLayout/materialAcquisition",
children: [],
},
......@@ -426,7 +426,7 @@ export function trendsRules(type) {
}
}
export function defaultRouter() {
sessionStorage.setItem("author", "sgitg_weizheng");
sessionStorage.setItem("author", "weizheng");
sessionStorage.setItem("authorName",99);
let type=sessionStorage.getItem('authorName')
console.log( type,'hahaha ')
......
src/views/assessChecks/assistedFeedback.vue
......@@ -533,59 +533,6 @@ export default {
this.pageSize = 10;
this.submitForm();
},
//确认问题
// async confirm() {
// console.log('整改')
// this.mergingPos = 0;
// this.mergingRows = [];
// if (this.checkedList.length != 1) {
// this.$message("请选择一条数据进行确认");
// return;
// }
// console.log(this.checkedList[0].postEvalStateText,'this.checkedList[0].postEvalStateText')
// if (this.checkedList[0].postEvalStateText == '已申诉') {
// this.$message("请选择未申诉的数据");
// return;
// }
// this.dialogQR = true;
// let params = {
// projectId: this.checkedList[0].projectId,
// batchId: this.checkedList[0].batchId,
// };
// let res = await wtssSelProblemAssistedFeedback(params);
// if (res.code == "200") {
// this.tableDataQR = res.data.records;
// this.tableDataQR.forEach((item) => {
// if (!item.confirmStatus) {
// this.$set(item, "confirmStatus", "2");
// }
// switch (item.projectStage) {
// case "1":
// this.$set(item, "projectStagetext", "1.可研");
// break;
// case "2":
// this.$set(item, "projectStagetext", "2.计划");
// break;
// case "3":
// this.$set(item, "projectStagetext", "3.采购");
// break;
// case "4":
// this.$set(item, "projectStagetext", "4.合同");
// break;
// case "5":
// this.$set(item, "projectStagetext", "5.执行");
// break;
// case "6":
// this.$set(item, "projectStagetext", "6.结决算及转资");
// break;
// }
// });
// console.log(this.tableDataQR);
// this.dataPretreatment();
// }
// },
dataPretreatment() {
for (let i = 0; i < this.tableDataQR.length; i++) {
// tabledata 表格数据源
......@@ -775,7 +722,7 @@ export default {
this.dataPretreatmentSS();
}
},
handleFileUpload(event, row, id) {
handleFileUploadZG(event, row, id) {
console.log("来了么");
this.file = event.target.files[0];
this.submitFile(row, id);
......
src/views/assessChecks/auxiliarySelection.vue
......@@ -41,7 +41,7 @@
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间:" prop="batchName" class="fromItem">
<el-form-item label="发起时间:" prop="batchName" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
......@@ -103,10 +103,12 @@
<el-table-column prop="expertName" label="后评估专家" width="auto">
</el-table-column>
<!-- <el-table-column prop="expertId" label="专家编号" width="auto">
</el-table-column> -->
<el-table-column
prop="planReviewDate"
label="计划评估日期"
width="auto"
width="220"
>
</el-table-column>
<el-table-column
......@@ -118,9 +120,9 @@
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> -->
<el-table-column prop="creator" label="创建人" width="120">
<el-table-column prop="creator" label="发起人" width="120">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="auto">
<el-table-column prop="createTime" label="发起时间" width="220">
</el-table-column>
</el-table>
</div>
......@@ -202,6 +204,8 @@
</el-table-column>
<el-table-column prop="fullName" label="专家姓名" width="auto">
</el-table-column>
<el-table-column prop="expertId" label="专家编号" width="auto">
</el-table-column>
<el-table-column prop="gender" label="性别" width="auto">
<template slot-scope="scope">{{
scope.row.gender | filtergender
......@@ -342,6 +346,8 @@
</el-table-column>
<el-table-column prop="fullName" label="专家姓名" width="auto">
</el-table-column>
<el-table-column prop="expertId" label="专家编号" width="auto">
</el-table-column>
<el-table-column prop="gender" label="性别" width="auto">
<template slot-scope="scope">{{
scope.row.gender | filtergender
......@@ -409,6 +415,24 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="专家编号:" prop="expertId" class="fromItem">
<el-input
v-model="ruleFormZJ.expertId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="专家级别:" prop="expertLevel" class="fromItem">
<el-select
v-model="ruleFormZJ.expertLevel"
placeholder="请选择"
clearable
>
<el-option label="初级" value="0"></el-option>
<el-option label="高级" value="1"></el-option>
<el-option label="中级" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="专业领域:" prop="fields" class="fromItem">
<el-select
v-model="ruleFormZJ.fields"
......@@ -456,7 +480,9 @@
<!-- <el-table-column type="selection"> </el-table-column> -->
<el-table-column label="单位" width="auto" prop="compId">
</el-table-column>
<el-table-column prop="fullName" label="专家姓名" width="fullName">
<el-table-column prop="fullName" label="专家姓名" width="auto">
</el-table-column>
<el-table-column prop="expertId" label="专家编号" width="auto">
</el-table-column>
<el-table-column prop="gender" label="性别" width="gender">
<template slot-scope="scope">{{
......@@ -476,6 +502,8 @@
scope.row.fields | filtertfields
}}</template>
</el-table-column>
<el-table-column prop="新增字段" label="专家简介" width="auto">
</el-table-column>
<el-table-column prop="expertLevel" label="专家级别" width="auto">
<template slot-scope="scope">{{
scope.row.expertLevel | filtertLevel
......@@ -602,6 +630,8 @@
</el-table-column>
<el-table-column prop="fullName" label="专家姓名" width="auto">
</el-table-column>
<el-table-column prop="expertId" label="专家编号" width="auto">
</el-table-column>
<el-table-column prop="gender" label="性别" width="auto">
<template slot-scope="scope">{{
scope.row.gender | filtergender
......
src/views/assessChecks/confirmRelease.vue
......@@ -107,15 +107,26 @@
width="auto"
>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="postEvalStateText"
label="后评估批次状态"
width="120"
>
</el-table-column> -->
<el-table-column label="后评估批次状态" prop="link">
<template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link> -->
<router-link :to="{path:'/mainLayout/auxiliaryInspection',query:{batchName:scope.row.batchName}}">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column prop="creator" label="创建人" width="120" >
<el-table-column prop="creator" label="发起人" width="120" >
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="auto">
<el-table-column prop="createTime" label="发起时间" width="auto">
</el-table-column>
<!-- <el-table-column prop="batchName" label="评估项目" width="auto">
</el-table-column> -->
......@@ -233,8 +244,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -364,8 +375,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -399,8 +410,9 @@
>
</el-pagination>
<p class="midBtn">
<span @click="cancelXZ()">取消</span
><span @click="saveXZ()">确认发布</span>
<span @click="cancelXZ()">取消</span>
<span @click="savepro()">保存</span>
<span @click="saveXZ()">确认发布</span>
</p>
</div>
</el-dialog>
......@@ -414,6 +426,27 @@
>
<div class="adzjdialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item label="部门:" prop="department" class="fromItem">
<el-input
v-model="ruleFormZJ.department"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleFormZJ.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select
v-model="ruleFormZJ.projectYear"
......@@ -428,27 +461,38 @@
/>
</el-select>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem">
<el-select
v-model="ruleFormZJ.projectCategory"
placeholder="请选择"
clearable
>
<el-option label="统推" value="01"></el-option>
<el-option label="自建" value="02"></el-option>
<el-option label="独立建设" value="03"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="承建单位:" prop="projectName" class="fromItem">
<el-input
v-model="ruleFormZJ.projectId"
v-model="ruleFormZJ.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
</el-form-item> -->
<el-form-item label="负责人:" prop="personCharge" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
v-model="ruleFormZJ.personCharge"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<!-- <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-input
v-model="ruleFormZJ.projectInfo"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item class="cxItem">
<span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item>
......@@ -507,8 +551,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -855,11 +899,38 @@ export default {
},
saveXZ() {
console.log("保存验证", this.addtableData);
if (this.addtableData.length < 1) {
this.$message("请选择待评估项目");
}
console.log(this.addZJList, "this.addZJList");
// 确认发布入参
let expertIdList = "";
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
expertIdList = expertIdList.concat(item.projectId + ",");
});
}
let params = {
expertStr: expertIdList,
};
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();
});
},
//保存选择项目
savepro() {
if (this.addtableData.length < 1) {
this.$message("请选择待评估项目");
}
console.log('调取保存接口')
return
console.log(this.addZJList, "this.addZJList");
// 确认发布入参
let expertIdList = "";
......@@ -1154,14 +1225,18 @@ export default {
text-align: center;
margin-right: 10px;
border-radius: 5px;
background-color: #4ca6a7;
color: #fff;
}
span:first-of-type {
border: 1px solid grey;
color: grey;
background-color: #fff;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
}
// span:last-of-type {
// background-color: #4ca6a7;
// color: #fff;
// }
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
......
src/views/layout/leftBar.vue
......@@ -67,37 +67,43 @@ export default {
},
},
watch: {
"$route": {
immediate: true,
handler(newParams, oldParams) {
console.log('路又变了',newParams)
},
},
autho(newVal, oldVal) {
console.log(newVal, "newValnewVal");
if (newVal == "sgtig_liyiming") {
if (newVal == "liyiming") {
this.$router.push({
path: "/mainLayout/confirmRelease",
query: {
madata: newVal,
},
});
} else if (newVal == "sgtig_wangmeiling") {
} else if (newVal == "wangmeiling") {
this.$router.push({
path: "/mainLayout/confirmRelease",
query: {
madata: newVal,
},
});
} else if (newVal == "sgtig_mengdejian") {
} else if (newVal == "mengdejian") {
this.$router.push({
path: "/mainLayout/materialAcquisition",
query: {
madata: newVal,
},
});
} else if (newVal == "sgtig_liwenbo") {
} else if (newVal == "liwenbo") {
this.$router.push({
path: "/mainLayout/materialAcquisition",
query: {
madata: newVal,
},
});
} else if (newVal == "sgtig_zhangke") {
} else if (newVal == "zhangke") {
this.$router.push({
path: "/mainLayout/materialAcquisition",
query: {
......@@ -123,26 +129,23 @@ export default {
path: "/mainLayout/confirmRelease",
});
this.activeIndex = "/mainLayout/confirmRelease"
// this.$refs.kzMenu.activeIndex= "/mainLayout/materialAcquisition"
} else if (newVal == 3) {
this.menuList = trendsRules(3);
this.$router.push({
path: "/mainLayout/materialAcquisition",
});
this.activeIndex = "/mainLayout/materialAcquisition"
// this.$refs.kzMenu.activeIndex= "/mainLayout/materialAcquisition"
} else if (newVal == 99) {
this.menuList = trendsRules(99);
this.$router.push({
path: "/mainLayout/auxiliarySelection",
});
this.activeIndex = '/mainLayout/auxiliarySelection'
// this.$refs.kzMenu.activeIndex='/assesszc/auxiliarySelection'
}
console.log('不是来了么',this.$route.path)
// this.activeIndex = this.$route.path;
// this.$refs.kzMenu.activeIndex = this.$route.path;
console.log('获取权限后的页面',this.$refs.kzMenu.activeIndex)
},
},
mounted() {
......@@ -163,7 +166,6 @@ export default {
}
} else {
this.activeIndex = this.$route.path;
}
},
......
src/views/layout/mainLayout.vue
......@@ -85,7 +85,7 @@ export default {
children: [
{
name: "张宇",
code: "sgtig_zhangyu",
code: "zhangyu",
children: [],
},
],
......@@ -96,13 +96,13 @@ export default {
children: [
{
name: "李一鸣",
code: "sgtig_liyiming",
code: "liyiming",
children: [],
},
{
name: "王美玲",
code: "sgtig_wangmeiling",
code: "wangmeiling",
children: [],
},
......@@ -114,19 +114,19 @@ export default {
children: [
{
name: "孟德建",
code: "sgtig_mengdejian",
code: "mengdejian",
children: [],
},
{
name: "李文博",
code: "sgtig_liwenbo",
code: "liwenbo",
children: [],
},
{
name: "章轲",
code: "sgtig_zhangke",
code: "zhangke",
children: [],
},
......@@ -139,7 +139,7 @@ export default {
children: [
{
name: "魏征",
code: "sgitg_weizheng",
code: "weizheng",
children: [],
},
],
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!