فهرست منبع

前端-部分bug修复

armg 1 سال پیش
والد
کامیت
b582fc2f83

BIN
ruoyi-ui/dist.zip


+ 24 - 9
ruoyi-ui/src/views/invest/channel/index.vue

@@ -127,6 +127,7 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
       v-loading="loading"
       border
       :data="channelList"
@@ -134,9 +135,14 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <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="渠道名称"  width="150" align="center" prop="channelName" />
+      <el-table-column label="渠道编号"  width="100"  align="center" prop="channelCode" />
+      <el-table-column
+        label="渠道类别"
+        width="260"
+        align="center"
+        prop="channelType"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.channel_type"
@@ -144,10 +150,10 @@
           />
         </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="联系人" width="80" align="center" prop="contacts" />
+      <el-table-column label="联系电话" width="120" align="center" prop="telephone" />
+      <el-table-column label="渠道负责人" width="120" align="center" prop="channelHead" />
+      <el-table-column label="状态" width="60" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.channel_status"
@@ -155,15 +161,16 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建人"  width="120" align="center" prop="createBy" />
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
-        width="150"
+        width="160"
       />
       <el-table-column
         label="操作"
+        fixed="right"
         align="center"
         class-name="small-padding fixed-width"
       >
@@ -544,3 +551,11 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.tableWrapper {
+  ::v-deep .cell {
+    // height: 30px;
+    // line-height: 30px !important;
+  }
+}
+</style>

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

@@ -137,7 +137,7 @@
         label="创建时间"
         align="center"
         prop="createTime"
-        width="150"
+        width="160"
       />
       <!-- <el-table-column label="合同类别" align="center" prop="contractType">
         

+ 6 - 4
ruoyi-ui/src/views/invest/components/fileList.vue

@@ -103,7 +103,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="文件名称"  width="300" align="center" prop="fileName" />
       <el-table-column label="文件类别" align="center" prop="fileType">
         <template slot-scope="scope">
           <dict-tag
@@ -114,6 +114,7 @@
       </el-table-column>
       <el-table-column
         label="项目名称"
+        width="300"
         align="center"
         prop="tProjectPool.projectName"
       />
@@ -126,10 +127,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="备注" width="120"  align="center" prop="remark" />
+      <el-table-column label="创建人"   width="120" align="center" prop="createBy" />
+      <el-table-column label="创建时间" width="120"  align="center" prop="createTime" />
       <el-table-column
+        fixed="right"
         label="操作"
         align="center"
         class-name="small-padding fixed-width"

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

@@ -158,7 +158,7 @@
         label="创建时间"
         align="center"
         prop="createTime"
-        width="150"
+        width="160"
       />
       <el-table-column
         label="操作"

+ 10 - 9
ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -137,14 +137,14 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="会议主题" align="center" prop="meetingTheme" />
+      <el-table-column label="会议主题"  width="150" align="center" prop="meetingTheme" />
       <el-table-column
         label="项目名称"
         align="center"
         prop="tProjectPool.projectName"
       />
-      <el-table-column label="会议编号" align="center" prop="meetingCode" />
-      <el-table-column label="会议类别" align="center" prop="meetingType">
+      <el-table-column label="会议编号" width="120" align="center" prop="meetingCode" />
+      <el-table-column label="会议类别" width="120" align="center" prop="meetingType">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.meeting_type"
@@ -152,28 +152,29 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="会议开始时间" align="center" prop="startTime">
+      <el-table-column label="会议开始时间" width="120" align="center" prop="startTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="会议结束时间" align="center" prop="endTime">
+      <el-table-column label="会议结束时间"  width="120" align="center" prop="endTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="会议地点" align="center" prop="place" />
-      <el-table-column label="会议发起人" align="center" prop="promoter" />
-      <el-table-column label="会议参与人" align="center" prop="participants" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="会议发起人" width="120" align="center" prop="promoter" />
+      <el-table-column label="会议参与人"  width="300" align="center" prop="participants" />
+      <el-table-column label="创建人" width="120" align="center" prop="createBy" />
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
-        width="150"
+        width="160"
       />
       <el-table-column
         label="操作"
+        fixed="right"
         align="center"
         class-name="small-padding fixed-width"
         width="160"

+ 62 - 18
ruoyi-ui/src/views/invest/components/poolForm.vue

@@ -4,7 +4,7 @@
       ref="form"
       :model="form"
       :rules="type === '2' ? rules1 : rules"
-      label-width="140px"
+      label-width="160px"
       class="special-el-form"
     >
       <h3>项目基础信息</h3>
@@ -152,7 +152,6 @@
         <el-input
           v-model="form.tProjectCompany.phone"
           placeholder="请输入联系电话"
-          maxlength="11"
         />
       </el-form-item>
       <el-form-item label="所属类型" prop="tProjectCompany.type">
@@ -195,20 +194,57 @@
       <el-form-item label="预期融资金额(万元)" prop="financingMoney">
         <el-input
           v-model="form.financingMoney"
+          onkeyup="this.value=this.value.replace(/\D/g,'')"
           placeholder="请输入预期融资金额"
         />
       </el-form-item>
       <el-form-item label="投前估值(万元)" prop="investValuation">
-        <el-input v-model="form.investValuation" placeholder="请输入投前估值" />
+        <el-input
+          v-model="form.investValuation"
+          onkeyup="this.value=this.value.replace(/\D/g,'')"
+          placeholder="请输入投前估值"
+        />
       </el-form-item>
       <el-form-item label="预计投资金额(万元)" prop="investMoney">
-        <el-input v-model="form.investMoney" placeholder="请输入预计投资金额" />
+        <el-input
+          v-model="form.investMoney"
+          onkeyup="this.value=this.value.replace(/\D/g,'')"
+          placeholder="请输入预计投资金额"
+        />
+      </el-form-item>
+      <!--  -->
+      <el-form-item label="投资类型" prop="investType">
+        <el-select v-model="form.investType" placeholder="请选择投资类型">
+          <el-option
+            v-for="dict in dict.type.invest_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="投资策略" prop="investPloy">
+        <el-select v-model="form.investPloy" placeholder="请选择投资策略">
+          <el-option
+            v-for="dict in dict.type.invest_ploy"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="投资价值" prop="investWorth">
-        <el-input v-model="form.investWorth" placeholder="请输入投资价值" />
+        <el-select v-model="form.investWorth" placeholder="请选择投资价值">
+          <el-option
+            v-for="dict in dict.type.invest_worth"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item
-        label="历史融资"
+        label="历融资"
         prop="previousFinancing"
         class="special-el-form-item"
       >
@@ -216,7 +252,7 @@
           rows="4"
           type="textarea"
           v-model="form.previousFinancing"
-          placeholder="请输入历融资"
+          placeholder="请输入历融资"
         />
       </el-form-item>
       <el-form-item
@@ -294,7 +330,13 @@ export default {
     },
   },
   components: { fileItem, channelItem, selecDept },
-  dicts: ["CUSTOMER_TRADE", "project_group"],
+  dicts: [
+    "CUSTOMER_TRADE",
+    "project_group",
+    "invest_type",
+    "invest_ploy",
+    "invest_worth",
+  ],
   data() {
     return {
       deptId: process.env.VUE_APP_DEPTID,
@@ -402,12 +444,12 @@ export default {
           { required: true, trigger: "blur", message: "请输入" },
         ],
         "tProjectCompany.phone": [
-          { required: true, trigger: "blur", message: "请输入手机号" },
-          {
-            pattern: /^1[3456789]\d{9}$/,
-            message: "请输入正确的手机号",
-            trigger: "blur",
-          },
+          { required: true, trigger: "blur", message: "请输入联系电话" },
+          // {
+          //   pattern: /^1[3456789]\d{9}$/,
+          //   message: "请输入正确的手机号",
+          //   trigger: "blur",
+          // },
         ],
         "tProjectCompany.type": [
           { required: true, trigger: "blur", message: "请输入" },
@@ -432,11 +474,13 @@ export default {
           { required: true, trigger: "blur", message: "请输入" },
         ],
         investMoney: [{ required: true, trigger: "blur", message: "请输入" }],
-        investWorth: [{ required: true, trigger: "blur", message: "请输入" }],
+        investType: [{ required: true, trigger: "change", message: "请选择" }],
+        investPloy: [{ required: true, trigger: "change", message: "请选择" }],
+        investWorth: [{ required: true, trigger: "change", message: "请选择" }],
         // previousFinancing: [{ required: true, trigger: "blur", message: "请输入" }],
-        financingCondition: [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
+        // financingCondition: [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
         investSparkle: [{ required: true, trigger: "blur", message: "请输入" }],
         shareholding: [{ required: true, trigger: "blur", message: "请输入" }],
         // mark: [{ required: true, trigger: "blur", message: "请输入" }]

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

@@ -49,10 +49,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目联系人" prop="projectContacts">
+      <el-form-item label="公司联系人" prop="projectContacts">
         <el-input
           v-model="queryParams.projectContacts"
-          placeholder="请输入项目联系人"
+          placeholder="请输入公司联系人"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -364,7 +364,7 @@
         label="创建时间"
         align="center"
         prop="createTime"
-        width="100"
+        width="160"
       />
       <el-table-column
         width="350"

+ 11 - 4
ruoyi-ui/src/views/invest/pool/detail.vue

@@ -3,9 +3,9 @@
     <section class="section1 public-flex-col-end">
       <div class="public-margin-r-20">
         <h4>投资项目</h4>
-        <p>{{ detailInfo.projectName }}</p>
+        <p class="projectNameTit">{{ detailInfo.projectName }}</p>
       </div>
-      <div>
+      <div class="btnList">
         <el-button
           type="primary"
           icon="el-icon-upload2"
@@ -181,7 +181,7 @@ export default {
     meetingList,
     projectList,
     tableForm,
-    listAllfile
+    listAllfile,
   },
   data() {
     return {
@@ -227,6 +227,7 @@ export default {
         meetingType: type,
         orderByColumn: "createTime",
         isAsc: "desc",
+        projectPoolId: this.id,
       };
       listMeeting(queryParams).then((response) => {
         let meetingList = response.rows;
@@ -272,10 +273,16 @@ export default {
   margin: 0 auto;
   .section1 {
     p {
-      font-size: 28px;
+      font-size: 24px;
       font-weight: bold;
       margin: 0;
     }
+    > div:first-child {
+      width: calc(100% - 600px);
+    }
+    .btnList {
+      width: 600px;
+    }
   }
   .basicsInfo {
     font-size: 14px;