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

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

@@ -677,7 +677,7 @@
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="onTaskSelected(domain)">
                                 <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>
                             </el-select>
-                            <el-checkbox v-model="domain.taskFinish" v-if="domain.taskId != undefined">{{$t('state.completed')}}</el-checkbox>
+                            <el-checkbox v-model="domain.taskFinish" v-if="domain.taskId != undefined && user.companyId != '5608'">{{$t('state.completed')}}</el-checkbox>
                         </el-form-item>
                         <!--针对依斯贝的SAP服务-->
                         <el-form-item v-if="user.companyId==3092" label="服务" :prop="'domains.' + index + '.sapServiceId'" 
@@ -1161,6 +1161,15 @@
                         <el-option :label="$t('state.alreadyPassedAndWaitingAudit')" value="1"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item prop="exportType" :label="'导出方式'" v-if="user.companyId == '936'">
+                    <div class="exportReportRadio">
+                        <el-radio v-model="exportType" :label="0">完整导出</el-radio>
+                        <el-radio v-model="exportType" :label="1">精简导出</el-radio>
+                        <el-tooltip effect="dark" :content="'精简日报不含工作事项和审批信息，数据量更小导出更快。'" placement="top-start">
+                            <i class="el-icon-question"></i>
+                        </el-tooltip>
+                    </div>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="exportReport" style="width:100%;" :loading="exportingData">{{$t('export.export')}}</el-button>
@@ -1952,6 +1961,7 @@
         },
         data() {
             return {
+                exportType: 0,
                 exportingData: false,
                 roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
                 jobResponseList:[],
@@ -4182,6 +4192,7 @@
             // },
 
             showExportDialog() {
+                this.exportType = 0
                 this.exportDialog = true;
             },
             showExportTimeDialog() {
@@ -5338,7 +5349,7 @@
                 this.exportingData = true;
                 var param = {};
                 if (this.exportParam.dateRange != null) {
-                    param = {startDate:this.exportParam.dateRange[0], endDate: this.exportParam.dateRange[1]};
+                    param = {startDate:this.exportParam.dateRange[0], endDate: this.exportParam.dateRange[1], exportType: this.exportType};
                 }
                 if (this.exportParam.projectId != null) {
                     param.projectId = this.exportParam.projectId;
@@ -5348,6 +5359,7 @@
                 }
                 param.stateKey = this.stateKey
                 // param.departmentId = this.user.departmentId
+                console.log(param, '《=== 导出传的参数')
                 this.http.post( this.port.report.export, param,
                 res => {
                     this.exportingData = false;

fhKeeper/formulahousekeeper/timesheet_h5/package.json

@@ -17,6 +17,7 @@
     "css-loader": "^3.6.0",
     "dingtalk-jsapi": "^2.13.42",
     "echarts": "^4.9.0",
+    "element-ui": "^2.15.14",
     "font-awesome": "^4.7.0",
     "jquery": "^3.6.1",
     "pdfh5": "^1.4.2",

fhKeeper/formulahousekeeper/timesheet_h5/src/components/Element.js

@@ -0,0 +1,6 @@
+import Vue from 'vue'
+import { Tree, Radio, Checkbox } from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css';
+Vue.use(Tree)
+Vue.use(Radio)
+Vue.use(Checkbox)

fhKeeper/formulahousekeeper/timesheet_h5/src/main.js

@@ -13,6 +13,7 @@ import axios from 'axios'; /* 引入axios进行地址访问*/
 Vue.prototype.$http = axios;
 
 import "@/components/Vant";
+import './components/Element.js'
 
 import { Form , Toast , Grid, GridItem , DatetimePicker , Popover,
 Picker , Dialog , NumberKeyboard , Sticky , Skeleton ,

fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -196,7 +196,7 @@
                         if(this.user.timeType.enableNewWeeklyfill != 1 && this.user.companyId != 4374) { // 针对新版按周填报去掉填写日报
                             this.routers.push({name: '填写日报',url: '/edit',icon: 'edit'})
                         }
-                        if (this.user.companyId != 3092) {
+                        if (this.user.companyId != 3092 && this.user.timeType.type != 0) {
                             this.routers.push({name: '按周填报',url: '/weekEdit',icon: 'records'})
                         }
                         if(jurisdictionNameList.some(item => item == '代填日报')) {
@@ -361,7 +361,6 @@
                             //去掉按周填报
                             this.routers = this.routers.filter(r=>r.name != '按周填报');
                         } 
-
                         // this.bindIfNessary();
                     } 
                 }).catch(err=> {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue

@@ -4,9 +4,45 @@
 
         <div class="login_form">
             <van-sticky :offset-top="46">
-                <van-field readonly clickable name="datetimePicker" :value="nowTime" label="时间选择" placeholder="点击选择时间"
-                    @click="showPicker = true" />
+                <van-cell title="时间选择" clickable :value="nowTime" @click="showPicker = true" />
             </van-sticky>
+            <div v-if="user.manageDeptId != 0 || reportsCompany || reportsDept">
+                <van-sticky :offset-top="90">
+                    <van-cell title="选择部门" clickable :value="departmentText" @click="selectDepartmentShow = true">
+                        <template #extra>
+                            <van-icon v-if="departmentText" name="close" class="clearSeach"
+                                @click.stop="selectUserClear('dept')" />
+                        </template>
+                        <template #default>
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <span v-if="departmentText">
+                                    <ww-open-data type='departmentName' :openid='departmentText'></ww-open-data>
+                                </span>
+                            </span>
+                            <span v-else>{{ departmentText }}</span>
+                        </template>
+                    </van-cell>
+                </van-sticky>
+                <van-sticky :offset-top="134" class="one_report_select">
+                    <van-cell title="选择人员" clickable :value="userNameValue" @click="selectUserShow = true"
+                        value-class="userNameValue">
+                        <template #extra>
+                            <van-icon v-if="selectPeopleVal.name" name="close" class="clearSeach"
+                                @click.stop="selectUserClear('user')" />
+                        </template>
+                        <template #default>
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <span v-if="selectPeopleVal.name">
+                                    <ww-open-data type='userName' :openid='selectPeopleVal.name'></ww-open-data>
+                                </span>
+                            </span>
+                            <span v-else>{{ userNameValue }}</span>
+                        </template>
+                    </van-cell>
+                </van-sticky>
+            </div>
+
+
             <van-popup v-model="showPicker" position="bottom">
                 <van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate"
                     @confirm="changeTime" @cancel="showPicker = false" />
@@ -33,8 +69,8 @@
                         </span>
                     </div>
                     <div v-if="user.timeType.enableNewWeeklyfill == 1 && item.summary != null" style="margin-left:20px;"
-                         v-html="'<b>'+item.summaryTitle+'</b><br>'+item.summary.replace(/\r\n/g, '<br>')">
-                        
+                        v-html="'<b>' + item.summaryTitle + '</b><br>' + item.summary.replace(/\r\n/g, '<br>')">
+
                     </div>
                     <div v-for="(item1, index1) in item.data" class="one_report_data" :key="index1">
                         <div class="project_title" style="font-weight:bold;">项目：{{ item1.project }} <span
@@ -73,12 +109,16 @@
                         <div style="color:red;" v-if="item1.state == 2 && item1.rejectReason != null">原因:{{
                             item1.rejectReason }}
                         </div>
-                        <div class="project_title" v-if="item1.subProjectName != null && user.companyId != yuzhongCompId">子项目：{{ item1.subProjectName }}</div>
-                        <div class="project_title" v-if="user.companyId == yuzhongCompId" >角色：{{item1.extraField1?roleList.find(r=>r.value==item1.extraField1).label:''}}</div>
+                        <div class="project_title" v-if="item1.subProjectName != null && user.companyId != yuzhongCompId">
+                            子项目：{{ item1.subProjectName }}</div>
+                        <div class="project_title" v-if="user.companyId == yuzhongCompId">
+                            角色：{{ item1.extraField1 ? roleList.find(r => r.value == item1.extraField1).label : '' }}</div>
                         <div class="project_title" v-if="user.company.packageProject == 1 && item1.groupName != null">
                             任务分组：{{ item1.groupName }}</div>
-                        <div class="project_title" v-if="user.companyId == yuzhongCompId" >工作职责：{{item1.extraField2?item1.extraField2Name:''}}</div>
-                        <div class="project_title" v-if="user.companyId == yuzhongCompId" >工作内容：{{item1.extraField3?item1.extraField3Name:''}}</div>
+                        <div class="project_title" v-if="user.companyId == yuzhongCompId">
+                            工作职责：{{ item1.extraField2 ? item1.extraField2Name : '' }}</div>
+                        <div class="project_title" v-if="user.companyId == yuzhongCompId">
+                            工作内容：{{ item1.extraField3 ? item1.extraField3Name : '' }}</div>
                         <div class="project_title" v-if="user.company.packageProject == 1 && item1.stage != '-'">
                             投入阶段：{{ item1.stage }}</div>
                         <!--自定义维度 -->
@@ -149,16 +189,81 @@
             <van-empty v-if="report.length == 0" description="暂无日报">
                 <van-button round type="primary" class="bottom-button" @click="toWriteReport()">去填写</van-button>
             </van-empty>
+
+            <!-- 人员选择 -->
+            <van-popup v-model="selectUserShow" position="bottom" style="height: 90%">
+                <div class="popupDiv">
+                    <div class="popupSearch">
+                        <van-search v-model.trim="searchInputValue" placeholder="输入员工姓名搜索" @clear="userListSearch" @search="userListSearch"
+                            shape="round" background="#F4F4F4"></van-search>
+                    </div>
+
+                    <div class="popupCon conBorder" style="flex: 1;background-color: #fff;">
+                        <div class="popupConBox">
+                            <van-radio-group v-model="selectPeopleVal">
+                                <van-radio v-for="uitem in showUserList" :key="uitem.id" :name="uitem" style="padding:10px"
+                                    class="popupItem marginNone borderNone">
+                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
+                                            :openid='uitem.name'></ww-open-data></span>
+                                    <span v-else>{{ uitem.name ? uitem.name : '' }}</span>
+                                </van-radio>
+                            </van-radio-group>
+                        </div>
+                    </div>
+
+                    <div class="popupBtn">
+                        <van-button style="width:100%;background: #1989fa;color: #ffffff;" round
+                            @click="selectUserConfirm()">确定</van-button>
+                    </div>
+                </div>
+            </van-popup>
+
+            <!-- 部门选择 -->
+            <van-popup v-model="selectDepartmentShow" position="bottom" style="height: 90%">
+                <div class="popupDiv">
+                    <div class="comPaceholder">
+                        已选择部门：
+                        <span v-if="user.userNameNeedTranslate != '1'">
+                            {{ selectDepartmentText.length > 0 ? selectDepartmentText[0].label : '请选择部门' }}
+                        </span>
+                        <span v-else>
+                            <span v-if="selectDepartmentText.length > 0">
+                                <ww-open-data type='departmentName' :openid='selectDepartmentText[0].label'></ww-open-data>
+                            </span>
+                            <span v-else>请选择部门</span>
+                        </span>
+                    </div>
+                    <div class="popupCon conBorder comTree" style="flex: 1;">
+                        <el-tree :data="departmentList" :props="defaultProps" @node-click="treeNodeClick">
+                            <span class="custom-tree-node" slot-scope="{ node }">
+                                <span v-if="user.userNameNeedTranslate == '1'">
+                                    <span>
+                                        <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    </span>
+                                </span>
+                                <span v-if="user.userNameNeedTranslate != '1'">
+                                    {{ node.label }}
+                                </span>
+                            </span>
+                        </el-tree>
+                    </div>
+                    <div class="popupBtn">
+                        <van-button style="width:100%;background: #1989fa;color: #ffffff;" round
+                            @click="treeBtn">确定</van-button>
+                    </div>
+                </div>
+            </van-popup>
         </div>
     </div>
 </template>
 
 <script>
 export default {
+    components: {},
     data() {
         return {
             yuzhongCompId: 3385,
-            roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
+            roleList: [{ value: 1, label: 'CRC&LM' }, { value: 2, label: 'PM' }],
             tmpPics: [],
             imgShow: false,
             hasWaiting: false,
@@ -173,6 +278,24 @@ export default {
             report: [],
             fullDayTxt: ['全天', '上午', '下午'],
             statusTxt: ["待审核", "已通过", "已驳回", "待提交"],
+            selectUserShow: false,
+            searchInputValue: '',
+            userList: '',
+            showUserList: '',
+            userIdList: '',
+            userNameValue: '',
+            selectPeopleVal: {},
+
+            selectDepartmentShow: false,
+            selectDepartmentText: [],
+            departmentText: '',
+            departmentList: [],
+            defaultProps: {
+                children: 'children',
+                label: 'label'
+            },
+            reportsCompany: false,
+            reportsDept: false
         };
     },
     created() {
@@ -182,12 +305,94 @@ export default {
             this.imgShow = true;
             this.tmpPics = item;
         },
-
         // 返回
         back() {
             history.back();
         },
+        getUsers() {
+            this.$axios.post("/user/getEmployeeList", {
+                departmentId: -1,
+                pageIndex: 1,
+                pageSize: -1
+            })
+                .then(res => {
+                    if (res.code == "ok") {
+                        this.userList = res.data.records;
+                        this.showUserList = res.data.records
+                    } else {
+                        this.$toast.fail('获取失败');
+                    }
+                }).catch(err => { this.$toast.clear(); });
+        },
+        getDepartmentList() {
+            this.$axios.post("/department/list", {})
+                .then(res => {
+                    if (res.code == "ok") {
+                        this.departmentList = res.data;
+                    } else {
+                        this.$toast.fail('获取失败');
+                    }
+                }).catch(err => { this.$toast.clear(); });
+        },
+        userListSearch(val) {
+            const { userNameNeedTranslate } = this.user
+            if(!this.searchInputValue) {
+                this.showUserList = JSON.parse(JSON.stringify(this.userList))
+                return
+            }
+
+            if (userNameNeedTranslate != 1) {
+                const newUserList = JSON.parse(JSON.stringify(this.userList))
+                this.showUserList = newUserList.filter(item => item.name.indexOf(this.searchInputValue) != -1)
+            }
+
+            if (userNameNeedTranslate == 1) {
+                this.$axios.post("/user/getEmployeeList", {
+                    departmentId: -1, pageIndex: 1, pageSize: 200,
+                    keyword: this.searchInputValue, status: '',
+                    roleId: '', cursor: '', onlyDirect: 0, matchingType: 0
+                })
+                    .then(res => {
+                        if (res.code == "ok") {
+                            const dataList = res.data.records
+                            const userNameList = dataList.map(item => item.name)
+                            const newUserList = JSON.parse(JSON.stringify(this.userList))
+                            this.showUserList = newUserList.filter(item => userNameList.some(uItem => uItem.includes(item.name)))
+                            console.log(userNameList)
+                        } else {
+                            this.$toast.fail('搜索失败');
+                        }
+                    }).catch(err => { this.$toast.clear(); });
+            }
+        },
+        selectUserConfirm() {
+            console.log(this.selectPeopleVal)
 
+            this.selectUserShow = false
+            this.getReport()
+        },
+        selectUserClear(str) {
+            if (str == 'user') {
+                this.selectPeopleVal = {}
+            }
+            if (str == 'dept') {
+                this.departmentText = '',
+                    this.selectDepartmentText = []
+            }
+            this.getReport()
+        },
+        treeNodeClick(item) {
+            this.selectDepartmentText = [item]
+        },
+        treeBtn() {
+            if (this.selectDepartmentText.length <= 0) {
+                this.$toast('请选择部门');
+                return
+            }
+            this.departmentText = this.selectDepartmentText[0].label
+            this.selectDepartmentShow = false
+            this.getReport()
+        },
         // 时间转换
         format(date, pattern) {
             pattern = pattern || "yyyy-MM-dd";
@@ -226,7 +431,16 @@ export default {
                 forbidClick: true,
                 duration: 0
             });
-            this.$axios.post("/report/getReportList", { date: this.nowTime })
+            let pames = {
+                date: this.nowTime,
+            }
+            if (this.selectPeopleVal.id) {
+                pames.userId = this.selectPeopleVal.id
+            }
+            if (this.departmentText && this.selectDepartmentText.length > 0) {
+                pames.deptId = this.selectDepartmentText[0].id
+            }
+            this.$axios.post("/report/getReportList", pames)
                 .then(res => {
                     if (res.code == "ok") {
                         this.$toast.clear();
@@ -247,7 +461,7 @@ export default {
         // 点击编辑
         editor(item) {
             var path = '/edit';
-            if(this.user.timeType.enableNewWeeklyfill == 1) {
+            if (this.user.timeType.enableNewWeeklyfill == 1) {
                 //物奇要填到按周填报
                 path = '/weekEdit';
             }
@@ -261,7 +475,7 @@ export default {
         // 去填写日报
         toWriteReport() {
             var path = '/edit';
-            if(this.user.timeType.enableNewWeeklyfill == 1) {
+            if (this.user.timeType.enableNewWeeklyfill == 1) {
                 //物奇要填到按周填报
                 path = '/weekEdit';
             }
@@ -278,7 +492,18 @@ export default {
             this.nowTime = sessionStorage.targetDate;
             sessionStorage.removeItem('targetDate');
         }
+        const { functionList } = this.user
+        for (var i in functionList) {
+            if (functionList[i].name == '查看全公司工时') {
+                this.reportsCompany = true
+            }
+            if (functionList[i].name == '查看本部门工时') {
+                this.查看本部门工时 = true
+            }
+        }
         this.getReport();
+        this.getUsers()
+        this.getDepartmentList()
     }
 };
 </script>
@@ -293,6 +518,10 @@ export default {
     font-size: 14px;
 }
 
+.one_report_select {
+    margin-bottom: 15px;
+}
+
 .form_text {
     margin: 15px 0 15px;
     padding: 0 12px;
@@ -314,6 +543,19 @@ export default {
         line-height: 30px;
     }
 }
+
+.comPaceholder {
+    margin: 10px 15px;
+    background: #fff;
+    padding: 10px 10px;
+    border-radius: 6px;
+    font-size: 14px;
+    color: #606266;
+}
+
+.comTree {
+    background: #ffffff;
+}
 </style>
 <style lang="less">
 .van-nav-bar .van-icon,
@@ -349,4 +591,15 @@ export default {
     background-color: rgb(53, 130, 245);
     border-color: rgb(53, 130, 245);
 }
+
+.clearSeach {
+    line-height: 0.64rem;
+    position: relative;
+    left: 5px;
+}
+
+.userNameValue {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>

fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -5,19 +5,19 @@ const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 const Timestamp = new Date().getTime();
 
 // var ip = '47.101.180.183'
-// var ip = '47.100.37.243'
+var ip = '47.100.37.243'
 // var ip = '192.168.2.7'
 // var ip = '127.0.0.1'
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
     runtimeCompiler: true,