Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-dev

src/views/financial/onlinePayDetails/index.vue

@@ -132,6 +132,22 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'体系名称'">
+              <el-select
+                v-model="select.vertexId"
+                clearable
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="item in vertexValueList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="'下单日期'">
               <el-date-picker
@@ -201,6 +217,11 @@
             prop="memberName"
             :label="'会员姓名'"
           />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'体系名称'"
+          />
           <el-table-column
             align="center"
             prop="businessTypeVal"
@@ -338,6 +359,7 @@ export default {
   },
   data() {
     return {
+      vertexValueList: [],
       creationTime: [],
       select: {
         orderType: ''
@@ -418,6 +440,9 @@ export default {
       api.businessType().then((res) => {
         this.tradeTypeList = res.data
       })
+      api.getvertexValue().then(res => {
+        this.vertexValueList = res.data
+      })
     },
     changeTime(val) {
       // this.select.startDate = val[0]