Browse Source

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

ggooalice 2 years ago
parent
commit
2e62b306f6

+ 3 - 0
fhKeeper/formulahousekeeper/inva_4_tivo/homemovement.html

@@ -123,6 +123,9 @@
             <div class="customer_title">来自客户的认可</div>
             <div class="swiper-container customer_fo">
               <div class="swiper-wrapper">
+                <div class="swiper-slide">
+                  <img src="./image/yidong/ggg0.png" alt="" />
+                </div>
                 <div class="swiper-slide">
                   <img src="./image/yidong/ggg1.png" alt="" />
                 </div>

BIN
fhKeeper/formulahousekeeper/inva_4_tivo/image/yidong/ggg0.png


+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -1522,7 +1522,7 @@ public class WeiXinCorpController {
                                 newCompany.setPackageProvider(0);//供应商模块
                                 break;
                             //旗舰版
-                            case "sp69f71e42798c7f55":
+                            case "specf7090ca7757870":
                                 newCompany.setPackageProject(1);//项目协作平台
                                 newCompany.setPackageOa(1);//OA平台;请假,出差等
                                 newCompany.setPackageExpense(1);//费用报销
@@ -3337,7 +3337,7 @@ public class WeiXinCorpController {
                     newCompany.setPackageProvider(0);//供应商模块
                     break;
                 //旗舰版
-                case "sp69f71e42798c7f55":
+                case "specf7090ca7757870":
                     newCompany.setPackageProject(1);//项目协作平台
                     newCompany.setPackageOa(1);//OA平台;请假,出差等
                     newCompany.setPackageExpense(1);//费用报销

+ 3 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -555,6 +555,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
         if (functionIdList.size() > 0) {
             //根据功能id获取可用的操作代码
+            if (formIds.size() == 0) {
+                formIds.add(-1);
+            }
             QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper1->wrapper1.isNull("report_form_id").or().in("report_form_id",formIds)).and(wrapper->{
                 wrapper.eq("package_time", 1);
                 if (company.getPackageProject() == 1) {

+ 50 - 15
fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -36,11 +36,9 @@
     <transition name="el-zoom-in-top">
       <div v-show="show" style="position: relative;z-index: 999;"> 
         <!-- 搜索框 -->
-        <!-- <div class="searchBox">
-            <el-input :placeholder="$t('peaseenterthe')" size="mini" v-model="searchTex" style="width: 150px" @focus="searchBox()">
-                <el-button slot="append" icon="el-icon-search" size="mini" @click="searchLick()"></el-button>
-            </el-input>
-        </div> -->
+        <div class="searchBox" v-if="filterable">
+            <el-input placeholder="请输入名称搜索" size="mini" v-model="searchTex" style="width: 100%" @input="searchLick()" @focus="selectCli()"></el-input>
+        </div>
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 
@@ -178,6 +176,9 @@ export default {
             multiSelectList: [],
             searchTex: '', // 搜索文字
             cursor: '', // 搜索的标记(需传给后端)
+            time: null,//防抖
+            fistArrList: [], // 第一次进来的人员数组
+            fistArrListOne: [], // 第一次进来的人员初始数组
         };
     },
     computed: {},
@@ -277,6 +278,18 @@ export default {
             }
         }
         console.log(this.subject, this.subjectId)
+
+        var thats = this
+        var phoneArr = []
+        setTimeout(()=>{
+            for(var s in thats.subject) {
+                phoneArr.push(thats.subject[s].optionsOId || thats.subject[s].auditorId || thats.subject[s].id) 
+            }
+            thats.fistArrListOne = thats.subject
+        }, 500)
+        
+        thats.fistArrList = phoneArr
+        console.log(thats.fistArrList)
         this.dailyListIndex = this.idx
     },
     methods: {
@@ -353,6 +366,7 @@ export default {
                         name: this.selectName
                     }
                     this.$emit("selectCal", obj)
+                    this.options = this.fistArrListOne
                 }
             }
         },
@@ -371,6 +385,7 @@ export default {
                         idx: this.dailyListIndex
                     }
                     this.$emit("selectCatCli", obj);
+                    this.options = this.fistArrListOne
                 } else {
                     let obj = {
                         id: nameId,
@@ -380,6 +395,7 @@ export default {
                         name: this.selectName
                     }
                     this.$emit("selectCal", obj)
+                    this.options = this.fistArrListOne
                 }
                 this.transitionBoxLiIdx = ''
                 this.show = false
@@ -434,6 +450,7 @@ export default {
                     }
                 }
                 this.$emit("selectCal", obj)
+                this.options = this.fistArrListOne
             }
         },
         deleteMultiSelectList(str) {
@@ -461,25 +478,42 @@ export default {
                 name: this.selectName
             }
             this.$emit("selectCal", obj)
+            this.options = this.fistArrListOne
         },
-        searchBox() {
-            this.selectCli()
-        },
-        // 搜索
+        // searchBox() {
+        //     this.selectCli()
+        // },
+        // // 搜索
         searchLick() {
-            console.log('文字')
-            this.getSimpleActiveUserList()
+            if (this.time != null) {
+                clearTimeout(this.time)
+            }
+            var that = this
+            this.time = setTimeout(() => {
+                that.getSimpleActiveUserList()
+            }, 500)
+            
         },
         // 针对  getSimpleActiveUserList 获取所有人员接口
         getSimpleActiveUserList() {
-            this.http.post('/user/getSimpleActiveUserList', {
+            this.http.post('/user/getEmployeeList', {
+                departmentId: -1,
+                pageIndex: 1,
+                pageSize: 200,
                 keyword: this.searchTex,
-                cursor: this.cursor
+                status: 1,
+                roleId: '',
+                cursor: '',
+                onlyDirect: 0,
             },
             res => {
                 if (res.code == "ok") {
-                    console.log('数据')
-                    this.options = res.data.retUser
+                    var arr = res.data.records.filter((item) => {
+                        if (this.fistArrList.indexOf(item.id) != '-1') {
+                            return item;
+                        }
+                    })
+                    this.options = arr
                     this.cursor = res.data.nextCursor
                 } else {
                     this.$message({
@@ -570,6 +604,7 @@ export default {
     .searchBox {
         position: absolute; 
         width: 100%;
+        top: -9px;
     }
     .transitionBox {
         background: #FFF;

+ 6 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -287,7 +287,12 @@
                     </div>
                     <div v-else>
                         <span v-for="par in scope.row.participator" :key="par.id" >
-                            <el-link style="margin-right:10px;" type="primary" :underline="false" @click="showUser(par.id)">{{par.name}}</el-link>
+                            <el-link style="margin-right:10px;" type="primary" :underline="false" @click="showUser(par.id)" v-if="user.userNameNeedTranslate != 1">
+                                {{par.name}}
+                            </el-link>
+                            <el-link style="margin-right:10px;" type="primary" :underline="false" @click="showUser(par.id)" v-if="user.userNameNeedTranslate == 1">
+                                <ww-open-data type='userName' :openid='par.name'></ww-open-data>
+                            </el-link>
                         </span>
                     </div>
                     

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -430,7 +430,7 @@
                             </el-option>
                         </el-select>
 
-                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="index" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)"></selectCat>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :filterable="true" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="index" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)"></selectCat>
                         <!-- <selectCat v-if="user.userNameNeedTranslate == '1'" :wxCope="true" :size="'size'" :subjectId="executorItem.executorId" :distinction="'1'" :subject="users"  @selectCal="selectCal" :index="index" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)"></selectCat> -->
 
 

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -255,7 +255,7 @@
                             </el-option>
                         </el-select>
                         
-                        <selectCat :subject="users" :subjectId="executorItem.executorId" :index="index" @selectCal="selectCal" :size="'mini'" v-if="user.userNameNeedTranslate == '1'"></selectCat>
+                        <selectCat :subject="users" :subjectId="executorItem.executorId" :filterable="true" :index="index" @selectCal="selectCal" :size="'mini'" v-if="user.userNameNeedTranslate == '1'"></selectCat>
 
                         <span style="margin-left:30px;margin-right:10px;">{{ $t('plantime') }}</span>
                         <el-input-number size="small" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" v-model="executorItem.planHours" style="width:30%;" :min="1" :max="100"  :placeholder="$t('pleaseentertheplannedworking')" ></el-input-number ><span style="margin-left:10px;">{{ $t('time.hour') }}</span>