Merge branch 'master' into zhaoj

.vscode/settings.json

@@ -7,5 +7,6 @@
   "files.associations": {
     "*.css": "postcss"
   },
-  "editor.formatOnSave": false
+  "editor.formatOnSave": false,
+  "vue.codeActions.enabled": false
 }

src/pages/administrativeService/leaveManagement/add.vue

@@ -4,6 +4,7 @@ import {userInfo} from '~/store/user';
 
 const {
   uo_type,
+  user_realname,
   user_id,
   uo_id
 } = userInfo
@@ -52,6 +53,7 @@ const onConfirm_applyTime = ({
 /******请假人********/
 const userLIST = ref([]);
 const columns = ref([]);
+const onlyOneArr = ref([]);
 //获取用户列表
 const getUserList=()=> {
   let transObjs = {
@@ -70,6 +72,7 @@ const getUserList=()=> {
       })
       userLIST.value = tempArr;
       columns.value = userLIST.value;
+      onlyOneArr.value = [{ text: user_realname, value: user_id}];
     }
   });
 }
@@ -166,8 +169,6 @@ const onSubmit = () => {
     xxq_spr: checker.value,//审批人
     xxq_spr_user_id: checker_id.value,//审批人id
   }
-  console.log('transParams',transParams);
-
   if ( checker_id.value == applyPerson_id.value) {
     showNotify({ type: 'success', message: "审批人和请假人不能为同一人" });
     return
@@ -204,8 +205,8 @@ const onSubmit = () => {
       </van-popup>
 
       <van-field v-model="applyPerson" is-link readonly name="picker" label="请假人" placeholder="点击选择请假人" @click="showPicker_applyPerson = true" />
-      <van-popup v-model:show="showPicker_applyPerson" position="bottom">
-        <van-picker :columns="columns" @confirm="onConfirm_applyPerson" @cancel="showPicker_applyPerson = false" />
+      <van-popup v-model:show="showPicker_applyPerson" position="bottom" >
+        <van-picker :columns="onlyOneArr" @confirm="onConfirm_applyPerson" @cancel="showPicker_applyPerson = false" />
       </van-popup>
 
       <van-field v-model="startTimeForm" is-link readonly name="datePicker" label="开始时间" placeholder="点击选择开始时间" @click="showPicker_startTimeForm = true" />
@@ -218,7 +219,7 @@ const onSubmit = () => {
         <van-date-picker @confirm="onConfirm_endTimeForm" @cancel="showPicker_endTimeForm = false" />
       </van-popup>
 
-      <van-field v-model="duration" name="请假时长(天)" label="请假时长(天)" placeholder="自动计算" disabled="false" />
+      <van-field v-model="duration" name="请假时长(天)" label="请假时长(天)" placeholder="自动计算" :disabled="false" />
 
       <van-field v-model="reason" rows="2" autosize label="请假原因" type="textarea" maxlength="150" placeholder="请输入请假原因" show-word-limit/>
 

src/pages/administrativeService/leaveManagement/index.vue

@@ -171,7 +171,7 @@ const onRefresh = () => {
             </van-cell-group>
             <div style="padding: 5px 16px;">
               <van-button type="primary" block round @click="onConfirm('qjgl')">
-                确认
+                搜索
               </van-button>
             </div>
           </van-dropdown-item>
@@ -210,7 +210,7 @@ const onRefresh = () => {
             </van-cell-group>
             <div style="padding: 5px 16px;">
               <van-button type="primary" block round @click="onConfirm('qjsp')">
-                确认
+                搜索
               </van-button>
             </div>
           </van-dropdown-item>

src/pages/administrativeService/outManagement/add.vue

@@ -7,6 +7,7 @@ import {
 } from '~/store/user';
 const {
   uo_type,
+  user_realname,
   user_id,
   uo_id
 } = userInfo
@@ -33,6 +34,7 @@ const onConfirm_applyTime = ({
 /******请假人********/
 const userLIST = ref([]);
 const columns = ref([]);
+const onlyOneArr = ref([]);
 //获取用户列表
 const getUserList=()=> {
   let transObjs = {
@@ -51,6 +53,7 @@ const getUserList=()=> {
       })
       userLIST.value = tempArr;
       columns.value = userLIST.value;
+      onlyOneArr.value = [{ text: user_realname, value: user_id}];
     }
   });
 }
@@ -174,7 +177,7 @@ return
 
       <van-field v-model="applyPerson" is-link readonly name="picker" label="请假人" placeholder="点击选择请假人" @click="showPicker_applyPerson = true" />
       <van-popup v-model:show="showPicker_applyPerson" position="bottom">
-        <van-picker :columns="columns" @confirm="onConfirm_applyPerson" @cancel="showPicker_applyPerson = false" />
+        <van-picker :columns="onlyOneArr" @confirm="onConfirm_applyPerson" @cancel="showPicker_applyPerson = false" />
       </van-popup>
 
       <van-field v-model="begainTime" is-link readonly name="datePicker" label="开始时间" placeholder="点击选择开始时间" @click="showPicker_begainTime = true" />

src/pages/administrativeService/outManagement/index.vue

@@ -134,18 +134,18 @@ const checkSubmitForm = () => {
       <van-tabs v-model:active="tabActive" @click-tab="onClickTab">
         <van-tab title="外出申请">
 
-          <van-dropdown-menu>
-          <van-dropdown-item  title="请假人">
-            <van-cell-group inset>
-              <van-field v-model="applyPerson" placeholder="请输入请假人" />
-            </van-cell-group>
-            <div style="padding: 5px 16px;">
-              <van-button type="primary" block round @click="onConfirm()">
-                确认
-              </van-button>
-            </div>
-          </van-dropdown-item>
-        </van-dropdown-menu>
+          <van-dropdown-menu v-if="false">
+            <van-dropdown-item  title="请假人">
+              <van-cell-group inset>
+                <van-field v-model="applyPerson" placeholder="请输入请假人" />
+              </van-cell-group>
+              <div style="padding: 5px 16px;">
+                <van-button type="primary" block round @click="onConfirm()">
+                  搜索
+                </van-button>
+              </div>
+            </van-dropdown-item>
+          </van-dropdown-menu>
         <van-pull-refresh v-model="loading" @refresh="onRefresh">
           <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
             <van-cell v-for="(item,index ) in tableList" :key="index" :title="item.xxq_spr" >
@@ -172,14 +172,14 @@ const checkSubmitForm = () => {
         </van-tab>
         <van-tab title="外出审批">
 
-          <van-dropdown-menu>
+          <van-dropdown-menu >
           <van-dropdown-item  title="请假人">
             <van-cell-group inset>
               <van-field v-model="applyPerson" placeholder="请输入请假人" />
             </van-cell-group>
             <div style="padding: 5px 16px;">
               <van-button type="primary" block round @click="onConfirm()">
-                确认
+                搜索
               </van-button>
             </div>
           </van-dropdown-item>

src/store/produ/la.js

@@ -7,9 +7,9 @@ export default {
   "user_role_id": "7",
   "user_level_id": "1",
   "user_detail_id": "0",
-  "user_score": "134",
+  "user_score": "162",
   "create_dateline": "1658113811",
-  "modify_dateline": "1692696847",
+  "modify_dateline": "1694158727",
   "isdelete": "0",
   "area_id1": "0",
   "area_id2": "0",
@@ -56,7 +56,7 @@ export default {
   "wx_last_login": null,
   "wx_graduation": "0",
   "power_set": null,
-  "token": "f2c13s93wtxoJJ8lVACuzIcuCnZSYa909r8bxoz4FACGWgAUwT4bSejSiPJkPSCzzqXv8iNFasvHeFQLexjs6veDo70Vapy00YWN2EHJBvU",
+  "token": "c1eazsmVg2D6Vxx8IiyhSZ3wmcKuPhsGcSRQQxNpnH_bYsxAi4OJlfSnD4MWWoELpsd_bqWYzZEPiER_ayYVoKcb_aQ2PLCyU99nWBeBNRAiX_bI",
   "setting": {
       "sitename": "景宁教育魔方",
       "sitedomain": "http://60.188.226.44:8090/",

src/store/user.js

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 
-// import produ from './produ/wyj'
-
+// import produ from './produ/la'
 // localStorage.setItem(
 //   'userInfo',
 //   JSON.stringify(produ),