Merge remote-tracking branch 'origin/master' into dispatch

src/common/mx-config.js

@@ -72,5 +72,61 @@ export default {
       title: '知识兴趣探索',
       description: '知识兴趣是我们对某类知识的喜欢程度，通过知识兴趣的探索，你将会对自己喜欢在哪个领域进行学习有所洞察，它们很可能就是你未来渴望学习的专业。'
     }
+  },
+  electiveGenerationOptions: {
+    init: {
+      stepsVisible: false,
+      title: '',
+      description: '',
+      icon: ''
+    },
+    primary: {
+      stepsVisible: true,
+      title: '初选报名',
+      description: '',
+      icon: ''
+    },
+    primaryDM: {
+      stepsVisible: true,
+      title: '初选报名决策',
+      description: '',
+      icon: ''
+    },
+    backTracking: {
+      stepsVisible: true,
+      title: '补录报名',
+      description: '',
+      icon: ''
+    },
+    backTrackingDM: {
+      stepsVisible: true,
+      title: '补录报名决策',
+      description: '',
+      icon: ''
+    },
+    finalAdjust: {
+      stepsVisible: true,
+      title: '补录调剂报名',
+      description: '',
+      icon: ''
+    },
+    finalAdjustDM: {
+      stepsVisible: true,
+      title: '补录调剂报名决策',
+      description: '',
+      icon: ''
+    },
+    rankBalance: {
+      stepsVisible: true,
+      title: '排名均衡',
+      description: '',
+      icon: ''
+    },
+    terminate: {
+      stepsVisible: false,
+      title: '',
+      description: '',
+      icon: ''
+    }
   }
 }

src/common/mx-const.js

@@ -69,6 +69,17 @@ export default {
       philosophy: 1,  // 人生价值观
       occupation: 2,  // 职业兴趣
       knowledge: 3    // 知识兴趣
+    },
+    electiveGeneration: {
+      init: 0,
+      primary: 1,
+      primaryDM: 2,
+      backTracking: 3,
+      backTrackingDM: 4,
+      finalAdjust: 5,
+      finalAdjustDM: 6,
+      rankBalance: 7,
+      terminate: 8
     }
   }
 }

src/components/MxTable/index.vue

@@ -3,7 +3,7 @@
     <template v-for="(prop, key) in propDefines">
       <template v-if="prop.hidden"></template>
       <el-table-column v-else-if="!prop.type" :key="key" :label="prop.label" :width="prop.width"
-                       :align="prop.align || 'center'">
+                       :min-width="prop.minWidth" :align="prop.align || 'center'">
         <template v-if="prop.slotHeader" #header="scopeHeader">
           <slot :name="prop.slotHeader" v-bind="{
             ...scopeHeader,

src/views/elective/generation/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'generation-index'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/permission/components/steps/fauclty/faculty-forms.vue

@@ -79,37 +79,37 @@ export default {
           label: '原周课时数',
           slot: 'input',
           slotHeader: 'batch',
-          width: '130px'
+          minWidth: '130px'
         },
         teacherCount: {
           label: '单科老师数量',
           slot: 'input',
           slotHeader: 'batch',
-          width: '130px'
+          minWidth: '130px'
         },
         teacherClassesCount: {
           label: '老师周课时数',
           slot: 'input',
           slotHeader: 'batch',
-          width: '130px'
+          minWidth: '130px'
         },
         classesCount: {
           label: '单科总课时数',
           slot: 'input',
-          width: '130px',
+          minWidth: '130px',
           disabled: true
         },
         levelClassesCount: {
           label: '等级考课时数',
           slot: 'input',
           slotHeader: 'batch',
-          width: '130px'
+          minWidth: '130px'
         },
         qualifiedClassesCount: {
           label: '合格考课时数',
           slot: 'input',
           slotHeader: 'batch',
-          width: '130px'
+          minWidth: '130px'
         }
       }
     },

src/views/permission/components/steps/fauclty/faculty-result.vue

@@ -34,30 +34,30 @@ export default {
         },
         levelClassCount: {
           label: '等级考班级数',
-          width: '130px'
+          minWidth: '130px'
         },
         qualifiedClassCount: {
           label: '合格考班级数',
-          width: '130px'
+          minWidth: '130px'
         },
         requiredClassesCount: {
           label: '所需课时数',
-          width: '130px'
+          minWidth: '130px'
         },
         actualClassesCount: {
           label: '实际课时数',
-          width: '130px',
+          minWidth: '130px',
           disabled: true
         },
         missingClassesCount: {
           label: '所缺课时数',
           slot: 'tag',
-          width: '130px'
+          minWidth: '130px'
         },
         missingTeacherCount: {
           label: '所需老师人数',
           slot: 'tag',
-          width: '130px'
+          minWidth: '130px'
         }
       }
     },

src/views/permission/components/steps/round-setting-group.vue

@@ -187,8 +187,8 @@ export default {
     groupLimitDefines() {
       return {
         groupName: { label: '组合', slot: 'replace', width: '100px' },
-        personCount: { label: '人数', slot: 'input', width: '130px' },
-        classCount: { label: '班级数', slot: 'input', width: '130px' },
+        personCount: { label: '人数', slot: 'input', minWidth: '130px' },
+        classCount: { label: '班级数', slot: 'input', minWidth: '130px' },
         limitPerson: { label: '人数限制', slot: 'switch' },
         rankOut: { label: '排名挤出', slot: 'switch', hidden: !this.hasImportWeight },
         scoreQuery: { label: '成绩查询', slot: 'view', hidden: !this.hasImportWeight },