Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

# Conflicts:
#	src/pages/course/catagory.vue

src/components/course/category-form.vue

@@ -2,28 +2,19 @@
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
     <q-card style="width: 800px;max-width:900px;">
       <q-card-section>
-        <div class="text-h6">{{objOption.CateId==0?'新增课程分类信息':'修改课程分类信息'}}</div>
+        <div class="text-h6">{{objOption.CateId==0?'新增系列':'修改系列'}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
-        <div class="text-caption q-mb-lg q-px-md text-grey-6">课程分类信息</div>
+        <div class="text-caption q-mb-lg q-px-md text-grey-6">系列信息</div>
         <div class="row wrap">
           <q-input filled stack-label maxlength="50" :dense="false" v-model="objOption.CateName" ref="CateName"
-            class="col-6 q-pr-lg q-pb-lg" label="分类名称" :rules="[val => !!val || '请填写分类名称']" />
+            class="col-6 q-pr-lg q-pb-lg" label="系列名称" :rules="[val => !!val || '系列名称']" />
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.SortNum" ref="SortNum"
-            class="col-6 q-pr-lg q-pb-lg" label="排序" />
+            class="col-6 q-pr-lg q-pb-lg" label="排序" @keyup.native="checkInteger(objOption,'SortNum')" />
           <div class="col-12 q-pr-lg q-pb-lg q-pt-lg">
             <q-toggle size="md" label="状态" color="primary" :false-value="1" :true-value="0" v-model="objOption.Status"
               title="注意：关闭后，分类将无法正常使用." />
           </div>
-          <div class="col-12 q-pr-lg q-pb-lg q-pt-lg">
-            上级分类:
-            <div class="q-pa-md q-gutter-sm">
-              <q-tree v-if="isShow" style="max-width:300px;" :nodes="TreeCategoryList" node-key="CateId"
-                label-key="CateName" children-key="ChildList" tick-strategy="strict" :default-expand-all="true"
-                no-connectors :ticked.sync="chooseCategroyArray">
-              </q-tree>
-            </div>
-          </div>
         </div>
       </q-card-section>
       <q-separator />
@@ -55,7 +46,7 @@
         objOption: {
           CateId: 0, //分类编号
           ParentId: 0, //父级编号
-          CateName: "", //分类名称
+          CateName: "", //系列名称
           SortNum: 0, //排序
           Status: 0, //状态(0-正常,1-禁用)},
         },
@@ -95,9 +86,9 @@
               this.chooseCategroyArray.push(res.Data.ParentId);
             }
           })
-          this.optionTitle = "修改课程分类信息"
+          this.optionTitle = "修改系列信息"
         } else {
-          this.optionTitle = "新增课程分类"
+          this.optionTitle = "新增系列"
           this.objOption.CateId = 0;
           this.objOption.ParentId = 0;
           this.objOption.CateName = "";