1

1

dist/static/css/chunk-77449cf7.e41e0d60.css → dist/static/css/chunk-68da6b0b.8cda9683.css

@@ -1 +1 @@
-.left[data-v-dea7477a]{margin-right:20px}.listWrap[data-v-dea7477a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.courseMask .el-tag.el-tag--info{margin-right:4px}
+.left[data-v-47c56bb0]{margin-right:20px}.listWrap[data-v-47c56bb0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.courseMask .el-tag.el-tag--info{margin-right:4px}

src/views/categroyManager/insideSetting/addressManager.vue

@@ -220,9 +220,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
+          <!-- :show-message="addressMessage" -->
         <el-form-item
           prop="address"
-          :show-message="addressMessage"
+
           label="上课地点"
           :label-width="formLabelWidth"
         >

src/views/categroyManager/vipActiveList.vue

@@ -32,7 +32,7 @@
           <el-input
             v-model.trim="searchForm.search"
             clearable
-            placeholder="请输入活动编号、名称"
+            placeholder="活动编号、名称"
           ></el-input>
         </el-form-item>
         <el-form-item prop="organId">
@@ -192,7 +192,7 @@
     </div>
     <el-dialog
       title="修改VIP/乐理课活动"
-      width="650px"
+      width="800px"
       v-if="dialogVisible"
       :visible.sync="dialogVisible"
     >
@@ -401,9 +401,12 @@
                     this.$refs['form'].resetFields();
                     activeType = 'BASE_ACTIVITY';
                     courseNumForm = {
-                      minCourseNum: null,
-                      maxCourseNum: null,
+                      minCourseNum: '',
+                      maxCourseNum: '',
+                      studentMaxUsedTimes: '',
                     };
+                    attribute1 = '';
+                    attribute2 = '';
                   }
                 "
                 :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
@@ -455,6 +458,15 @@
                   >
                   </el-input>
                 </el-form-item>
+                <el-form-item>
+                  <el-input
+                    v-model.number="courseNumForm.studentMaxUsedTimes"
+                    type="number"
+                    style="margin-left: 10px; width: 120px !important"
+                    placeholder="学员购买次数"
+                  >
+                  </el-input>
+                </el-form-item>
               </el-form>
             </div>
             <div>
@@ -464,10 +476,10 @@
                   () => {
                     this.$refs['form'].resetFields();
                     activeType = 'GIVE_CLASS';
-                    courseNumForm = {
-                      minCourseNum: null,
-                      maxCourseNum: null,
-                    };
+                    courseNumForm.minCourseNum = '';
+                    courseNumForm.maxCourseNum = '';
+                    attribute1 = '';
+                    attribute2 = '';
                   }
                 "
                 :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
@@ -489,6 +501,14 @@
                 type="number"
                 style="margin: 0 10px"
               ></el-input>
+              <el-input
+                v-show="activeType == 'GIVE_CLASS'"
+                v-model.number="courseNumForm.studentMaxUsedTimes"
+                type="number"
+                style="margin-left: 10px; width: 120px !important"
+                placeholder="学员购买次数"
+              >
+              </el-input>
               <!-- <el-checkbox v-if="activeType=='GIVE_CLASS'"
                            v-model.trim="giveClassPaySalaryFlag"
                            label="赠送课时结算课酬"></el-checkbox> -->
@@ -591,6 +611,7 @@ export default {
       courseNumForm: {
         minCourseNum: "",
         maxCourseNum: "",
+        studentMaxUsedTimes: "",
       },
       courseNumrules: {
         minCourseNum: [
@@ -926,10 +947,15 @@ export default {
       this.activeType = row.type;
       this.attribute1 = row.attribute1;
       this.attribute2 = row.attribute2;
-      (this.courseNumForm.minCourseNum = row.minCourseNum),
-        (this.courseNumForm.maxCourseNum = row.maxCourseNum),
-        (this.giveClassPaySalaryFlag =
-          row.giveClassPaySalaryFlag == 1 ? true : false);
+      this.$set(
+        this.courseNumForm,
+        "studentMaxUsedTimes",
+        row.studentMaxUsedTimes
+      );
+      this.$set(this.courseNumForm, "minCourseNum", row.minCourseNum);
+      this.$set(this.courseNumForm, "maxCourseNum", row.maxCourseNum);
+      this.giveClassPaySalaryFlag =
+        row.giveClassPaySalaryFlag == 1 ? true : false;
     },
     // 点击确认按钮发送修改请求
     resetRow() {
@@ -1029,7 +1055,14 @@ export default {
                 onlineSalarySettlement,
                 offlineSalarySettlement,
               };
-
+              if (type == "BASE_ACTIVITY") {
+                this.courseNumForm.studentMaxUsedTimes = 0;
+                this.courseNumForm.minCourseNum = 0;
+                this.courseNumForm.maxCourseNum = 0;
+              } else if (type == "GIVE_CLASS") {
+                this.courseNumForm.minCourseNum = 0;
+                this.courseNumForm.maxCourseNum = 0;
+              }
               // 发请求创建活动
               resetVipActive({
                 paymentReadonlyFlag,
@@ -1050,6 +1083,7 @@ export default {
                 attribute2: this.attribute2,
                 minCourseNum: this.courseNumForm.minCourseNum,
                 maxCourseNum: this.courseNumForm.maxCourseNum,
+                studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes,
                 onlineClassJoinGradientRewards:
                   this.onlineClassJoinGradientRewards * 1,
                 offlineClassJoinGradientRewards:

src/views/categroyManager/vipNewActive.vue

@@ -225,10 +225,14 @@
                 () => {
                   this.$refs['form'].resetFields();
                   activeType = 'BASE_ACTIVITY';
-                  courseNumForm = {
-                    minCourseNum: null,
-                    maxCourseNum: null,
-                  };
+                    courseNumForm = {
+                      minCourseNum: '',
+                      maxCourseNum: '',
+                      studentMaxUsedTimes: '',
+                    };
+                    attribute1 = '';
+                    attribute2 = '';
+
                 }
               "
             >
@@ -267,6 +271,7 @@
                   style="margin-left: 10px; width: 120px !important"
                   placeholder="最小课时数"
                 >
+
                 </el-input>
               </el-form-item>
               <el-form-item prop="maxCourseNum">
@@ -277,8 +282,19 @@
                   style="margin-left: 10px; width: 120px !important"
                   placeholder="最大课时数"
                 >
+
                 </el-input>
               </el-form-item>
+               <el-form-item>
+                  <el-input
+                    v-model.number="courseNumForm.studentMaxUsedTimes"
+                    type="number"
+                    style="margin-left: 10px; width: 120px !important"
+                    placeholder="学员购买次数"
+                  >
+
+                  </el-input>
+                </el-form-item>
             </el-form>
           </div>
           <div>
@@ -289,10 +305,11 @@
                 () => {
                   this.$refs['form'].resetFields();
                   activeType = 'GIVE_CLASS';
-                      courseNumForm = {
-                    minCourseNum: null,
-                    maxCourseNum: null,
-                  };
+                 courseNumForm.minCourseNum = '';
+                    courseNumForm.maxCourseNum = '';
+                    attribute1 = '';
+                    attribute2 = '';
+
                 }
               "
             >
@@ -306,7 +323,7 @@
               @mousewheel.native.prevent
               style="margin-right: 10px; width: 200px !important"
             >
-              <template slot="append">节</template>
+             <template slot="append">节</template>
             </el-input>
             <span v-if="activeType == 'GIVE_CLASS'">赠</span>
             <el-input
@@ -317,8 +334,17 @@
               v-model.trim="attribute2"
               style="margin: 0 10px; width: 200px !important"
             >
-              <template slot="append">节</template>
+             <template slot="append">节</template>
             </el-input>
+                 <el-input
+                v-show="activeType == 'GIVE_CLASS'"
+                v-model.number="courseNumForm.studentMaxUsedTimes"
+                type="number"
+                style="margin-left: 10px; width: 120px !important"
+                placeholder="学员购买次数"
+              >
+
+              </el-input>
             <!-- <el-checkbox
               v-if="activeType=='GIVE_CLASS'"
               v-model.trim="giveClassPaySalaryFlag"
@@ -403,6 +429,7 @@ export default {
       courseNumForm: {
         minCourseNum: "",
         maxCourseNum: "",
+         studentMaxUsedTimes: "",
       },
       giveClassPaySalaryFlag: true,
       organList: [],
@@ -598,6 +625,14 @@ export default {
                 onlineSalarySettlement,
                 offlineSalarySettlement,
               };
+                    if (type == "BASE_ACTIVITY") {
+                this.courseNumForm.studentMaxUsedTimes = 0;
+                this.courseNumForm.minCourseNum = 0;
+                this.courseNumForm.maxCourseNum = 0;
+              } else if (type == "GIVE_CLASS") {
+                this.courseNumForm.minCourseNum = 0;
+                this.courseNumForm.maxCourseNum = 0;
+              }
               // 发请求创建活动
               addVipActive(
                 cleanDeep({
@@ -618,6 +653,7 @@ export default {
                   attribute2: this.attribute2,
                   minCourseNum: this.courseNumForm.minCourseNum,
                   maxCourseNum: this.courseNumForm.maxCourseNum,
+                  studentMaxUsedTimes:this.courseNumForm.studentMaxUsedTimes,
                   offlineClassJoinGradientRewards:
                     this.offlineClassJoinGradientRewards * 1,
                   onlineClassJoinGradientRewards:

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -137,12 +137,11 @@
           <template
             slot-scope="scope"
             v-if="
-              scope.row.courseScheduleType != 'VIP' && !scope.row.settlementTime
+             !scope.row.settlementTime
             "
           >
             <auth
               auths="courseSchedule/updateTeacherCoursesSalary/settlement"
-              v-if="scope.row.courseScheduleType != 'DEMO'"
             >
               <el-button @click="onUpdate(scope.row)" type="text"
                 >课酬补贴</el-button
@@ -199,12 +198,21 @@
           prop="subsidy"
           :label-width="formLabelWidth"
         >
-          <el-input
+          <!-- <el-input
             v-model.trim="form.subsidy"
             type="number"
             @mousewheel.native.prevent
             autocomplete="off"
-          ></el-input>
+          ></el-input> -->
+              <el-input-number
+          class="number-input"
+             @mousewheel.native.prevent
+            autocomplete="off"
+            :controls="false"
+            :min="0"
+            style="width: 180px;"
+            v-model.number="form.subsidy"
+          ></el-input-number>
         </el-form-item>
         <!-- <el-form-item label="课时补贴调整为"
                       prop="subsidy"
@@ -388,5 +396,10 @@ export default {
   },
 };
 </script>
-<style lang="scss" scope>
+<style lang="scss" scoped>
+.number-input{
+  /deep/ .el-input__inner {
+    text-align: left;
+  }
+}
 </style>

src/views/teamDetail/componentCourse/teacherList.vue

@@ -188,7 +188,10 @@
               @click="lookGPS(scope.row)"
               >GPS定位</el-button
             >
-            <auth auths="courseSchedule/queryTeacherSalary">
+            <auth
+              auths="courseSchedule/queryTeacherSalary"
+              v-if="!scope.row.settlementTime"
+            >
               <el-button
                 type="text"
                 size="small"
@@ -325,7 +328,9 @@
         </el-form-item>
         <el-form-item label="总课酬" prop="expectSalary">
           <span>{{
-           ((activeTeacher&&activeTeacher.expectSalary)+(activeTeacher&&activeTeacher.subsidy))  | moneyFormat
+            ((activeTeacher && activeTeacher.expectSalary) +
+              (activeTeacher && activeTeacher.subsidy))
+              | moneyFormat
           }}</span>
         </el-form-item>
         <br />
@@ -339,10 +344,13 @@
         </el-form-item>
         <br />
         <el-form-item label="课程补贴" prop="subsidy">
-          <el-input
-            style="width: 180px"
-            v-model.trim="teacherMask.subsidy"
-          ></el-input>
+          <el-input-number
+          class="number-input"
+            :controls="false"
+            :min="0"
+            style="width: 180px;"
+            v-model.number="teacherMask.subsidy"
+          ></el-input-number>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -553,4 +561,9 @@ export default {
 .orgin {
   color: #e6a23c;
 }
+.number-input{
+  /deep/ .el-input__inner {
+    text-align: left;
+  }
+}
 </style>