Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master'

yurk 2 anni fa
parent
commit
3071435a83

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -84,7 +84,7 @@
         </el-select>
           
           <!-- 部门筛选 -->
-          <el-cascader v-if="(ins == 9 && (permissions.reportAllTimely || permissions.reportTimely)) || (ins == 8 && (permissions.reportAllTimeDivide || permissions.reportTimeDivide)) || (ins == 6 && (permissions.reportAllOvertime || permissions.reportOvertime)) || (ins == 11 && (permissions.reportPersonnel || permissions.reportResponsible))" v-model="departmentIdArray" :options="departmentList" placeholder="请选择部门"
+          <el-cascader v-if="(ins == 9 && permissions.reportAllTimely) || (ins == 8 && permissions.reportAllTimeDivide) || (ins == 6 && permissions.reportAllOvertime) || (ins == 11 && permissions.reportPersonnel)" v-model="departmentIdArray" :options="departmentList" placeholder="请选择部门"
             :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
             @change="selcts(9)" size="small" style="margin-left:10px"
           ></el-cascader>

+ 22 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -209,24 +209,30 @@
         <!-- 合同金额修改记录 -->
         <el-dialog title="合同金额修改记录" v-if="contractRecordDialog" :visible.sync="contractRecordDialog" :close-on-click-modal="false" customClass="customWidth" width="900px">
             <el-table :data="contractRecordData" height="400px" :loading="contractRecordLoading">
-                <el-table-column label="操作人" prop="name" min-width="90">
+                <el-table-column label="操作人" prop="name" min-width="70">
                     <template slot-scope="scope">
                         <!-- <span>{{users.filter(item => item.id == scope.row.editUserId)[0].name}}</span> -->
                         <span>{{filterUserContract(scope.row.editUserId)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改时间" prop="date" min-width="180">
+                <el-table-column label="修改时间" prop="date" min-width="140">
                     <template slot-scope="scope">
-                        <span>{{scope.row.updateDate[0] + '-' + scope.row.updateDate[1] + '-' + scope.row.updateDate[2] + '\u3000' + scope.row.updateDate[3] + ':' + scope.row.updateDate[4] + ':' + scope.row.updateDate[5]}}</span>
+                        <!-- <span>{{scope.row.updateDate[0] + '-' + scope.row.updateDate[1] + '-' + scope.row.updateDate[2] + '\u3000' + scope.row.updateDate[3] + ':' + scope.row.updateDate[4] + ':' + scope.row.updateDate[5]}}</span> -->
+                        <span>{{tempDateContract(scope.row.updateDate)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改情况" prop="record" min-width="180">
+                <el-table-column label="原金额" prop="oldContractAmount" min-width="140">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.oldContractAmount.toFixed(2)}} 元</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="修改情况" prop="record" min-width="140">
                     <template slot-scope="scope">
                         <span>{{scope.row.oldContractAmount - scope.row.newContractAmount > 0 ? '减少' : '增加'}}</span>
-                        <span>{{scope.row.oldContractAmount - scope.row.newContractAmount > 0 ? (scope.row.oldContractAmount - scope.row.newContractAmount).toFixed(2) : (scope.row.newContractAmount - scope.row.oldContractAmount).toFixed(2)}}元</span>
+                        <span>{{scope.row.oldContractAmount - scope.row.newContractAmount > 0 ? (scope.row.oldContractAmount - scope.row.newContractAmount).toFixed(2) : (scope.row.newContractAmount - scope.row.oldContractAmount).toFixed(2)}} 元</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改原因" prop="reason" min-width="270"></el-table-column>
+                <el-table-column label="修改原因" prop="reason" min-width="210"></el-table-column>
             </el-table>
         </el-dialog>
 
@@ -563,6 +569,16 @@
                     return '-'
                 }
             },
+            tempDateContract(date){
+                let yyyy = date[0]
+                let mm = date[1] < 10 ? '0' + date[1] : date[1]
+                let dd = date[2] < 10 ? '0' + date[2] : date[2]
+                let dh = date[3] < 10 ? '0' + date[3] : date[3]
+                let dm = date[4] < 10 ? '0' + date[4] : date[4]
+                let ds = date[5] < 10 ? '0' + date[5] : date[5]
+                let datestr = yyyy + '-' + mm + '-' + dd + '\u3000' + dh + ':' + dm + ':' + ds
+                return datestr
+            },
             // 修改合同金额:参数
             //      oldContractAmount   原合同金额(看你要不要)
             //      contractAmount      修改后金额

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -380,7 +380,7 @@
                 <!-- 增加合同金额字段 -->
                         <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%;"
-                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" ></el-input><span style="margin-left:10px;">元</span>
+                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" :disabled="true"></el-input><span style="margin-left:10px;">元</span>
                 <!-- 增加合同金额字段 -->
                 </el-form-item>
                 <el-form-item label="开始日期" prop="planStartDate"  >

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -606,7 +606,7 @@
 
 
             <div slot="footer" class="dialog-footer">
-                <el-button v-if="user.id == this.addForm.createrId || currentProject.inchargerId == user.id" @click.native="deleteTask" style="float:left;">删除</el-button>
+                <el-button v-if="user.id == addForm.createrId || currentProject.inchargerId == user.id || currentProject.creatorId == user.id || permissions.projectManagement" @click.native="deleteTask()" style="float:left;">删除</el-button>
                 <el-button @click.native="addFormVisible = false">取消</el-button>
                 <el-button type="primary" @click="submitInsert" :loading="addLoading">提交</el-button>
             </div>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -418,7 +418,7 @@
                     </div>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button v-if="user.id == this.addForm.createrId || currentProject.inchargerId == user.id" @click.native="deleteTask" style="float:left;">删除</el-button>
+                <el-button v-if="user.id == addForm.createrId || currentProject.inchargerId == user.id || currentProject.creatorId == user.id || permissions.projectManagement" @click.native="deleteTask" style="float:left;">删除</el-button>
                 <el-button @click.native="addFormVisible = false">取消</el-button>
                 <el-button type="primary" @click="submitInsert" :loading="addLoading">提交</el-button>
             </div>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -159,7 +159,7 @@
                 </el-table-column>
                 <el-table-column label="状态" width="160">
                     <template slot-scope="scope">
-                        <span>{{scope.row.isActive==0 ? '离职(' + scope.row.inactiveDate + ')' : '在职'}}</span>
+                        <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '活跃'}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="300">

+ 66 - 32
fhKeeper/formulahousekeeper/timesheet_h5/src/views/count/count.vue

@@ -1,12 +1,9 @@
 <template>
   <div>
-    <div style="position:">
-    <!-- <van-cell>
-        <template #default>
-            <div style="text-align:center">团队填报统计</div>
-        </template>
-    </van-cell> -->
+    <div>
+
     <div class="title111">
+    <van-sticky offset-top="-0.9rem">
     <van-cell :title="'选择月份:' + nowMonthTitle" @click="monthSelectShow = true" class="monthSel" />
     <van-action-sheet v-model="monthSelectShow">
         <div class="monthSelectContent">
@@ -21,7 +18,8 @@
             />
         </div>
     </van-action-sheet>
-    <van-tabs background="#20a0ff" title-active-color="#fff" title-inactive-color="#3c3c45" @change="dateChange" v-model="nowDay">
+    
+    <van-tabs background="#20a0ff" title-active-color="#fff" title-inactive-color="#3c3c45" @change="dateChange" v-model="nowDay" style="height:1.17333rem">
         <van-tab v-for="item in dateArray" :key="item.day" :name="item.day">
             <template #title>
                 <div style="text-align:center;width:0.6rem;padding-bottom:10px">
@@ -31,28 +29,42 @@
             </template>
         </van-tab>
     </van-tabs>
+    </van-sticky>
     </div>
 
 
     <div id="main" style="width:250px;height:250px;margin:0 auto"></div>
-
-    <van-tabbar v-model="stateActive" :fixed="false" @change="stateChange" class="stateActiveClass">
-        <van-tabbar-item name="submit">已提交
-            <template #icon>
-                <span style="color:#409eff;font-size:0.58rem">{{submitList.length}}</span><span style="font-size:0.32rem;color:#333">人</span>
+    <van-sticky offset-top="1.35333rem">
+        <div style="background:#fff;">
+    <van-tabs v-model="stateActive" :fixed="false" @change="stateChange" class="stateActiveClass" color="#20a0ff">
+        <van-tab name="submit">
+            <template #title>
+                <div style="text-align:center">
+                    <span style="color:#409eff;font-size:0.58rem">{{submitList.length}}</span>
+                    <span style="font-size:0.32rem;color:#333">人</span>
+                </div>
+                <div style="font-size:0.32rem;color:#333">已提交</div>
             </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="unsubmit">待提交
-            <template #icon>
-                <span style="color:#ffa366;font-size:0.58rem">{{unSubmitList.length}}</span><span style="font-size:0.32rem;color:#333">人</span>
+        </van-tab>
+        <van-tab name="unsubmit">
+            <template #title>
+                <div style="text-align:center">
+                    <span style="color:#ffa366;font-size:0.58rem">{{unSubmitList.length}}</span>
+                    <span style="font-size:0.32rem;color:#333">人</span>
+                </div>
+                <div style="font-size:0.32rem;color:#333">待提交</div>
             </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="unfill">未填写
-            <template #icon>
-                <span style="color:#ff4500;font-size:0.58rem">{{unFillList.length + unFillLeaveList.length}}</span><span style="font-size:0.32rem;color:#333">人</span>
+        </van-tab>
+        <van-tab name="unfill">
+            <template #title>
+                <div style="text-align:center">
+                    <span style="color:#ff4500;font-size:0.58rem">{{unFillList.length + unFillLeaveList.length}}</span>
+                    <span style="font-size:0.32rem;color:#333">人</span>
+                </div>
+                <div style="font-size:0.32rem;color:#333">未填写</div>
             </template>
-        </van-tabbar-item>
-    </van-tabbar>
+        </van-tab>
+    </van-tabs>
     <van-cell v-if="stateActive == 'unfill' && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || user.company.packageOa == 1)">
         <template #default>
             <van-tabs type="card" @change="unfillSelect" v-model="unfillSelKey" color="#20a0ff">
@@ -61,16 +73,23 @@
             </van-tabs>
         </template>
     </van-cell>
+        </div>
+    </van-sticky>
     </div>
-    <van-cell-group v-if="showList.length">
-        <van-cell v-for="item in showList" :key="item.id" :title="item.name" :value="item.department" title-style="color:#666"></van-cell>
-    </van-cell-group>
-    <van-cell-group v-else>
-        <van-cell>
+    <van-cell-group>
+        <van-cell v-if="listLoading">
+            <template #default>
+                <van-loading color="#1989fa" size="24" text-size="12" style="text-align:center;">加载中...</van-loading>
+            </template>
+        </van-cell>
+        <van-cell v-if="showList.length == 0">
             <template #default>
                 <div style="text-align:center;color:#7d7e80;font-size:13px">暂无数据</div>
             </template>
         </van-cell>
+        <template v-else>
+            <van-cell v-for="item in showList" :key="item.id" :title="item.name" :value="item.department" title-style="color:#666"></van-cell>
+        </template>
     </van-cell-group>
     <Footer page="index"></Footer>
   </div>
@@ -103,6 +122,7 @@ export default {
             unFillList:[],  //未填写人员列表
             unFillLeaveList:[],
             showList:[],
+            listLoading: false,
 
             stateActive: 'submit'
         }
@@ -174,21 +194,25 @@ export default {
             if (this.user.manageDeptId != 0 && !this.reportsCompany && !this.reportsDept) {
                 parameter.manageDeptId = this.user.manageDeptId; 
             }
+            this.listLoading = true
+            this.submitList = []
+            this.unSubmitList = []
+            this.unFillList = []
+            this.unFillLeaveList = []
             this.$axios.post('/report/getMembList', parameter)
             .then(res => {
                 if(res.code == 'ok'){
-                    this.submitList = []
-                    this.unSubmitList = []
-                    this.unFillList = []
-                    this.unFillLeaveList = []
                     this.extractUser(res.data)
                     this.drawChart()
+                    this.listLoading = false
                     this.stateChange('submit')
                 }else {
+                    this.listLoading = false
                     this.$toast.clear();
                     this.$toast.fail('获取失败:'+res.msg);
                 } 
             }).catch(err=> {
+                this.listLoading = false
                 this.$toast.clear();
             });
         },
@@ -220,6 +244,7 @@ export default {
         },
 
         drawChart(){
+            this.$echarts.init(document.getElementById('main')).dispose()
             var myChart = this.$echarts.init(document.getElementById('main'));
             // 绘制图表
             myChart.setOption({
@@ -235,6 +260,15 @@ export default {
                     }
                 ]
             });
+            myChart.on('click',(params)=>{
+                if(params.dataIndex == 0){
+                    this.stateChange('submit')
+                }else if(params.dataIndex == 1){
+                    this.stateChange('unsubmit')
+                }else{
+                    this.stateChange('unfill')
+                }
+            })
         }
     },
     mounted() {
@@ -286,6 +320,6 @@ body{
     overflow: hidden;
 }
 .title111 .van-tabs__line{
-    background-color: #eee;
+    background-color: #f7f7f7;
 }
 </style>