armg 1 year ago
parent
commit
9bf0406ef0

+ 22 - 11
ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -252,7 +252,11 @@
             @command="handleCommand($event, scope.row)"
           >
             <!-- class="custom-blue-color"  -->
-            <span class="el-dropdown-link" v-preventReClick @click="getButtonItem(scope.row)">
+            <span
+              class="el-dropdown-link"
+              v-preventReClick
+              @click="getButtonItem(scope.row)"
+            >
               <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
                 >更多</el-button
               >
@@ -339,7 +343,9 @@
           <el-select
             v-model="form.meetingType"
             placeholder="请选择会议类别"
-            :disabled="pageType === '1' && meetingType != null"
+            :disabled="
+              meetingTypeDisabled || (pageType === '1' && meetingType != null)
+            "
           >
             <el-option
               v-for="dict in dict.type.meeting_type"
@@ -463,18 +469,20 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!--选择人员-->
-      <selecUser
-        ref="flowUser"
-        :checkType="checkType"
-        :selectValues="selectValues"
-        :selectNameValues="selectNameValues"
-        @handleUserSelect="handleUserSelect"
-      ></selecUser>
+    <selecUser
+      ref="flowUser"
+      :checkType="checkType"
+      :selectValues="selectValues"
+      :selectNameValues="selectNameValues"
+      @handleUserSelect="handleUserSelect"
+    ></selecUser>
   </div>
 </template>
 
@@ -525,12 +533,13 @@ export default {
   },
   data() {
     return {
+      meetingTypeDisabled: false, //会议类别
       showMenu: false,
       // 人员选择器
       checkType: "multiple",
       // 数据回显
       selectValues: null,
-      selectNameValues:null,
+      selectNameValues: null,
       userVisible: false,
       pageType: null,
       meetingType: null,
@@ -837,6 +846,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd(projectId) {
       let that = this;
+      this.meetingTypeDisabled = false;
       this.selectValues = null;
       this.selectNameValues = null;
       this.reset();
@@ -864,6 +874,7 @@ export default {
       this.selectNameValues = null;
       this.reset();
       const id = row.id || this.ids;
+      this.meetingTypeDisabled = true;
       getMeeting(id).then((response) => {
         this.form = response.data;
         this.form.projectName = response.data.tProjectPool.projectName;

+ 8 - 2
ruoyi-ui/src/views/invest/components/poolForm.vue

@@ -118,7 +118,10 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="注册资本(万元)" prop="tProjectCompany.registeredCapital">
+      <el-form-item
+        label="注册资本(万元)"
+        prop="tProjectCompany.registeredCapital"
+      >
         <el-input
           v-model="form.tProjectCompany.registeredCapital"
           onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
@@ -312,7 +315,9 @@
       </el-form-item>
       <el-form-item class="btnList" v-if="type === '1'">
         <el-button @click="goBack">返 回</el-button>
-        <el-button type="primary" @click="submitForm" v-preventReClick>提 交</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >提 交</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
@@ -552,6 +557,7 @@ export default {
           } else {
             this.form.projectStage = "1";
             this.form.projectState = "a";
+            this.form.projectGroup = this.form.tProjectChannel.channelGroup;
             addPool(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               setTimeout(() => {