调整移动端选择项目，加班情况统计选择项目

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,7 +1,8 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.36'
+// var ip = '192.168.2.36'
+var ip = '192.168.2.39'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -283,8 +283,11 @@
             <div v-if="ins == 6" style="padding: 0 20px">
               <div class="flsx">
                 <div>
-                  <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
+                  <!-- <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
                     <el-option v-for="(item, index) in proList" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
+                  </el-select> -->
+                  <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
+                    <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
                   </el-select>
                 </div>
                 <div class="bianju">
@@ -535,6 +538,7 @@ export default {
       detailsList: [],
       baseCostList: [],
       baseCostColumns: [],
+      proListOvertime: [], // 加班情况项目筛选
     };
   },
   computed: {},
@@ -549,6 +553,7 @@ export default {
   },
 
   mounted() {
+    this.getProjectListOvertime()
     this.getProjectList();
     this.getUserList()
   },
@@ -992,6 +997,31 @@ export default {
             });
         });
     },
+    // 加班情况获取项目
+    getProjectListOvertime() {
+        this.listLoading = true;
+        this.http.post('/project/getProjectPage', {
+                    pageIndex: 1,
+                    pageSize: 9999,
+        },
+        res => {
+            if (res.code == "ok") {
+                this.proListOvertime = res.data.records
+                this.listLoading = false; 
+            } else {
+                this.$message({
+                message: res.msg,
+                type: "error"
+                });
+            }
+        },
+        error => {
+            this.$message({
+                message: error,
+                type: "error"
+            });
+        });
+    },
     // 点击侧边栏事件
     side() {
       if(this.$refs.side.style.left < '0px') {

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

@@ -750,7 +750,12 @@
                         end-placeholder="结束日期"
                     ></el-date-picker>
                 </el-form-item>
-                
+                <el-form-item prop="stateKey" label="是否包含">
+                    <el-select v-model="stateKey" placeholder="请选择" filterable style="width:350px;">
+                        <el-option label="不包含未审核" value="0"></el-option>
+                        <el-option label="包含未审核" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="exportReport" style="width:100%;" >导出</el-button>
@@ -1416,7 +1421,9 @@
                 deptMembDataText: '',
 
                 isFlag: false,
-                isMore: false
+                isMore: false,
+
+                stateKey: '0'
             };
         },
         watch: {
@@ -3352,7 +3359,7 @@
                     this.$message({
                         message: error,
                         type: "error"
-                    });
+                    }); 
                 });
             },
             //导出日报
@@ -3365,6 +3372,7 @@
                 if (this.exportParam.projectId != null) {
                     param.projectId = this.exportParam.projectId;
                 }
+                param.stateKey = this.stateKey
                 this.http.post( this.port.report.export, param,
                 res => {
                     this.listLoading = false;

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

@@ -298,7 +298,7 @@
         <!-- 选择项目弹窗 -->
         <van-popup v-model="showPickerUserddp" position="bottom" style="height: 80%">
             <!-- <van-search v-model="userName" placeholder="输入项目名称搜索" @clear="sea()" @blur="sea()" @search="sea()"></van-search> -->
-            <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()"/>
+            <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
                 <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">{{item.projectName}}</div>
             </div>
@@ -430,11 +430,11 @@
                     console.log(123)
                     let text = this.userName
                     let reg = new RegExp(text)
-                    let data = this.projectss.filter(item => reg.test(item.projectName)) //返回
+                    let data = this.proads.filter(item => reg.test(item.projectName)) //返回
                     this.projectss = data
                 } else {
                     console.log(456)
-                    this.project = this.proads
+                    this.projectss = this.proads
                 }
             },
             fZr(item,index) {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -320,7 +320,7 @@
         <!-- 选择项目弹窗 -->
         <van-popup v-model="showPickerUserddp" position="bottom" style="height: 80%">
             <!-- <van-search v-model="userName" placeholder="输入项目名称搜索" @clear="sea()" @blur="sea()" @search="sea()"></van-search> -->
-            <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()"/>
+            <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
                 <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">{{item.projectName}}</div>
             </div>
@@ -522,11 +522,11 @@
                     console.log(123)
                     let text = this.userName
                     let reg = new RegExp(text)
-                    let data = this.projectss.filter(item => reg.test(item.projectName)) //返回
+                    let data = this.proads.filter(item => reg.test(item.projectName)) //返回
                     this.projectss = data
                 } else {
                     console.log(456)
-                    this.project = this.proads
+                    this.projectss = this.proads
                 }
             },
             fZr(item,index) {

fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,17 +4,17 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 // var ip = '127.0.0.1'
-// var ip = '192.168.2.6'
+var ip = '192.168.2.39'
 // var ip = '47.100.37.243'
-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 = {
     // 关闭eslint检查