11

src/components/UserMan/distributors.vue

@@ -102,7 +102,7 @@
         </el-table-column>
         <el-table-column v-if="hpEnabled==1" prop="name" label="和平分销商等级">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.HPGradeName && scope.row.HPGradeName!=''" type="info">{{scope.row.HPGradeName}}</el-tag>
+            <el-tag v-if="scope.row.HPGradeName && scope.row.HPGradeName!=''">{{scope.row.HPGradeName}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="name" label="状态">
@@ -191,24 +191,7 @@
     </el-dialog>
     <!-- 审批同意或拒绝单个修改等级 -->
     <el-dialog title="提示" :visible.sync="reasonDig" width="500px">
-      <template v-if="hpEnabled==1">
-          <p v-if="hpUserInfo.Status==1">{{hpUserInfo.UserName}}({{hpUserInfo.HPGradeName}})</p>
-          <p class="cred" v-if="hpUserInfo.Status==2">需上级用户先分配分销等级</p>
-          <p class="cred" v-if="hpUserInfo.Status==3">需上级用户先成为分销商</p>
-          <el-form style="margin-top:10px" v-if="hpUserInfo.Status==1 || SuperiorNum==1" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
-              <el-form-item label-width="100px" label="分销商等级">
-                <el-select class="w200" v-model="addMsg.NewGradeId" size="small" placeholder="请选择">
-                  <el-option v-for="item in hpGradeList" :key="item.Id" :label="item.GradeName" :value="item.Id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-          </el-form> 
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" @click="reasonDig = false">取 消</el-button>
-            <el-button v-if="hpUserInfo.Status==1 || SuperiorNum==1" size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
-          </span>
-      </template>
-      <template v-if="hpEnabled==2">
+      
         <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
           <template v-if="addMsg.Type==1 || addMsg.Type==2">
             <p style="margin-bottom:10px">请输入原因</p>
@@ -229,7 +212,6 @@
           <el-button size="small" @click="reasonDig = false">取 消</el-button>
           <el-button size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
         </span>
-      </template>
     </el-dialog>
     <!-- 批量修改 -->
     <el-dialog custom-class="plxg" title="批量修改" :visible.sync="plDig" width="960px">
@@ -305,6 +287,24 @@
         <el-button size="small" type="primary" @click="referDig=false">确定</el-button>
       </div>
     </el-dialog>
+    <!-- 审批同意或拒绝单个修改等级 -->
+    <el-dialog title="提示" :visible.sync="reasonDig2" width="500px">
+          <p v-if="hpUserInfo.Status==1">{{hpUserInfo.UserName}}({{hpUserInfo.HPGradeName}})</p>
+          <p class="cred" v-if="hpUserInfo.Status==2">需上级用户先分配分销等级</p>
+          <p class="cred" v-if="hpUserInfo.Status==3">需上级用户先成为分销商</p>
+          <el-form style="margin-top:10px" v-if="hpUserInfo.Status==1 || SuperiorNum==1" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
+              <el-form-item label-width="100px" label="分销商等级">
+                <el-select class="w200" v-model="addMsg.NewGradeId" size="small" placeholder="请选择">
+                  <el-option v-for="item in hpGradeList" :key="item.Id" :label="item.GradeName" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+          </el-form> 
+          <span slot="footer" class="dialog-footer">
+            <el-button size="small" @click="reasonDig2 = false">取 消</el-button>
+            <el-button v-if="hpUserInfo.Status==1 || SuperiorNum==1" size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
+          </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -374,6 +374,7 @@
         imgurl: '',
         AuditStatusList: [],
         reasonDig: false,
+        reasonDig2: false,
         DropdownList: [],
         checktableList: [],
         checllen: 0,
@@ -422,7 +423,7 @@
         this.addMsg.Type = num;
         this.addMsg.UserIds = row.UserId;
         this.addMsg.NewGradeId = row.HPGradeId;
-        this.reasonDig = true;
+        this.reasonDig2 = true;
         this.hpUserInfo={};
         this.SuperiorNum=0;
         if(row.SuperiorId==0){
@@ -432,7 +433,7 @@
         }
       },
       getGrade(row){
-        this.apipost("/api/user/GetHpDistributorGradeList",{GradeName:''}, res => {
+        this.apipost("/api/user/GetHpDistributorGradeList",{GradeName:'',IsGuest:2}, res => {
             if(res.data.resultCode==1){
                 this.hpGradeList=res.data.data;
             }
@@ -569,6 +570,7 @@
         this.remarkDig = true;
       },
       openReason(num, row) {
+        this.SuperiorNum=0;
         this.addMsg.Type = num;
         this.addMsg.UserIds = row.UserId;
         this.addMsg.NewGradeId = row.GradeId;
@@ -602,6 +604,7 @@
                   this.getList();
                   this.Success(res.data.message)
                   this.reasonDig = false;
+                  this.reasonDig2 = false;
                   this.remarkDig = false;
                   this.plDig = false;