15179599649
2024-01-24 bfddcb406854c5887b522913d3e11e82bfadab6a
'增加一轮二轮不能投选自己'
3 files modified
41 ■■■■■ changed files
src/views/login/index.vue 22 ●●●● patch | view | raw | blame | history
src/views/toAppraising/toAppraisingone.vue 14 ●●●●● patch | view | raw | blame | history
src/views/toAppraising/toAppraisingthree.vue 5 ●●●● patch | view | raw | blame | history
src/views/login/index.vue
@@ -93,20 +93,20 @@
      const isValidcode = this.codecheck(this.Code);
      const isValiduser = this.usernamecheck(this.username);
      if (isValidcode && isValiduser) {
        let Data = {
          tenantId: "000000",
          grant_type: "smsCode",
          phone: this.username,
          code: this.Code
        };
        // let Data = {
        //   tenantId: "000000",
        //   username: this.username,
        //   grant_type: "password",
        //   password: "94e8cde4612b3fd390677d42e7b22002",
        //   scope: "all",
        //   type: "account"
        //   grant_type: "smsCode",
        //   phone: this.username,
        //   code: this.Code
        // };
        let Data = {
          tenantId: "000000",
          username: this.username,
          grant_type: "password",
          password: "94e8cde4612b3fd390677d42e7b22002",
          scope: "all",
          type: "account"
        };
        Loginto(Data).then(res => {
          if (res.data.code == 400) {
            this.$toast.fail(res.data.msg);
src/views/toAppraising/toAppraisingone.vue
@@ -191,12 +191,16 @@
        })
        if(itemin.state==false){
            // 新增投票人选
            if(numnowtype==0){
                this.show=true;
                this.temporaryData.realName=itemin.realName
        }
            if(itemin.realName==localStorage.getItem("nick_name")){
              this.$toast.success("不能投选自己");
            }
            else if(numnowtype>0){
              this.$toast.success("每个奖项只能投选一票");
            }
            else{
                this.$toast.success("每个奖项只能投选一票");
              this.show=true;
              this.temporaryData.realName=itemin.realName
            }
        }else{
            this.cancelshow=true;
src/views/toAppraising/toAppraisingthree.vue
@@ -209,9 +209,12 @@
      remarkto(item){
        // 新增投票人选
        if(item.state==false){
          if(item.deptName==this.deptname&&this.deptname!="职能部门"&&this.infoData.isSelfDept==1){
          if(item.deptName==this.deptname&&this.deptname!="职能部门"&&this.infoData.isSelfDept==0){
            this.$toast.fail("该评优任务不能投选本部门候选人");
          }
          else if(item.userName==localStorage.getItem("nick_name")){
              this.$toast.success("不能投选自己");
          }
          else{
            this.Categorylist.forEach(ins=>{
            if(item.evaluateTaskCategoryId==ins.id){