Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

# Conflicts:
#	src/views/elective/select/components/elective-tools-mixins.js

src/components/MxCondition/condition-mixins-data.js

@@ -486,7 +486,6 @@ export default {
 
         const invoker = function(){
           formRef.validate((valid, errors) => {
-            //debugger
             if (valid) resolve(valid)
             else reject(errors) // 经这一步转化，可以外抛errors
           })

src/views/elective/select/components/ai-round-select-resolvers/backTracking-ai-resolver-mixins.js

@@ -2,7 +2,7 @@ export default {
   methods: {
     backTrackingAIResolver(model, activeModel, context) {
       const models = model?.models || []
-      this.rows.forEach(item => {
+      this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         const disenrollAll = Math.abs(models.sum(m => m.groupIndicator))
         item.groupIndicator = currentGroup.groupIndicator

src/views/elective/select/components/ai-round-select-resolvers/finalAdjust-ai-resolver-mixins.js

@@ -2,7 +2,7 @@ export default {
   methods: {
     finalAdjustAIResolver(model, activeModel, context) {
       const models = model?.models || []
-      this.rows.forEach(item => {
+      this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         const disenrollAll = Math.abs(models.sum(m => m.groupIndicator))
         item.groupIndicator = currentGroup.groupIndicator

src/views/elective/select/components/elective-ai-table.vue

@@ -81,21 +81,21 @@ export default {
       const options = this.generation.options
       if (!options || !this.generation.active) return {}
       const dynamicColumns = {}
-      this.generation.activeModels.forEach(model => {
-        if (model.generation != this.generation.active) return // 暂只执行一步
-        const resolverKey = model.option.key + 'AIResolver'
-        const resolver = this[resolverKey]
-        if (typeof resolver === 'function') {
-          const genColumns = resolver(model, this.generation.activeModel, dynamicColumns)
-          Object.assign(dynamicColumns, genColumns)
-        }
-      })
+
+      const model = this.generation.activeModel
+      const resolverKey = model.option.key + 'AIResolver'
+      const resolver = this[resolverKey]
+      if (typeof resolver === 'function') {
+        const genColumns = resolver(model, model, dynamicColumns)
+        Object.assign(dynamicColumns, genColumns)
+      }
+
       return dynamicColumns
     },
     formatCols() {
+      const _ = this.resolveDynamicTable // Note: force execute!
       return {
         ...this.resolveTablePrefix,
-        ...this.resolveDynamicTable,
         ...this.resolveDynamicAITable,
         ...this.resolveTableSuffix
       }

src/views/elective/select/components/elective-preference-command.vue

@@ -1,7 +1,7 @@
 <template>
   <span v-if="!group.allowSelect">{{ group.disabledReason || '无法报名' }}</span>
-  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">取消报名</span>
   <span v-else-if="isRejected">已拒绝</span>
+  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">取消报名</span>
   <span v-else-if="enableCommit" class="f-warning">被锁定</span>
   <span v-else class="btn-green" @click="handleCommit">报名</span>
 </template>

src/views/elective/select/components/elective-preference-reject.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mb5 mt10 text-right">
+  <div class="mb5 mt10 text-right" v-if="recommendGroup">
     <el-popover v-if="!this.isSelected" ref="pop" placement="right" width="300" trigger="click">
       <div>
         <el-input type="textarea" :rows="4" placeholder="请输入原因" v-model="recommendGroup.rejectedReason"></el-input>
@@ -33,7 +33,7 @@ export default {
       return this.generation.activeModel.selectedList
     },
     recommendGroup() {
-      return this.generation.activeModel.models.find(g => g.isRecommend) || {}
+      return this.generation.activeModel.models.find(g => g.isRecommend)
     },
     isSelected() {
       return this.selectedList.some(this.isGroupSelected)

src/views/elective/select/components/elective-tools-mixins.js

@@ -53,11 +53,9 @@ export default {
     },
     combineGroupStatus(group, model) {
       // 逻辑同elective-preference-command
-      // if(group.approved || group.forceAdjusted) return '已录取'
       if (!group.allowSelect) return group.disabledReason || '无法报名'
-
-      if (group.selected) return '已报名'
       if (this.isModelRejected(model)) return '已拒绝'
+      if (group.selected) return '已报名'
       return '报名中'
     }
   }

src/views/permission/round-score-import.vue

@@ -338,7 +338,6 @@ export default {
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      debugger
       this.upload.isUploading = true
     },
     // 文件上传成功处理