冲突

src/views/system/changeBalance/index.vue

@@ -103,6 +103,11 @@
 <!--      <el-table-column label="所属人id" align="center" prop="ownerId" />-->
       <el-table-column label="手机号" align="center" prop="ownerPhone" />
       <el-table-column label="变动原因" align="center" prop="reason" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination

src/views/system/partner/index.vue

@@ -194,7 +194,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
-              <!-- <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -202,15 +202,6 @@
                   :value="item.roleId"
                   :disabled="item.status == 1"
                 ></el-option>
-              </el-select> -->
-              <el-select v-model="form.roleIds"  placeholder="请选择角色">
-                <el-option
-                  v-for="item in options" 
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                 
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/views/system/role/authUser.vue

@@ -62,8 +62,8 @@
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
-      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+<!--      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />-->
+<!--      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />-->
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -196,4 +196,4 @@ export default {
     }
   }
 };
-</script>
+</script>