Merge branch 'master' into zhaoj

src/pages/administrativeService/leaveManagement/add.vue

@@ -15,9 +15,9 @@ import { showNotify } from 'vant';
 const router = useRouter();
 
 
-const onclickBack = () => {
-  router.push("/administrativeService/leaveManagement");
-}
+// const onclickBack = () => {
+//   router.push("/administrativeService/leaveManagement");
+// }
 
 const holidayType = ref();
 const holidayType_value = ref();
@@ -188,7 +188,7 @@ const onSubmit = () => {
 
 <template>
 <div class="addApplyHoliday">
-  <van-nav-bar title="请假管理" left-text="返回" left-arrow @click-left="onclickBack" />
+  <!-- <van-nav-bar title="请假管理" left-text="返回" left-arrow @click-left="onclickBack" /> -->
 
   <van-form @failed="onFailed"  ref="ApplyHolidyFormRef"  @submit="onSubmit()" >
     <van-cell-group inset>

src/pages/administrativeService/leaveManagement/index.vue

@@ -12,7 +12,7 @@ isBureau.value = uo_type === '1'
 /***************************请假管理*******************************************/
 
 //外出管理-返回
-const onclickBack = () => history.back();
+// const onclickBack = () => history.back();
 
 const tabActive = ref(0);
 
@@ -32,11 +32,6 @@ const applyReason = ref();
 
 //select请求
 const dropItemChange = (fromA) => {
-  if (fromA == "qjlx") {
-  console.log(fromA);
-  } else {
-    console.log('44');
-  }
   onLoad();
 }
 //头部确定按钮
@@ -47,6 +42,7 @@ const onConfirm = (markLabel) => {
 const onClickTab = () => {
   applyType.value = "";
   applyReason.value = "";
+  applyPerson.value = "";
   onLoad();
  }
 
@@ -58,8 +54,10 @@ const onLoad = () => {
   let transObjs = {
     page: 1,
     limit:20,
-    xxq_qjlx: applyType.value,
-    xxq_qjsy: applyReason.value
+    xxq_qjlx: applyType.value,//请假类型
+    xxq_qjsy: applyReason.value,//请假事由
+    // xxq_qjr: applyPerson.value,//请假人
+    xxq_qjr_user_id:applyPerson.value//请假人编号
   }
   queryApi(transObjs)
     .then(res => {
@@ -109,6 +107,8 @@ const getUserList=()=> {
           value:item.user_id,
         })
       })
+      let popTitle = { text: '申请人', value: '' };
+      tempArr.unshift(popTitle);
       userLIST.value = tempArr;
     }
   });
@@ -158,13 +158,13 @@ const onRefresh = () => {
     <div style="width: 100%;text-align: center;"><span style="font-size: 20px;">本功能仅对校端用户开放</span></div>
   </div>
   <div class="index" v-show="!isBureau">
-    <van-nav-bar title="请假管理" left-text="返回" left-arrow @click-left="onclickBack"/>
+    <!-- <van-nav-bar title="请假管理" left-text="返回" left-arrow @click-left="onclickBack"/> -->
 
     <van-tabs v-model:active="tabActive" @click-tab="onClickTab">
       <van-tab title="请假管理">
 
         <van-dropdown-menu>
-          <van-dropdown-item v-model="applyType" title="请假类型" :options="applyTypeOption"  @change="dropItemChange('qjlx')" />
+          <van-dropdown-item v-model="applyType" title="请假类型" :options="applyTypeOption"  @change="dropItemChange()" />
           <van-dropdown-item  title="请假事由">
             <van-cell-group inset>
               <van-field v-model="applyReason" placeholder="请输入请假事由" />
@@ -202,8 +202,8 @@ const onRefresh = () => {
       </van-tab>
       <van-tab title="请假审批">
         <van-dropdown-menu>
-          <van-dropdown-item v-model="applyType" title="请假类型" :options="applyTypeOption"  @change="dropItemChange('qjsp')" />
-          <van-dropdown-item v-model="applyPerson" title="申请人" :options="userLIST" @change="dropItemChange('qjsp')" />
+          <van-dropdown-item v-model="applyType" title="请假类型" :options="applyTypeOption"  @change="dropItemChange()" />
+          <van-dropdown-item v-model="applyPerson" title="申请人" :options="userLIST" @change="dropItemChange()" />
           <van-dropdown-item  title="请假事由">
             <van-cell-group inset>
               <van-field v-model="applyReason" placeholder="请输入请假事由" />

src/pages/administrativeService/outManagement/add.vue

@@ -16,9 +16,9 @@ import {
 } from './apiItem';
 const router = useRouter();
 import { showNotify } from 'vant';
-const onclickBack = () => {
-  router.push("/administrativeService/outManagement");
-}
+// const onclickBack = () => {
+//   router.push("/administrativeService/outManagement");
+// }
 
 
 const applyTime = ref('');
@@ -162,7 +162,7 @@ return
 
 <template>
   <div class="outAdd">
-    <van-nav-bar title="外出管理" left-text="返回" left-arrow @click-left="onclickBack" />
+    <!-- <van-nav-bar title="外出管理" left-text="返回" left-arrow @click-left="onclickBack" /> -->
     <!-- @failed=""onFailed -->
     <van-form   @submit="onSubmit()" >
     <van-cell-group inset>

src/pages/administrativeService/outManagement/index.vue

@@ -10,7 +10,7 @@ const isBureau = ref(false); // 当前用户是否局端
 isBureau.value = uo_type === "1";
 
 //外出管理-返回
-const onClickLeft = () => history.back();
+// const onClickLeft = () => history.back();
 const tabActive = ref(0);
 
 const applyPerson = ref();
@@ -130,7 +130,7 @@ const checkSubmitForm = () => {
       </div>
     </div>
     <div class="index" v-show="!isBureau">
-      <van-nav-bar title="外出管理" left-text="返回" left-arrow @click-left="onClickLeft"/>
+      <!-- <van-nav-bar title="外出管理" left-text="返回" left-arrow @click-left="onClickLeft"/> -->
       <van-tabs v-model:active="tabActive" @click-tab="onClickTab">
         <van-tab title="外出申请">