Merge branch 'dev' into dev-dev

zhangmeng
Showing 4 changed files with 26 additions and 14 deletions
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/addCoach.vue
src/viewsPc/match/components/allSportsmanList.vue
vite.config.js
--- a/src/viewsPc/match/chooseSportsman.vue
View file @e7e8886
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @e7e8886
@@ -243,7 +243,7 @@ const data = reactive({
  currProjectId: '',
  openTour: false,
  isNational: false,
-  languageSource:''
+  languageSource:'',singlePersonEntryLimit:'',doublePersonEntryLimit:''
 })
 const {
  activeTeam,
@@ -271,7 +271,7 @@ const {
  tableType,
  zuQuery,
  openTour, currProjectId,
-  tourCurrent, isNational,languageSource
+  tourCurrent, isNational,languageSource,singlePersonEntryLimit,doublePersonEntryLimit
 } = toRefs(data)
 const nextButtonProps = ref({})
 const matchId = ref(route.query.matchId)
@@ -291,7 +291,7 @@ function getAthletesList() {
    athletesList.value = res.rows
    if(!isNational.value){
      for(let ath of athletesList.value){
-        if(!ath.picUrl||!ath.phone){
+        if(!ath.phone){
          ath.disabled = true
        } else {
          ath.disabled = false
@@ -305,6 +305,8 @@ function getMatch(id) {
  match.getMatchById({
    id: id
  }).then(res => {
+    singlePersonEntryLimit.value = res.data.singlePersonEntryLimit
+    doublePersonEntryLimit.value = res.data.doublePersonEntryLimit
    noPhotoCanSign.value = res.data.noPhotoCanSign
    coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
    extraform.value = JSON.parse(res.data.participantsInfo)
@@ -582,6 +584,8 @@ let hasPproperty=''
 let hasPlevel=''
 let hasAlmighty={}
 let hasPpropertyLength=0
+let isDanNum=0
+let isShuangNum=0
 watch(projectIds, (newVal, oldVal) => {
  let currProject = {}
  if (newVal.length > oldVal.length) {
@@ -598,6 +602,8 @@ watch(projectIds, (newVal, oldVal) => {
    hasPproperty=''
    hasPlevel=''
    hasAlmighty={}
+    isDanNum = 0
+    isShuangNum = 0
    hasPpropertyLength=0
    for(let hh of projectList.value){
      if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){
@@ -610,6 +616,12 @@ watch(projectIds, (newVal, oldVal) => {
      if(projectIds.value.indexOf(hh.id)>-1&&hh.almightyFlag=='1'){
        hasAlmighty = hh
      }
+      if(projectIds.value.indexOf(hh.id)>-1&&hh.singleFlag=='1'){
+        isDanNum += 1
+      }
+      if(projectIds.value.indexOf(hh.id)>-1&&hh.doubleSingleProjectFlag=='1'){
+        isShuangNum += 1
+      }
    }
    console.log(hasPproperty,hasPlevel,hasPpropertyLength)
    filterProjectList(currProject)
@@ -621,11 +633,11 @@ watch(projectIds, (newVal, oldVal) => {
 function filterProjectList(currProject){
  for(let pp of projectList.value){
    if(
-        (currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty))
+        (pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4))
-        ||(currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel))
-        ||(pp.pproperty==hasPproperty)&&(pp.danceTypeDetailStr.split(',').length<hasPpropertyLength)
        ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty)
        ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel)
+        ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
+        ||(isShuangNum==Number(doublePersonEntryLimit.value) && pp.doubleSingleProjectFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
    ){
      pp.disabled = true
    } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1')
--- a/src/viewsPc/match/components/addCoach.vue
View file @e7e8886
+++ b/src/viewsPc/match/components/addCoach.vue
View file @e7e8886
@@ -8,7 +8,7 @@
      <el-row :gutter="30" class="mt30">
        <el-col :lg="12" class="touxiang">
-          <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" :required="form.labelArr.indexOf('0')>-1">
+          <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'">
            <ImageUpload2
                v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
                :is-show-tip="false"
@@ -304,10 +304,10 @@ function giveBirthDay() {
 function submitForm() {
  proxy.$refs['dialogRef'].validate((valid) => {
    if (valid) {
-      if(!form.value.picUrl&&form.value.labelArr.indexOf('0')>-1){
+      // if(!form.value.picUrl&&form.value.labelArr.indexOf('0')>-1){
-        ElMessage.warning(language.value == 0 ? '请上传个人照片' :'Please upload  your photo')
+      //   ElMessage.warning(language.value == 0 ? '请上传个人照片' :'Please upload  your photo')
-        return
+      //   return
-      }
+      // }
      // 验证身份证号
      if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
        ElMessage.warning('请输入正确的身份证号码')
--- a/src/viewsPc/match/components/allSportsmanList.vue
View file @e7e8886
+++ b/src/viewsPc/match/components/allSportsmanList.vue
View file @e7e8886
@@ -72,7 +72,7 @@
      <!--      </el-table-column>-->
      <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center">
        <template #default="scope">
-          <el-button link v-if="!isNational&&(!scope.row.picUrl||!scope.row.phone)" type="danger" @click="editPerson(scope.row)">
+          <el-button link v-if="!isNational&&(!scope.row.phone)" type="danger" @click="editPerson(scope.row)">
            {{language==0?'完善信息':'Complete'}}
          </el-button>
          <el-button link v-else type="primary" @click="editPerson(scope.row)">
--- a/vite.config.js
View file @e7e8886
+++ b/vite.config.js
View file @e7e8886
@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
        },
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
-          target: 'http://192.168.1.131:8081/',
+          // target: 'http://192.168.1.131:8081/',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')