2022.4.25

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -1,6 +1,6 @@
 <template>
 <section>
-    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
+    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff" v-if="!isDingding">
         <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>出差管理</h3>
         <el-divider ></el-divider>
         <el-col :span="12">
@@ -153,7 +153,7 @@
             </div>
         </div>
         <!-- 出差列表 -->
-        <div class="tops" v-if="displayTable && apk == 0">
+        <div class="tops" v-if="displayTable && apk == 0" :style="isDingding ? 'padding-left:20px' : ''">
             <div class="ctons">
         <!-- 出差列表筛选 -->
                 <div class="flex">
@@ -239,7 +239,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column v-if="isDingding" label="操作" width="180" fixed="right">
+                    <el-table-column v-if="isDingding" label="操作" width="90" fixed="right">
                         <template slot-scope="scope">
                             <el-button icon="el-icon-edit" circle size="mini" @click="DingdingEditor(scope.row)"></el-button>
                         </template>
@@ -522,7 +522,7 @@
     </el-dialog>
 
     <!-- 钉钉环境交互效果切换 -->
-    <el-dialog title="关联项目" :visible.sync="DingdingEditDialog" width="800px">
+    <el-dialog title="进行项目关联" :visible.sync="DingdingEditDialog" width="800px">
         <el-form ref="DingdingForm" label-width="80px" style="margin:40px 0">
             <el-form-item label="投入项目" style="width:300px;margin-right:30px;display:inline-block;" prop="projectId">
                 <el-select style="width:100%" @change="getwuduList(0)" v-model="DingdingForm.projectId" filterable clearable placeholder="请选择投入项目" >
@@ -631,7 +631,7 @@ export default {
             page: 1,
             size: 20,
             falg: 0,
-            code: 0,
+            code: '',
             type: '',
             ownerIds: null,
             createDate: [],
@@ -683,10 +683,14 @@ export default {
         this.isDingding = this.wuduData.syncDingding
     },
     mounted(){
+        if(this.isDingding){
+            this.staffs(2,['2'])
+        }
         this.getTableList()
         this.getProjectList()
         this.getDepartment()
         
+        
         // console.log("session",this.wuduData);
     },
     methods: {
@@ -924,32 +928,33 @@ export default {
 
         // 获取出差列表
         getTableList(){
-            this.http.post('/business-trip/list', {
-                pageIndex: 1,
-                pageSize: 20,
-                status: '',  // 全部/已审核
-                startDate: '',  // start  end
-                endDate: '',
-                ownerId: '',
-                leaveType: '', // way
-            },
-            res => {
-                if (res.code == "ok") {
-                    this.tableList = res.data.records
-                    // console.log("getlist",res.data);
-                } else {
-                    this.$message({
-                        message: res.msg,
-                        type: "error"
-                    });
-                }
-            },
-            error => {
-                this.$message({
-                    message: error,
-                    type: "error"
-                });
-            });
+            this.billss()
+            // this.http.post('/business-trip/list', {
+            //     pageIndex: 1,
+            //     pageSize: 20,
+            //     status: '',  // 全部/已审核
+            //     startDate: '',  // start  end
+            //     endDate: '',
+            //     ownerId: '',
+            //     leaveType: '', // way
+            // },
+            // res => {
+            //     if (res.code == "ok") {
+            //         this.tableList = res.data.records
+            //         // console.log("getlist",res.data);
+            //     } else {
+            //         this.$message({
+            //             message: res.msg,
+            //             type: "error"
+            //         });
+            //     }
+            // },
+            // error => {
+            //     this.$message({
+            //         message: error,
+            //         type: "error"
+            //     });
+            // });
         },
         // 筛选刷新
         billss() {

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

@@ -1,6 +1,6 @@
 <template>
   <section>
-    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
+    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff" v-if="!isDingding">
       <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>请假管理</h3>
       <el-divider ></el-divider>
       <el-col :span="12">
@@ -62,7 +62,7 @@
       </div> -->
     <!-- 内容主体区域 -->
   <div class="contents">
-    <div v-if="!displayTable" class="headine" ref="headine">
+    <div v-if="!displayTable && !isDingding" class="headine" ref="headine">
       <h3 ref="headHe" style="padding-left: 220px">请假填报</h3>
       <!-- <p style="float: right;margin-right: 25px;"><el-button type="primary" @click="submits('addFormRules')" size="mini">提交</el-button></p> -->
     </div>
@@ -86,9 +86,9 @@
                     </template>
                 </el-form-item>
                 <!-- 请假人 -->
-                <el-form-item label="请假人" prop="ownerId"  style="width: 300px" v-show="false">
+                <el-form-item label="请假人" prop="ownerId"  style="width: 300px">
                     <!--普通员工只能自己填报自己的 -->
-                    <el-select v-model="addForm.ownerId" @change="txselts(addForm.leaveType,addForm.ownerId)" placeholder="请选择请假人" style="width: 240px" :disabled="!permissions.leaveFil" filterable="true">
+                    <el-select v-model="addForm.ownerId" @change="txselts(addForm.leaveType,addForm.ownerId)" placeholder="请选择请假人" style="width: 240px" :disabled="true" filterable="true">
                         <span v-for="(item, index) in users" :key="index">
                         <el-option :label="item.name" :value="item.id"></el-option>
                         </span> 
@@ -152,7 +152,7 @@
     </div>
 
     <!-- 下面部分 -->
-    <div v-if="displayTable && apk == false" class="tops">
+    <div v-if="displayTable && apk == false" class="tops" :style="isDingding ? 'padding-left:20px' : ''">
         <!-- 公共 -->
         <div class="ctons">
           <div class="flex">
@@ -235,7 +235,7 @@
                     </el-popover>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right" v-if="isAuditList">
+                <el-table-column label="操作" width="180" fixed="right" v-if="isAuditList && !isDingding">
                     <template slot-scope="scope">
                       <div>
                         <el-button icon="el-icon-check" circle size="mini" @click.stop.native="approve(scope.row)"></el-button>
@@ -243,7 +243,7 @@
                       </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right" v-if="!isAuditList">
+                <el-table-column label="操作" width="180" fixed="right" v-if="!isAuditList && !isDingding">
                     <template slot-scope="scope">
                       <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll">
                         <el-button icon="el-icon-delete" circle size="mini"  @click.stop.native="deletes(scope.row)" ></el-button>
@@ -362,11 +362,12 @@
                     <span v-for="(item, index) in dataArray" :key="item.seq" >
                         
                         <el-button type="primary" v-if="item.auditorType == 1" @click="editNodeDialog(index, item)">{{item.auditDeptName}}</el-button>
-                        <el-button type="primary" v-if="item.auditorType == 0" >项目负责人</el-button>
                         <el-button type="primary" v-if="item.auditorType == 2" @click="editNodeDialog(index, item)">{{item.userName}}</el-button>
+                        <template v-if="item.auditorType == 1 || item.auditorType == 2">
                         <icon class="iconfont firerock-iconright"></icon>
                         <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(index+1)"></icon>
                         <icon class="iconfont firerock-iconright"></icon>
+                        </template>
                     </span>
 
                     <!--结束点 -->
@@ -709,7 +710,8 @@ export default {
       txselnum: 0,
 
       approverList: [],
-      mustApprover: ''
+      mustApprover: '',
+      isDingding: 0
     };
   },
   computed: {},
@@ -721,13 +723,22 @@ export default {
             window.onresize = function temp() {
                 that.tableHeight = window.innerHeight - 195;
             };
+    // console.log('user',this.user);
+    this.isDingding = this.user.timeType.syncDingding
   },
 
   mounted() {
-    this.getUsers() // 获取人员信息
+    if(this.isDingding){
+      this.bills(false,2)
+      this.staffs(2,['2'])
+      this.getUsers()
+    }else{
+      this.getUsers() // 获取人员信息
     this.getDepartment();
     this.getAl();
     this.getApproverList()
+    }
+    
   },
   filters: {},
   methods: {
@@ -754,7 +765,6 @@ export default {
       })
     },
 
-
     changeAltime(e){
       if(e == 0 && this.AlchangeP.length == 0){
           this.$message('请选择要批量设置的项')
@@ -1077,7 +1087,6 @@ export default {
                 }
                 //只能自己填报自己的请假单
                 this.addForm.ownerId = this.user.id;
-                this.ownerIds = this.user.id
                 this.addForm.status = 1;
                 this.addForm.tel = this.user.phone
             } else {

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

@@ -204,7 +204,7 @@
                 <!-- <el-checkbox style="margin-left:10px;" v-model="assignNoProUser" @click="assignToProject">均摊无项目人员成本</el-checkbox> -->
                 <!-- <el-button type="primary" :underline="false" size="small" @click="assignNoProUser=false;assignToProject();" style="margin-left:10px;">分摊已填工时人员成本</el-button>
                 <el-button type="primary" :underline="false" size="small" @click="assignNoProUser=true;assignToProject();" style="margin-left:10px;">分摊全部人员成本</el-button> -->
-                <el-radio-group v-model="costListRadio" @change="switchCostList" style="margin-left:5px;margin-top:5px;">
+                <el-radio-group size="small" v-model="costListRadio" @change="switchCostList" style="margin-left:5px;margin-top:5px;">
                     <el-radio-button label="1" >分摊已填工时人员成本</el-radio-button>
                     <el-radio-button label="2">分摊全部人员成本</el-radio-button>
                 </el-radio-group>

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

@@ -77,7 +77,7 @@
                         <template slot-scope="scope">
                             <div style="display: flex;justify-content: space-between;padding-right: 40px">
                             <span style="display: inline-block;margin-right: 55px">
-                                <span  :class="judgedate(scope.row.endDate) && searchField == '0' ? 'redwarningspan autodatespan' : 'autodatespan'">{{scope.row.endDate}}</span>
+                                <span  :class="judgedate(scope.row.endDate) && searchField == '0' && scope.row.taskStatus == 0 ? 'redwarningspan autodatespan' : 'autodatespan'">{{scope.row.endDate}}</span>
                             </span>
                             <el-button v-if="searchField == 0" size="small" type="primary" @click="completes(scope.row.id, 0)">完成</el-button>
                             <el-button v-if="searchField == 1" size="small" type="warning" @click="completes(scope.row.id, 1)">重启</el-button>