提交

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

@@ -1308,6 +1308,12 @@
                     </el-select>
                 </el-form-item>
 
+                <el-form-item :label="customConfigurationRow.name">
+                    <el-select v-model="exportParam.plate" placeholder="请选择"  clearable filterable>
+                        <el-option v-for="item in customConfigurationRow.subUserCustomList || []"  :key="item.id" :label="item.name" :value="item.newId"></el-option>
+                    </el-select>
+                </el-form-item>
+
                 <el-form-item prop="exportType" :label="$t('daoChuFangShi')" v-if="user.companyId == '936'">
                     <div class="exportReportRadio">
                         <el-radio v-model="exportType" :label="0">{{ $t('wanZhengDaoChu') }}</el-radio>
@@ -2692,7 +2698,10 @@
                 transferWorkingHoursVisable: false,
                 multiOptionData:[],
                 businessTripsArray: [],
-                refreshAttendanceLoading: false
+                refreshAttendanceLoading: false,
+                customConfigurationRow: {
+                    subUserCustomList: []
+                }
             };
         },
         watch: {
@@ -4972,6 +4981,7 @@
             showExportDialog() {
                 this.exportType = 0
                 this.exportDialog = true;
+                this.getCustomConfigurationItems()
             },
             showExportTimeDialog() {
                 this.exportTimeDialog = true;
@@ -6224,6 +6234,9 @@
                     // param.departmentId = this.exportParam.departmentId[this.exportParam.departmentId.length - 1]
                     param.departmentIds = this.exportParam.departmentId.join(',')
                 }
+                if(this.exportParam.plate) {
+                    param.plate = this.exportParam.plate
+                }
                 param.stateKey = this.stateKey
                 // param.departmentId = this.user.departmentId
                 this.http.post(this.port.report.export, param,
@@ -9429,6 +9442,23 @@
                 this.zhoBao.taskId = taskId
                 this.$set(this.zhoBao, 'taskList', data)
             },
+            getCustomConfigurationItems() {
+                this.postData('/user-custom/getUserCustomFirstPullDown', {}).then(res => { 
+                    // this.customConfigurationRow = res.data || { subUserCustomList: [] }
+                    const { subUserCustomList = [], plate = '' } = res.data
+                    this.customConfigurationRow = {
+                        ...res.data,
+                        subUserCustomList: subUserCustomList.map(item => {
+                            return {
+                                ...item,
+                                newId: `${plate}-${item.name}`
+                            }
+                        })
+                    }
+
+                    console.log(this.customConfigurationRow)
+                })
+            },
             // 封装 post 请求
             postData(url, params) {
                 return new Promise((resolve, reject) => {