2022.5.7

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,7 +1,7 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.21'
+// var ip = '192.168.2.14'
 // 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

@@ -313,6 +313,7 @@
             <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
+                :current-page="page"
                 :page-sizes="[20 , 50 , 80 , 100]"
                 :page-size="20"
                 layout="total, sizes, prev, pager, next"
@@ -690,6 +691,7 @@ export default {
       this.list = [];
       this.page = 1;
       this.pageSize = 20;
+      this.$forceUpdate()
       this.getList();
     },
     getCustomerProjectInAndOut() {

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

@@ -1141,6 +1141,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 },res => {
                     if(res.code == 'ok'){
                         this.alreadyPartArray = res.data
+                        this.chosenMembCount = res.data.length
                         // console.log('get',res.data, this.alreadyPartArray)
                     }else {
                         this.$message({

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

@@ -171,7 +171,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="addSubProject = false">取消</el-button>
-                <el-button type="primary" @click="submitInsertSubProject" :loading="addLoading">提交</el-button>
+                <el-button type="primary" @click="submitInsertSubProject" :loading="addLoading">提交456</el-button>
             </div>
         </el-dialog>
 
@@ -1009,54 +1009,56 @@ import { error } from 'dingtalk-jsapi';
                         }
                 });
             },
-            submitInsert() {
-                this.$refs.form1.validate(valid => {
-                    if (valid) {
-                        this.addLoading = true;
-                        let formData = new FormData();
-                        formData.append("name", this.addForm.name);
-                        if(this.addForm.id != null) {
-                            formData.append("id", this.addForm.id);
-                        }
-                        if(this.addForm.userId.length != 0) {
-                            for(var j in this.addForm.userId) {
-                                formData.append("userId", this.addForm.userId[j]);
-                            }
-                        }
-                        if(this.addForm.inchargerId != null) {
-                            formData.append("inchargerId", this.addForm.inchargerId);
-                        }
-                        if(this.addForm.code != null) {
-                            formData.append("code", this.addForm.code);
-                        }
-                        
-                        this.http.uploadFile(this.port.project.add,formData,
-                        res => {
-                            this.addLoading = false;
-                            if (res.code == "ok") {
-                                this.$message({
-                                    message: this.addForm.id!=null?'修改':'创建'+"成功",
-                                    type: "success"
-                                });
-                                this.addFormVisible = false;
-                                this.getList();
-                            } else {
-                                this.$message({
-                                    message: res.msg,
-                                    type: "error"
-                                });
-                            }
-                        },
-                        error => {
-                            this.addLoading = false;
-                            this.$message({
-                                message: error,
-                                type: "error"
-                            });
-                        });
-                        }
-                });
-            },
+            // submitInsert() {
+            //     console.log("111");
+            //     this.$refs.form1.validate(valid => {
+            //         if (valid) {
+            //             this.addLoading = true;
+            //             let formData = new FormData();
+            //             formData.append("name", this.addForm.name);
+            //             if(this.addForm.id != null) {
+            //                 formData.append("id", this.addForm.id);
+            //             }
+            //             if(this.addForm.userId.length != 0) {
+            //                 for(var j in this.addForm.userId) {
+            //                     formData.append("userId", this.addForm.userId[j]);
+            //                 }
+            //             }
+            //             if(this.addForm.inchargerId != null) {
+            //                 formData.append("inchargerId", this.addForm.inchargerId);
+            //             }
+            //             if(this.addForm.code != null) {
+            //                 formData.append("code", this.addForm.code);
+            //             }
+            //             formData.delete("refTaskList")
+            //             console.log('走了')
+            //             this.http.uploadFile(this.port.project.add,formData,
+            //             res => {
+            //                 this.addLoading = false;
+            //                 if (res.code == "ok") {
+            //                     this.$message({
+            //                         message: this.addForm.id!=null?'修改':'创建'+"成功",
+            //                         type: "success"
+            //                     });
+            //                     this.addFormVisible = false;
+            //                     this.getList();
+            //                 } else {
+            //                     this.$message({
+            //                         message: res.msg,
+            //                         type: "error"
+            //                     });
+            //                 }
+            //             },
+            //             error => {
+            //                 this.addLoading = false;
+            //                 this.$message({
+            //                     message: error,
+            //                     type: "error"
+            //                 });
+            //             });
+            //             }
+            //     });
+            // },
 
             // 删除
             deletePro(i, item) {
@@ -1509,6 +1511,7 @@ import { error } from 'dingtalk-jsapi';
                     if (valid) {
                         delete this.addForm.subTaskList;
                         delete this.addForm.progress;
+                        delete this.addForm.refTaskList;
                         this.addForm.executorListStr = JSON.stringify(this.addForm.executorListFront);
                         this.http.post('/task/save',this.addForm,
                             res => {

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

@@ -1356,11 +1356,15 @@
                 monthTotal: 0,
                 monthTotalPage: 0,
                 monthTotalLages: 20,
+
+                monthworkDate: [],
+                monthNotWorkDate: [],
+
                 monthworkDateS1: [],
                 monthnotTotal: 0,
                 monthnotTotalPage: 0,
                 monthnotTotalLages: 20,
-                monthnotworkDateS1: [],
+                monthNotWorkDateS1: [],
                 deptMembDataText: ''
             };
         },
@@ -1410,29 +1414,22 @@
             },
             searchScreen(e){
                 if(e){
-                    
                     this.monthNotWorkDateS1 = []
                     for (let i = 0; i < this.monthNotWorkDate.length; i++) {
                         if(this.monthNotWorkDate[i].name.indexOf(this.searchKeyword) != -1){
                             this.monthNotWorkDateS1.push(this.monthNotWorkDate[i])
                         }
                     }
-                    if (this.monthworkDateS1.length > 20) {
-                this.monthworkDateS = this.monthworkDateS1.slice(0,20);
-            }else{
-                this.monthworkDateS = this.monthworkDateS1 
-            }
-            
-            // this.monthworkDateS = infoList
-            // 判断
-            if (this.monthworkDateS1.length > 0) {
-                setTimeout(() => {
-                    this.tableListener()
-                }, 1000);
-            }
-                    // this.$nextTick(()=>{
-                    //     this.$refs.hasworkTbl2.doLayout();
-                    // });
+                    if (this.monthNotWorkDateS1.length > 20) {
+                        this.monthNotWorkDateS = this.monthNotWorkDateS1.slice(0,20);
+                    }else{
+                        this.monthNotWorkDateS = this.monthNotWorkDateS1 
+                    }
+                    if (this.monthNotWorkDateS1.length > 0) {
+                        setTimeout(() => {
+                            this.tableListener()
+                        }, 1000);
+                    }
                 }else{
                     this.monthworkDateS1 = []
                     for (let i = 0; i < this.monthworkDate.length; i++) {
@@ -1441,23 +1438,16 @@
                         }
                     }
                     if (this.monthworkDateS1.length > 20) {
-                this.monthworkDateS = this.monthworkDateS1.slice(0,20);
-            }else{
-                this.monthworkDateS = this.monthworkDateS1 
-            }
-            
-            // this.monthworkDateS = infoList
-            // 判断
-            if (this.monthworkDateS1.length > 0) {
-                setTimeout(() => {
-                    this.tableListener()
-                }, 1000);
-            }
-                    // this.$nextTick(()=>{
-                    //     this.$refs.hasworkTbl.doLayout();
-                    // });
+                        this.monthworkDateS = this.monthworkDateS1.slice(0,20);
+                    }else{
+                        this.monthworkDateS = this.monthworkDateS1 
+                    }
+                    if (this.monthworkDateS1.length > 0) {
+                        setTimeout(() => {
+                            this.tableListener()
+                        }, 1000);
+                    }
                 }
-                // console.log("keyword",this.monthNotWorkDateS);
             },
             addUpload(data) {
                 // var zhi = data.fileName.split('.')[0]
@@ -2071,9 +2061,9 @@
           // scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
             const scrollDistance2 = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
             if (scrollDistance2 < 2) {
-              if (that.monthNotWorkDateS.length < that.monthnotworkDateS1.length) {
+              if (that.monthNotWorkDateS.length < that.monthNotWorkDateS1.length) {
                 that.monthnotTotalPage++; //当前页数自增
-                var arrList = JSON.parse(JSON.stringify(that.monthnotworkDateS1))
+                var arrList = JSON.parse(JSON.stringify(that.monthNotWorkDateS1))
                 var infoList = arrList.splice(
                   that.monthnotTotalPage * that.monthnotTotalLages,
                   that.monthnotTotalLages