Merge branch 'techPool_447'

src/views/financialStatistics/commodityPayment.vue

@@ -518,7 +518,21 @@ const moment = inject('$moment')
       <!-- 设置套餐信息弹窗 -->
       <el-dialog title="套餐信息" v-model="setServiceInfoDia.diaShow" width="774"
       :close-on-click-modal="false">
-        <div class="serviceInf-table" :style="{'height':Math.ceil(setServiceInfoDia.dataForm.list.length/2)*50+'px'}">
+        <el-table :data="setServiceInfoDia.dataForm.list" border max-height="500px">
+          <el-table-column label="套餐类型" align="center" prop="service_product_id">
+            <template #default="{row}">
+              {{ row.service_product_id == 1?'FICC套餐':row.service_product_id == 2?'权益套餐':'--' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="套餐" align="center" prop="service_template_name">
+          </el-table-column>
+          <el-table-column label="价格" align="center" prop="amount">
+            <template #default="{row}">
+              <el-input v-model="row.amount" placeholder="请输入价格" @input="serviceAmountChange(row)"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- <div class="serviceInf-table" :style="{'height':Math.ceil(setServiceInfoDia.dataForm.list.length/2)*50+'px'}">
           <div class="serviceInf-table-item" v-for="item in setServiceInfoDia.dataForm.list" :key="item.serviceId">
             <div class="serviceInfo-label">{{ item.service_template_name }}</div>
             <div class=" serviceInfo-label serviceInfo-input" id="serviceInfo-input">
@@ -530,7 +544,7 @@ const moment = inject('$moment')
             <div class=" serviceInfo-label serviceInfo-input" id="serviceInfo-input">
             </div>
           </div>
-        </div>
+        </div> -->
         <template #footer>
           <div style="padding: 10px 0;">
             <el-button @click="setServiceInfoDia.diaShow = false">取消</el-button>
@@ -703,34 +717,34 @@ const moment = inject('$moment')
         }
       }
     }
-    .serviceInf-table{
-      margin: 0 auto;
-      width: 644px;
-      // height: 200px;
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
-      border-top: solid 1px $auxiliaryColor ;
-      border-left: solid 1px $auxiliaryColor ;
-      .serviceInf-table-item{
-        display: flex;
-        align-items: center;
-        .serviceInfo-label{
-          width: 140px;
-          height: 50px;
-          border-right: solid 1px $auxiliaryColor ;
-          border-bottom: solid 1px $auxiliaryColor ;
-          box-sizing: border-box;
-          padding: 10px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-        .serviceInfo-input{
-          width: 182px;
-        }
-      }
-    }
+    // .serviceInf-table{
+    //   margin: 0 auto;
+    //   width: 644px;
+    //   // height: 200px;
+    //   display: flex;
+    //   flex-direction: column;
+    //   flex-wrap: wrap;
+    //   border-top: solid 1px $auxiliaryColor ;
+    //   border-left: solid 1px $auxiliaryColor ;
+    //   .serviceInf-table-item{
+    //     display: flex;
+    //     align-items: center;
+    //     .serviceInfo-label{
+    //       width: 140px;
+    //       height: 50px;
+    //       border-right: solid 1px $auxiliaryColor ;
+    //       border-bottom: solid 1px $auxiliaryColor ;
+    //       box-sizing: border-box;
+    //       padding: 10px;
+    //       display: flex;
+    //       align-items: center;
+    //       justify-content: center;
+    //     }
+    //     .serviceInfo-input{
+    //       width: 182px;
+    //     }
+    //   }
+    // }
   }
 </style>
 <style lang="scss">