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

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

@@ -7258,17 +7258,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
     }
 
-    private List<Department> getSubDepts(Department dp, List<Department> list) {
-        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());
-        List<Department> allList = new ArrayList<>();
-        allList.addAll(collect);
-        if (collect.size() > 0) {
-            collect.forEach(c->{
-                allList.addAll(getSubDepts(c, list));
-            });
-        }
-        return allList;
-    }
     private  List<LocalDateTime> getDays(LocalDateTime start, LocalDateTime end) {
         List<LocalDateTime> result = new ArrayList();
         while (start.isBefore(end)) {
@@ -7502,6 +7491,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return msg;
     }
 
+    //递归获取所有子部门
+    private List<Department> getSubDepts(Department dp, List<Department> list) {
+        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());;
+        List<Department> allList = new ArrayList<>();
+        allList.addAll(collect);
+        if (collect.size() > 0) {
+            collect.forEach(c->{
+                allList.addAll(getSubDepts(c,list));
+            });
+        }
+        return allList;
+    }
+
     //部门参与项目情况表
     @Override
     public HttpRespMsg deptPartInProjects(Integer pageIndex, Integer pageSize, String startDate,String endDate, Integer departmentId, HttpServletRequest request){
@@ -7559,15 +7561,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }else {
                     stringObjectMap.put("deptName",getSupDepartment(department));
                 }
-                if (stringObjectMap.get("projectCount")==null){
-                    stringObjectMap.put("projectCount",0);
-                }
-                if (stringObjectMap.get("tripCount")==null){
-                    stringObjectMap.put("tripCount",0);
-                }
-                if (stringObjectMap.get("peopleCount")==null){
-                    stringObjectMap.put("peopleCount",0);
-                }
+                stringObjectMap.put("projectCount",stringObjectMap.get("projectCount")==null?0:stringObjectMap.get("projectCount"));
+                stringObjectMap.put("tripCount",stringObjectMap.get("tripCount")==null?0:stringObjectMap.get("tripCount"));
+                stringObjectMap.put("peopleCount",stringObjectMap.get("peopleCount")==null?0:stringObjectMap.get("peopleCount"));
             }
         }
         HashMap<String, Object> result = new HashMap<>();

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

@@ -97,6 +97,8 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
     @Resource
     LeaveSheetMapper leaveSheetMapper;
+    @Resource
+    TimeTypeMapper timeTypeMapper;
 
 
     //获取服务商provider_access_token
@@ -1396,7 +1398,8 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                             }else{
                                 leaveSheet.setTimeType(0);
                                 leaveSheet.setTimeHours(time/3600);
-                                leaveSheet.setTimeDays(time/3600/24);
+                                TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", wxCorpInfo.getCompanyId()));
+                                leaveSheet.setTimeDays(time/3600/allDay.getAllday());
                             }
                             result.add(leaveSheet);
                         }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1283,18 +1283,18 @@
         department.department_name AS deptName,
         u.projectCount,
         u.peopleCount,
-        u.tripCount
+        t.trip AS tripCount
         from department
         left JOIN (
         SELECT `user`.department_id AS departmentId,
         project.create_date,
         COUNT(DISTINCT(project.id)) AS projectCount,
-        COUNT(`user`.id) AS peopleCount,
-        (select COUNT(DISTINCT(business_trip.id)) from business_trip where owner_id = user.id) AS tripCount
+        COUNT(`user`.id) AS peopleCount
         from  `user`
         LEFT JOIN participation ON `user`.id = participation.user_id
         LEFT JOIN project ON project.id = participation.project_id
         WHERE user.company_id = #{companyId}
+        and project.id is not null
         <if test="branchDepartment!=null and branchDepartment.size()>0">
             and user.department_id in
             <foreach collection="branchDepartment" open="(" close=")" separator="," item="item">
@@ -1315,6 +1315,23 @@
         </if>
         GROUP BY `user`.department_id
         ) u ON department.department_id = u.departmentId
+        left join (
+            SELECT u.deptId AS deptId,SUM(tripCount) AS trip
+            FROM (
+            SELECT `user`.department_id AS deptId,SUM(day_count) AS tripCount from business_trip
+            LEFT JOIN `user` ON business_trip.owner_id = `user`.id
+            where STATUS  = 0
+            AND user.company_id = #{companyId}
+            <if test="endDate!= null and endDate!= ''" >
+                and business_trip.start_date &lt;=#{endDate}
+            </if>
+            <if test="startDate!= null and startDate!= ''">
+                and business_trip.end_date &gt;= #{startDate}
+            </if>
+            GROUP BY `user`.id
+            ) u
+            GROUP BY u.deptId
+        ) t on t.deptId = department.department_id
         WHERE department.company_id = #{companyId}
         <if test="branchDepartment!=null and branchDepartment.size()>0">
             and department.department_id in

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

@@ -711,7 +711,9 @@
                 statusTxt: [this.$t('all'),this.$t('ongoing'),this.$t('state.completed'),this.$t('state.undone')],
                 mileStoneList:[],
                 reverse:false,
-                project:{},
+                project:{
+                    auditorList: []
+                },
                 addFolderDialog: false,
                 upLoading:false,
                 keyword:null,

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

@@ -401,318 +401,320 @@
 
         <!--新增界面-->
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px" :top="'6vh'">
-            <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px" style="height: 72vh;overflow: auto;">
-                <el-form-item :label="$t('Itemno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
-                    <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable></el-input>
-                </el-form-item>
-                 <el-form-item :label="$t('zhu-xiang-mu')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.mainProjectState == '1'">
-                    <!-- <el-select v-model="addForm.projectMainId" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id" @change="projectManagementChange"> -->
-                    <el-select v-model="addForm.projectMainId" clearable @change="projectManagementChange">
-                        <el-option v-for="(item) in mainProjectList" :key="item.id" :value="item.id" :label="item.name + '\u3000' + item.code">
-                            <span style="float: left; color: #8492a6; font-size: 13px;">{{ item.code }}</span>
-                            <span style="float: right;margin-left: 20px">{{ item.name }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item :label="$t('projectclassification')" v-if="user.timeType.mainProjectState != '1'">
-                    <!-- <el-select v-model="addForm.category"  style="width:32%;" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
-                    <el-select v-model="addForm.category"  style="width:32%;" clearable filterable>
-                        <el-option v-for="(item) in baseClfList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item :label="$t('headerTop.projectName')" prop="name">
-                    <!-- <el-input v-model="addForm.name" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目名称" clearable></el-input> -->
-                    <el-input v-model="addForm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
-                </el-form-item>
-                <el-form-item :label="$t('other.projectDescription')" prop="projectDesc">
-                    <!-- <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="4000"></el-input> -->
-                    <el-input v-model="addForm.projectDesc" :placeholder="$t('peaseenterthe')" clearable maxlength="4000"></el-input>
-                </el-form-item>
-                <el-form-item :label="$t('projecttype')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" prop="isPublic">
-                    <!-- <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic" :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
-                    <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic">
-                        <el-option :value="0" :label="$t('commonproject')"></el-option>
-                        <el-option :value="1" :label="$t('publicprojects')"></el-option>
-                    </el-select>
-                    <el-tooltip effect="dark" :content="$t('ordinaryprojectsareopen')" placement="top-start">
-                    <i class="el-icon-question"></i>
-                    </el-tooltip>
-                    <div v-if="user.company.packageCustomer == 1" style="display: inline-block;width: 50%">
-                        <span style="margin-left:63px;margin-right:10px;" >{{ $t('ke-hu') }}</span>
-                        <el-select v-model="addForm.customerId" clearable="true" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:70%;" >
-                            <el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id"></el-option>
+            <div style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
+                <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
+                    <el-form-item :label="$t('Itemno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
+                        <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('zhu-xiang-mu')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.mainProjectState == '1'">
+                        <!-- <el-select v-model="addForm.projectMainId" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id" @change="projectManagementChange"> -->
+                        <el-select v-model="addForm.projectMainId" clearable @change="projectManagementChange">
+                            <el-option v-for="(item) in mainProjectList" :key="item.id" :value="item.id" :label="item.name + '\u3000' + item.code">
+                                <span style="float: left; color: #8492a6; font-size: 13px;">{{ item.code }}</span>
+                                <span style="float: right;margin-left: 20px">{{ item.name }}</span>
+                            </el-option>
                         </el-select>
-                    </div>
-                </el-form-item>
+                    </el-form-item>
+                    <el-form-item :label="$t('projectclassification')" v-if="user.timeType.mainProjectState != '1'">
+                        <!-- <el-select v-model="addForm.category"  style="width:32%;" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
+                        <el-select v-model="addForm.category"  style="width:32%;" clearable filterable>
+                            <el-option v-for="(item) in baseClfList" :key="item.id" :value="item.id" :label="item.name"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="$t('headerTop.projectName')" prop="name">
+                        <!-- <el-input v-model="addForm.name" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目名称" clearable></el-input> -->
+                        <el-input v-model="addForm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('other.projectDescription')" prop="projectDesc">
+                        <!-- <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="4000"></el-input> -->
+                        <el-input v-model="addForm.projectDesc" :placeholder="$t('peaseenterthe')" clearable maxlength="4000"></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('projecttype')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" prop="isPublic">
+                        <!-- <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic" :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
+                        <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic">
+                            <el-option :value="0" :label="$t('commonproject')"></el-option>
+                            <el-option :value="1" :label="$t('publicprojects')"></el-option>
+                        </el-select>
+                        <el-tooltip effect="dark" :content="$t('ordinaryprojectsareopen')" placement="top-start">
+                        <i class="el-icon-question"></i>
+                        </el-tooltip>
+                        <div v-if="user.company.packageCustomer == 1" style="display: inline-block;width: 50%">
+                            <span style="margin-left:63px;margin-right:10px;" >{{ $t('ke-hu') }}</span>
+                            <el-select v-model="addForm.customerId" clearable="true" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:70%;" >
+                                <el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id"></el-option>
+                            </el-select>
+                        </div>
+                    </el-form-item>
 
-                <el-form-item :label="$t('subordinatedepartments')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.projectWithDept">
-                    <el-cascader v-model="addForm.deptId" :options="departmentList" :placeholder="$t('defaultText.pleaseChoose')"
-                        :props="{ checkStrictly: true, expandTrigger: 'hover' }" clearable filterable @change="cascaderChange" style="width: 100%"
-                    ></el-cascader>
-                </el-form-item>
+                    <el-form-item :label="$t('subordinatedepartments')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.projectWithDept">
+                        <el-cascader v-model="addForm.deptId" :options="departmentList" :placeholder="$t('defaultText.pleaseChoose')"
+                            :props="{ checkStrictly: true, expandTrigger: 'hover' }" clearable filterable @change="cascaderChange" style="width: 100%"
+                        ></el-cascader>
+                    </el-form-item>
 
-                <!-- 供应商 -->
-                <!-- <el-form-item label="供应商" v-if="user.company.packageProvider">
-                    <el-select v-model="addForm.supplierId" multiple collapse-tags style="width:32%;" placeholder="请选择供应商">
-                        <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item> -->
-                <el-form-item :label="$t('supplier')" v-if="user.company.packageProvider">
-                    <el-select v-model="addForm.supplierId" multiple :placeholder="$t('defaultText.pleaseChoose')" filterable="true" style="width: 100%">
-                        <span v-for="(item, index) in supplierList" :key="index">
-                            <el-option :label="item.providerName" :value="item.id"></el-option>
-                        </span> 
-                    </el-select>
-                </el-form-item>
+                    <!-- 供应商 -->
+                    <!-- <el-form-item label="供应商" v-if="user.company.packageProvider">
+                        <el-select v-model="addForm.supplierId" multiple collapse-tags style="width:32%;" placeholder="请选择供应商">
+                            <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item> -->
+                    <el-form-item :label="$t('supplier')" v-if="user.company.packageProvider">
+                        <el-select v-model="addForm.supplierId" multiple :placeholder="$t('defaultText.pleaseChoose')" filterable="true" style="width: 100%">
+                            <span v-for="(item, index) in supplierList" :key="index">
+                                <el-option :label="item.providerName" :value="item.id"></el-option>
+                            </span> 
+                        </el-select>
+                    </el-form-item>
 
-                <el-form-item :label="yonghuUser.customDegreeName" v-if="yonghuUser.customDegreeActive == 1">
-                    <el-select v-model="auseList" multiple :placeholder="$t('defaultText.pleaseChoose')" filterable="true" style="width: 100%">
-                        <span v-for="(item, index) in ause" :key="index">
-                        <el-option :label="item.name" :value="item.id"></el-option>
-                        </span> 
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="客户" v-if="user.company.packageCustomer == 1">
-                    <el-select v-model="addForm.customerId" clearable="true" filterable placeholder="请选择客户" style="width:100%;" >
-                        <el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item> -->
-                <el-form-item :label="$t('Allparticipants')" v-show="addForm.isPublic == 0" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <el-tooltip placement="top" effect="light" v-if="user.userNameNeedTranslate != 1">
+                    <el-form-item :label="yonghuUser.customDegreeName" v-if="yonghuUser.customDegreeActive == 1">
+                        <el-select v-model="auseList" multiple :placeholder="$t('defaultText.pleaseChoose')" filterable="true" style="width: 100%">
+                            <span v-for="(item, index) in ause" :key="index">
+                            <el-option :label="item.name" :value="item.id"></el-option>
+                            </span> 
+                        </el-select>
+                    </el-form-item>
+                    <!-- <el-form-item label="客户" v-if="user.company.packageCustomer == 1">
+                        <el-select v-model="addForm.customerId" clearable="true" filterable placeholder="请选择客户" style="width:100%;" >
+                            <el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item> -->
+                    <el-form-item :label="$t('Allparticipants')" v-show="addForm.isPublic == 0" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <el-tooltip placement="top" effect="light" v-if="user.userNameNeedTranslate != 1">
 
-                        <div slot="content" style="width:780px">{{addForm.userNames}}</div>
-                        <el-input  @focus="showChooseMembTree" v-model="addForm.userNames"></el-input>
-                    </el-tooltip>
-                    <el-tooltip placement="top" effect="light" v-if="user.userNameNeedTranslate == 1">
-                        <div slot="content" style="width:780px">
-                            <span v-for="(item, index) in addFormUserNames" :key="index">
-                                <!-- {{item}} -->
-                                <ww-open-data type='userName' :openid='item'></ww-open-data>
-                                <span v-if="index < addFormUserNames.length - 1">,</span>
-                            </span>
-                        </div>
-                        <div @click="showChooseMembTree" style="width: 800px;overflow:hidden;white-space:nowrap;height:40px;border: 1px solid #DCDFE6;border-radius: 4px;box-sizing: border-box;padding: 0 10px">
-                            <span v-for="(item, index) in addFormUserNames" :key="index">
-                                <!-- {{item}} -->
-                                <ww-open-data type='userName' :openid='item'></ww-open-data>
-                                <span v-if="index < addFormUserNames.length - 1">,</span>
-                            </span>
-                        </div>
-                    </el-tooltip>
-                </el-form-item>
-                <el-form-item :label="$t('projectmanager')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <!-- <el-select v-model="addForm.inchargerId"  :disabled="(addForm.userId.length==0 && addForm.isPublic == 0) || (!permissions.projectManagement && user.id != addForm.creatorId)" filterable placeholder="请选择项目经理" style="width:32%;" > -->
+                            <div slot="content" style="width:780px">{{addForm.userNames}}</div>
+                            <el-input  @focus="showChooseMembTree" v-model="addForm.userNames"></el-input>
+                        </el-tooltip>
+                        <el-tooltip placement="top" effect="light" v-if="user.userNameNeedTranslate == 1">
+                            <div slot="content" style="width:780px">
+                                <span v-for="(item, index) in addFormUserNames" :key="index">
+                                    <!-- {{item}} -->
+                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <span v-if="index < addFormUserNames.length - 1">,</span>
+                                </span>
+                            </div>
+                            <div @click="showChooseMembTree" style="width: 800px;overflow:hidden;white-space:nowrap;height:40px;border: 1px solid #DCDFE6;border-radius: 4px;box-sizing: border-box;padding: 0 10px">
+                                <span v-for="(item, index) in addFormUserNames" :key="index">
+                                    <!-- {{item}} -->
+                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <span v-if="index < addFormUserNames.length - 1">,</span>
+                                </span>
+                            </div>
+                        </el-tooltip>
+                    </el-form-item>
+                    <el-form-item :label="$t('projectmanager')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <!-- <el-select v-model="addForm.inchargerId"  :disabled="(addForm.userId.length==0 && addForm.isPublic == 0) || (!permissions.projectManagement && user.id != addForm.creatorId)" filterable placeholder="请选择项目经理" style="width:32%;" > -->
 
-                    <el-select v-if="user.userNameNeedTranslate != 1" v-model="addForm.inchargerId" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" >
-                        <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
+                        <el-select v-if="user.userNameNeedTranslate != 1" v-model="addForm.inchargerId" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" >
+                            <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
 
-                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="addForm.inchargerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="addForm.inchargerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
 
-                </el-form-item>
-                <el-form-item :label="$t('newspaperauditor')" v-show="user.timeType.reportAuditType==0">
-                    <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.auditUserIds" multiple="true" :disabled=" !(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" filterable :placeholder="$t('defaultistheprojectleader')" style="width:100%;" >
-                        <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
+                    </el-form-item>
+                    <el-form-item :label="$t('newspaperauditor')" v-show="user.timeType.reportAuditType==0">
+                        <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.auditUserIds" multiple="true" :disabled=" !(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" filterable :placeholder="$t('defaultistheprojectleader')" style="width:100%;" >
+                            <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
 
-                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :tile="true" :widthStr="'800'" :disabled="!(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" :subjectId="addForm.auditUserIds" :subject="participator" :clearable="false" :distinction="'10'"  :multiSelect="true" @selectCal="selectCal"></selectCat>
+                        <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :tile="true" :widthStr="'800'" :disabled="!(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" :subjectId="addForm.auditUserIds" :subject="participator" :clearable="false" :distinction="'10'"  :multiSelect="true" @selectCal="selectCal"></selectCat>
 
-                </el-form-item>
-                <!--专业项目协作版本功能 -->
-                <el-form-item :label="$t('ji-bie')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.company.packageProject==1">
-                    <el-select v-model="addForm.level"  :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" v-if="user.timeType.projectLevelState == 1">
-                        <el-option v-for="item in levelList" :key="item.id" :label="item.projectLevelName" :value="item.id"></el-option>
-                    </el-select>
-                    <el-select v-model="addForm.level"  :placeholder="this.$t('defaultText.pleaseChoose')" style="width:32%;" v-else>
-                        <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
-                    </el-select>
-                <!-- 增加合同金额字段 -->
-                        <!-- <span style="margin-left:63px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
-                        <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:33%;" @blur="contractAmountChange(addForm.contractAmount)"
-                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" :disabled="title == '新增项目' ? false : false"></el-input><span style="margin-left:10px;">元</span> -->
-                </el-form-item>
-                <!-- 增加合同金额字段 -->
-                <el-form-item  :label="$t('contractamount')" v-if="user.company.packageProject==1">
-                    <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:32%;" @input="contractAmountChange(addForm.contractAmount)" :placeholder="$t('zheng-shu')" clearable  @keyup.native="restrictNumber('contractAmount')"></el-input><span style="margin-left:10px;position:absolute;">{{ $t('yuan') }}</span>
-                    <template v-if="title == $t('modifytheproject') && contractAmountReasonShow">
-                        <span style="margin-left:63px;margin-right:10px;">{{ $t('modifythereason') }}</span>
-                        <el-input v-model="addForm.changeContractReason" style="width:33%" clearable :placeholder="$t('contractamountasd')"></el-input>
-                    </template>
-                </el-form-item>
+                    </el-form-item>
+                    <!--专业项目协作版本功能 -->
+                    <el-form-item :label="$t('ji-bie')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.company.packageProject==1">
+                        <el-select v-model="addForm.level"  :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" v-if="user.timeType.projectLevelState == 1">
+                            <el-option v-for="item in levelList" :key="item.id" :label="item.projectLevelName" :value="item.id"></el-option>
+                        </el-select>
+                        <el-select v-model="addForm.level"  :placeholder="this.$t('defaultText.pleaseChoose')" style="width:32%;" v-else>
+                            <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
+                        </el-select>
+                    <!-- 增加合同金额字段 -->
+                            <!-- <span style="margin-left:63px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
+                            <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:33%;" @blur="contractAmountChange(addForm.contractAmount)"
+                            placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" :disabled="title == '新增项目' ? false : false"></el-input><span style="margin-left:10px;">元</span> -->
+                    </el-form-item>
+                    <!-- 增加合同金额字段 -->
+                    <el-form-item  :label="$t('contractamount')" v-if="user.company.packageProject==1">
+                        <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:32%;" @input="contractAmountChange(addForm.contractAmount)" :placeholder="$t('zheng-shu')" clearable  @keyup.native="restrictNumber('contractAmount')"></el-input><span style="margin-left:10px;position:absolute;">{{ $t('yuan') }}</span>
+                        <template v-if="title == $t('modifytheproject') && contractAmountReasonShow">
+                            <span style="margin-left:63px;margin-right:10px;">{{ $t('modifythereason') }}</span>
+                            <el-input v-model="addForm.changeContractReason" style="width:33%" clearable :placeholder="$t('contractamountasd')"></el-input>
+                        </template>
+                    </el-form-item>
 
 
-                <el-form-item :label="$t('ommencementDate')" prop="planStartDate"  >
-                    <el-date-picker v-model="addForm.planStartDate" 
-                     :editable="false" style="width:32%;" 
-                     format="yyyy-MM-dd" 
-                     value-format="yyyy-MM-dd"
-                     :clearable="false" type="date" 
-                     :placeholder="$t('optiondate')"></el-date-picker>
+                    <el-form-item :label="$t('ommencementDate')" prop="planStartDate"  >
+                        <el-date-picker v-model="addForm.planStartDate" 
+                        :editable="false" style="width:32%;" 
+                        format="yyyy-MM-dd" 
+                        value-format="yyyy-MM-dd"
+                        :clearable="false" type="date" 
+                        :placeholder="$t('optiondate')"></el-date-picker>
 
-                    <span style="margin-left:63px;margin-right:10px;" >{{ $t('ji-hua-jie-shu-ri-qi') }}</span>
-                    <el-date-picker v-model="addForm.planEndDate" style="width:33%;"
-                     :editable="false" 
-                     format="yyyy-MM-dd" 
-                     value-format="yyyy-MM-dd"
-                     :clearable="false" type="date" 
-                     :placeholder="$t('optiondate')"></el-date-picker>
-                </el-form-item>
-                <el-form-item :label="$t('projectoutput')" prop="outputValue" v-if="user.timeType.outputValueStatus == 1">
-                    <el-input id="outputValue" v-model="addForm.outputValue" style="width:32%;"
-                    placeholder="" clearable  @keyup.native="restrictNumber('outputValue')">
-                    </el-input><span style="margin-left:10px;">{{ $t('yuan') }}</span>
-                </el-form-item>
+                        <span style="margin-left:63px;margin-right:10px;" >{{ $t('ji-hua-jie-shu-ri-qi') }}</span>
+                        <el-date-picker v-model="addForm.planEndDate" style="width:33%;"
+                        :editable="false" 
+                        format="yyyy-MM-dd" 
+                        value-format="yyyy-MM-dd"
+                        :clearable="false" type="date" 
+                        :placeholder="$t('optiondate')"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item :label="$t('projectoutput')" prop="outputValue" v-if="user.timeType.outputValueStatus == 1">
+                        <el-input id="outputValue" v-model="addForm.outputValue" style="width:32%;"
+                        placeholder="" clearable  @keyup.native="restrictNumber('outputValue')">
+                        </el-input><span style="margin-left:10px;">{{ $t('yuan') }}</span>
+                    </el-form-item>
 
-                <!-- 单个公司的固定字段 -->
-                <div v-if="user.companyId == '936'">
-                <el-form-item :label="$t('contractno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <el-input v-model="addForm.contractCode" maxlength="50" show-word-limit :placeholder="$t('peaseenterthe')" clearable></el-input>
-                </el-form-item>
-                <el-form-item :label="$t('warrantystartime')">
-                    <el-date-picker v-model="addForm.warrantyStartDate" 
-                     :editable="false" style="width:32%;" 
-                     format="yyyy-MM-dd" 
-                     value-format="yyyy-MM-dd"
-                     :clearable="false" type="date" 
-                     :placeholder="$t('optiondate')"></el-date-picker>
+                    <!-- 单个公司的固定字段 -->
+                    <div v-if="user.companyId == '936'">
+                    <el-form-item :label="$t('contractno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <el-input v-model="addForm.contractCode" maxlength="50" show-word-limit :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('warrantystartime')">
+                        <el-date-picker v-model="addForm.warrantyStartDate" 
+                        :editable="false" style="width:32%;" 
+                        format="yyyy-MM-dd" 
+                        value-format="yyyy-MM-dd"
+                        :clearable="false" type="date" 
+                        :placeholder="$t('optiondate')"></el-date-picker>
 
-                     <span style="margin-left:63px;margin-right:10px;" >{{ $t('warrantyexpirationtime') }}</span>
-                    <el-date-picker v-model="addForm.warrantyEndDate" style="width:33%;"
-                     :editable="false" 
-                     format="yyyy-MM-dd" 
-                     value-format="yyyy-MM-dd"
-                     :clearable="false" type="date" 
-                     placeholder="$t('optiondate')"></el-date-picker>
-                </el-form-item>
-                <el-form-item :label="$t('IndependentProject')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <!-- <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input> -->
-                    <el-select v-model="addForm.projectCategorySub" :placeholder="$t('defaultText.pleaseChoose')" clearable>
-                        <el-option :value="$t('softwareproject')" :label="$t('softwareproject')"></el-option>
-                        <el-option :value="$t('hardwareproject')" :label="$t('hardwareproject')"></el-option>
-                        <el-option :value="$t('integrationproject')" :label="$t('integrationproject')"></el-option>
-                        <el-option :value="$t('fu-wu-xiang-mu')" :label="$t('fu-wu-xiang-mu')"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item :label="$t('region')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
-                    <el-input v-model="addForm.region" :placeholder="$t('peaseenterthe')" clearable></el-input>
-                </el-form-item>
-                <el-form-item :label="$t('subordinateBU')" >
-                    <el-input v-model="addForm.bu" :placeholder="$t('subordinateBU')" clearable></el-input>
-                </el-form-item>
-                </div>
-                <div v-if="user.companyId == '428'">
-                    <el-form-item :label="$t('projectgroup')" >
-                        <el-input v-model="addForm.projectCategorySub" maxlength="50" show-word-limit :placeholder="$t('peaseenterthe')" clearable></el-input>
+                        <span style="margin-left:63px;margin-right:10px;" >{{ $t('warrantyexpirationtime') }}</span>
+                        <el-date-picker v-model="addForm.warrantyEndDate" style="width:33%;"
+                        :editable="false" 
+                        format="yyyy-MM-dd" 
+                        value-format="yyyy-MM-dd"
+                        :clearable="false" type="date" 
+                        placeholder="$t('optiondate')"></el-date-picker>
                     </el-form-item>
-                </div>
-                <!-- 项目基线 -->
-                <div style="margin: 10px 0 30px 0;min-height:200px;" v-if="user.company.packageProject == 1">
-                    <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane :label="$t('costbaseline')" name="baseCostPanel"  >
-                        <div style="padding-top:10px;">
-                            <!--新版 -->
-                            <span class="rg_span" v-for="(item, index) in projectBaseCostData" :key="item.id">
-                                <span style="width:120px;display: inline-block;" v-if="user.company.packageProject==1">{{item.baseName}}</span>
-                                <el-input :id="'baseCost'+index" @input="addUpfun()" v-model="item.baseAmount" style="width:200px; margin-bottom: 20px"
-                                :placeholder="$t('zheng-shu')" clearable  @keyup.native="restrictNumber('baseCost'+index)"></el-input><span style="margin-left:10px;">{{ $t('yuan') }}</span>
-                            </span>    
+                    <el-form-item :label="$t('IndependentProject')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <!-- <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input> -->
+                        <el-select v-model="addForm.projectCategorySub" :placeholder="$t('defaultText.pleaseChoose')" clearable>
+                            <el-option :value="$t('softwareproject')" :label="$t('softwareproject')"></el-option>
+                            <el-option :value="$t('hardwareproject')" :label="$t('hardwareproject')"></el-option>
+                            <el-option :value="$t('integrationproject')" :label="$t('integrationproject')"></el-option>
+                            <el-option :value="$t('fu-wu-xiang-mu')" :label="$t('fu-wu-xiang-mu')"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="$t('region')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
+                        <el-input v-model="addForm.region" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('subordinateBU')" >
+                        <el-input v-model="addForm.bu" :placeholder="$t('subordinateBU')" clearable></el-input>
+                    </el-form-item>
+                    </div>
+                    <div v-if="user.companyId == '428'">
+                        <el-form-item :label="$t('projectgroup')" >
+                            <el-input v-model="addForm.projectCategorySub" maxlength="50" show-word-limit :placeholder="$t('peaseenterthe')" clearable></el-input>
+                        </el-form-item>
+                    </div>
+                    <!-- 项目基线 -->
+                    <div style="margin: 10px 0 30px 0;min-height:200px;" v-if="user.company.packageProject == 1">
+                        <el-tabs v-model="activeName" @tab-click="handleClick">
+                        <el-tab-pane :label="$t('costbaseline')" name="baseCostPanel"  >
+                            <div style="padding-top:10px;">
+                                <!--新版 -->
+                                <span class="rg_span" v-for="(item, index) in projectBaseCostData" :key="item.id">
+                                    <span style="width:120px;display: inline-block;" v-if="user.company.packageProject==1">{{item.baseName}}</span>
+                                    <el-input :id="'baseCost'+index" @input="addUpfun()" v-model="item.baseAmount" style="width:200px; margin-bottom: 20px"
+                                    :placeholder="$t('zheng-shu')" clearable  @keyup.native="restrictNumber('baseCost'+index)"></el-input><span style="margin-left:10px;">{{ $t('yuan') }}</span>
+                                </span>    
 
-                            <!-- 合计 -->
-                            <div style="margin-top: 10px;float:right;">
-                                <span style="margin-right:50px;margin-right:10px;" v-if="user.company.packageProject==1">{{ $t('other.totals') }}</span>
-                                <span v-if="addForm.budget <= 0 || addForm.budget == undefined">0</span>
-                                <span v-else>{{addForm.budget | numberToCurrency}}</span>
-                                <span style="margin-right:50px;margin-left:10px;">{{ $t('yuan') }}</span>
-                            </div>
-                        </div>
-                    </el-tab-pane>
-                    <el-tab-pane :label="$t('keynodes')" name="baseCostPanep" v-if="user.companyId == '936'">
-                        <div style="padding-top:10px;">
-                            <!--新版 -->
-                            <div class="keyNodes">
-                                <div class="keyNodesName">{{ $t('nameofthenode') }}</div>
-                                <div class="keyNodesTime">{{ $t('plannedcompletiontime') }}</div>
-                                <div class="keyNodesTime">{{ $t('actualcompletiontime') }}</div>
-                                <div class="keyNodesTime">{{ $t('state.states') }}</div>
-                            </div>
-                            <div class="keyNodes" v-for="item in projectKeyNodesData" :key="item.nodesId">
-                                <div class="keyNodesName">{{item.nodesName}}</div>
-                                <div class="keyNodesTime">
-                                    <el-date-picker v-model="item.planCompleteDate" clearable style="width: 80%" size="small" :editable="false" format="yyyy-MM-dd"  value-format="yyyy-MM-dd" type="date"  :placeholder="$t('optiondate')"></el-date-picker>
+                                <!-- 合计 -->
+                                <div style="margin-top: 10px;float:right;">
+                                    <span style="margin-right:50px;margin-right:10px;" v-if="user.company.packageProject==1">{{ $t('other.totals') }}</span>
+                                    <span v-if="addForm.budget <= 0 || addForm.budget == undefined">0</span>
+                                    <span v-else>{{addForm.budget | numberToCurrency}}</span>
+                                    <span style="margin-right:50px;margin-left:10px;">{{ $t('yuan') }}</span>
                                 </div>
-                                <div class="keyNodesTime">
-                                    <el-date-picker v-model="item.actualCompleteDate" clearable style="width: 80%" size="small" :editable="false" format="yyyy-MM-dd"  value-format="yyyy-MM-dd" type="date"  :placeholder="$t('optiondate')"></el-date-picker>
+                            </div>
+                        </el-tab-pane>
+                        <el-tab-pane :label="$t('keynodes')" name="baseCostPanep" v-if="user.companyId == '936'">
+                            <div style="padding-top:10px;">
+                                <!--新版 -->
+                                <div class="keyNodes">
+                                    <div class="keyNodesName">{{ $t('nameofthenode') }}</div>
+                                    <div class="keyNodesTime">{{ $t('plannedcompletiontime') }}</div>
+                                    <div class="keyNodesTime">{{ $t('actualcompletiontime') }}</div>
+                                    <div class="keyNodesTime">{{ $t('state.states') }}</div>
                                 </div>
-                                <div class="keyNodesTime">
-                                    <el-select v-model="item.states" :placeholder="$t('defaultText.pleaseChoose')" style="width: 80%" size="small">
-                                        <el-option :label="$t('zheng-chang')" value="0"></el-option>
-                                        <el-option :label="$t('yan-qi')" value="1"></el-option>
-                                        <el-option :label="$t('wan-cheng')" value="2"></el-option>
-                                    </el-select>
+                                <div class="keyNodes" v-for="item in projectKeyNodesData" :key="item.nodesId">
+                                    <div class="keyNodesName">{{item.nodesName}}</div>
+                                    <div class="keyNodesTime">
+                                        <el-date-picker v-model="item.planCompleteDate" clearable style="width: 80%" size="small" :editable="false" format="yyyy-MM-dd"  value-format="yyyy-MM-dd" type="date"  :placeholder="$t('optiondate')"></el-date-picker>
+                                    </div>
+                                    <div class="keyNodesTime">
+                                        <el-date-picker v-model="item.actualCompleteDate" clearable style="width: 80%" size="small" :editable="false" format="yyyy-MM-dd"  value-format="yyyy-MM-dd" type="date"  :placeholder="$t('optiondate')"></el-date-picker>
+                                    </div>
+                                    <div class="keyNodesTime">
+                                        <el-select v-model="item.states" :placeholder="$t('defaultText.pleaseChoose')" style="width: 80%" size="small">
+                                            <el-option :label="$t('zheng-chang')" value="0"></el-option>
+                                            <el-option :label="$t('yan-qi')" value="1"></el-option>
+                                            <el-option :label="$t('wan-cheng')" value="2"></el-option>
+                                        </el-select>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </el-tab-pane>
-                    <el-tab-pane :label="$t('engineering')" name="engineeringProfession" v-if="user.company.packageEngineering == 1">
-                       <div style="padding-top:10px;">
-                           <el-table :data="projectProfessionList" size="small" :key="Math.random()">
-                               <el-table-column prop="professionId" width="200">
-                                   <template slot-scope="scope">
-                                       <el-select v-model="scope.row.professionId" >
-                                           <el-option v-for="item in professionList" :key="item.id" :label="item.name" :value="item.id"/>
-                                       </el-select>
-                                   </template>
-                                   <template slot="header" >
-                                       <span style="font-size:14px;font-weight:normal;">{{ $t('nameprofessional') }}</span>
-                                   </template>
-                               </el-table-column>
-                               <el-table-column prop="percentage" width="120" :label="$t('zhan-bi')">
-                                   <template slot-scope="scope">
-                                       <div><el-input type="number" v-model="scope.row.percentage"></el-input></div>
-                                   </template>
-                               </el-table-column>
-                               
-                               <el-table-column prop="membNames" :label="$t('personnelproportion')">
-                                   <template slot-scope="scope">
-                                       <span style="margin:0 5px;" v-for="item in scope.row.membList" :key="item.membId">
-                                            <span v-if="user.userNameNeedTranslate != 1">{{item.membName}}({{item.percentage}}%)</span>
-                                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.membName'></ww-open-data>({{item.percentage}}%)</span>
-                                        </span>
-                                       <el-link @click="showEditPpMembs(scope.row)">{{(scope.row.membList == null || scope.row.membList.length == 0)?$t('professionalparticipants'):$t('setup')}}</el-link>
-                                   </template>
-                               </el-table-column>
-                               <el-table-column prop="inchargerName" width="120" :label="$t('head')">
-                                   <template slot-scope="scope">
-                                       <el-select v-model="scope.row.inchargerId" v-if="user.userNameNeedTranslate != 1">
-                                           <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                       </el-select>
+                        </el-tab-pane>
+                        <el-tab-pane :label="$t('engineering')" name="engineeringProfession" v-if="user.company.packageEngineering == 1">
+                        <div style="padding-top:10px;">
+                            <el-table :data="projectProfessionList" size="small" :key="Math.random()">
+                                <el-table-column prop="professionId" width="200">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.professionId" >
+                                            <el-option v-for="item in professionList" :key="item.id" :label="item.name" :value="item.id"/>
+                                        </el-select>
+                                    </template>
+                                    <template slot="header" >
+                                        <span style="font-size:14px;font-weight:normal;">{{ $t('nameprofessional') }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="percentage" width="120" :label="$t('zhan-bi')">
+                                    <template slot-scope="scope">
+                                        <div><el-input type="number" v-model="scope.row.percentage"></el-input></div>
+                                    </template>
+                                </el-table-column>
+                                
+                                <el-table-column prop="membNames" :label="$t('personnelproportion')">
+                                    <template slot-scope="scope">
+                                        <span style="margin:0 5px;" v-for="item in scope.row.membList" :key="item.membId">
+                                                <span v-if="user.userNameNeedTranslate != 1">{{item.membName}}({{item.percentage}}%)</span>
+                                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.membName'></ww-open-data>({{item.percentage}}%)</span>
+                                            </span>
+                                        <el-link @click="showEditPpMembs(scope.row)">{{(scope.row.membList == null || scope.row.membList.length == 0)?$t('professionalparticipants'):$t('setup')}}</el-link>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="inchargerName" width="120" :label="$t('head')">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.inchargerId" v-if="user.userNameNeedTranslate != 1">
+                                            <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                        </el-select>
 
-                                       <!-- <selectCat :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :index="scope.index" :distinction="'4'" style="position: relative;z-index:99999999999 !important;"></selectCat> -->
+                                        <!-- <selectCat :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :index="scope.index" :distinction="'4'" style="position: relative;z-index:99999999999 !important;"></selectCat> -->
 
-                                   </template>
-                               </el-table-column>
-                               <el-table-column  width="80">
-                                   <template slot-scope="scope">
-                                       <el-button icon="el-icon-delete" size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.$index)"></el-button>
-                                   </template>
-                                   <template slot="header" >
-                                       <el-link type="primary" :underline="false" @click="addItem">{{ $t('addTian') }}</el-link>
-                                   </template>
-                               </el-table-column>
-                           </el-table>
-                       </div>
-                    </el-tab-pane>
-                    <!-- <el-tab-pane label="相关领导" name="leaders" >
-                       <div style="padding-top:10px;">
-                           <el-input @focus="showChooseLeaderTree" v-model="addForm.notifyUserNames" placeholder="请选择需要接收审核通知的相关领导"></el-input>
-                       </div>
-                    </el-tab-pane> -->
-                    </el-tabs>
-                </div>
-            
-            </el-form>  
+                                    </template>
+                                </el-table-column>
+                                <el-table-column  width="80">
+                                    <template slot-scope="scope">
+                                        <el-button icon="el-icon-delete" size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.$index)"></el-button>
+                                    </template>
+                                    <template slot="header" >
+                                        <el-link type="primary" :underline="false" @click="addItem">{{ $t('addTian') }}</el-link>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        </el-tab-pane>
+                        <!-- <el-tab-pane label="相关领导" name="leaders" >
+                        <div style="padding-top:10px;">
+                            <el-input @focus="showChooseLeaderTree" v-model="addForm.notifyUserNames" placeholder="请选择需要接收审核通知的相关领导"></el-input>
+                        </div>
+                        </el-tab-pane> -->
+                        </el-tabs>
+                    </div>
+                
+                </el-form>  
+            </div>
             <div slot="footer" class="dialog-footer;">
                 <el-button @click.native="deletePro(1, addForm)" v-if="(permissions.projectManagement || user.id==deleteVif) && addForm.id" style="float:left">{{ $t('btn.delete') }}</el-button>
                 <el-button @click.native="addFormVisible = false">{{ $t('btn.cancel') }}</el-button>

fhKeeper/formulahousekeeper/timesheet_h5/public/index.html

@@ -17,17 +17,21 @@
     <!-- 引入企业微信js -->
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
-    <script>
-        window.onerror = function(err) {
-            return true
+    <script language="javascript"> 
+        function killerrors() {
+            return true;
         }
-    </script>
-    <meta name="wpk-bid" content="dta_2_71020"> <script>var isDingtalk = navigator && /DingTalk/.test(navigator.userAgent);var isProductEnv = window &&window.location &&window.location.host 
+        window.onerror = killerrors;
+      </script>
+    <meta name="wpk-bid" content="dta_2_71020">
+        <script>
+        var isDingtalk = navigator && /DingTalk/.test(navigator.userAgent);var isProductEnv = window &&window.location &&window.location.host 
         && window.location.host.indexOf('//127.0.0.1')===-1
         && window.location.host.indexOf('//localhost')===-1
         && window.location.host.indexOf('//192.168.')===-1
         // 如果有其它测试域名，请一起排掉，减少测试环境对生产环境监控的干扰
-    if (isProductEnv) {    !(function(c,i,e,b){var h=i.createElement("script");var f=i.getElementsByTagName("script")[0];h.type="text/javascript";h.crossorigin=true;h.onload=function(){c[b]||(c[b]=new c.wpkReporter({bid:"dta_2_71020"}));c[b].installAll()};f.parentNode.insertBefore(h,f);h.src=e})(window,document,"https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js","__wpk"); }</script>
+        if (isProductEnv) {    !(function(c,i,e,b){var h=i.createElement("script");var f=i.getElementsByTagName("script")[0];h.type="text/javascript";h.crossorigin=true;h.onload=function(){c[b]||(c[b]=new c.wpkReporter({bid:"dta_2_71020"}));c[b].installAll()};f.parentNode.insertBefore(h,f);h.src=e})(window,document,"https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js","__wpk"); }
+    </script>
 
     <script>
         function IsPC() { 

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -231,7 +231,7 @@ export default {
         return {
             user: JSON.parse(localStorage.userInfo),
             projectId: JSON.parse(sessionStorage.projectId),
-            projectDetail: null,
+            projectDetail: {},
             
             active: 0,
             inside:{    // 任务看板