修改入学年级

src/utils/vueFilter.js

@@ -132,9 +132,9 @@ Vue.filter('studentTeamStatus', value => {
 })
 
 // 时间处理
-Vue.filter('dayjsFormat', (value) => {
+Vue.filter('dayjsFormat', (value, format = 'YYYY-MM-DD') => {
   if (value) {
-    return dayjs(value).format('YYYY-MM-DD')
+    return dayjs(value).format(format)
   } else {
     return value
   }

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -28,6 +28,10 @@
                            label="分部地址">
           </el-table-column>
           <el-table-column align='center'
+                           prop="address"
+                           label="学年制">
+          </el-table-column>
+          <el-table-column align='center'
                            label="成立时间">
             <template slot-scope="scope">
               {{ scope.row.registerDate | formatTimer }}

src/views/teamBuild/signupList.vue

@@ -194,6 +194,11 @@
           </el-table-column>
           <el-table-column label="家长姓名" prop="parentsName" align="center">
           </el-table-column>
+          <el-table-column align="center" label="入团年份">
+            <template slot-scope="scope">
+              <div>{{ scope.row.currentGradeDate | dayjsFormat('YYYY年') }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="年级班级" align="center">
             <template slot-scope="scope">
               <div>

src/views/teamDetail/components/studentList.vue

@@ -240,6 +240,11 @@
             </copy-text>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="入团年份">
+          <template slot-scope="scope">
+            <div>{{ scope.row.currentGradeDate | dayjsFormat('YYYY年') }}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="年级班级">
           <template slot-scope="scope">
             <div>{{ scope.row.currentGrade + scope.row.currentClass }}</div>
@@ -895,7 +900,7 @@ export default {
         1: "已缴费",
       };
       return template[val];
-    },
+    }
   },
   // activated() {
   //   this.init();

vue.config.js

@@ -17,11 +17,11 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-// let target = 'http://dyme.utools.club' //test环境
+let target = 'https://test.dayaedu.com' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -62,7 +62,7 @@ module.exports = {
       // http://47.99.212.176:8000
       // http://192.168.3.28:8000
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: 'https://test.dayaedu.com',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''