Merge branch '0709_OA' into test

src/views/categroyManager/insideSetting/staffManager.vue

@@ -262,12 +262,13 @@
                 :label-width="formLabelWidth"
                 class="setWidth"
                 :prop="'postDeptIds.' + index + '.postId'"
-                :rules="[{ required: true, message: '请选择所属岗位', trigger: 'change' }]"
               >
+              <!-- :rules="[{ required: true, message: '请选择所属岗位', trigger: 'change' }]"  衔接老师，不用设置 -->
+              <!-- 所属岗位（必填） -->
               <el-select
                       filterable
                       clearable
-                      placeholder="所属岗位（必填）"
+                      placeholder="所属岗位"
                       style="width: 180px !important"
                       v-model.trim="postDeptIds.postId">
                 <el-option v-for="item in postList"
@@ -281,9 +282,10 @@
                 style="margin: 0 10px;width: 190px !important;"
                 :prop="'postDeptIds.' + index + '.deptIds'"
               >
+              <!-- 管理部门（非必填） -->
                 <el-cascader
                   v-model="postDeptIds.deptIds"
-                  placeholder="管理部门（非必填）"
+                  placeholder="管理部门"
                   clearable
                   :options="deptList"
                   :show-all-levels="false"
@@ -478,9 +480,9 @@ export default {
         gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
         phone: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }],
         roleIds: [{ type: 'array', required: true, message: '请选择分类', trigger: 'change' }],
-        deptId: [{ required: true, message: '请选择社保分部', trigger: 'change' }],
+        // deptId: [{ required: true, message: '请选择社保分部', trigger: 'change' }],
         organIdLists: [{ type: 'array', required: true, message: '请选择所属分部', trigger: 'change' }],
-        deptIds: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
+        // deptIds: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
         // postIds: [{ type: 'array', required: true, message: '请选择所属岗位', trigger: 'change' }],
         jobNature: [{ required: true, message: '请选择工作类型', trigger: 'change' }],
         entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
@@ -531,7 +533,7 @@ export default {
             tempDeptIds.push(ds[ds.length - 1])
           })
 
-          const tempDeptId = deptId[deptId.length - 1]
+          const tempDeptId = deptId ? deptId[deptId.length - 1] : ''
 
           let tempForm = {
             postDeptIds: JSON.stringify(tempPost),