投资项目管理修改

ruoyi-ui/src/views/project/approval/applyList.vue

@@ -89,11 +89,10 @@
       <el-col :span="1.5">
         <el-button
           plain
-          :disabled="multiple"
           type="warning"
           size="mini"
           icon="el-icon-document"
-          @click="handleSelectData(6)"
+          @click="handleAdd"
           >立项申请</el-button
         >
       </el-col>
@@ -111,7 +110,7 @@
       :data="poolList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="40" align="center" />
+      <!-- <el-table-column type="selection" width="40" align="center" /> -->
       <el-table-column
         type="index"
         label="序号"
@@ -382,7 +381,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({ path: "/invest/pool/add" });
+      // 立项申请
+      this.$refs.meetingList.showLXApplyPop();
+      // this.$router.push({ path: "/invest/pool/add" });
     },
     handleSelectData(type, otherData) {
       // type 1=修改 2=详情 3=设置项目阶段 4=终止 5=上传评估意见

ruoyi-ui/src/views/project/approval/projectItem.vue

@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <!-- 选择项目 -->
+    <el-dialog
+      title="选择项目"
+      :visible.sync="showProjectItem"
+      width="800px"
+      append-to-body
+    >
+      <el-table
+        class="tableWrapper"
+        @row-click="clickRow"
+        ref="dataTable"
+        :data="poolList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" width="150" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="渠道"
+          align="center"
+          prop="tProjectChannel.channelName"
+        >
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectChannel.channelName" v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else>无</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="所属组别"
+          align="center"
+          prop="tProjectChannel.channelGroup"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelGroup"
+              :options="dict.type.project_group"
+              :value="scope.row.tProjectChannel.channelGroup"
+            />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+
+        <el-table-column label="项目负责人" align="center" prop="investHead" />
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_stage"
+              :value="scope.row.projectStage"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目状态" align="center" prop="projectState">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_state"
+              :value="scope.row.projectState"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="projectItemTotal > 0"
+        :total="projectItemTotal"
+        :page.sync="projectQueryParams.pageNum"
+        :limit.sync="projectQueryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit" v-preventReClick
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { listApprovalList } from "@/api/invest/pool";
+import { mapGetters } from "vuex";
+export default {
+  props: {
+    // showProjectItem: {
+    //   type: Boolean,
+    //   default: false,
+    // },
+  },
+  dicts: ["project_group", "project_stage", "project_state"],
+  data() {
+    return {
+      showProjectItem: false,
+      // 总条数
+      projectItemTotal: 0,
+      poolList: [],
+      projectQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
+      },
+
+      // 选中数组
+      ids: [],
+      idsName: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+    };
+  },
+   computed: {
+    ...mapGetters(["user"]),
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    clickRow(row) {
+      this.$refs.dataTable.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      if (selection.length > 1) {
+        //移除上一次选中行数据
+        selection.shift();
+        //修改选中图标为未选中状态
+        this.$refs.dataTable.clearSelection();
+        //将当前选中行改为选中状态
+        this.$refs.dataTable.toggleRowSelection(selection[0]);
+      }
+      this.ids = selection;
+    },
+    /** 查询项目池列表 */
+    getList() {
+      listApprovalList(this.projectQueryParams).then((response) => {
+        this.poolList = response.rows;
+        this.projectItemTotal = response.total;
+      });
+    },
+    submit() {
+      // console.log("确定", this.ids);
+      const row = this.ids[0];
+        if (row.delFlag == "1") {
+          this.$message({
+            message: "项目已终止",
+            duration: 1500,
+            type: "error",
+          });
+        }
+        if (row.investHead === this.user.nickName){
+           if (row.approvalFlag == "0") {
+              this.$emit("getProjectInfo", this.ids);
+              this.showProjectItem = false;
+            } else {
+              this.$message({
+                message: "您已发起立项申请,无需重复操作",
+                duration: 1500,
+                type: "warning",
+              });
+            }
+        }else {
+          this.$message({
+            message: "无权限",
+            duration: 1500,
+            type: "error",
+          });
+        }
+      
+    },
+    cancel() {
+      this.showProjectItem = false;
+    },
+  },
+};
+</script>

ruoyi-ui/src/views/project/decision/applyList.vue

@@ -89,11 +89,10 @@
       <el-col :span="1.5">
         <el-button
           plain
-          :disabled="multiple"
           type="warning"
           size="mini"
           icon="el-icon-document"
-          @click="handleSelectData(11)"
+          @click="handleAdd"
           >投决申请</el-button
         >
       </el-col>
@@ -111,7 +110,7 @@
       :data="poolList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="40" align="center" />
+      <!-- <el-table-column type="selection" width="40" align="center" /> -->
       <el-table-column
         type="index"
         label="序号"
@@ -385,7 +384,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({ path: "/invest/pool/add" });
+      // 投决申请
+      this.$refs.meetingList.showTJApplyPop();
+      // this.$router.push({ path: "/invest/pool/add" });
     },
     handleSelectData(type, otherData) {
       // type 1=修改 2=详情 3=设置项目阶段 4=终止 5=上传评估意见

ruoyi-ui/src/views/project/decision/projectItem.vue

@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <!-- 选择项目 -->
+    <el-dialog
+      title="选择项目"
+      :visible.sync="showProjectItem"
+      width="800px"
+      append-to-body
+    >
+      <el-table
+        class="tableWrapper"
+        @row-click="clickRow"
+        ref="dataTable"
+        :data="poolList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" width="150" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="渠道"
+          align="center"
+          prop="tProjectChannel.channelName"
+        >
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectChannel.channelName" v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else>无</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="所属组别"
+          align="center"
+          prop="tProjectChannel.channelGroup"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelGroup"
+              :options="dict.type.project_group"
+              :value="scope.row.tProjectChannel.channelGroup"
+            />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+
+        <el-table-column label="项目负责人" align="center" prop="investHead" />
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_stage"
+              :value="scope.row.projectStage"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目状态" align="center" prop="projectState">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_state"
+              :value="scope.row.projectState"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="projectItemTotal > 0"
+        :total="projectItemTotal"
+        :page.sync="projectQueryParams.pageNum"
+        :limit.sync="projectQueryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit" v-preventReClick
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { listDecisionList } from "@/api/invest/pool";
+import { mapGetters } from "vuex";
+export default {
+  props: {
+    // showProjectItem: {
+    //   type: Boolean,
+    //   default: false,
+    // },
+  },
+  dicts: ["project_group", "project_stage", "project_state"],
+  data() {
+    return {
+      showProjectItem: false,
+      // 总条数
+      projectItemTotal: 0,
+      poolList: [],
+      projectQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
+      },
+
+      // 选中数组
+      ids: [],
+      idsName: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+    };
+  },
+   computed: {
+    ...mapGetters(["user"]),
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    clickRow(row) {
+      this.$refs.dataTable.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      if (selection.length > 1) {
+        //移除上一次选中行数据
+        selection.shift();
+        //修改选中图标为未选中状态
+        this.$refs.dataTable.clearSelection();
+        //将当前选中行改为选中状态
+        this.$refs.dataTable.toggleRowSelection(selection[0]);
+      }
+      this.ids = selection;
+    },
+    /** 查询项目池列表 */
+    getList() {
+      listDecisionList(this.projectQueryParams).then((response) => {
+        this.poolList = response.rows;
+        this.projectItemTotal = response.total;
+      });
+    },
+    submit() {
+      // console.log("确定", this.ids);
+      const row = this.ids[0];
+        if (row.delFlag == "1") {
+          this.$message({
+            message: "项目已终止",
+            duration: 1500,
+            type: "error",
+          });
+        }
+        if (row.investHead === this.user.nickName){
+           if (row.decisionFlag == "0") {
+              this.$emit("getProjectInfo", this.ids);
+              this.showProjectItem = false;
+            } else {
+              this.$message({
+                message: "您已发起投决申请,无需重复操作",
+                duration: 1500,
+                type: "warning",
+              });
+            }
+        }else {
+          this.$message({
+            message: "无权限",
+            duration: 1500,
+            type: "error",
+          });
+        }
+      
+    },
+    cancel() {
+      this.showProjectItem = false;
+    },
+  },
+};
+</script>

ruoyi-ui/src/views/project/investigate/applyList.vue

@@ -89,11 +89,10 @@
       <el-col :span="1.5">
         <el-button
           plain
-          :disabled="multiple"
           type="warning"
           size="mini"
           icon="el-icon-tickets"
-          @click="handleSelectData(9)"
+          @click="handleAdd"
           v-hasPermi="['invest:pool:due']"
           >尽调申请</el-button
         >
@@ -112,7 +111,7 @@
       :data="poolList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="40" align="center" />
+      <!-- <el-table-column type="selection" width="40" align="center" /> -->
       <el-table-column
         type="index"
         label="序号"
@@ -398,7 +397,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({ path: "/invest/pool/add" });
+      // 尽调申请
+      this.$refs.dueDiligenceLists.handleShowApplyPop();
+      // this.$router.push({ path: "/invest/pool/add" });
     },
     handleSelectData(type, otherData) {
       // type 1=修改 2=详情 3=设置项目阶段 4=终止 5=上传评估意见

ruoyi-ui/src/views/project/investigate/dueDiligenceList.vue

@@ -121,17 +121,26 @@
         :rules="dueRules"
         label-width="170px"
       >
-        <el-form-item
+       <el-form-item
           label="项目名称"
           prop="projectName"
-          class="special-el-form-item"
+          class="special-el-form-item public-input-height-2"
+          :rules="[
+            { required: true, trigger: 'blur', message: '请选择' },
+          ]"
         >
-          <el-input
-            rows="2"
-            type="textarea"
-            disabled
-            v-model="dueForm.projectName"
-          />
+          <div
+            class="el-input__inner inputSimulation"
+            @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }"
+            :title="dueForm.projectName"
+          >
+            {{ dueForm.projectName ? dueForm.projectName : "请选择 " }}
+          </div>
+          <projectItem
+            ref="projectItem"
+            @getProjectInfo="getProjectInfo"
+          ></projectItem>
         </el-form-item>
         <el-form-item
           label="尽调名称"
@@ -640,7 +649,7 @@ import {
   getDueAllPeportList,
 } from "@/api/invest/pool";
 import {investigateStart} from "@/api/project/investigate/pool";
-import projectItem from "../../invest/components/projectItem";
+import projectItem from "./projectItem";
 import fileItem from "../../invest/components/fileItem";
 import selecDept from "../../invest/components/selecDept";
 import selecUser from "../../invest/components/selecUser";
@@ -668,6 +677,7 @@ export default {
       }
     };
     return {
+      pageType: null,
       // 人员选择器
       checkType: "multiple",
       // 数据回显
@@ -749,6 +759,7 @@ export default {
         deadDate: { required: true, trigger: "blur", message: "请选择" },
       },
       fileList: [],
+      showProjectItem: false,
       reportFileList: [],
       dueDiligenceType: "0",
       showDetail: false,
@@ -769,7 +780,17 @@ export default {
     // this.getList();
   },
   methods: {
-
+     //展示人员
+    handleProjectItem() {
+      this.$refs.projectItem.showProjectItem = true;
+    },
+    // 获取公司信息
+    getProjectInfo(info) {
+      if (info.length > 0) {
+        this.dueForm.projectPoolId = info[0].id;
+        this.dueForm.projectName = info[0].projectName;
+      }
+    },
     // 展示最新的尽调申请及下面的尽调报告
     handleShowDetail(id) {
       this.showDetail = true;
@@ -874,8 +895,7 @@ export default {
       }
     },
     // 发起尽调申请
-    handleShowApplyPop(row) {
-      console.log("row=", row);
+    handleShowApplyPop() {
       let that = this;
       this.fileList = [];
       this.resetDueForm();
@@ -884,8 +904,8 @@ export default {
       }, 300);
       this.dueDiligenceTit = "发起尽调申请";
       this.dueDiligenceOpen = true;
-      this.dueForm.projectName = row.projectName;
-      this.dueForm.projectPoolId = row.id;
+      // this.dueForm.projectName = row.projectName;
+      // this.dueForm.projectPoolId = row.id;
     },
     // 上传尽调报告-按钮
     handleShowReportPop(row) {

ruoyi-ui/src/views/project/investigate/projectItem.vue

@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <!-- 选择项目 -->
+    <el-dialog
+      title="选择项目"
+      :visible.sync="showProjectItem"
+      width="800px"
+      append-to-body
+    >
+      <el-table
+        class="tableWrapper"
+        @row-click="clickRow"
+        ref="dataTable"
+        :data="poolList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" width="150" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="渠道"
+          align="center"
+          prop="tProjectChannel.channelName"
+        >
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectChannel.channelName" v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else>无</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="所属组别"
+          align="center"
+          prop="tProjectChannel.channelGroup"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              v-if="scope.row.tProjectChannel && scope.row.tProjectChannel.channelGroup"
+              :options="dict.type.project_group"
+              :value="scope.row.tProjectChannel.channelGroup"
+            />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+
+        <el-table-column label="项目负责人" align="center" prop="investHead" />
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_stage"
+              :value="scope.row.projectStage"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目状态" align="center" prop="projectState">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.project_state"
+              :value="scope.row.projectState"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="projectItemTotal > 0"
+        :total="projectItemTotal"
+        :page.sync="projectQueryParams.pageNum"
+        :limit.sync="projectQueryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit" v-preventReClick
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { listInvestigateList } from "@/api/invest/pool";
+import { mapGetters } from "vuex";
+export default {
+  props: {
+    // showProjectItem: {
+    //   type: Boolean,
+    //   default: false,
+    // },
+  },
+  dicts: ["project_group", "project_stage", "project_state"],
+  data() {
+    return {
+      showProjectItem: false,
+      // 总条数
+      projectItemTotal: 0,
+      poolList: [],
+      projectQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
+      },
+
+      // 选中数组
+      ids: [],
+      idsName: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+    };
+  },
+   computed: {
+    ...mapGetters(["user"]),
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    clickRow(row) {
+      this.$refs.dataTable.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      if (selection.length > 1) {
+        //移除上一次选中行数据
+        selection.shift();
+        //修改选中图标为未选中状态
+        this.$refs.dataTable.clearSelection();
+        //将当前选中行改为选中状态
+        this.$refs.dataTable.toggleRowSelection(selection[0]);
+      }
+      this.ids = selection;
+    },
+    /** 查询项目池列表 */
+    getList() {
+      listInvestigateList(this.projectQueryParams).then((response) => {
+        this.poolList = response.rows;
+        this.projectItemTotal = response.total;
+      });
+    },
+    submit() {
+      // console.log("确定", this.ids);
+      const row = this.ids[0];
+        if (row.delFlag == "1") {
+          this.$message({
+            message: "项目已终止",
+            duration: 1500,
+            type: "error",
+          });
+        }
+        if (row.investHead === this.user.nickName){
+           if (row.investigateFlag == "0") {
+              this.$emit("getProjectInfo", this.ids);
+              this.showProjectItem = false;
+            } else {
+              this.$message({
+                message: "您已发起尽调申请,无需重复操作",
+                duration: 1500,
+                type: "warning",
+              });
+            }
+        }else {
+          this.$message({
+            message: "无权限",
+            duration: 1500,
+            type: "error",
+          });
+        }
+      
+    },
+    cancel() {
+      this.showProjectItem = false;
+    },
+  },
+};
+</script>

ruoyi-ui/src/views/project/meetingList.vue

@@ -711,14 +711,23 @@
         <el-form-item
           label="项目名称"
           prop="projectName"
-          class="special-el-form-item"
+          class="special-el-form-item public-input-height-2"
+          :rules="[
+            { required: true, trigger: 'blur', message: '请选择' },
+          ]"
         >
-          <el-input
-            type="textarea"
-            rows="2"
-            v-model="formLXApply.projectName"
-            disabled
-          />
+          <div
+            class="el-input__inner inputSimulation"
+            @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }"
+            :title="formLXApply.projectName"
+          >
+            {{ formLXApply.projectName ? formLXApply.projectName : "请选择 " }}
+          </div>
+          <projectItemLX
+            ref="projectItem"
+            @getProjectInfo="getProjectInfo"
+          ></projectItemLX>
         </el-form-item>
 
         <el-form-item
@@ -799,14 +808,23 @@
         <el-form-item
           label="项目名称"
           prop="projectName"
-          class="special-el-form-item"
+          class="special-el-form-item public-input-height-2"
+          :rules="[
+            { required: true, trigger: 'blur', message: '请选择' },
+          ]"
         >
-          <el-input
-            type="textarea"
-            rows="2"
-            v-model="formTJApply.projectName"
-            disabled
-          />
+          <div
+            class="el-input__inner inputSimulation"
+            @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }"
+            :title="formTJApply.projectName"
+          >
+            {{ formTJApply.projectName ? formTJApply.projectName : "请选择 " }}
+          </div>
+          <projectItemTJ
+            ref="projectItem"
+            @getProjectInfo="getProjectInfo"
+          ></projectItemTJ>
         </el-form-item>
 
         <el-form-item
@@ -911,11 +929,15 @@ import {
   addMeeting,
   updateMeeting,
   getCanScoringMeetingId,
+  addApproval,
+  updateApproval,
+  addDecision,
+  updateDecision,
 } from "@/api/invest/meeting";
 import {approvalStart} from "@/api/project/approval/pool";
-import {decisionStart} from "@/api/project/decision/pool";
-import {terminationStart} from "@/api/project/termination/pool";
 import projectItem from "../invest/components/projectItem";
+import projectItemLX from "./approval/projectItem";
+import projectItemTJ from "./decision/projectItem";
 import fileItem from "../invest/components/fileItem";
 import selecDept from "../invest/components/selecDept";
 import selecUser from "../invest/components/selecUser";
@@ -932,9 +954,10 @@ export default {
     },
   },
   dicts: ["meeting_type", "project_stage", "project_group"],
-  components: { projectItem, selecDept, fileItem, selecUser },
+  components: { projectItem,projectItemLX, projectItemTJ, selecDept, fileItem, selecUser },
   watch: {
     "form.meetingType": function (newValue, oldValue) {
+      // console.log(newValue,"this.form.meetingType", this.form.meetingType);
       if (this.form.meetingType == "LX" || this.form.meetingType == "TJ") {
         this.verifyProjectName = true;
       } else {
@@ -1037,6 +1060,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        projectGroup: "",
       },
       // 表单校验
       rules: {
@@ -1305,7 +1329,7 @@ export default {
     },
     // 展示立项申请弹窗
     showLXApplyPop(row) {
-      this.resetLXApply(row);
+      // this.resetLXApply(row);
       this.fileListLXApply = [];
       this.openLXApply = true;
       this.titleLXApply = "立项申请";
@@ -1314,8 +1338,8 @@ export default {
       }, 200);
     },
     // 展示投决申请弹窗
-    showTJApplyPop(row) {
-      this.resetTJApply(row);
+    showTJApplyPop() {
+      // this.resetTJApply(row);
       this.fileListLXApply = [];
       this.openTJApply = true;
       this.titleTJApply = "投决申请";
@@ -1354,17 +1378,10 @@ export default {
     // 获取公司信息
     getProjectInfo(info) {
       if (info.length > 0) {
-        //console.log("info=", info);
-        this.form.projectPoolId = info[0].id;
-        this.form.projectName = info[0].projectName;
-        this.form.projectStage = info[0].projectStage;
-        this.form.projectState = info[0].projectState;
-        if (info[0].tProjectChannel && info[0].tProjectChannel.channelGroup) {
-          this.form.projectGroup = info[0].tProjectChannel.channelGroup;
-        } else {
-          this.form.projectGroup = "";
-        }
-        this.$refs.form.clearValidate(["projectName"]);
+        this.formLXApply.projectPoolId = info[0].id;
+        this.formLXApply.projectName = info[0].projectName;
+        this.formTJApply.projectPoolId = info[0].id;
+        this.formTJApply.projectName = info[0].projectName;
       }
     },
     //展示人员
@@ -1411,6 +1428,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        projectGroup: "",
       };
       this.resetForm("form");
     },
@@ -1610,17 +1628,11 @@ export default {
             });*/
           }
           this.formLXApply.flag=flag;
-          try {
-            approvalStart(this.formLXApply).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.openLXApply = false;
-              this.$emit("getList");
-              this.$store.dispatch("getMyTaskApprovalNumber"); //更新代办数量
-            });
-          } catch (err) {
-            // 捕获重复提交错误
-            this.$message.error(err.message);
-          }
+          approvalStart(this.formLXApply).then((response) => {
+            this.$modal.msgSuccess("新增成功");
+            this.openLXApply = false;
+            this.$emit("getList");
+          });
         }
       });
     },
@@ -1643,17 +1655,11 @@ export default {
             });
           }*/
           this.formTJApply.flag=flag;
-          try {
-            decisionStart(this.formTJApply).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.openTJApply = false;
-              this.$emit("getList");
-              this.$store.dispatch("getMyTaskDecisionNumber"); //更新代办数量
-            });
-          } catch (err) {
-            // 捕获重复提交错误
-            this.$message.error(err.message);
-          }
+          decisionStart(this.formTJApply).then((response) => {
+            this.$modal.msgSuccess("新增成功");
+            this.openTJApply = false;
+            this.$emit("getList");
+          });
         }
       });
     },
@@ -1662,17 +1668,11 @@ export default {
       this.$refs["formZZApply"].validate((valid) => {
         if (valid) {
           this.formZZApply.flag=flag;
-          try {
-            terminationStart(this.formZZApply).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.openZZApply = false;
-              this.$emit("getList");
-              this.$store.dispatch("getMyTaskTerminationNumber"); //更新代办数量
-            });
-          } catch (err) {
-            // 捕获重复提交错误
-            this.$message.error(err.message);
-          }
+          terminationStart(this.formZZApply).then((response) => {
+            this.$modal.msgSuccess("新增成功");
+            this.openZZApply = false;
+            this.$emit("getList");
+          });
         }
       });
     },

ruoyi-ui/vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
         // target: `http://192.168.100.234:8091`,
-        target: `http://47.103.79.143:8091`,
+        target: `http://47.103.79.143:18091`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''