Browse Source

修改bug

lyn7568 6 years ago
parent
commit
372c4865c4

+ 2 - 1
src/views/sysSetting/platUser/editUser.vue

@ -41,7 +41,8 @@
41 41
        </el-col>
42 42
        <el-col :span="24" class="el-btn-col">
43 43
          <div class="el-btn-col-box">
44
            <el-button type="primary" @click="submitForm('userForm')">保存</el-button>
44
            <el-button v-if="viewShow" type="primary" @click="userDialogVisible=false">确定</el-button>
45
            <el-button v-else type="primary" @click="submitForm('userForm')">保存</el-button>
45 46
          </div>
46 47
        </el-col>
47 48
        <el-col :span="24" v-if="timeShow">

+ 13 - 6
src/views/sysSetting/platUser/normal.vue

@ -223,12 +223,19 @@
223 223
      },
224 224
      handleBan(id) {
225 225
        var that = this
226
        this.$http.get(banUser, {
227
          id: id
228
        }, function(res) {
229
          if (res.success) {
230
            that.pageQueryUser()
231
          }
226
        this.$confirm('确定停用该账户?', '提示', {
227
          confirmButtonText: '确定',
228
          cancelButtonText: '取消',
229
          type: 'warning',
230
          center: true
231
        }).then(() => {
232
          that.$http.get(banUser, {
233
            id: id
234
          }, function(res) {
235
            if (res.success) {
236
              that.pageQueryUser()
237
            }
238
          })
232 239
        })
233 240
      }
234 241
    }

+ 22 - 12
src/views/userInfo/blackList.vue

@ -137,21 +137,31 @@ export default {
137 137
        that.tableLoading = false
138 138
        if (res.success && res.data) {
139 139
          const obj = res.data.data
140
          for (let i = 0; i < obj.length; ++i) {
141
            if (obj[i].invalidTime) {
142
              obj[i].invalidTime = parseTime(obj[i].invalidTime)
140
          if (obj.length) {
141
            var h = 0
142
            for (let i = 0; i < obj.length; ++i) {
143
              h++
144
              if (obj[i].invalidTime) {
145
                obj[i].invalidTime = parseTime(obj[i].invalidTime)
146
              }
147
              if (obj[i].invalidOperator) {
148
                queryBase.getAdminUser(obj[i].invalidOperator, function(sc, value) {
149
                  if (sc) {
150
                    h--
151
                    obj[i].invalidOperator = value.name
152
                  }
153
                })
154
              }
143 155
            }
144
            if (obj[i].invalidOperator) {
145
              queryBase.getAdminUser(obj[i].invalidOperator, function(sc, value) {
146
                if (sc) {
147
                  obj[i].invalidOperator = value.name
148
                }
149
              })
156
            if (h === 0) {
157
              that.total = res.data.total
158
              that.tableData = obj
159
              comTable.gapFilling(that.tableData)
150 160
            }
161
          } else {
162
            that.total = 0
163
            that.tableData = []
151 164
          }
152
          that.total = res.data.total
153
          that.tableData = obj
154
          comTable.gapFilling(that.tableData)
155 165
        } else {
156 166
          that.total = 0
157 167
          that.tableData = []