Browse Source

user head show

lyn7568 6 years ago
parent
commit
d40628d0cc

+ 4 - 4
src/views/demandCen/preview.vue

96
              <el-input v-else type="textarea" :rows="4" v-model="ruleFormDem.descp" maxlength="1000" placeholder="请描述您的需求背景、具体问题、对专家的要求等等"></el-input>
96
              <el-input v-else type="textarea" :rows="4" v-model="ruleFormDem.descp" maxlength="1000" placeholder="请描述您的需求背景、具体问题、对专家的要求等等"></el-input>
97
            </el-form-item>
97
            </el-form-item>
98
          </el-col>
98
          </el-col>
99
          <el-col :span="24"><div class="form-line"></div></el-col>
99
          <el-col :span="24" v-if="ruleFormDem.state===2"><div class="form-line"></div></el-col>
100
          <el-col :span="24" v-if="ruleFormDem.state===2">
100
          <el-col :span="24" v-if="ruleFormDem.state===2">
101
            <el-form-item label="意见建议">
101
            <el-form-item label="意见建议">
102
              <span v-html="feedback"></span>
102
              <span v-html="feedback"></span>
294
            that.turnOutUserName(obj.creator)
294
            that.turnOutUserName(obj.creator)
295
            that.formLoading = false
295
            that.formLoading = false
296
            that.ruleFormDem = obj
296
            that.ruleFormDem = obj
297
            if (obj.state === 2) {
298
              that.getFeedBack()
299
            }
297
          }
300
          }
298
        })
301
        })
299
      },
302
      },
302
        queryBase.getNormalOne(id, function(sc, value) {
305
        queryBase.getNormalOne(id, function(sc, value) {
303
          if (sc) {
306
          if (sc) {
304
            that.ownerIn = value
307
            that.ownerIn = value
305
            if (that.ruleFormDem.state === 2) {
306
              that.getFeedBack()
307
            }
308
          }
308
          }
309
        })
309
        })
310
      },
310
      },

+ 1 - 3
src/views/layout/components/TopNavbar.vue

36
        this.$store.dispatch('LogOut').then(() => {
36
        this.$store.dispatch('LogOut').then(() => {
37
          location.reload() // 为了重新实例化vue-router对象 避免bug
37
          location.reload() // 为了重新实例化vue-router对象 避免bug
38
        })
38
        })
39
      }).catch(() => {
40
        console.log('已取消退出')
41
      })
39
      }).catch(() => {})
42
    }
40
    }
43
  }
41
  }
44
}
42
}

+ 1 - 1
src/views/userInfo/baseInfo.vue

80
        return this.type ? '黑名单用户信息' : '用户信息'
80
        return this.type ? '黑名单用户信息' : '用户信息'
81
      },
81
      },
82
      headUrl() {
82
      headUrl() {
83
        return this.infoRow.head ? '/data/head' + this.infoRow.head : defaultSet.img.user
83
        return this.infoRow.head || defaultSet.img.user
84
      },
84
      },
85
      createTime() {
85
      createTime() {
86
        return this.infoRow.createTime ? parseTime(this.infoRow.createTime) : ''
86
        return this.infoRow.createTime ? parseTime(this.infoRow.createTime) : ''

+ 1 - 1
src/views/userInfo/usingList.vue

86
          tit: '职位'
86
          tit: '职位'
87
        },
87
        },
88
        {
88
        {
89
          prop: 'dep',
89
          prop: 'comp',
90
          tit: '所在机构'
90
          tit: '所在机构'
91
        },
91
        },
92
        {
92
        {