立项审批

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

@@ -772,7 +772,6 @@
                             this.$router.push("/projectInside/"+date);
                             this.drawer = false;
                         } else if(type == 11) {
-                            console.log(row, '<====== ganttData')
                             const { taskId, ganttData } = row
                             this.$router.push({
                                 path: '/list',
@@ -782,6 +781,11 @@
                                 }
                             });
                             this.drawer = false;
+                        } else if(type == 12) {
+                            this.$router.push({
+                                path: '/projectApproval'
+                            });
+                            this.drawer = false;
                         }
                         
                         

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

@@ -174,21 +174,12 @@
         <!--列表-->
         <el-table ref="projectlistOfWudulist" border @cell-mouse-enter="hoverCall" @cell-mouse-leave="handCall" :cell-class-name="tableCellClassName" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedWudulist" @sort-change="tableSort">
             <el-table-column type="selection" width="60" :selectable="isSelectable">
-                <!-- creator 项目创建人    incharger 项目负责人 -->
             </el-table-column>
-            <!-- <el-table-column type="index" width="60" v-else>
-                <template slot-scope="scope" >
-                        {{scope.$index+1+(page-1)*size}}
-                    </template>
-            </el-table-column> -->
             <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" sortable="custom" width="150"></el-table-column>
             <el-table-column prop="projectMainName" :label="$t('zhu-xiang-mu')" sortable="custom" min-width="250" v-if="user.timeType.mainProjectState == '1'">
             </el-table-column>
             <el-table-column prop="contractCode" :label="$t('contractno')" width="200" v-if="user.companyId == '936'">
                 <template slot-scope="scope">
-                    <!-- <div v-if="scope.row.projectSeparate">
-                        {{scope.row.projectSeparate.contractCode}}
-                    </div> -->
                     <div v-if="scope.row.projectSeparate">
                         <div v-if="scope.row.projectSeparate.contractCode">
                             <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectSeparate.contractCode.length > 15">
@@ -206,42 +197,9 @@
                      </div>
                 </template>
             </el-table-column>
-            <!-- <el-table-column prop="projectCategorySub" label="项目分组" width="200" v-if="user.companyId == '428'">
-                <template slot-scope="scope">
-                    <div v-if="scope.row.projectSeparate">
-                        <div v-if="scope.row.projectSeparate.projectCategorySub">
-                            <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectSeparate.projectCategorySub.length > 15">
-                                <div>
-                                    <span>{{scope.row.projectSeparate.projectCategorySub}}</span>
-                                </div>
-                                <div slot="reference" class="kans">
-                                    <span>{{scope.row.projectSeparate.projectCategorySub}}...</span>
-                                </div>
-                            </el-popover>
-                            <div v-else>
-                                <span>{{scope.row.projectSeparate.projectCategorySub}}</span>
-                            </div>
-                        </div>
-                     </div>
-                </template>
-            </el-table-column> -->
             <el-table-column prop="categoryName" :label="$t('projectclassification')" sortable="custom" width="140"></el-table-column>
             <el-table-column prop="projectName" :label="$t('headerTop.projectName')" min-width="250" sortable="custom">
                  <template slot-scope="scope">
-                     <!-- <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectName.length > 15">
-                         <div>
-                             <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
-                             <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
-                         </div>
-                         <div slot="reference" class="kans">
-                            <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName.substring(0,15)}}...</el-link>
-                            <span v-if="user.company.packageProject==0" >{{scope.row.projectName.substring(0,15)}}...</span>
-                         </div>
-                     </el-popover>
-                     <div v-else>
-                         <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
-                            <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
-                     </div> -->
                      <div> 
                          <el-link type="primary" v-if="user.company.packageProject==1 && (user.company.nonProjectSimple==0 || (user.company.nonProjectSimple==1&&scope.row.isPublic==0))" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
                          <span v-else>{{scope.row.projectName}}</span>
@@ -343,10 +301,6 @@
                     </el-link>
                 </template>
             </el-table-column>
-            <!-- 供应商 -->
-            <!-- <el-table-column prop="providerNames" label="供应商" min-width="190" v-if="user.company.packageProvider">
-            </el-table-column> -->
-            <!-- <div v-if="user.company.packageProvider"> -->
             <template>
                 <div v-for="(item, index) in listHeader" :key="index">
                     <el-table-column prop="providerNames" :label="item" min-width="190" v-if="user.company.packageProvider">
@@ -397,7 +351,7 @@
                             <el-button size="mini"  @click="suspendPro(scope.row)" class="customdropdown_menu_btn">{{ $t('zan-ting') }}</el-button><br>
                         </el-dropdown-menu>
                     </el-dropdown>
-                    <el-button v-if="user.id!=scope.row.inchargerId&& (permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId) && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">{{ $t('zhong-qi') }}</el-button>
+                    <el-button v-if="(permissions.projectManagement || user.id==scope.row.creatorId) && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">{{ $t('zhong-qi') }}</el-button>
                 </template>
             </el-table-column>
         </el-table>

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

@@ -88,7 +88,16 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="rejectInfo" :label="$t('dismissreason')" min-width="250" ></el-table-column>
-                        <el-table-column prop="auditStr" :label="$t('auditStr')" min-width="100" ></el-table-column>
+                        <el-table-column prop="auditStr" :label="$t('auditStr')" min-width="100" >
+                            <template slot-scope="scope">
+                                <span v-if="user.userNameNeedTranslate == 1">
+                                    <TranslationOpenDataText v-if="user.corpwxUserid != null" type='userName' :openid='scope.row.auditStr'></TranslationOpenDataText>
+                                </span>
+                                <span v-else>
+                                    {{ scope.row.auditStr }}
+                                </span>
+                            </template>
+                        </el-table-column>
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="primary" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck)&&scope.row.status!=1" :disabled="(scope.row.status!==-1&& scope.row.status!==2) || user.id!== scope.row.creatorId"    @click="handleAdd(scope.$index, scope.row)">{{'编辑'}}</el-button>
@@ -525,7 +534,8 @@ return {
     showImportResult:false,
     importResultMsg:null,
     filterText:'',
-    wxFilterText:''
+    wxFilterText:'',
+    levelList: [],  // 项目级别
 }
 },
 computed: {},
@@ -544,6 +554,9 @@ mounted () {
     this.getClfConfigList();
     this.getDepartment();
     this.getUsers();
+    if(this.user.timeType.projectLevelState == 1){
+        this.getProjectLevel()
+    }
 },
 methods: {
     deny() {
@@ -597,6 +610,27 @@ methods: {
             return false
         }
     },
+    // 获取级别
+    getProjectLevel(){
+        this.http.post('/project-level/list', {},
+        res => {
+            if (res.code == "ok") {
+                this.levelList = res.data
+                // this.$set(this, 'levelList', res.data)
+            } else {
+                this.$message({
+                    message: res.msg,
+                    type: "error"
+                });
+            }
+        },
+        error => {
+            this.$message({
+                message: error,
+                type: "error"
+            });
+        });
+    },
     submitInsert() {
         this.$refs.form1.validate(valid => {
             if (valid) {

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

@@ -4,7 +4,7 @@
             <el-button @click="getCurrentWeek(-7)" size="small">&lt;&lt;</el-button>
             <el-button @click="getCurrentWeek(0)" size="small">{{ $t('time.thisWeek') }}</el-button>
             <el-button @click="getCurrentWeek(7)" size="small">&gt;&gt;</el-button>
-            <el-button @click="refreshCardTime()" size="small" style="margin-left:20px;" v-if="user.roleName == '超级管理员'" :loading="isRefreshing">刷新考勤</el-button>
+            <el-button @click="refreshCardTime()" size="small" style="margin-left:20px;" :loading="isRefreshing">刷新考勤</el-button>
         </div>
         <div class="weekcen flexColumn" v-loading="submitLoading">
             <div class="flexColumnAuto flex1">