0552625c by zhangmeng

高中生报名

1 parent ff58cc11
...@@ -720,29 +720,23 @@ const goPersonInfo = (row) => { ...@@ -720,29 +720,23 @@ const goPersonInfo = (row) => {
720 const flag2=row.signInfo.some(val=>val.cptProjectName.indexOf('高中')>-1) 720 const flag2=row.signInfo.some(val=>val.cptProjectName.indexOf('高中')>-1)
721 const participantsInfoArr=_.cloneDeep(extraform.value) 721 const participantsInfoArr=_.cloneDeep(extraform.value)
722 722
723 if (flag){
724 for (const val of participantsInfoArr) { 723 for (const val of participantsInfoArr) {
724 if (flag){
725 if(val.name.indexOf('学生证')>-1||val.name.indexOf('毕业证')>-1){ 725 if(val.name.indexOf('学生证')>-1||val.name.indexOf('毕业证')>-1){
726 val.status=0 726 val.status=0
727 }else{
728 val.status=1
729 }
730 } 727 }
731 } 728 }
732 if (flag2){ 729 if (flag2){
733 for (const val of participantsInfoArr) {
734 if(val.name.indexOf('学生证')>-1){ 730 if(val.name.indexOf('学生证')>-1){
735 val.status=0 731 val.status=0
736 }else{
737 val.status=1
738 } 732 }
739 } 733 }
740 } 734 }
741 debugger 735
742 const params = { 736 const params = {
743 matchId: matchId.value, 737 matchId: matchId.value,
744 title: language.value == 0 ? '完善补充信息' : 'Complete the supplementary information', 738 title: language.value == 0 ? '完善补充信息' : 'Complete the supplementary information',
745 participantsInfoArr: flag||flag2?participantsInfoArr: extraform.value, 739 participantsInfoArr: flag||flag2?participantsInfoArr: _.cloneDeep(extraform.value),
746 personId: row.personInfo.id, 740 personId: row.personInfo.id,
747 extraId: row.extraPersonInfo?.id || 0, 741 extraId: row.extraPersonInfo?.id || 0,
748 isNational: isNational.value 742 isNational: isNational.value
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
4 </div> 4 </div>
5 <!-- 参赛人员清单--> 5 <!-- 参赛人员清单-->
6 <el-table v-loading="loading" :data="list" :sum-text="sumText" border style="width: 100%"> 6 <el-table v-loading="loading" :data="list" :sum-text="sumText" border style="width: 100%">
7 <el-table-column :label="language==0?'序号':'Index'" align="center" type="index" width="70" /> 7 <el-table-column :label="language==0?'序号':'Index'" align="center" type="index" width="70"/>
8 <el-table-column 8 <el-table-column
9 v-if="!isNational" :label="language==0?'姓名':'Real Name'" align="center" 9 v-if="!isNational" :label="language==0?'姓名':'Real Name'" align="center"
10 min-width="100" prop="personInfo.realName" 10 min-width="100" prop="personInfo.realName"
11 /> 11 />
12 <el-table-column v-if="isNational" :label="language==0?'姓氏':'Surname'" min-width="100" prop="personInfo.xing" /> 12 <el-table-column v-if="isNational" :label="language==0?'姓氏':'Surname'" min-width="100" prop="personInfo.xing"/>
13 <el-table-column v-if="isNational" :label="language==0?'名':'Name'" min-width="100" prop="personInfo.ming" /> 13 <el-table-column v-if="isNational" :label="language==0?'名':'Name'" min-width="100" prop="personInfo.ming"/>
14 <el-table-column 14 <el-table-column
15 :label="language==0?'所属国家/地区':'Country'" align="center" header-align="center" 15 :label="language==0?'所属国家/地区':'Country'" align="center" header-align="center"
16 min-width="120" 16 min-width="120"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <span v-if="scope.row.personInfo.representing">{{ scope.row.personInfo.representing }}</span> 20 <span v-if="scope.row.personInfo.representing">{{ scope.row.personInfo.representing }}</span>
21 </template> 21 </template>
22 </el-table-column> 22 </el-table-column>
23 <el-table-column :label="language==0?'性别':'Gender'" align="center" prop="personInfo.sexStr" /> 23 <el-table-column :label="language==0?'性别':'Gender'" align="center" prop="personInfo.sexStr"/>
24 <el-table-column 24 <el-table-column
25 v-if="!isNational" :label="language==0?'证件类型':'ID Type'" :width="language==0?'':'140'" 25 v-if="!isNational" :label="language==0?'证件类型':'ID Type'" :width="language==0?'':'140'"
26 align="center" header-align="center" prop="personInfo.idcTypeStr" 26 align="center" header-align="center" prop="personInfo.idcTypeStr"
...@@ -108,7 +108,8 @@ ...@@ -108,7 +108,8 @@
108 </el-table-column> 108 </el-table-column>
109 <el-table-column v-if="hasAction" :label="language==0?'操作':'Actions'" align="center" fixed="right" width="150"> 109 <el-table-column v-if="hasAction" :label="language==0?'操作':'Actions'" align="center" fixed="right" width="150">
110 <template #default="scope"> 110 <template #default="scope">
111 <el-button v-if="extraform&&extraform.length>0&&handelRules(scope.row)" link type="primary" @click="goPersonInfo(scope.row)"> 111 <el-button v-if="extraform&&extraform.length>0&&handelRules(scope.row)" link type="primary"
112 @click="goPersonInfo(scope.row)">
112 <span v-if="scope.row.extraPersonInfo">{{ language == 0 ? '修改' : 'Edit' }}</span> 113 <span v-if="scope.row.extraPersonInfo">{{ language == 0 ? '修改' : 'Edit' }}</span>
113 <span v-else class="red">{{ language == 0 ? '完善补充信息' : 'Additional Information' }}</span> 114 <span v-else class="red">{{ language == 0 ? '完善补充信息' : 'Additional Information' }}</span>
114 </el-button> 115 </el-button>
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
132 133
133 <script setup> 134 <script setup>
134 import * as match from '@/apiPc/match' 135 import * as match from '@/apiPc/match'
135 import { ref } from 'vue' 136 import {ref} from 'vue'
136 137
137 const emit = defineEmits(['editExtra']) 138 const emit = defineEmits(['editExtra'])
138 const props = defineProps({ 139 const props = defineProps({
...@@ -164,7 +165,7 @@ const props = defineProps({ ...@@ -164,7 +165,7 @@ const props = defineProps({
164 default: 0 165 default: 0
165 } 166 }
166 }) 167 })
167 import { useStorage } from '@vueuse/core/index' 168 import {useStorage} from '@vueuse/core/index'
168 169
169 const language = useStorage('language', 0) 170 const language = useStorage('language', 0)
170 const extraTableHead = ref([]) 171 const extraTableHead = ref([])
...@@ -184,12 +185,15 @@ function getTableHead() { ...@@ -184,12 +185,15 @@ function getTableHead() {
184 }) 185 })
185 } 186 }
186 187
187 function handelRules(row){ 188 function handelRules(row) {
188 return row.signInfo.some(val=>val.cptProjectName?.indexOf('大学生')>-1||val.cptProjectName?.indexOf('高中')>-1) 189 const flag = row.signInfo.some(val => val.cptProjectName?.indexOf('大学生') > -1 || val.cptProjectName?.indexOf('高中') > -1)
190 const status = props.extraform.some(val => val.status == 0)
191 return flag || status
192 // return true
189 } 193 }
190 194
191 function getMatch() { 195 function getMatch() {
192 match.getMatchById({ id: props.matchId }).then(res => { 196 match.getMatchById({id: props.matchId}).then(res => {
193 if (res.data.languageSource == '100') { 197 if (res.data.languageSource == '100') {
194 isNational.value = false 198 isNational.value = false
195 } else { 199 } else {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!