zc

src/views/comprehensive/personnel/teacher/index.vue

@@ -304,15 +304,19 @@
         <el-form-item label="上级部门" prop="parentId" label-width="90px" v-if="treeForm.parentId != 0">
           <treeselect v-model="treeForm.parentId" :options="deptOptions" :show-count="true" @select="deptSelect" placeholder="请选择上级部门" />
         </el-form-item>
-        <div style="display:flex;">
-          <el-form-item label="部门编号" prop="" label-width="90px" v-if="treeForm.parentId != 0">
-            <el-input v-model="treeForm.deptNum" maxlength="10" disabled
-                      onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" placeholder="请输入部门编号"/>
-          </el-form-item>
-          <el-form-item label="部门名称" prop="deptName" label-width="90px">
-            <el-input v-model="treeForm.deptName" maxlength="10" placeholder="请输入部门名称"/>
-          </el-form-item>
-        </div>
+        <el-form-item label="部门编号" prop="" label-width="90px" v-if="treeForm.parentId != 0">
+          <el-input v-model="treeForm.deptNum" maxlength="10" disabled
+                    onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" placeholder="请输入部门编号"/>
+        </el-form-item>
+        <el-form-item label="部门名称" prop="deptName" label-width="90px">
+          <el-input v-model="treeForm.deptName" maxlength="10" placeholder="请输入部门名称"/>
+        </el-form-item>
+        <el-form-item label="部门类型" prop="deptType" label-width="90px">
+          <el-radio-group v-model="treeForm.deptType" style="margin:4px 0 0 10px;">
+            <el-radio :label="1">学院</el-radio>
+            <el-radio :label="0">非学院</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="teacher-tree-dialog-button-box">
         <p class="reset-button-one" @click="treeOpenOff">取消</p>
@@ -322,28 +326,40 @@
     <!--新增--组织架构-->
     <el-dialog title="新增部门" :visible.sync="treeAddOpen" width="600px" append-to-body class="teacher-tree-dialog-box">
       <el-form :model="treeAddForm" class="teacher-tree-dialog-form-box" ref="treeAddForm" :rules="rules" v-show="showSearch">
-        <el-form-item label="上级部门" prop="id" label-width="90px">
-          <treeselect v-model="treeAddForm.id" :options="deptOptions" :show-count="true" @select="deptAddSelect" placeholder="请选择上级部门" />
+        <el-form-item label="上级部门" prop="id" label-width="110px">
+          <treeselect style="width:402px;" v-model="treeAddForm.id" :options="deptOptions" :show-count="true" @select="deptAddSelect" placeholder="请选择上级部门" />
         </el-form-item>
-        <div style="display:flex;" v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index">
-          <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index + '.deptNum'" :rules="rules.deptNum" label-width="90px">
-            <el-input v-model="item.deptNum" maxlength="10" placeholder="请输入部门编号"/>
-          </el-form-item>
-          <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index + '.deptName'" :rules="rules.deptName" label-width="90px">
-            <el-input v-model="item.deptName" maxlength="10" placeholder="请输入部门名称"/>
-          </el-form-item>
-          <div style="display: flex;width:100px;" v-if="index != treeAddForm.teaCherDpetList.length-1">
-            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
-          </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index != 0">
-            <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
-            <p class="el-icon-delete" style="margin:10px 0;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
-          </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index == 4">
-            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
-          </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index == 0">
-            <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
+        <div class="scrollbar-box" style="max-height:500px">
+          <div style="display:flex;border:1px solid #d8d8d8;border-radius:6px;margin:0 20px 20px;padding-top:20px;position: relative" v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index">
+            <div style="width:490px;">
+              <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index + '.deptNum'" :rules="rules.deptNum" label-width="90px">
+                <el-input v-model="item.deptNum" maxlength="10" placeholder="请输入部门编号"/>
+              </el-form-item>
+              <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index + '.deptName'" :rules="rules.deptName" label-width="90px">
+                <el-input v-model="item.deptName" maxlength="10" placeholder="请输入部门名称"/>
+              </el-form-item>
+              <el-form-item label="部门类型" :prop="'teaCherDpetList.' + index + '.deptType'" :rules="rules.deptType" label-width="90px">
+                <el-radio-group v-model="item.deptType" style="margin:4px 0 0 10px;">
+                  <el-radio :label="1">学院</el-radio>
+                  <el-radio :label="0">非学院</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div style="position: absolute;right:30px;bottom:22px;">
+              <div style="display: flex;width:100px;" v-if="index != treeAddForm.teaCherDpetList.length-1">
+                <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+              </div>
+              <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index != 0">
+                <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
+                <p class="el-icon-delete" style="margin:10px 0;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+              </div>
+              <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index == 4">
+                <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+              </div>
+              <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index == 0">
+                <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
+              </div>
+            </div>
           </div>
         </div>
       </el-form>
@@ -494,6 +510,10 @@
             { required: true, message: "请输入部门名称", trigger: "blur" },
             { required: true, message: "请输入部门名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
+          deptType: [
+            { required: true, message: "请选择部门类型", trigger: "blur" },
+            { required: true, message: "请选择部门类型", validator: this.spaceJudgment, trigger: "blur" }
+          ],
         },
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
         selectedNum:0,
@@ -721,6 +741,7 @@
           deptNum : data.deptNum,
           parentId : data.parentId,
           deptName : data.label,
+          deptType : data.deptType,
           ancestors : data.ancestors,
         }
         this.$set(this,'treeForm',obj);