Kaynağa Gözat

task-6020 签到问题修改

tianxinyu 1 hafta önce
ebeveyn
işleme
635ab395b9

+ 1 - 1
src/views/component/trainingManage/importExcel.vue

@@ -97,7 +97,7 @@ export default {
           if(addList && addList.length > 0){
             const { variables: { cont } } = await this.$common.request('add', addParams)
             let allIds = [...(this.params.addPeople.split(',')), ...addList.map(item => item.ren_yuan_id_)]
-            let uniqueIds = [...new Set(allIds)];
+            let uniqueIds = [...new Set(allIds.filter(id => id != null && id !== ''))];
             this.$emit('action-event', 'import', uniqueIds.join(','))
           }
           

+ 2 - 2
src/views/component/trainingManage/registerInfoDialog.vue

@@ -361,7 +361,7 @@ export default {
               person.ye_wu_biao_ming_ === 't_gshyjyb' ||
               person.ye_wu_biao_ming_ === 't_nshyjyb'
                 ? '已签到'
-                : person.qian_dao_lei_xing === '手动'
+                : (person.qian_dao_lei_xing === '手动' || person.qian_dao_lei_xing === '导入')
                 ? '已签到'
                 : '已补签',
             qian_dao_shi_jian: person.qian_dao_shi_jian
@@ -377,7 +377,7 @@ export default {
             person.ye_wu_biao_ming_ === 't_gshyjyb' ||
             person.ye_wu_biao_ming_ === 't_nshyjyb'
               ? '已签到'
-              : person.qian_dao_lei_xing === '手动'
+              : (person.qian_dao_lei_xing === '手动' || person.qian_dao_lei_xing === '导入')
               ? '已签到'
               : '已补签'
           p.qian_dao_shi_jian = person.qian_dao_shi_jian