应用列表操作权限优化

src/views/regionSection/applicationManage/applicationManage.vue

@@ -55,12 +55,7 @@
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
         <template slot-scope="{ row }" slot="enabled">
-          <div
-            v-if="
-              row.createid === userInfo.adminid ||
-              row.regionid === powerParams.objectid
-            "
-          >
+          <div v-if="row.regionid === powerParams.objectid">
             <i-switch
               size="large"
               v-model="row.enabled"
@@ -98,19 +93,13 @@
           <div class="action_list">
             <div @click="toView(row)">查看</div>
             <div
-              v-if="
-                row.createid === userInfo.adminid ||
-                row.regionid === powerParams.objectid
-              "
+              v-if="row.regionid === powerParams.objectid"
               @click="toEdit(row)"
             >
               编辑
             </div>
             <div
-              v-if="
-                row.createid === userInfo.adminid ||
-                row.regionid === powerParams.objectid
-              "
+              v-if="row.regionid === powerParams.objectid"
               class="action_del"
               @click="toDel(row)"
             >

src/views/regionSection/networkManage/whitelist.vue

@@ -31,20 +31,13 @@
           <div class="action_list">
             <div v-if="row.whiteType === 1" @click="toView(row)">查看</div>
             <div
-              v-if="
-                row.whiteType === 1 &&
-                (row.createid === userInfo.adminid ||
-                  row.regionid === powerParams.objectid)
-              "
+              v-if="row.regionid === powerParams.objectid"
               @click="toEdit(row)"
             >
               编辑
             </div>
             <div
-              v-if="
-                row.createid === userInfo.adminid ||
-                row.regionid === powerParams.objectid
-              "
+              v-if="row.regionid === powerParams.objectid"
               class="action_del"
               @click="toDel(row)"
             >

src/views/regionSection/regionManage/adminManage.vue

@@ -173,12 +173,6 @@
             }}
           </div>
         </FormItem>
-        <FormItem label="状态" prop="enabled" style="width: 100%">
-          <RadioGroup v-model="adminInfo.enabled">
-            <Radio :label="1">启用</Radio>
-            <Radio :label="2">禁用</Radio>
-          </RadioGroup>
-        </FormItem>
         <FormItem label="地址" style="width: 100%">
           <Input v-model="adminInfo.address" placeholder="请输入地址"></Input>
         </FormItem>
@@ -412,7 +406,6 @@ export default {
         address: "",
         comm: "",
         atype: 2,
-        enabled: 1,
         schoolid: null,
         regionid: null
       },
@@ -597,7 +590,6 @@ export default {
         oldPhone: "",
         phone: "",
         msgcode: "",
-        enabled: 1,
         address: "",
         comm: "",
         atype: 2,
@@ -692,7 +684,6 @@ export default {
             loginpwd: this.adminInfo.loginpwd,
             phone: this.adminInfo.phone,
             msgcode: this.adminInfo.msgcode,
-            enabled: this.adminInfo.enabled,
             atype: this.adminInfo.atype,
             schoolid: this.adminInfo.schoolid || null,
             regionid: this.adminInfo.regionid,
@@ -767,7 +758,6 @@ export default {
             phone: res.obj.phone,
             oldPhone: res.obj.phone,
             msgcode: "",
-            enabled: res.obj.enabled,
             atype: res.obj.atype,
             regionid: res.obj.regionid,
             rversion: row.rversion,

src/views/regionSection/search/allApps.vue

@@ -492,7 +492,7 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 100,
+          width: 70,
           align: "center"
         }
       ]

src/views/schoolSection/applicationManage/applicationList.vue

@@ -71,12 +71,10 @@
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
         <template slot-scope="{ row }" slot="enabled">
-          <div
-            v-if="
-              row.createid === userInfo.adminid ||
-              row.schoolid === powerParams.objectid
-            "
-          >
+          <div v-if="row.regionSchool === 2">
+            {{ row.enabled === 1 ? "启用" : "禁用" }}
+          </div>
+          <div v-else-if="row.regionSchool === 3">
             <i-switch
               size="large"
               v-model="row.enabled"
@@ -88,9 +86,6 @@
               <span slot="close">禁用</span>
             </i-switch>
           </div>
-          <div v-else>
-            {{ row.enabled === 1 ? "启用" : "禁用" }}
-          </div>
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
@@ -113,20 +108,9 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
+            <div v-if="row.regionSchool === 3" @click="toEdit(row)">编辑</div>
             <div
-              v-if="
-                row.createid === userInfo.adminid ||
-                row.schoolid === powerParams.objectid
-              "
-              @click="toEdit(row)"
-            >
-              编辑
-            </div>
-            <div
-              v-if="
-                row.createid === userInfo.adminid ||
-                row.schoolid === powerParams.objectid
-              "
+              v-if="row.regionSchool === 3"
               class="action_del"
               @click="toDel(row)"
             >
@@ -210,12 +194,6 @@
               </template>
             </Select>
           </FormItem>
-          <FormItem label="状态" style="width: 100%">
-            <RadioGroup v-model="wallpaperInfo.enabled">
-              <Radio :label="1">启用</Radio>
-              <Radio :label="2">禁用</Radio>
-            </RadioGroup>
-          </FormItem>
           <FormItem label="应用属性" style="width: 100%">
             <RadioGroup
               @on-change="ChangeAppType"
@@ -600,7 +578,7 @@
           </div>
           <div class="view_com">
             <div class="view_t">更新内容</div>
-            <div>{{ viewInfo.appRenew || "无"}}</div>
+            <div>{{ viewInfo.appRenew || "无" }}</div>
           </div>
           <div class="view_com">
             <div class="view_t">授权型号</div>
@@ -745,7 +723,6 @@ export default {
         appid: null,
         appName: "",
         appgroupid: 0,
-        enabled: 1,
         appType: 1,
         forced: 0,
         whited: 1,
@@ -1382,7 +1359,6 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        enabled: 1,
         appType: 1,
         forced: 0,
         whited: 1,
@@ -1448,7 +1424,6 @@ export default {
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             appName: this.wallpaperInfo.appName,
-            enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
             forced:
               this.wallpaperInfo.appType === 1 ? 0 : this.wallpaperInfo.forced,
@@ -1507,7 +1482,6 @@ export default {
             rversion: res.obj.rversion,
             appName: res.obj.appName,
             appgroupid: res.obj.appgroupid,
-            enabled: res.obj.enabled,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,