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

fhKeeper/formulahousekeeper/octopus/src/views/workReport/review.vue

@@ -2,8 +2,10 @@
     <section>
         <el-col :span="24" class="toolbar" style="">
             <div style="display:flex;justify-content: left;align-items: center;">
-                <el-input id="contractAmount" v-model="paramCompanyId" placeholder="输入公司ID" @keyup.native="restrictNumber('contractAmount')" style="width:200px" clearable size="small"></el-input>
-                <el-button size="small" @click="toolbarSelect()">确定</el-button>
+                <el-input id="contractAmount" v-model="paramCompanyName" placeholder="输入公司名称" @keyup.native="restrictNumber('contractAmount')" style="width:200px" clearable size="small">
+                    <el-button slot="append" size="small" icon="el-icon-search" @click="toolbarSelect()"></el-button>
+                </el-input>
+                
                 <el-date-picker 
                 v-model="dateArray" 
                 type="daterange" 
@@ -23,11 +25,7 @@
             <el-table-column prop="companyName" label="公司名称" min-width="160"></el-table-column>
             <el-table-column prop="moduleName" label="模块" min-width="80"></el-table-column>
             <el-table-column prop="operatorName" label="操作人" min-width="100"></el-table-column>
-            <el-table-column prop="operationTime" label="操作时间" min-width="200">
-                <template slot-scope="scope">
-                    <span>{{timeString(scope.row.operationTime)}}</span>
-                </template>
-            </el-table-column>
+            <el-table-column prop="time" label="操作时间" min-width="200"></el-table-column>
             <el-table-column prop="content" label="操作内容" min-width="500">
                 <template slot-scope="scope">
                     <div v-for="item,index in contentString(scope.row.content)" :key="index">{{item}}</div>
@@ -65,7 +63,7 @@
 
                 tableList: [],
                 dateArray: [],
-                paramCompanyId: ''
+                paramCompanyName: ''
             }
         },
         created() {
@@ -101,14 +99,14 @@
                 this.http.post('/operation-record/getList',{
                     startDate: this.dateArray[0],
                     endDate: this.dateArray[1],
-                    companyId: this.paramCompanyId,
+                    companyName: this.paramCompanyName,
                     pageIndex: this.page,
                     pageSize: this.size,
                 },res => {
                     this.listLoading = false
                     if(res.code == 'ok'){
-                        this.total = res.data.total
-                        this.tableList = res.data.record
+                        this.total = res.data ? res.data.total : 0
+                        this.tableList = res.data ? res.data.record : []
                     }else {
                         this.$message({
                             message: res.msg,
@@ -123,17 +121,6 @@
                     })
                 })
             },
-
-            timeString(list){
-                let str1 = list[0] + '-'
-                let str2 = list[1] < 10 ? '0' + list[1] + '-' : list[1] + '-'
-                let str3 = list[2] < 10 ? '0' + list[2] : list[2]
-                let str4 = list[3] < 10 ? '0' + list[3] + ':' : list[3] + ':'
-                let str5 = list[4] < 10 ? '0' + list[4] + ':' : list[4] + ':'
-                let str6 = list[5] < 10 ? '0' + list[5] : list[5]
-                let str7 = str1 + str2 + str3 + ' ' + str4 + str5 + str6
-                return str7
-            },
             contentString(string){
                 return string.split('\n')
             },
@@ -148,8 +135,8 @@
                 this.getTableList();
             },
             restrictNumber(targetId){
-                let inpu = document.getElementById(targetId);
-                inpu.value = inpu.value.replace(/\D/g,'')
+                // let inpu = document.getElementById(targetId);
+                // inpu.value = inpu.value.replace(/\D/g,'')
             }
         },
     };

fhKeeper/formulahousekeeper/timesheet_h5/src/components/Footer.vue

@@ -38,6 +38,9 @@
             }
         },
         mounted() {
+            this.reportsCompany = false
+            this.reportsDept = false
+            this.cost = false
             for(let i in this.user.functionList){
                 if(this.user.functionList[i].name == '查看全公司工时'){
                     this.reportsCompany = true

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

@@ -61,7 +61,7 @@
             </template>
     </div>
     
-    <Footer page="index"></Footer>
+    <Footer page="cost"></Footer>
 </div>
 </template>
 

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

@@ -100,7 +100,7 @@
             </van-cell>
         </template>
     </van-cell-group>
-    <Footer page="index"></Footer>
+    <Footer page="count"></Footer>
   </div>
 </template>
 

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

@@ -1066,6 +1066,14 @@ import timetoolVue from '../timetool/timetool.vue';
                                 if (list[i].subProjectId) {
                                     subProjectName = list[i].subProjectList.filter(s=>s.id==list[i].subProjectId)[0].name;
                                 }
+                                let basecostName = ''
+                                if (res.data.timeBasecostList && res.data.timeBasecostList.length > 0) {
+                                    for(let m in res.data.timeBasecostList){
+                                        if(res.data.timeBasecostList[m].id == list[i].basecostId){
+                                            basecostName = res.data.timeBasecostList[m].name
+                                        }
+                                    }
+                                }
                                 array.push({
                                     id: list[i].id,
                                     projectId: list[i].projectId,
@@ -1105,6 +1113,8 @@ import timetoolVue from '../timetool/timetool.vue';
                                     auditUserList: list[i].auditUserList,
                                     overtimeHours: list[i].overtimeHours,
                                     customText: list[i].customText,
+                                    basecostId: list[i].basecostId,
+                                    basecostName: basecostName,
                                     canEdit: list[i].state >= 2 ? true : false,
 
                                     auditorFirst: list[i].auditorSetting && list[i].auditorSetting.auditorFirst ? list[i].auditorSetting.auditorFirst : {name:'',id:''},

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/details.vue

@@ -4,7 +4,6 @@
         <van-form class="edit_form" label-width="140">
             <!-- 报销人 -->
             <van-field
-                v-model="editForm.ownerId"
                 label="报销人"
                 @click="ownerIdShow = true"
                 readonly
@@ -415,7 +414,6 @@ export default {
                 this.$toast.fail('请选择填报日期')
                 return
             }
-            console.log(this.invoiceList);
             let required1 = false
             let required2 = false
             let required3 = false

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

@@ -11,7 +11,7 @@
         <div class="edit" v-if="active == 0">
             <van-form class="edit_form" label-width="140">
                 <!-- 报销人 -->
-                <van-field v-model="editForm.ownerId" label="报销人" @click="ownerIdShow = true" readonly clickable required>
+                <van-field label="报销人" @click="ownerIdShow = true" readonly clickable required>
                     <template #input>
                         <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='formshowText.name'></ww-open-data></span>
                         <span v-else>{{formshowText.name}}</span>
@@ -402,7 +402,6 @@ export default {
             }else{
                 this.invoiceList.pop()
             }
-            console.log(value,this.invoiceList);
         },
 
         // 发票
@@ -455,7 +454,6 @@ export default {
             return true
         },
         afterRead(file){
-            console.log('afterRead',file);
             let formData = new FormData();
             formData.append("multipartFile", file.file);
             this.$axios.post("/common/uploadFile", formData)
@@ -537,10 +535,12 @@ export default {
                                 type: 0,
                                 remark: ''
                             }
-                            this.formshowText = {
-                                name: '',
-                                inProjectName: []
-                            }
+                            // this.formshowText = {
+                            //     name: '',
+                            //     inProjectName: []
+                            // }
+                            this.formshowText.name = ''
+                            this.formshowText.inProjectName = []
                             this.totalCost = 0
                             this.invoiceList = []
                             this.uploader = []