|
|
@@ -1170,6 +1170,13 @@
|
|
|
{{ formLXApply.participants ? formLXApply.participants : "请选择" }}
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="附件" prop="file" class="special-el-form-item">
|
|
|
+ <fileItem
|
|
|
+ ref="fileItems"
|
|
|
+ :id="meetingForm.id"
|
|
|
+ @getFileList="getFileList"
|
|
|
+ ></fileItem>
|
|
|
+ </el-form-item>
|
|
|
<!-- 关键代码：el-form-item 包裹单选组 -->
|
|
|
<el-form-item label="是否需要立项会议">
|
|
|
<el-radio-group v-model="formLXApply.needMeeting">
|
|
|
@@ -1235,7 +1242,6 @@
|
|
|
</el-form-item> -->
|
|
|
<el-form-item label="会议类别" prop="meetingType">
|
|
|
<el-select
|
|
|
- v-if="showAllType"
|
|
|
v-model="meetingForm.meetingType"
|
|
|
placeholder="请选择会议类别"
|
|
|
:disabled="
|
|
|
@@ -1249,21 +1255,6 @@
|
|
|
:value="dict.value"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
- <el-select
|
|
|
- v-else
|
|
|
- v-model="meetingForm.meetingType"
|
|
|
- placeholder="请选择会议类别"
|
|
|
- :disabled="
|
|
|
- meetingTypeDisabled || (pageType === '1' && meetingType != null)
|
|
|
- "
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in meetingTypeList1"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="会议开始时间" prop="startTime">
|
|
|
@@ -1320,13 +1311,6 @@
|
|
|
{{ meetingForm.participants ? meetingForm.participants : "请选择会议参与人" }}
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="附件" prop="file" class="special-el-form-item">
|
|
|
- <fileItem
|
|
|
- ref="fileItems"
|
|
|
- :id="meetingForm.id"
|
|
|
- @getFileList="getFileList"
|
|
|
- ></fileItem>
|
|
|
- </el-form-item>
|
|
|
</el-form>
|
|
|
<!--会议信息结束-->
|
|
|
</div>
|
|
|
@@ -1337,7 +1321,7 @@
|
|
|
</section>
|
|
|
|
|
|
<section>
|
|
|
- <flowBase :procInstId="formLXApply.procInstId" v-if="formLXApply.procInstId"></flowBase>
|
|
|
+ <flowBase :procInstId="formLXApply.procInstId" :id="id" v-if="formLXApply.procInstId "></flowBase>
|
|
|
</section>
|
|
|
<section>
|
|
|
|
|
|
@@ -1408,6 +1392,8 @@ import {
|
|
|
import{
|
|
|
approvalComplete,
|
|
|
getApprovalInfo,
|
|
|
+ getMeetingInfo,
|
|
|
+ getSumScore
|
|
|
} from "@/api/project/approval/pool"
|
|
|
|
|
|
|
|
|
@@ -1521,11 +1507,19 @@ export default {
|
|
|
pageType: null,
|
|
|
showAllType: false,
|
|
|
meetingTypeDisabled: false, //会议类别
|
|
|
- meetingTypeList1: [
|
|
|
+ meetingTypeList: [
|
|
|
{
|
|
|
value: "A",
|
|
|
label: "管理会议",
|
|
|
},
|
|
|
+ {
|
|
|
+ value: "LX",
|
|
|
+ label: "项目立项会",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "TJ",
|
|
|
+ label: "项目投决会",
|
|
|
+ },
|
|
|
{
|
|
|
value: "X",
|
|
|
label: "临时会议",
|
|
|
@@ -1686,62 +1680,14 @@ export default {
|
|
|
if (this.$route.query.activeName) {
|
|
|
this.activeName = this.$route.query.activeName;
|
|
|
}
|
|
|
-
|
|
|
+ this.openMeetingPage(this.id,'LX');
|
|
|
+ //会议投决节点
|
|
|
+ this.getMeeting();
|
|
|
+ //总裁室
|
|
|
+ this.getSelectMeetingId();
|
|
|
//this.getSelectMeetingId(this.scoreForm.meetingId);
|
|
|
},
|
|
|
methods: {
|
|
|
- /** 查询列表 */
|
|
|
- /*changeShowDueApply(showDueApply) {
|
|
|
- this.showDueApply = showDueApply === "1";
|
|
|
- },
|
|
|
- getDueList() {
|
|
|
- // this.loading = true;
|
|
|
- let queryParams = {
|
|
|
- orderByColumn: "createTime",
|
|
|
- isAsc: "desc",
|
|
|
- projectPoolId: this.id,
|
|
|
- };
|
|
|
- getInvestigatelist(queryParams).then((response) => {
|
|
|
- let list = response.rows,
|
|
|
- showDueApply;
|
|
|
- // 如果尽调全部完成，才能显示发起尽调；
|
|
|
- if (list && list.length > 0) {
|
|
|
- showDueApply = list.every(function (item) {
|
|
|
- return item.status === "1";
|
|
|
- });
|
|
|
- } else {
|
|
|
- showDueApply = true;
|
|
|
- }
|
|
|
- this.showDueApply = showDueApply;
|
|
|
- });
|
|
|
- },*/
|
|
|
- /*getMettingId(type) {
|
|
|
- let queryParams = {
|
|
|
- pageNum: 1,
|
|
|
- pageSize: 10,
|
|
|
- meetingType: type,
|
|
|
- orderByColumn: "createTime",
|
|
|
- isAsc: "desc",
|
|
|
- projectPoolId: this.id,
|
|
|
- };
|
|
|
- listMeeting(queryParams).then((response) => {
|
|
|
- let meetingList = response.rows;
|
|
|
- if (meetingList.length > 0) {
|
|
|
- let meetingId = meetingList[0].id;
|
|
|
- if (type === "LX") {
|
|
|
- this.$refs.approvalTableForm.initialize(meetingId);
|
|
|
- } else if (type === "TJ") {
|
|
|
- this.$refs.voteTableForm.initialize(meetingId);
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (type === "LX") {
|
|
|
- this.$refs.approvalTableForm.showNodata();
|
|
|
- } else if (type === "TJ") {
|
|
|
- this.$refs.voteTableForm.showNodata();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- },*/
|
|
|
handleClick(tab, event) {
|
|
|
let that = this;
|
|
|
if (this.activeName === "0") {
|
|
|
@@ -1786,8 +1732,43 @@ export default {
|
|
|
this.active = parseInt(response.data.projectStage) - 1;
|
|
|
}
|
|
|
});
|
|
|
- //会议详情
|
|
|
- /*getMeeting(this.id).then((response) => {
|
|
|
+ },
|
|
|
+ //会议详情
|
|
|
+ openMeetingPage(projectId, meetingType) {
|
|
|
+ let that = this;
|
|
|
+ //this.fileList = [];
|
|
|
+ this.showAllType = this.type === "3";
|
|
|
+ this.meetingTypeDisabled = false;
|
|
|
+ this.selectValues = null;
|
|
|
+ this.selectNameValues = null;
|
|
|
+ //this.reset();
|
|
|
+ this.meetingForm.promoter = this.user.nickName;
|
|
|
+ this.meetingForm.promoterId = this.user.userId;
|
|
|
+ if (meetingType) {
|
|
|
+ this.meetingType = meetingType;
|
|
|
+ this.meetingTypeDisabled = true;
|
|
|
+ }
|
|
|
+ if (projectId && typeof projectId === "string") {
|
|
|
+ this.pageType = "1";
|
|
|
+ }
|
|
|
+ // 直接绑定好项目
|
|
|
+ if (this.pageType === "1") {
|
|
|
+ let projectItemMessage = this.$store.getters.projectItemMessage;
|
|
|
+ this.meetingForm.projectPoolId = projectItemMessage.id;
|
|
|
+ this.meetingForm.projectName = projectItemMessage.projectName;
|
|
|
+ this.meetingForm.projectStage = projectItemMessage.projectStage;
|
|
|
+ this.meetingForm.projectGroup = projectItemMessage.projectGroup;
|
|
|
+ this.meetingForm.meetingType = this.meetingType;
|
|
|
+ }
|
|
|
+ /*this.open = true;
|
|
|
+ this.title = "添加会议";*/
|
|
|
+ /*setTimeout(() => {
|
|
|
+ that.$refs.fileItems.fileList = [];
|
|
|
+ }, 200);*/
|
|
|
+ },
|
|
|
+ //会议投决
|
|
|
+ getMeeting(){
|
|
|
+ getMeetingInfo(this.$route.query.pInstId).then((response) => {
|
|
|
this.form1 = response.data;
|
|
|
this.form1.projectPoolId = response.data.projectPoolId;
|
|
|
this.form1.projectName = response.data.tProjectPool.projectName;
|
|
|
@@ -1807,37 +1788,16 @@ export default {
|
|
|
this.$refs.fileItems.getListFileBusinessId(id);
|
|
|
this.$refs.fileItems.handleButton();
|
|
|
}, 300);
|
|
|
- });*/
|
|
|
+ });
|
|
|
},
|
|
|
- //会议的基础信息
|
|
|
- /* getMeetingInfo(){
|
|
|
- let projectItemMessage = this.$store.getters.projectItemMessage;
|
|
|
- /!*!/ 基础判断：存在有效值（非 null/undefined/空字符串等）*!/
|
|
|
- if (projectItemMessage) {
|
|
|
- const fields = Object.keys(projectItemMessage);
|
|
|
- console.log("所有字段名：", fields); // 例如：["id", "name", "createTime", ...]
|
|
|
- const allFields = this.getAllFields(projectItemMessage);
|
|
|
- console.log("所有字段（包括嵌套）：", allFields);
|
|
|
- // 有值时的逻辑（此时可安全访问 id）
|
|
|
- console.log("projectItemMessage 有值，id 为：", projectItemMessage.id);
|
|
|
- } else {
|
|
|
- // 无值时的逻辑（如提示或默认处理）
|
|
|
- console.log("projectItemMessage 无有效值");
|
|
|
- }
|
|
|
- console.log(projectItemMessage.id+"-----------");
|
|
|
- this.meetingForm.projectPoolId = projectItemMessage.id;
|
|
|
- this.meetingForm.projectName = projectItemMessage.projectName;
|
|
|
- this.meetingForm.projectStage = projectItemMessage.projectStage;
|
|
|
- this.meetingForm.projectGroup = projectItemMessage.projectGroup;
|
|
|
- this.meetingForm.meetingType = this.meetingType;
|
|
|
- },*/
|
|
|
+ //总裁室
|
|
|
// 根据会议ID查询汇总分数和平均分数
|
|
|
- /*getSelectMeetingId(id) {
|
|
|
- selectMeetingId(id).then((response) => {
|
|
|
+ getSelectMeetingId() {
|
|
|
+ getSumScore(this.$route.query.pInstId).then((response) => {
|
|
|
this.collectForm = response.data;
|
|
|
- this.collectForm.investCommissioner = this.meetingForm.investCommissioner;
|
|
|
+ this.collectForm.investCommissioner = this.scoreForm.investCommissioner;
|
|
|
});
|
|
|
- },*/
|
|
|
+ },
|
|
|
/** 加载审批任务弹框 */
|
|
|
handleComplete(flag) {
|
|
|
/*this.completeOpen = true;
|
|
|
@@ -1853,10 +1813,6 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
//会议人
|
|
|
- /*if (this.formLXApply.taskDefKey=='softwareDept'&&!this.formAssess.context) {
|
|
|
- this.$modal.msgError("请输入评估意见!");
|
|
|
- return;
|
|
|
- }*/
|
|
|
this.formLXApply.flag=flag;
|
|
|
const params={
|
|
|
projectApproval: this.formLXApply, // 拆分明确字段
|
