| @@ -74,6 +74,7 @@ const user = { | |||||
| commit('SET_TOKEN', res.token) | commit('SET_TOKEN', res.token) | ||||
| getInfo(res.token).then(response => { | getInfo(res.token).then(response => { | ||||
| const user = response.user | const user = response.user | ||||
| console.info(user.nickName); | |||||
| // const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; | // const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; | ||||
| const avatar = ""; | const avatar = ""; | ||||
| if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组 | if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组 | ||||
| @@ -180,6 +181,7 @@ const user = { | |||||
| logout(state.token).then(() => { | logout(state.token).then(() => { | ||||
| commit('SET_TOKEN', '') | commit('SET_TOKEN', '') | ||||
| commit('SET_businessLevel', '') | commit('SET_businessLevel', '') | ||||
| commit('SET_NICKNAME', '') | |||||
| commit('SET_ROLES', []) | commit('SET_ROLES', []) | ||||
| commit('SET_PERMISSIONS', []) | commit('SET_PERMISSIONS', []) | ||||
| removeToken() | removeToken() | ||||
| @@ -223,9 +223,12 @@ | |||||
| userList().then(response => { | userList().then(response => { | ||||
| this.taskExecutortions = response.data | this.taskExecutortions = response.data | ||||
| }) | }) | ||||
| console.info(this.checked); | |||||
| if(this.checked){ | if(this.checked){ | ||||
| let userId = this.$store.getters.userId; | let userId = this.$store.getters.userId; | ||||
| this.nickName = this.$store.getters.nickName; | |||||
| setTimeout(() => { | |||||
| this.nickName = this.$store.state.user.nickName; | |||||
| },1000) | |||||
| this.$set(this.queryParams, "rwzxr", userId); | this.$set(this.queryParams, "rwzxr", userId); | ||||
| this.getList(); | this.getList(); | ||||
| }else{ | }else{ | ||||
| @@ -580,12 +580,12 @@ export default { | |||||
| this.permission = localStorage.getItem("executePermission"); | this.permission = localStorage.getItem("executePermission"); | ||||
| this.zjdzdxxItem = JSON.parse(localStorage.getItem("zjdzdxxItem")); | this.zjdzdxxItem = JSON.parse(localStorage.getItem("zjdzdxxItem")); | ||||
| if(this.form.id == null){ | if(this.form.id == null){ | ||||
| this.$set(this.form, 'hx', "01"); | |||||
| this.$set(this.form, 'hx', "03"); | |||||
| this.$set(this.form, 'hxjg', "01"); | this.$set(this.form, 'hxjg', "01"); | ||||
| this.$set(this.form, 'fwlx', "01"); | this.$set(this.form, 'fwlx', "01"); | ||||
| this.$set(this.form, 'fwxz', "6"); | |||||
| this.$set(this.form, 'fwjg', "01"); | |||||
| this.$set(this.form, 'sjly', "01"); | |||||
| this.$set(this.form, 'fwxz', "10"); | |||||
| this.$set(this.form, 'fwjg', "02"); | |||||
| this.$set(this.form, 'sjly', "04"); | |||||
| this.$set(this.form, 'sffz', "0"); | this.$set(this.form, 'sffz', "0"); | ||||
| this.$set(this.form, 'sfjf', "0"); | this.$set(this.form, 'sfjf', "0"); | ||||
| this.$set(this.form, 'sfcf', "0"); | this.$set(this.form, 'sfcf', "0"); | ||||
| @@ -595,6 +595,7 @@ export default { | |||||
| this.$set(this.form, 'fwzt', "01"); | this.$set(this.form, 'fwzt', "01"); | ||||
| this.$set(this.form, 'fwyt', "10"); | this.$set(this.form, 'fwyt', "10"); | ||||
| this.$set(this.form, 'sfytrgy', "0"); | this.$set(this.form, 'sfytrgy', "0"); | ||||
| this.$set(this.form, 'sjcs', 1); | |||||
| }else{ | }else{ | ||||
| if(this.form.sffz === "1"){ | if(this.form.sffz === "1"){ | ||||
| this.showFzxx = true; | this.showFzxx = true; | ||||
| @@ -167,6 +167,8 @@ | |||||
| placeholder="请选择数据来源" | placeholder="请选择数据来源" | ||||
| remote-url="/open/zdzh/list/sjly" | remote-url="/open/zdzh/list/sjly" | ||||
| :on-remote-response="'data'" | :on-remote-response="'data'" | ||||
| :rules="[{ required: true }]" | |||||
| required | |||||
| /> | /> | ||||
| <van-field | <van-field | ||||
| input-align="right" | input-align="right" | ||||