提交测试

1

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/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>