plg 7 сар өмнө
parent
commit
90e5ae5d53

+ 3 - 3
src/assets/js/utils/ajax.js

@@ -65,15 +65,15 @@ axios.interceptors.response.use(data => {
     hideFullScreenLoading()
     let _status = error.response && error.response.status
     if (_status === 504 || _status === 404) {
-        Toast.fail('网络错误 请稍后再试')
+        // Toast.fail('网络错误 请稍后再试')
         return
     }
     if (_status === 500) {
-        Toast.fail('服务器错误 请稍后再试')
+        // Toast.fail('服务器错误 请稍后再试')
         return
     }
     if(error.code == 'ECONNABORTED' && error.message.indexOf('timeout')!=-1){
-        Toast.fail('请求超时 请重试')
+        // Toast.fail('请求超时 请重试')
         return
     }
     return Promise.reject(error)

+ 3 - 3
src/views/manage/channelInfo/invite.vue

@@ -103,7 +103,7 @@
                 </div>
                 <div
                   class="detail_button"
-                  v-show="scope.row.status == '1'"
+                  v-show="scope.row.status != '1'"
                   @click="resetPlan(false, scope.row)"
                 >
                   <img src="../../../assets/img/table/xiafa.png" />
@@ -417,8 +417,8 @@ export default {
     },
     //每页多少条
     handleSizeChange(val) {
-      this.pageSize=val
-      this.searchTarget()
+      this.pageSize = val;
+      this.searchTarget();
       // console.log(`每页 ${val} 条`);
       //将首页重置为1时---且总条数变化
       //设置为当前总条数

+ 7 - 41
src/views/manage/userManage.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="record-warp">
     <div class="record-main">
-      <el-row>
+      <el-row >
         <el-col :span="24">
-          <div class="search-head">
+          <div class="search-head" style="padding-bottom:10px">
             <el-input v-model="name" clearable placeholder="请输入姓名"></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -20,14 +20,6 @@
               :props="{ checkStrictly: true }"
               clearable
             ></el-cascader>
-            <!-- <el-select v-model="channel" placeholder="请选择所属组织架构">
-              <el-option
-                :label="item.name"
-                :value="item.id"
-                v-for="item in channelList"
-                :key="item.id"
-              ></el-option> 
-            </el-select> -->
             &nbsp;&nbsp;&nbsp;&nbsp;
             <!-- <span style="font-size: 16px;">性别:</span>&nbsp;&nbsp; -->
             <div style="display: flex; flex-direction: row; align-items: center">
@@ -55,13 +47,13 @@
           </div>
         </el-col>
       </el-row>
-      <el-row class="add_user_class">
+      <!-- <el-row class="add_user_class">
         <el-col :span="24">
           <div class="search-head"></div>
         </el-col>
-      </el-row>
+      </el-row> -->
 
-      <div class="table-content">
+      <div class="table-content" style="flex: 1;overflow:auto">
         <el-table
           :data="tableData"
           :row-style="{ height: '0px' }"
@@ -113,34 +105,6 @@
                   <span> 删除 </span>
                 </div>
               </div>
-              <!-- <el-popconfirm
-                v-if="scope.row.state != 0"
-                title="确定删除吗?"
-                placement="top"
-                @confirm="deleteUser(scope.$index, scope.row)"
-              >
-                <el-button
-                  size="small"
-                  style="margin-left: 10px"
-                  type="text"
-                  slot="reference"
-                  >删除</el-button
-                >
-              </el-popconfirm>
-              <el-popconfirm
-                v-if="scope.row.state != 0"
-                title="密码将重置为123456"
-                placement="top"
-                @confirm="resetUser(scope.$index, scope.row)"
-              >
-                <el-button
-                  size="small"
-                  style="margin-left: 10px"
-                  type="text"
-                  slot="reference"
-                  >重置密码</el-button
-                >
-              </el-popconfirm> -->
             </template>
           </el-table-column>
         </el-table>
@@ -619,6 +583,8 @@ export default {
     height: 100%;
     box-sizing: border-box;
     overflow-y: auto;
+    display: flex;
+    flex-direction: column;
 
     .search-head {
       width: 100%;