diff --git a/miniprogram/app.js b/miniprogram/app.js index 163c743..c5cc9fd 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -24,6 +24,7 @@ indexCount:1, nickName:"", userName:"", + currentUserName: '', // 当前登录人 role:"", // 角色,是管理用户还是普通用户 isConfigProject: '', // 管理用户是否配置了选择项目,,1 是【选择项目】,'0'否,【不选择项目】, devcode:"", diff --git a/miniprogram/app.js b/miniprogram/app.js index 163c743..c5cc9fd 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -24,6 +24,7 @@ indexCount:1, nickName:"", userName:"", + currentUserName: '', // 当前登录人 role:"", // 角色,是管理用户还是普通用户 isConfigProject: '', // 管理用户是否配置了选择项目,,1 是【选择项目】,'0'否,【不选择项目】, devcode:"", diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 339d469..411785a 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -263,6 +263,10 @@ }; personArr.push(person); } +  personArr.push({ +             text: app.globalData.currentUserName, +             value: app.globalData.currentUserName +          }); that.setData({ personoption1: personArr }) @@ -342,6 +346,10 @@ that.setData({ [description]: installTypeMap[that.data.form.installType] }) + +  that.setData({ +        'form.installperson': app.globalData.currentUserName, // 安装人员 +    }) }, diff --git a/miniprogram/app.js b/miniprogram/app.js index 163c743..c5cc9fd 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -24,6 +24,7 @@ indexCount:1, nickName:"", userName:"", + currentUserName: '', // 当前登录人 role:"", // 角色,是管理用户还是普通用户 isConfigProject: '', // 管理用户是否配置了选择项目,,1 是【选择项目】,'0'否,【不选择项目】, devcode:"", diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 339d469..411785a 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -263,6 +263,10 @@ }; personArr.push(person); } +  personArr.push({ +             text: app.globalData.currentUserName, +             value: app.globalData.currentUserName +          }); that.setData({ personoption1: personArr }) @@ -342,6 +346,10 @@ that.setData({ [description]: installTypeMap[that.data.form.installType] }) + +  that.setData({ +        'form.installperson': app.globalData.currentUserName, // 安装人员 +    }) }, diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 1df57b3..2551c72 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -290,6 +290,8 @@ app.globalData.isConfigProject = res.data.data.configProject === '0' ? '0' : '1' // 在【批产】里面是否配置了选择小程序 app.globalData.userName = res.data.data.phone app.globalData.projectList = res.data.data.projects +  app.globalData.currentUserName = res.data.data.name +                    console.log('=====app.globalData.currentUserName====', app.globalData.currentUserName); if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员',