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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -451,11 +451,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     expenseSheet.setOwnerId(first.get().getId());
                     expenseSheet.setOwnerName(first.get().getName());
                 } else {
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        throw new Exception("报销人/工号[" +reimburserCell+"]不存在");
-                    }else {
-                        throw new Exception("报销人[" +reimburserCell+"]不存在");
-                    }
+                    throw new Exception("报销人[" +reimburserCell+"]不存在");
                 }
                 expenseSheet.setOperatorId(user.getId());
                 expenseSheet.setRemark(remarksCell.getStringCellValue());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -3310,8 +3310,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 project.setInchargerName(first.get().getName());
                             } else {
                                 switch (exception){
-                                    case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"项目负责人工号为["+split[0]+"]的人员不存在":"项目负责人姓名/工号为["+split[0]+"]的人员不存在");
-                                    case 1:throw new Exception("项目负责人["+split[0]+"]姓名与工号不匹配");
+                                    case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                    case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                 }
                             }
                         }
@@ -3414,8 +3414,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             participationList.add(p);
                         } else {
                             switch (exception){
-                                case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                             }
                         }
                     }
@@ -3463,8 +3463,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     }
                                 } else {
                                     switch (exception){
-                                        case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                        case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                        case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                        case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                     }
                                 }
                             }
@@ -3880,8 +3880,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 project.setInchargerName(first.get().getName());
                             } else {
                                 switch (exception){
-                                    case 0:throw new Exception((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)?"项目负责人工号为["+split[0]+"]的人员不存在":"项目负责人姓名/工号为["+split[0]+"]的人员不存在");
-                                    case 1:throw new Exception("项目负责人["+split[0]+"]姓名与工号不匹配");
+                                    case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                    case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                 }
                             }
                         }
@@ -4464,8 +4464,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             participationList.add(p);
                         } else {
                             switch (exception){
-                                case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                             }
                         }
                     }
@@ -4513,8 +4513,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     }
                                 } else {
                                     switch (exception){
-                                        case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                        case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                        case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                        case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                     }
                                 }
                             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -3621,11 +3621,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     if (!any.isPresent()) {
                         //msg.setError("人员["+username+"]不存在，请先在组织结构中添加或者通过钉钉同步导入");
-                        if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                            msg.setError(MessageUtils.message("staff.peopleNullAndAddPlus",username));
-                        }else {
-                            msg.setError(MessageUtils.message("staff.peopleNullAndAdd",username));
-                        }
+                        msg.setError(MessageUtils.message("staff.peopleNullAndAdd",username));
                         return msg;
                     }
                     User reportCreator = any.get();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/DockWithMLD.java

@@ -79,7 +79,7 @@ public class DockWithMLD {
         //分页参数 处理全部数据 不需要进行分页
         JSONObject pageInfo = new JSONObject();
         pageInfo.put("pageNo", 1);
-        pageInfo.put("pageSize",1000);
+        pageInfo.put("pageSize",10000);
         paramDatajson.put("pageInfo",pageInfo);
         //封装 mainTable 参数
         JSONObject mainTable  = JSON.parseObject(screenString);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -350,7 +350,6 @@ role.deleteErrorByHavePeople=该角色存在相关人员，请将他们修改为
 #员工相关
 staff.nameNullByRow=第{0}行缺少员工姓名
 staff.peopleNullAndAdd=人员[{0}]不存在，请先在组织结构中添加或者通过钉钉同步导入
-staff.peopleNullAndAddPlus=人员/工号[{0}]不存在，请先在组织结构中添加或者通过钉钉同步导入
 staff.proportionError=人员[{0}]分摊比例不满足100%,当前比例[{1}%],请检查
 staff.workingHoursNull=工号为{0}的员工在工时系统中不存在
 staff.deleteErrorByDaily=该员工存在填写的日报，无法删除。

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -350,7 +350,6 @@ role.deleteErrorByHavePeople=There are related persons in this role. Please modi
 #员工相关
 staff.nameNullByRow=Employee name is missing in row {0}.
 staff.peopleNullAndAdd=The person [{0}] does not exist. Please add it in the organization structure first or import it synchronously through Ding Talk.
-staff.peopleNullAndAddPlus=The person/jobNumber [{0}] does not exist. Please add it in the organization structure first or import it synchronously through Ding Talk.
 staff.proportionError=The personnel [{0}] + allocation proportion does not meet 100%. The current proportion [{1}%], please check.
 staff.workingHoursNull=The employee with job number {0} does not exist in the work hour system.
 staff.deleteErrorByDaily=The employee has daily reports filled in and cannot be deleted.

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -289,7 +289,7 @@ export const allRouters = [//组织架构
     {
         path: '/',
         component: Home,
-        name: '项目管理',
+        name: '合同管理',
         iconCls: 'iconfont firerock-iconxiangmu',
         leaf: true,
         children: [

fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

@@ -78,7 +78,7 @@
           <el-button v-if="permissions.contractView || permissions.contractManagement" size="mini" @click="lookover(scope.row)">查看</el-button>
           <el-button v-if="permissions.contractManagement" size="mini" @click="editContract(scope.row)" type="primary">编辑</el-button>
           <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="process(scope.row,0)" type="success">通过</el-button>
-          <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="process(scope.row,2)" type="danger">驳回</el-button>
+          <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="processR(scope.row,2)" type="danger">驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -264,6 +264,16 @@
         </el-upload>
       </div>
     </el-dialog>
+    
+    <el-dialog :title="$t('defaultText.pleaseEnterTheReason')"  v-if="denyReasonDialog" :visible.sync="denyReasonDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+            <div>
+                <el-input type="textarea" v-model="denyReason" rows="2" placeholder="请输入驳回原因" />
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button  @click="denyReasonDialog = false" >{{$t('btn.cancel')}}</el-button>
+                <el-button type="primary" @click="process(null,2)" >{{$t('btn.submit')}}</el-button>
+            </div>
+        </el-dialog>
   </section>
 </template>
 
@@ -293,6 +303,10 @@ export default {
       typeItemDialog: false,
       typeItemForm: {typeName: ''},
 
+      denyReasonDialog: false,
+      denyReason: '',
+      denyrow: null,
+
       dialogTitle: '新增',
       addDialog: false,
       lookoverDialog: false,
@@ -566,13 +580,28 @@ export default {
         });          
       });
     },
+    processR(row,status){
+      this.denyReasonDialog = true
+      this.denyrowId = row.id
+    },
     process(row,status){
-      this.http.post('/contract/processContract',{
-        id: row.id,
-        status: status
-      },res => {
+      let parameter
+      if(status == 2){
+        parameter = {
+          id: this.denyrowId,
+          status: status,
+          msg: this.denyReason
+        }
+      }else{
+        parameter = {
+          id: row.id,
+          status: status
+        }
+      }
+      this.http.post('/contract/processContract',parameter,
+      res => {
         if(res.code == 'ok'){
-          row.status = status
+          this.getContractList()
           this.$message({
             message: status == 0 ? '已通过' : '已驳回',
             type: 'success'

fhKeeper/formulahousekeeper/timesheet/src/views/project/vueGantt.vue

@@ -28,7 +28,12 @@
             <el-table-column :label="items" v-for="items, idx in item.children" :key="idx" width="120px" align="center">
               <template slot-scope="scope">
                 <div>
-                  {{scope.row.end_date | dataValue(scope.column, scope.row)}}
+                  <!-- <span v-if="scope.row.translationType == 'user' && scope.column.label.indexof(scope.row.end_date) != '-1'">
+                    <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data>
+                  </span> -->
+                  <span v-if="scope.row.translationType != 'user'">
+                    {{scope.row.end_date | dataValue(scope.column, scope.row)}}
+                  </span>
                 </div>
               </template>
             </el-table-column>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1202,9 +1202,10 @@
               <!-- 222 -->
             </div>
             <div>
-                <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
+                <el-input style="float:left;width:22%" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(0)" icon="el-icon-search"></el-button>
                 </el-input>
+                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'12'" :clearable="true" @selectCal="selectCal"></selectCat>
             </div>
             <el-link
               type="primary"
@@ -1372,9 +1373,10 @@
               
             </div>
             <div>
-                <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
+                <el-input style="float:left;width:22%" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
                 </el-input>
+                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'13'" :clearable="true" @selectCal="selectCal"></selectCat>
             </div>
             <el-link
               type="primary"
@@ -1779,6 +1781,8 @@
                 selCon:[],  //筛选条件
                 selProjectList:[],  //筛选后项目列表
                 selConShow: true,
+                usersList: [], // 全部人员列表
+                usersListId: '', // 选中的人员id
 
                 dialogVisible: false, //项目弹窗
                 report: '',
@@ -5034,6 +5038,26 @@
                     zhi.he = he + 'h'
                 }
             },
+            // 获取全部人员
+            getUsers() {
+                this.http.post('/user/getSimpleActiveUserList', {},
+                res => {
+                    if (res.code == "ok") {
+                        this.usersList = res.data;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             // 按时间比例
             addBli(item, i) {
                 var iss = i
@@ -6308,10 +6332,27 @@
                     this.zhoBao.auditorThird = obj.id
                 } else if(obj.distinction == '5') {
                     this.zhoBao.ccUserid = obj.id
+                } else if(obj.distinction == '12') {
+                    this.usersListId = obj.id
+                    if(obj.name != this.$t('defaultText.pleaseChoose')) {
+                        this.searchKeyword = obj.name
+                    } else {
+                        this.searchKeyword = ''
+                    }
+                    this.searchScreen(0)
+                } else if(obj.distinction == '13') {
+                    this.usersListId = obj.id
+                    if(obj.name != this.$t('defaultText.pleaseChoose')) {
+                        this.searchKeyword = obj.name
+                    } else {
+                        this.searchKeyword = ''
+                    }
+                    this.searchScreen(1)
                 }
             }
         },
         created() {
+            this.getUsers()
             let height = window.innerHeight;
             this.tableHeight = height - 178;
             const that = this;

fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue

@@ -18,7 +18,7 @@
                 <van-cell title="公司" :title-style="'flex: 0.5;'" :value="userInfo.companyName"></van-cell>
                 <!-- <van-cell title="修改密码" isLink to="/my/set"></van-cell> -->
             </div>
-            <van-cell :title="'绑定'+(isCorpWX?'企业':'')+'微信'" v-if="isCorpWX || isWX" @click="bindWeiXin" style="margin-top:10px;" :title-style="'flex: 2.5;'" label="绑定微信后可接收工时填报提醒">
+            <van-cell :title="'绑定'+(isCorpWX?'企业':'')+'微信'" v-if="isWX" @click="bindWeiXin" style="margin-top:10px;" :title-style="'flex: 2.5;'" label="绑定微信后可接收工时填报提醒">
                 <template>
                     <span v-if="(isCorpWX && userInfo.corpwxUserid == null) || (isWX && userInfo.wxOpenid == null)" style="color:#ff0000;">未绑定</span>
                     <span v-if="(isCorpWX && userInfo.corpwxUserid != null) || (isWX && userInfo.wxOpenid != null)" style="color:#7CCD7C;">已绑定</span>