添加入学年级

src/constant/index.js

@@ -224,3 +224,8 @@ export const packageStatus = {
   1: '可用',
   2: '已使用',
 }
+
+export const gradeType = {
+  0: '6+3',
+  1: '5+4'
+}

src/utils/vueFilter.js

@@ -726,3 +726,8 @@ Vue.filter('inspectionItemFormat', value => {
 Vue.filter('studentPackage', value => {
   return constant.packageStatus[value]
 })
+
+// 分部 学年制
+Vue.filter('gradeTypeFormat', value => {
+  return constant.gradeType[value]
+})

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -28,8 +28,10 @@
                            label="分部地址">
           </el-table-column>
           <el-table-column align='center'
-                           prop="address"
                            label="学年制">
+            <template slot-scope="scope">
+              {{ scope.row.gradeType | gradeTypeFormat }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="成立时间">
@@ -64,7 +66,7 @@
         <el-form-item label="分部名称"
                       prop="name"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim="form.name"
+          <el-input v-model.trim="form.name" placeholder="请输入分部名称"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="城市"
@@ -74,6 +76,7 @@
             <el-form-item prop="province">
               <el-select v-model.trim="form.province"
                          filterable
+                         placeholder="请选择省"
                          clearable
                          @change="onChangeProvince">
                 <el-option v-for="item in provinceList"
@@ -87,6 +90,7 @@
             <el-form-item prop="city">
               <el-select v-model.trim="form.city"
                          filterable
+                         placeholder="请选择市"
                          clearable>
                 <el-option v-for="item in cityList"
                            :key="item.value"
@@ -96,10 +100,21 @@
             </el-form-item>
           </el-col>
         </el-form-item>
+        <el-form-item label="学年制"
+                      prop="address"
+                      :label-width="formLabelWidth">
+          <el-select v-model.trim="form.gradeType"
+                         filterable
+                         placeholder="请选择学年制"
+                         clearable>
+                <el-option label="6+3" value="SIX_PLUS"></el-option>
+                <el-option label="5+4" value="FIVE_PLUS"></el-option>
+              </el-select>
+        </el-form-item>
         <el-form-item label="分部地址"
                       prop="address"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim="form.address"
+          <el-input v-model.trim="form.address" placeholder="请输入分部地址"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="成立时间"
@@ -111,7 +126,7 @@
                           :picker-options="{
                             firstDayOfWeek:1
                           }"
-                          placeholder="选择日期"></el-date-picker>
+                          placeholder="选择成立时间"></el-date-picker>
         </el-form-item>
       </el-form>
       <span slot="footer"
@@ -127,7 +142,6 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { branchQueryPage, areaQueryChild, branchAdd, branchUpdate, getParentArea } from '@/api/specialSetting'
-import store from '@/store'
 export default {
   name: 'branchSetting',
   components: { pagination },
@@ -156,14 +170,16 @@ export default {
         province: null,
         city: null,
         address: null,
-        registerDate: null
+        registerDate: null,
+        gradeType: 'SIX_PLUS',
       },
       rules: {
         name: [{ required: true, message: '请输入分部名称', trigger: 'blur' }],
         province: [{ required: true, message: '请选择省', trigger: 'change' }],
         city: [{ required: true, message: '请选择市', trigger: 'change' }],
         address: [{ required: true, message: '请输入分部地址', trigger: 'blur' }],
-        registerDate: [{ required: true, message: '请选择成立时间', trigger: 'change' }]
+        registerDate: [{ required: true, message: '请选择成立时间', trigger: 'change' }],
+        gradeType: [{ required: true, message: '请选择学年制', trigger: 'change' }]
       }
     }
   },
@@ -212,6 +228,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].resetFields()
+      this.form.gradeType = 'SIX_PLUS'
     },
     getAreaList (parentId, callback) {
       parentId = parentId ? parentId : 0
@@ -253,7 +270,8 @@ export default {
                 province: res.data.id,
                 city: row.areaId,
                 address: row.address,
-                registerDate: row.registerDate
+                registerDate: row.registerDate,
+                gradeType: row.gradeType == 1 ? 'FIVE_PLUS' : 'SIX_PLUS'
               }
             })