armg 1 year ago
parent
commit
b69c1cac95

+ 2 - 4
ruoyi-ui/src/views/invest/components/tableForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="" v-if="id != '0'">
+  <div class="" v-if="id">
     <el-form
       class="special-el-form"
       ref="form"
@@ -2049,9 +2049,6 @@ export default {
       type: Number,
       default: 1, //1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
     },
-    id: {
-      type: String,
-    },
     readonly: {
       type: Boolean,
     },
@@ -2059,6 +2056,7 @@ export default {
   dicts: ["meeting_type", "project_stage", "project_group"],
   data() {
     return {
+      id:"",
       // 打分表单参数
       form: {
         businessModel: null,

+ 10 - 2
ruoyi-ui/src/views/invest/meeting/mark.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <tableForm :formType="formType" :id="id" :readonly="readonly"></tableForm>
+    <tableForm
+      ref="tableForm"
+      :formType="formType"
+      :readonly="readonly"
+    ></tableForm>
   </div>
 </template>
 <script>
@@ -19,7 +23,11 @@ export default {
     this.formType = parseInt(this.$route.query.formType);
     let readonly = this.$route.query.readonly;
     this.readonly = readonly === "true" ? true : false;
-    console.log("this.readonly=", this.readonly);
+  },
+  mounted() {
+    setTimeout(() => {
+      this.$refs.tableForm.initialize(this.id);
+    }, 200);
   },
 };
 </script>

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

@@ -34,8 +34,8 @@
     </section>
     <el-divider></el-divider>
     <section>
+      <!-- :space="200" -->
       <el-steps
-        :space="200"
         :active="active"
         finish-status="success"
         align-center
@@ -113,7 +113,6 @@
         <div v-show="activeName === '3'">
           <tableForm
             :formType="2"
-            :id="meetingId"
             ref="approvalTableForm"
             :readonly="true"
           ></tableForm>
@@ -130,7 +129,6 @@
         <div v-show="activeName === '5'">
           <tableForm
             :formType="4"
-            :id="meetingId"
             ref="voteTableForm"
             :readonly="true"
           ></tableForm>
@@ -275,7 +273,7 @@ export default {
     font-size: 14px;
     background: #f1f1f1;
     margin-top: -24px;
-    width: 70%;
+    width: 100%;
     padding: 30px 20px 10px;
     div {
       color: #7e7d7d;