提交依斯倍定制报表（四张）

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

@@ -1074,26 +1074,26 @@
               <el-table-column align="center" prop="departmentName" label="部门" width="150">
                 <template slot-scope="scope">
                   <div>
-                    <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                    <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.deptName}}
-                    </span> -->
-                    {{ scope.row.departmentName }}
+                    </span>
+                    <!-- {{ scope.row.departmentName }} -->
                   </div>
                 </template>
               </el-table-column>
               <el-table-column align="center" prop="userName" label="人员" width="150">
                 <template slot-scope="scope">
                   <div>
-                    <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                    <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
-                    </span> -->
-                    {{scope.row.userName}}
+                    </span>
+                    <!-- {{scope.row.userName}} -->
                   </div>
                 </template>
               </el-table-column>
@@ -1107,13 +1107,13 @@
               <el-table-column align="center" prop="department_name" label="负责部门" min-width="150">
                 <template slot-scope="scope">
                   <div>
-                    <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                    <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='departmentName' :openid='scope.row.corpwxDeptId'></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
-                      {{scope.row.corpwxDeptId}}
-                    </span> -->
-                    {{ scope.row.corpwxDeptId }}
+                      {{scope.row.departmentName}}
+                    </span>
+                    <!-- {{ scope.row.corpwxDeptId }} -->
                   </div>
                 </template>
               </el-table-column>
@@ -1141,14 +1141,14 @@
                 <template slot-scope="scope">
                   <div class="participatingEmployee">
                     <div v-for="(item,index) in scope.row.userProgress" :key="index">
-                      <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                      <span v-if="user.userNameNeedTranslate == '1'">
                         <ww-open-data type='userName' :openid='item.userName'></ww-open-data> 
                         {{item.progress}}%
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{item.userName}} {{item.progress}}%
-                      </span> -->
-                      {{item.userName}} {{item.progress}}%
+                      </span>
+                      <!-- {{item.userName}} {{item.progress}}% -->
                       <span v-if="index < scope.row.userProgress.length - 1">,</span>
                     </div>
                   </div>
@@ -1161,26 +1161,26 @@
               <el-table-column align="center" prop="departmentName" label="部门" min-width="150">
                 <template slot-scope="scope">
                   <div>
-                    <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                    <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
-                    </span> -->
-                    {{ scope.row.departmentName }}
+                    </span>
+                    <!-- {{ scope.row.departmentName }} -->
                   </div>
                 </template>
               </el-table-column>
               <el-table-column align="center" prop="w" label="人员" min-width="150">
                 <template slot-scope="scope">
                   <div>
-                    <!-- <span v-if="user.userNameNeedTranslate == '1'">
+                    <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
-                    </span> -->
-                    {{scope.row.userName}}
+                    </span>
+                    <!-- {{scope.row.userName}} -->
                   </div>
                 </template>
               </el-table-column>