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

src/components/school/teacher/teacher-form.vue

@@ -23,7 +23,7 @@
             ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
             map-options />
           <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum"
-            class="col-6 q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
+            class="col-6 q-pb-lg q-pr-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
           <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
             class="col-6 q-pr-lg q-pb-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
         </div>

src/components/studyAbroad/studyAbroad-form.vue

@@ -2,36 +2,39 @@
   <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.Id==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="row wrap">
-          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.CateName" ref="CateName"
+          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.Name" ref="Name"
             class="col-6 q-pr-lg q-pb-lg" label="项目名称" :rules="[val => !!val || '项目名称']" />
-          <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.SortNum" ref="SortNum"
-            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>
+          <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.SupplierId"
+            ref="Type" :options="supplierList" label="供应编号" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value
+            map-options />
         </div>
+        <div class="row wrap">
+          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.SupplierContract" ref="SupplierContract"
+            class="col-6 q-pr-lg q-pb-lg" label="供应商合同" :rules="[val => !!val || '供应商合同']" />
+          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.CommissionProfits" ref="SupplierContract"
+            class="col-6 q-pr-lg q-pb-lg" label="佣金利润说明" :rules="[val => !!val || '佣金利润说明']" />
+        </div>
+
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
         <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
         <q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading"
-          @click="saveCategory" />
+          @click="saveStudyInfo" />
       </q-card-actions>
     </q-card>
   </q-dialog>
 </template>
 <script>
   import {
-    queryCourseCategoryTree,
-    queryCourseCategoryInfo,
-    saveCourseCategoryInfo
-  } from '../../api/course/index'
+    saveStudyAbroad,
+    queryStudyAbroadInfo
+  } from '../../api/studyabroad/index'
   export default {
     props: {
       saveObj: {
@@ -41,64 +44,39 @@
     },
     data() {
       return {
-        isShow: false,
         persistent: true,
         objOption: {
-          programName:'', //项目名称
-          supplier:'', //供应商
-          saleprice:'', //卖价
-          profits:'', //佣金/利润
-          costof:'', //直接成本
-          commission:'', //同行返佣
-          salecommission:'', //销售提成
-          offer:'', //报价
-          
+          Id:0,
+          Type:1, //1留学 2就业
+          Name:'', //项目名称
+          SupplierId:0, //供应商编号
+          SupplierContract:'', //供应商合同
+          CommissionProfits:'', //佣金利润说明
+          SellPrice:'', //卖价
+          CostPrice:'', //直接成本价
+          CostInfo:'', //成本价包含内容
+          B2BCommission:'', //同行返佣
+          B2BCommissionType:0, //同行返佣类型
+          B2BCommissionType:'', //销售返佣
+          SaleCommissionType:0, //销售返佣类型
+          OfferPrice:'', //校企报价
+          OfferCommissionType:0, //校企报价返佣类型
+          OfferCommission:'', //校企返佣金额
+          Remark:'', //备注
+          SaleState:0 //销售状态(0-待完善，1-上架审核中，2-上架)
         },
         optionTitle: "",
-        //树形课程分类列表
-        TreeCategoryList: [],
         saveLoading: false,
-        chooseCategroyArray: [],
+        supplierList:[], //供应商下拉数据
       }
     },
     mounted() {
-      this.getCategoryTreeList();
       this.initObj()
     },
     methods: {
-      //获取树形课程分类列表
-      getCategoryTreeList() {
-        this.TreeCategoryList = [];
-        var qMsg = {}
-        queryCourseCategoryTree(qMsg).then(res => {
-          this.TreeCategoryList = res.Data;
-          this.isShow = true;
-        })
-      },
       //初始化表单
       initObj() {
-        if (this.saveObj && this.saveObj.CateId > 0) {
-          queryCourseCategoryInfo({
-            CateId: this.saveObj.CateId
-          }).then(res => {
-            this.objOption.CateId = res.Data.CateId;
-            this.objOption.ParentId = res.Data.ParentId;
-            this.objOption.CateName = res.Data.CateName;
-            this.objOption.SortNum = res.Data.SortNum;
-            this.objOption.Status = res.Data.Status;
-            if (res.Data.ParentId && res.Data.ParentId > 0) {
-              this.chooseCategroyArray.push(res.Data.ParentId);
-            }
-          })
-          this.optionTitle = "修改系列信息"
-        } else {
-          this.optionTitle = "新增系列"
-          this.objOption.CateId = 0;
-          this.objOption.ParentId = 0;
-          this.objOption.CateName = "";
-          this.objOption.SortNum = 0;
-          this.objOption.Status = 0;
-        }
+        
       },
       //关闭弹窗
       closeSaveForm() {
@@ -106,38 +84,8 @@
         this.persistent = false
       },
       //保存菜单
-      saveCategory() {
-        var tempKeys = "";
-        if (this.chooseCategroyArray && this.chooseCategroyArray.length > 0) {
-          this.chooseCategroyArray.forEach(item => {
-            this.objOption.ParentId = item;
-          })
-        }
-        this.saveLoading = true
-        saveCourseCategoryInfo(this.objOption).then(res => {
-          this.saveLoading = false
-          this.$q.notify({
-            icon: 'iconfont icon-chenggong',
-            color: 'accent',
-            timeout: 2000,
-            message: '数据保存成功！',
-            position: 'top'
-          })
-          this.$emit("success")
-          this.closeSaveForm()
-        }).catch(() => {
-          this.saveLoading = false
-        })
-      }
-    },
-    watch: {
-      chooseCategroyArray: function (val, oldval) {
-        if (this.chooseCategroyArray.length > 1) {
-          var end = this.chooseCategroyArray[this.chooseCategroyArray.length - 1];
-          var tempArray = [];
-          tempArray.push(end);
-          this.chooseCategroyArray = tempArray;
-        }
+      saveStudyInfo() {
+        
       }
     }
   }