Merge branch 'qin_24'

src/api/hr/paiban/index.ts

@@ -63,3 +63,13 @@ import { AxiosPromise } from 'axios';
 		data: data
 	});
 }
+/**
+ * 行政组织树及相关人员
+ */
+export function get_org_everyone_people(data?:any){
+    return request({
+        url:'/systemapi/app/get_org_everyone_people',
+        method:'post',
+        data:data
+    })
+}

src/api/opk/zxy/news/api.ts

@@ -35,6 +35,7 @@ export function get_org(data?:get_org_everyone){
 		data:data
 	})
 }
+
 export function edit_scheme(data?:edit_scheme_target){
 	return request({
 		url:'kpiapi/department_pc/edit_scheme_target_cont',

src/views/hr/company/companyduty.vue

@@ -302,6 +302,7 @@ const isShowOrg = (item: any) => {
       </div>
     </el-card>
     <SavePage
+      v-if="saveOpen"
       v-model:is-open="saveOpen"
       :duty-cont="saveInfo"
       :cumpany-id="initConter.currentOrg"

src/views/hr/company/savePage.vue

@@ -4,7 +4,12 @@
 @ 备注: 编辑排班记录
 -->
 <script lang="ts" setup>
-import { geiOrgAllPeople, saveEditDutyInfo, getDutyCont } from "@/api/hr/paiban/index";
+import {
+  geiOrgAllPeople,
+  saveEditDutyInfo,
+  getDutyCont,
+  get_org_everyone_people,
+} from "@/api/hr/paiban/index";
 import { get_org } from "@/api/opk/zxy/news/api";
 const props = defineProps({
   isOpen: {
@@ -28,6 +33,7 @@ const props = defineProps({
     },
   },
 });
+const ruleFormRef = ref(null);
 const loading = ref(false);
 const emits = defineEmits(["update:isOpen", "pickRefresh"]);
 const isShow = computed({
@@ -47,6 +53,7 @@ const orgPeopleList = ref([]);
 //关闭比阿尼系统
 const closeSavePage = () => {
   emits("update:isOpen", false);
+  ruleFormRef.value.resetFields();
 };
 //监听
 watch(
@@ -79,7 +86,7 @@ const getOrgPeople = () => {
       if (saveInfo.value.isCompany == 1) {
         //   orgPeopleList.value = props.currOrgManList;
         //   loading.value = false;
-        get_org({
+        get_org_everyone_people({
           id: props.cumpanyId.toString(),
           all: 1,
         })
@@ -128,6 +135,9 @@ const orgTreeProps = {
   children: "child",
   label: "name",
 }; //行政组织树对照值
+onMounted(() => {
+  getOrgPeople();
+});
 </script>
 <template>
   <el-dialog