提交新按周填报的问题以及费用报销发放的筛选条件

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -114,6 +114,7 @@ const StringUtil = {
         costFil : false, // 费用填报 //
         costAudit : false, // 费用审核 //
         costAll : false, // 查看全部报销单 //
+        costExpenseRelease: false, // 费用发放 //
 
         // 工时成本统计
         countHours: false, // 查看工时统计 //
@@ -236,6 +237,7 @@ const StringUtil = {
         arr[i] == '全部子项目工时成本' ? obj.reportAllManhourCost = true : ''
         arr[i] == '负责项目子项目工时成本' ? obj.reportResponsibleManhourCost = true : ''
         arr[i] == '修改默认文件夹' ? obj.projectEditDefaultFolder = true : ''
+        arr[i] == '费用发放' ? obj.costExpenseRelease = true : ''
     }
     return obj
   }

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

@@ -232,6 +232,12 @@
                 <el-option :label="$t('wai-bao')" :value="2"></el-option> -->
               </el-select>
             </el-form-item>
+            <el-form-item :label="'发放状态'">
+              <el-select v-model="sendState" size="small" style="width: 150px" v-if="permissions.costExpenseRelease" clearable>
+                <el-option :label="'未发放'" :value="0" ></el-option>
+                <el-option :label="'已发放'" :value="1" ></el-option>
+              </el-select>
+            </el-form-item>
             <!-- 填报日期 -->
             <div style="display: inline-block;padding-left: 15px">
               <el-form-item :label="$t('fillinthedate')" >
@@ -252,10 +258,10 @@
               <el-form-item v-if="currentClick == '2-1'">
                 <el-button @click="exportDocument()" size="small">单据导出</el-button>
               </el-form-item>
-              <el-form-item v-if="currentClick == '2-1'">
+              <el-form-item v-if="currentClick == '2-1' && permissions.costExpenseRelease">
                 <el-button @click="documentIssuance(1)" size="small">发放</el-button>
               </el-form-item>
-              <el-form-item v-if="currentClick == '2-1'">
+              <el-form-item v-if="currentClick == '2-1' && permissions.costExpenseRelease">
                 <el-button @click="documentIssuance(0)" size="small">取消发放</el-button>
               </el-form-item>
               <!-- <span>审核模式：{{ auditTypeItem.auditType }}</span> -->
@@ -308,7 +314,7 @@
                   <span style="font-size:12px;">{{scope.row.denyReason}}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column prop="sendState" label="发放状态" width="80">
+              <el-table-column prop="sendState" label="发放状态" width="80" v-if="permissions.costExpenseRelease">
                 <template slot-scope="scope">
                   <span :style="`color: ${scope.row.sendState == 0 ? '#FFA500' : ''}`">{{ scope.row.sendState == 1 ? '已发放' : '未发放' }}</span>
                 </template>
@@ -941,6 +947,7 @@ export default {
       detailDialog: false,
       detaExpenseMainTypeName: '',
       multipleSelection: [],
+      sendState: '',
     };
   },
   computed: {
@@ -1654,13 +1661,16 @@ export default {
       if (this.isAuditList) {
         param.status = 1;
       }
+      if(this.permissions.costExpenseRelease) {
+        param.sendState = this.sendState
+      }
       this.list = [];
-      this.total = 0;
+      // this.total = 0;
       this.http.post('/expense-sheet/list', param,
         res => {
             if (res.code == "ok") {
                 this.list = res.data.records;
-                this.total = res.data.total; 
+                this.total = res.data.total || 0; 
             } else {
                 this.$message({
                 message: res.msg,

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

@@ -53,8 +53,9 @@
                             <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
                                     :openid='scope.row.projectAuditorName'></ww-open-data></span> -->
                             <span v-if="user.userNameNeedTranslate != '1'">{{ auditorNameFun(scope.row) }}</span>
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                    :openid='scope.row.projectAuditorName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <ww-open-data type='userName' :openid='auditorNameFun(scope.row)'></ww-open-data>
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="state" label="状态" width="140" fixed="right">