xgb преди 10 часа
родител
ревизия
e8d9eaab1a
променени са 2 файла, в които са добавени 11 реда и са изтрити 2 реда
  1. 5 1
      src/views/course/coursePlaySourceConfig/index.vue
  2. 6 1
      src/views/his/merchantAppConfig/index.vue

+ 5 - 1
src/views/course/coursePlaySourceConfig/index.vue

@@ -166,6 +166,7 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="配置绑定Id" align="center" prop="merchantConfigId" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="修改时间" align="center" prop="updateTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -196,6 +197,7 @@
             icon="el-icon-edit"
             @click="handleBind(scope.row)"
             v-hasPermi="['course:playSourceConfig:bind']"
+            v-if="!scope.row.merchantConfigId"
           >绑定</el-button>
           <el-button
             size="mini"
@@ -203,6 +205,7 @@
             icon="el-icon-edit"
             @click="handleUnbind(scope.row)"
             v-hasPermi="['course:playSourceConfig:unbind']"
+            v-if="scope.row.merchantConfigId"
           >解绑</el-button>
         </template>
       </el-table-column>
@@ -591,7 +594,8 @@ export default {
       const query = {
         pageNum: 1,
         pageSize: 100,
-        merchantType: value
+        merchantType: value,
+        isDeleted: 0
       }
       listMerchantAppConfig(query).then( response => {
           this.merchantAppConfigList = response.rows;

+ 6 - 1
src/views/his/merchantAppConfig/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--   主键ID   -->
+      <el-form-item label="主键ID" prop="id">
+        <el-input v-model="queryParams.id" placeholder="请输入主键ID" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="商户类型" prop="merchantType">
         <el-select v-model="queryParams.merchantType" placeholder="请选择商户类型" clearable size="small">
           <el-option
@@ -106,7 +110,7 @@
     </el-row>
 
     <el-table border v-loading="loading" :data="merchantAppConfigList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <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="merchantId" />
       <el-table-column label="商户类型" align="center" prop="merchantType">
@@ -367,6 +371,7 @@ export default {
         appIds: null,
         createdTime: null,
         isDeleted: "0",
+        id: null
       },
       appIdOptions:[],
       ybConfig: {}, // 易宝配置