修改

src/components/school/manager/manager-form.vue

@@ -29,7 +29,7 @@
             ref="Education" :options="EducationList" label="学历" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
             map-options />
           <q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.EmployeeTel"
-            ref="EmployeeTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写员工联系电话']" />
+            ref="EmployeeTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" />
           <q-input filled v-model="objOption.EntryTime" class="col-6 q-pr-lg q-pb-lg" mask="date" label="入职时间">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
@@ -49,9 +49,9 @@
             </template>
           </q-input>
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.Address" ref="Address"
-            class="col-6 q-pr-lg q-pb-lg" label="地址" :rules="[val => !!val || '地址']" />
+            class="col-6 q-pr-lg q-pb-lg" label="地址" />
           <q-input filled stack-label maxlength="60" :dense="false" v-model="objOption.Email" ref="Email"
-            class="col-6 q-pr-lg q-pb-lg" label="邮箱" :rules="[val => !!val || '邮箱']" />
+            class="col-6 q-pr-lg q-pb-lg" label="邮箱" />
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account"
             class="col-6 q-pr-lg q-pb-lg" label="账号" :rules="[val => !!val || '账号']" />
           <q-input v-if="objOption.AccountId==0" filled stack-label maxlength="20" :dense="false"
@@ -320,11 +320,37 @@
         this.persistent = false
       },
       setStudent() {
-        if(this.objOption.Email==''){
+        if(this.objOption.AccountId==0){
+          if(this.objOption.Dept_Id==''){
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请选择部门`
+            })
+            return;
+          }
+          if(this.objOption.Post_Id==0){
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请选择岗位`
+            })
+            return;
+          }
+          if(this.objOption.Password==''){
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请填写密码`
+            })
+            return;
+          }
+        }
+        if(this.objOption.EmployeeName==''){
           this.$q.notify({
             type: 'negative',
             position: "top",
-            message: `请填写邮箱`
+            message: `请填写员工姓名`
           })
           return;
         }

src/components/school/schoolarea/school-form.vue

@@ -10,7 +10,7 @@
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SName" ref="SName"
             class="col-6 q-pr-lg q-pb-lg" label="校区名称" :rules="[val => !!val || '请填写校区名称']" />
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.SAddress" ref="SAddress"
-            class="col-6 q-pb-lg" label="校区地址" :rules="[val => !!val || '请填写校区地址']" />
+            class="col-6 q-pb-lg" label="校区地址" />
           <q-select class="col-6 q-pb-lg q-pr-lg" clearable filled stack-label use-input option-value="Id"
             option-label="EmployeeName" v-model="objOption.ManagerId" ref="ManagerId" :options="EmployeeList"
             label="校区联系人" :dense="false" emit-value map-options @filter="filterFn">
@@ -23,12 +23,12 @@
             </template>
           </q-select>
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SLinkTel" ref="SLinkTel"
-            class="col-6 q-pb-lg" label="校区联系电话" :rules="[val => !!val || '请填写校区联系电话']" />
+            class="col-6 q-pb-lg" label="校区联系电话" />
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.Remark"
             class="col-6 q-pb-lg q-pr-lg" label="校区备注" />
           <selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
             nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="上级部门"
-            @getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
+            @getChild="getChild" classStr="col-6 q-pb-lg"></selectTree>
           <div class="col-6">
             <q-toggle size="md" label="校区状态" color="primary" :false-value="1" :true-value="0"
               v-model="objOption.Status" />
@@ -182,11 +182,11 @@
       },
       //保存校区
       saveSchool() {
-        if(this.objOption.ManagerId==0){
+        if(this.objOption.SName==''){
           this.$q.notify({
             type: 'negative',
             position: "top",
-            message: `请选择校区联系人`
+            message: `请填写校区名称`
           })
           return;
         }

src/components/system/dept-form.vue

@@ -2,7 +2,7 @@
   <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
     <q-card style="width: 800px;max-width:900px;">
       <q-card-section>
-        <div class="text-h6">{{objOption.MenuId==0?'新增部门信息':'修改部门信息'}}</div>
+        <div class="text-h6">{{objOption.DeptId==0?'新增部门信息':'修改部门信息'}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <div class="text-caption q-mb-lg q-px-md text-grey-6">部门信息</div>
@@ -255,13 +255,36 @@
       saveDept() {
         if (this.objOption.IsCompany == 1 && this.objOption.School_Id == 0) {
           this.$q.notify({
-            type: 'warning',
-            position: 'center',
-            timeout: 1500,
+            type: 'negative',
+            position: 'top',
             message: `请选择所属校区`
           })
           return
         }
+        if(this.objOption.DeptName==''){
+          this.$q.notify({
+            type: 'negative',
+            position: 'top',
+            message: `请填写部门名称`
+          })
+          return
+        }
+        if(this.objOption.DeptTier==0){
+          this.$q.notify({
+            type: 'negative',
+            position: 'top',
+            message: `请选择部门层级`
+          })
+          return
+        }
+        if(this.tempPost.length==0){
+          this.$q.notify({
+            type: 'negative',
+            position: 'top',
+            message: `请选择关联岗位`
+          })
+          return
+        }
         this.saveLoading = true;
         var tempStr = "";
         if (this.tempManager && this.tempManager.length > 0) {