前端

ruoyi-ui/src/views/invest/channel/index.vue

@@ -156,7 +156,12 @@
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="150"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -343,7 +348,7 @@ export default {
         telephone: null,
         channelHead: null,
         status: null,
-        channelGroup: null,        
+        channelGroup: null,
         orderByColumn: "createTime",
         isAsc: "desc",
       },
@@ -400,7 +405,10 @@ export default {
       this.$refs.selecDepts.show();
     },
     getDeptUserInfo(info) {
-      this.form.channelHead = info[0].nickName;
+      if (info.length > 0) {
+        this.form.channelHead = info[0].nickName;
+        this.$refs.form.clearValidate(["channelHead"]);
+      }
     },
     // 获取fileList
     getFileList(fileList) {
@@ -449,7 +457,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.orderByColumn = "createTime";

ruoyi-ui/src/views/invest/components/channelItem.vue

@@ -4,7 +4,7 @@
     <el-dialog
       title="选择渠道"
       :visible.sync="showChannelItem"
-      width="800px"
+      width="1000px"
       append-to-body
     >
       <el-table
@@ -17,11 +17,25 @@
         <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
         <el-table-column label="渠道名称" align="center" prop="channelName" />
         <el-table-column label="渠道编号" align="center" prop="channelCode" />
-        <el-table-column label="渠道类别" align="center" prop="channelType" />
+        <el-table-column label="渠道类别" align="center" prop="channelType">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.channel_type"
+              :value="scope.row.channelType"
+            />
+          </template>
+        </el-table-column>
         <el-table-column label="联系人" align="center" prop="contacts" />
         <el-table-column label="联系电话" align="center" prop="telephone" />
         <el-table-column label="渠道负责人" align="center" prop="channelHead" />
-        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.channel_status"
+              :value="scope.row.status"
+            />
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="channelItemTotal > 0"
@@ -54,10 +68,10 @@ export default {
         orderByColumn: "createTime",
         isAsc: "desc",
       },
-      
-    // 选中数组
+
+      // 选中数组
       ids: [],
-      idsName:[],
+      idsName: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -95,7 +109,7 @@ export default {
       });
     },
     submit() {
-    //   console.log("确定", this.ids);
+      //   console.log("确定", this.ids);
       this.$emit("getChannelInfo", this.ids);
       this.showChannelItem = false;
     },

ruoyi-ui/src/views/invest/components/contractList.vue

@@ -363,20 +363,25 @@ export default {
   methods: {
     // 获取公司信息
     getProjectInfo(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.length > 0) {
+        this.form.projectPoolId = info[0].id;
+        this.form.projectName = info[0].projectName;
+        this.form.projectStage = info[0].projectStage;
+        this.form.projectState = info[0].projectState;
+        this.$refs.form.clearValidate(["projectName"]);
+      }
     },
     //展示人员
     handleProjectItem() {
       this.$refs.projectItem.showProjectItem = true;
     },
     // 获取会议信息
-    getMeetingInfo(info) {
-      this.form.fileBusinessId = info[0].id;
-      this.form.meetingTheme = info[0].meetingTheme;
-    },
+    // getMeetingInfo(info) {
+    //   if (info.length > 0) {
+    //     this.form.fileBusinessId = info[0].id;
+    //     this.form.meetingTheme = info[0].meetingTheme;
+    //   }
+    // },
     handleMeetingItem() {
       this.$refs.meetingItem.showMeetingItem = true;
     },

ruoyi-ui/src/views/invest/components/fileList.vue

@@ -353,20 +353,25 @@ export default {
   methods: {
     // 获取公司信息
     getProjectInfo(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.length > 0) {
+        this.form.projectPoolId = info[0].id;
+        this.form.projectName = info[0].projectName;
+        this.form.projectStage = info[0].projectStage;
+        this.form.projectState = info[0].projectState;
+        this.$refs.form.clearValidate(["projectName"]);
+      }
     },
     //展示人员
     handleProjectItem() {
       this.$refs.projectItem.showProjectItem = true;
     },
     // 获取会议信息
-    getMeetingInfo(info) {
-      this.form.fileBusinessId = info[0].id;
-      this.form.meetingTheme = info[0].meetingTheme;
-    },
+    // getMeetingInfo(info) {
+    //   if (info.length > 0) {
+    //     this.form.fileBusinessId = info[0].id;
+    //     this.form.meetingTheme = info[0].meetingTheme;
+    //   }
+    // },
     handleMeetingItem() {
       this.$refs.meetingItem.showMeetingItem = true;
     },

ruoyi-ui/src/views/invest/components/followList.vue

@@ -424,16 +424,22 @@ export default {
       this.$refs.selecDepts.show();
     },
     getDeptUserInfo(info) {
-      this.form.upPerson = info[0].nickName;
+      if (info.length > 0) {
+        this.form.upPerson = info[0].nickName;
+        this.$refs.form.clearValidate(["upPerson"]);
+      }
     },
     // 获取公司信息
     getProjectInfo(info) {
-      this.form.projectId = info[0].id;
-      this.form.projectName = info[0].projectName;
-      this.form.projectStage = info[0].projectStage;
-      this.form.projectState = info[0].projectState;
-      // 联系人
-      this.form.contacts = info[0].tProjectContacts.name;
+      if (info.length > 0) {
+        this.form.projectId = info[0].id;
+        this.form.projectName = info[0].projectName;
+        this.form.projectStage = info[0].projectStage;
+        this.form.projectState = info[0].projectState;
+        // 联系人
+        this.form.contacts = info[0].tProjectContacts.name;
+        this.$refs.form.clearValidate(["projectName"]);
+      }
       // this.form.projectState = info[0].tProjectContacts;
     },
     //展示人员

ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -675,8 +675,11 @@ export default {
       }
     },
     getDeptUserInfo(info) {
-      this.form.promoter = info[0].nickName;
-      this.form.promoterId = info[0].userId.toString();
+      if (info.length > 0) {
+        this.form.promoter = info[0].nickName;
+        this.form.promoterId = info[0].userId.toString();
+        this.$refs.form.clearValidate(["promoter"]);
+      }
     },
     // 多选人
     getDeptMoreUserInfo(info) {
@@ -690,6 +693,7 @@ export default {
       let peopleIdStr = peoIdList.join(",");
       this.form.participants = peopleStr;
       this.form.participantsId = peopleIdStr;
+      this.$refs.form.clearValidate(["participants"]);
     },
     // 获取fileList
     getFileList(fileList) {
@@ -697,11 +701,14 @@ export default {
     },
     // 获取公司信息
     getProjectInfo(info) {
-      this.form.projectPoolId = info[0].id;
-      this.form.projectName = info[0].projectName;
-      this.form.projectStage = info[0].projectStage;
-      this.form.projectGroup = info[0].projectGroup;
-      this.form.projectState = info[0].projectState;
+      if (info.length > 0) {
+        this.form.projectPoolId = info[0].id;
+        this.form.projectName = info[0].projectName;
+        this.form.projectStage = info[0].projectStage;
+        this.form.projectGroup = info[0].projectGroup;
+        this.form.projectState = info[0].projectState;
+        this.$refs.form.clearValidate(["projectName"]);
+      }
     },
     //展示人员
     handleProjectItem() {

ruoyi-ui/src/views/invest/components/poolForm.vue

@@ -456,13 +456,19 @@ export default {
       this.$refs.selecDepts.show();
     },
     getDeptUserInfo(info) {
-      this.form.investHead = info[0].nickName;
+      if (info.length > 0) {
+        this.form.investHead = info[0].nickName;
+        this.$refs.form.clearValidate(["investHead"]);
+      }
     },
     // 获取渠道信息
     getChannelInfo(info) {
-      this.form.channel = info[0].id;
-      this.form.tProjectChannel.channelName = info[0].channelName;
-      this.form.tProjectChannel.channelGroup = info[0].channelGroup;
+      if (info.length > 0) {
+        this.form.channel = info[0].id;
+        this.form.tProjectChannel.channelName = info[0].channelName;
+        this.form.tProjectChannel.channelGroup = info[0].channelGroup;
+        this.$refs.form.clearValidate(["channel"]);
+      }
     },
     handleChannelItem() {
       this.$refs.channelItem.showChannelItem = true;

ruoyi-ui/src/views/invest/components/projectList.vue

@@ -253,11 +253,11 @@
         align="center"
         prop="tProjectChannel.channelName"
       />
-      <el-table-column label="所属组别" align="center" prop="projectGroup">
+      <el-table-column label="所属组别" align="center" prop="tProjectChannel.channelGroup">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_group"
-            :value="scope.row.projectGroup"
+            :value="scope.row.tProjectChannel.channelGroup"
           />
         </template>
       </el-table-column>
@@ -1071,10 +1071,13 @@ export default {
     },
     // 获取公司信息
     getProjectInfo(info) {
-      this.dueForm.projectPoolId = info[0].id;
-      this.dueForm.projectName = info[0].projectName;
-      this.dueForm.projectStage = info[0].projectStage;
-      this.dueForm.projectState = info[0].projectState;
+      if (info.length > 0) {
+        this.dueForm.projectPoolId = info[0].id;
+        this.dueForm.projectName = info[0].projectName;
+        this.dueForm.projectStage = info[0].projectStage;
+        this.dueForm.projectState = info[0].projectState;
+        this.$refs.form.clearValidate(["projectName"]);
+      }
     },
 
     handleProjectItem() {