学校编辑修改

src/modules/admin/components/ModifySchool.vue

@@ -34,12 +34,14 @@
           clearable
         ></el-input>
       </el-form-item> -->
-      <el-form-item label="学校logo：">
+      <el-form-item prop="logo" label="学校logo：">
         <UploadFetchFile
           ref="UploadFetchFile"
           input-width="340px"
           :disabled="isSubmit"
+          :format="['png', 'jpg']"
           @file-change="logoChange"
+          @valid-change="validChange"
         />
         <div class="mt-1">
           <p class="tips-info">logo会展示在登录页及内页；</p>
@@ -98,6 +100,7 @@ export default {
       isSubmit: false,
       modalForm: { ...initModalForm },
       imgSrc: "",
+      logoValidInfo: {},
       rules: {
         name: [
           {
@@ -112,6 +115,17 @@ export default {
             message: "请输入学校代码",
             trigger: "change"
           }
+        ],
+        logo: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.logoValidInfo.success && this.logoValidInfo.message) {
+                return callback(new Error(this.logoValidInfo.message));
+              }
+
+              callback();
+            }
+          }
         ]
       }
     };
@@ -147,6 +161,10 @@ export default {
       this.modalForm.logo = file;
       this.modalForm.logoMd5 = md5;
     },
+    validChange(res) {
+      this.logoValidInfo = res;
+      this.$refs.modalFormComp.validateField("logo", () => {});
+    },
     async submit() {
       const valid = await this.$refs.modalFormComp.validate();
       if (!valid) return;

src/modules/base/components/PrivilegeSet.vue

@@ -26,7 +26,11 @@
                 row.isPage && col && col.type === 'page-data-permission'
               "
             >
-              <el-select v-model="row.dataPermissionType" placeholder="请选择">
+              <el-select
+                v-model="row.dataPermissionType"
+                class="width-200"
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="(val, key) in DATA_PRIVILEGE_TYPE"
                   :key="key"