Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -5,24 +5,29 @@
 <script setup lang="ts">
 import { onMounted, ref, provide, inject } from 'vue'
 import { useStore } from '@/store/index'
-interface GlobalPopup {
-  showSuccess: (msg: string, time: number) => void
-  showError: (msg: string, time: number) => void
-  showWarning: (msg: string, time: number) => void
-}
+import { ElNotification } from 'element-plus'
 const { setAsyncRoutesMark } = useStore()
 window.addEventListener('beforeunload', () => beforeunloadFn())
 const beforeunloadFn = (() => {
   setAsyncRoutesMark(false)
 })
 
-provide('globalPopup', {
-  showSuccess: (msg: string, time: number) => { console.log(msg, '执行成功', time) }, //!SECTION 成功
-  showError: (msg: string, time: number) => { console.log(msg, '执行成功'), time }, //!SECTION 失败
-  showWarning: (msg: string, time: number) => { console.log(msg, '执行成功'), time }, //!SECTION 警告
+provide<GlobalPopup>('globalPopup', {
+  showSuccess: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 成功
+  showError: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 失败
+  showWarning: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 警告
+  showInfo: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 文本
 })
 
-
+const notificationTiop = (msg: string, time: number, icon: string, type: string) => {
+  let obj: any = {}
+  obj.title = '提示'
+  obj.message = msg
+  time ? obj.duration = time : obj.duration = 2000
+  icon ? obj.iconClass = icon : obj.iconClass = ''
+  type ? obj.type = type : obj.type = 'success'
+  ElNotification(obj)
+}
 
 </script>
 

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -76,7 +76,7 @@ const login = (formEl: FormInstance | undefined) => {
     console.log(ruleForm.value);
     post(LOGIN, { ...ruleForm.value }).then(res => {
       console.log(res);
-      globalPopup.showSuccess('登录成功')
+      globalPopup?.showSuccess('登录成功', 1000, '')
       // if(res.code == 'error') {
       //   ElMessage.error({
       //     message: "登录失败",

fhKeeper/formulahousekeeper/customerBuler-crm/src/type.d.ts

@@ -0,0 +1,6 @@
+type GlobalPopup = {
+  showSuccess: (msg: string, time: number, icon: string) => void;
+  showError: (msg: string, time: number, icon: string) => void;
+  showWarning: (msg: string, time: number, icon: string) => void;
+  showInfo: (msg: string, time: number, icon: string) => void;
+};

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -82,9 +82,9 @@
         <!-- 时间段筛选 ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5 || ins == 16 || ins == 17 || ins == 18 || ins == 20 || ins == 21 || ins == 22 -->
         <template v-if="screeningCondition.timePeriod.includes(ins)">
           <span>
-            <span class="demonstration" style="color:#999;padding:0 10px">
+            <!-- <span class="demonstration" style="color:#999;padding:0 10px">
               {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
-            </span>
+            </span> -->
             <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:300px" :clearable="ins == 15" size="small"> </el-date-picker>
           </span>
         </template>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -151,6 +151,9 @@
                         <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
                             <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="onSearch" shape="round" background="#F4F4F4"></van-search>
                         </div>
+                        <div class="popupSearch" v-if="user.userNameNeedTranslate == '1'">
+                            <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="getOnSearch(executor.searchText)" shape="round" background="#F4F4F4"></van-search>
+                        </div>
 
                         <div class="popupCon conBorder">
                             <van-radio-group v-model="executor.item" class="popupItem marginNone borderNone">
@@ -421,7 +424,9 @@ export default {
             this.finishDateShow = false
         },
         
-        executorChange(item,index){           // 选择执行人
+        executorChange(item,index){  // 选择执行人
+            this.executor.searchText = ''
+            this.getOnSearch('')
             this.executor.show = true
             this.executor.index = index
             this.executor.searchList.forEach(u=>{if (u.id == item.executorId) {