Merge remote-tracking branch 'origin/master'

src/api/school/salary/commissionPlans.js

@@ -16,10 +16,9 @@ export function saveOrEdit(data) {
   })
 }
 
-export function remove(data) {
+export function remove(row) {
   return request({
-    url: '/commissionPlans/remove',
+    url: '/commissionPlans/remove?id='+row.id,
-    method: 'get',
+    method: 'post',
-    params: data
   })
 }

src/components/sc/course/addCourse.vue

@@ -51,14 +51,14 @@
                 <el-radio
                   v-for="item in courseCampus"
                   :key="item.id"
-                  :label="item.id"
+                  :label="item.label"
-                  :value="item.id"
+                  :value="item.label"
                 >{{ item.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.courseCampus === 'part'">
+        <el-row v-if="form.courseCampus === '部分校区'">
           <el-form-item label="选择校区:" prop="partCampus" class="align-left">
             <el-checkbox-group v-model="form.partCampus">
               <el-checkbox v-for="(item) in campusOptions" :key="item.id" :label="item.id" name="partCampus">{{ item.label }}</el-checkbox>

src/views/school/salary/commission_plans/index.vue

@@ -28,7 +28,7 @@
       <el-table-column prop="tier4Rate" label="第四阶梯比例" />
       <el-table-column prop="renewalRate" label="续费率" />
       <el-table-column prop="referralRate" label="转介绍率" />
-      <el-table-column prop="isActive" label="是否生效" />
+      <el-table-column prop="isActive" :formatter="activeFormat" label="是否生效" />
       <el-table-column prop="effectiveDate" label="生效日期" />
       <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -61,7 +61,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="第二阶梯阈值:" prop="tier2Threshold">
-              <el-input v-model="form.tier2Threshold" placeholder="第二阶梯阈值(0-?元)" />
+              <el-input v-model="form.tier2Threshold" placeholder="第二阶梯阈值(?-?元)" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -71,7 +71,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="第三阶梯阈值:" prop="tier3Threshold">
-              <el-input v-model="form.tier3Threshold" placeholder="第三阶梯阈值(0-?元)" />
+              <el-input v-model="form.tier3Threshold" placeholder="第三阶梯阈值(?-?元)" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -91,7 +91,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="转介绍率:" prop="referralRate">
-              <el-input v-model="form.tier1Threshold" placeholder="转介绍率(8-10%)" />
+              <el-input v-model="form.referralRate" placeholder="转介绍率(8-10%)" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -102,11 +102,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="生效日期:" prop="referralRate">
+            <el-form-item label="生效日期:" prop="effectiveDate">
               <el-date-picker
                 v-model="form.effectiveDate"
-                :format="dateFormat"
+                format="yyyy-MM-dd"
-                :valueFormat="dateFormat"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期" />
             </el-form-item>
@@ -146,7 +146,6 @@ export default {
         isActive:1,
       },
       // 表单参数
-      dateFormat:'yyyy/MM/dd',
       form: {
         planName:'',
         tier1Threshold:null,
@@ -181,6 +180,14 @@ export default {
         this.loading = false
       })
     },
+    activeFormat(row,column,cellValue){
+      for (const item of this.options) {
+        if (item.value===cellValue){
+          return item.label
+        }
+      }
+      return cellValue
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -200,7 +207,7 @@ export default {
         renewalRate:null,
         referralRate:null,
         isActive:1,
-        effectiveDate:new Date().getDate(),
+        effectiveDate:new Date(),
       }
       this.resetForm('form')
     },
@@ -245,19 +252,18 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.roomId || this.ids
       this.$confirm('是否确认删除?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return remove({id:id})
+        return remove(row)
       }).then((response) => {
-        if (response.respCode === 200) {
+        if (response.code === 200) {
           this.getList()
           this.msgSuccess('删除成功')
         } else {
-          this.msgError(response.respMsg)
+          this.msgError(response.msg)
         }
       }).catch(function() {})
     }