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

src/views/regionSection/applicationManage/applicationManage.vue

@@ -206,14 +206,17 @@
               </template>
             </Select>
           </FormItem>
-          <FormItem label="状态" style="width: 300px">
+          <FormItem label="状态" style="width: 100%">
             <RadioGroup v-model="wallpaperInfo.enabled">
               <Radio :label="1">启用</Radio>
               <Radio :label="2">禁用</Radio>
             </RadioGroup>
           </FormItem>
-          <FormItem label="应用属性">
-            <RadioGroup v-model="wallpaperInfo.appType">
+          <FormItem label="应用属性" style="width: 100%">
+            <RadioGroup
+              @on-change="ChangeAppType"
+              v-model="wallpaperInfo.appType"
+            >
               <Radio :label="1">推荐应用</Radio>
               <Radio :label="2">必装应用</Radio>
             </RadioGroup>
@@ -221,8 +224,12 @@
           <FormItem label="强制安装" style="width: 100%">
             <div class="comm">
               <RadioGroup v-model="wallpaperInfo.forced">
-                <Radio :label="1">是</Radio>
-                <Radio :label="0">否</Radio>
+                <Radio :disabled="wallpaperInfo.appType === 1" :label="1"
+                  >是</Radio
+                >
+                <Radio :disabled="wallpaperInfo.appType === 1" :label="0"
+                  >否</Radio
+                >
               </RadioGroup>
               <span>用户进入安全桌面，该应用将被强制安装。</span>
             </div>
@@ -959,6 +966,11 @@ export default {
     this.searchList();
   },
   methods: {
+    ChangeAppType() {
+      if (this.wallpaperInfo.appType === 1) {
+        this.wallpaperInfo.forced = 0;
+      }
+    },
     //下载logo
     download(url) {
       window.location.href = this.$api.showImageUrl + url;
@@ -1507,7 +1519,7 @@ export default {
             appName: this.wallpaperInfo.appName,
             enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
-            forced: this.wallpaperInfo.forced,
+            forced: this.wallpaperInfo.appType === 1?0:this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
             showico: this.wallpaperInfo.showico,
             strategy: this.wallpaperInfo.strategy,

src/views/regionSection/regionManage/schoolManage.vue

@@ -693,8 +693,11 @@ export default {
           let areaObj = this.regionList.filter(
             (v) => v.areaCode === this.adminInfo.areaCode
           )[0];
+          if (!areaObj) {
+            this.$Message.error("请选择省市区!");
+            return;
+          }
           this.adminInfo.areaName = areaObj.areaAll;
-          this.adminInfo.show = false;
           let api = this.adminInfo.schoolid ? school_edit : school_add;
           let form = {
             rtype: this.powerParams.rtype,
@@ -728,6 +731,7 @@ export default {
           api(form).then((data) => {
             this.showLoading = false;
             if (data.code === 0) {
+              this.adminInfo.show = false;
               this.searchList();
               this.$Message.success(data.msg);
             } else {

src/views/schoolSection/applicationManage/applicationList.vue

@@ -185,14 +185,17 @@
               </template>
             </Select>
           </FormItem>
-          <FormItem label="状态" style="width: 300px">
+          <FormItem label="状态" style="width: 100%">
             <RadioGroup v-model="wallpaperInfo.enabled">
               <Radio :label="1">启用</Radio>
               <Radio :label="2">禁用</Radio>
             </RadioGroup>
           </FormItem>
-          <FormItem label="应用属性">
-            <RadioGroup v-model="wallpaperInfo.appType">
+          <FormItem label="应用属性" style="width: 100%">
+            <RadioGroup
+              @on-change="ChangeAppType"
+              v-model="wallpaperInfo.appType"
+            >
               <Radio :label="1">推荐应用</Radio>
               <Radio :label="2">必装应用</Radio>
             </RadioGroup>
@@ -200,8 +203,12 @@
           <FormItem label="强制安装" style="width: 100%">
             <div class="comm">
               <RadioGroup v-model="wallpaperInfo.forced">
-                <Radio :label="1">是</Radio>
-                <Radio :label="0">否</Radio>
+                <Radio :disabled="wallpaperInfo.appType === 1" :label="1"
+                  >是</Radio
+                >
+                <Radio :disabled="wallpaperInfo.appType === 1" :label="0"
+                  >否</Radio
+                >
               </RadioGroup>
               <span>用户进入安全桌面，该应用将被强制安装。</span>
             </div>
@@ -926,6 +933,11 @@ export default {
     this.searchList();
   },
   methods: {
+    ChangeAppType() {
+      if (this.wallpaperInfo.appType === 1) {
+        this.wallpaperInfo.forced = 0;
+      }
+    },
     //下载logo
     download(url) {
       window.location.href = this.$api.showImageUrl + url;
@@ -1093,7 +1105,7 @@ export default {
                 align: "center"
               },
               {
-                title: "设备名称",
+                title: "设备名",
                 key: "sn",
                 align: "center"
               },
@@ -1400,7 +1412,8 @@ export default {
             appName: this.wallpaperInfo.appName,
             enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
-            forced: this.wallpaperInfo.forced,
+            forced:
+              this.wallpaperInfo.appType === 1 ? 0 : this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
             showico: this.wallpaperInfo.showico,
             strategy: this.wallpaperInfo.strategy,