cs 2 năm trước cách đây
mục cha
commit
c57f2ea069

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

@@ -120,7 +120,7 @@
           </el-select>
 
           <!-- 地区筛选 -->
-          <el-select v-if="ins == 19" v-model="areaName" placeholder="请选择" @change="selcts()" clearable filterable size="small" style="margin-left:10px;width:150px">
+          <el-select v-if="ins == 19" v-model="areaName" :placeholder="customNameChoose" @change="selcts()" clearable filterable size="small" style="margin-left:10px;width:150px">
             <el-option :label="item" :value="item" v-for="item,index in areaList" :key="index"></el-option>
           </el-select>
 
@@ -841,7 +841,7 @@
 
             <!-- ETF报表 -->
             <el-table v-if="ins == 19"  key="19" border :data="fTEDataList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
-                <el-table-column align="center" prop="area" label="地区" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="area" :label="customName" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectCode" label="项目编号" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectName" label="项目名称" min-width="250"></el-table-column>
                 <el-table-column align="center" prop="userName" label="人名" min-width="150">
@@ -1086,7 +1086,9 @@ export default {
   props: {},
   data() {
     return {
+      customNameChoose: '',
       areaName: '',
+      customName: '',
       permissions: JSON.parse(sessionStorage.getItem("permissions")),
       curProject:{},
       feeType:[this.$t('generalcost'), this.$t('travelexpenses'), this.$t('outsourcingcost')],
@@ -1336,7 +1338,26 @@ export default {
       }
     },
 
-
+    getCustomName(){
+      this.http.post('/user/areaName', {},
+      res => {
+          if (res.code == "ok") {
+              this.customName = res.data
+              this.customNameChoose = "请选择" + res.data
+          } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              });
+          }
+      },
+      error => {
+          this.$message({
+              message: error,
+              type: "error"
+          });
+      });
+    },
 
     getUserList() {
       console.log(this.shuzArr[this.ins])
@@ -1769,6 +1790,7 @@ export default {
     },
     // 获取EFT报表的数据
     getETF() {
+      this.getCustomName();
       this.listLoading = true;
       let parameter = {
         month: this.monthPersonnel + '-01',