Merge remote-tracking branch 'origin/gzb' into wzl

src/views/regionSection/regionManage/adminManage.vue

@@ -48,22 +48,33 @@
           }}
         </template>
         <template slot-scope="{ row }" slot="enabledSlot">
-          <i-switch
-            size="large"
-            v-model="row.enabled"
-            :true-value="1"
-            :false-value="2"
-            @on-change="enabledChange(row)"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
+          <div v-if="row.adminid === userInfo.adminid">
+            {{ row.enabled === 1 ? "启用" : "禁用" }}
+          </div>
+          <div v-else>
+            <i-switch
+              size="large"
+              v-model="row.enabled"
+              :true-value="1"
+              :false-value="2"
+              @on-change="enabledChange(row)"
+            >
+              <span slot="open">启用</span>
+              <span slot="close">禁用</span>
+            </i-switch>
+          </div>
         </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
             <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
+            <div
+              v-if="row.adminid != userInfo.adminid"
+              class="action_del"
+              @click="toDel(row)"
+            >
+              删除
+            </div>
           </div>
         </template>
       </Table>
@@ -571,7 +582,7 @@ export default {
     },
     // 新建
     toAdd() {
-      if(this.adminInfo.timer){
+      if (this.adminInfo.timer) {
         clearInterval(this.adminInfo.timer);
       }
       this.adminInfo = {
@@ -741,7 +752,7 @@ export default {
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          if(this.adminInfo.timer){
+          if (this.adminInfo.timer) {
             clearInterval(this.adminInfo.timer);
           }
           this.adminInfo = {

src/views/schoolSection/strategy/personalStrategy.vue

@@ -1001,7 +1001,7 @@ export default {
       this.showLoading = true;
       stPad_list_user({
         schoolid: this.curClass.schoolid || this.curClass.id,
-        classid: this.curClass.id,
+        classid: this.curClass.type === 2 ? this.curClass.id : "",
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name