Merge branch 'iteration_0307' into jenkins

src/views/attendance-rule/index.tsx

@@ -115,7 +115,7 @@ export default defineComponent({
                   </p>
                 </div>
 
-                {/* <div class={styles.textWrap}>
+                <div class={styles.textWrap}>
                   <h4>异常签到：</h4>
                   <p>
                     课程
@@ -134,13 +134,13 @@ export default defineComponent({
                   <p>
                     时间段：{reduceFormMinute('12:00:00', forms['abnormal_sign_in'])} ~ 12:00:00
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['abnormal_sign_in_fee'] ? forms['abnormal_sign_in_fee'] : 0}
                       {forms['abnormal_sign_in_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
 
                 <div class={styles.textWrap}>
@@ -151,13 +151,13 @@ export default defineComponent({
                     内签到
                   </p>
                   <p>时间段：12:00:00 ~ {addFormMinute('12:00:00', forms['absence_sign_in'])}</p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['late_sign_in_fee'] ? forms['late_sign_in_fee'] : 0}
                       {forms['late_sign_in_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
 
                 <div class={styles.textWrap}>
@@ -172,26 +172,26 @@ export default defineComponent({
                     时间段：{addFormMinute('12:00:00', forms['absence_sign_in'])}后签到（含
                     {addFormMinute('12:00:00', forms['absence_sign_in'])}）
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['absence_sign_in_fee'] ? forms['absence_sign_in_fee'] : 0}
                       {forms['absence_sign_in_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
 
                 <div class={styles.textWrap}>
                   <h4>未签到：</h4>
                   <p>未进行【签到】操作</p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['not_sign_in_fee'] ? forms['not_sign_in_fee'] : 0}{' '}
                       {forms['not_sign_in_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
-                </div> */}
+                  </p> */}
+                </div>
               </div>
             </CollapseItem>
             <CollapseItem
@@ -236,7 +236,7 @@ export default defineComponent({
                   </p>
                   <p>时间段：13:00:00 ~ {addFormMinute('13:00:00', forms['normal_sign_out'])}</p>
                 </div>
-                {/* <div class={styles.textWrap}>
+                <div class={styles.textWrap}>
                   <h4>早退：</h4>
                   <p>
                     课程
@@ -249,13 +249,13 @@ export default defineComponent({
                     时间段：{reduceFormMinute('13:00:00', forms['premise_sign_out'])}前签退（含
                     {reduceFormMinute('13:00:00', forms['premise_sign_out'])}）{' '}
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['premise_sign_out_fee'] ? forms['premise_sign_out_fee'] : 0}
                       {forms['premise_sign_out_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
 
                 <div class={styles.textWrap}>
@@ -275,29 +275,29 @@ export default defineComponent({
                   <p>
                     时间段：{reduceFormMinute('13:00:00', forms['abnormal_sign_out'])} ~ 12:59:59
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['abnormal_sign_out_fee'] ? forms['abnormal_sign_out_fee'] : 0}{' '}
                       {forms['abnormal_sign_out_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
 
                 <div class={styles.textWrap}>
                   <h4>未签退：</h4>
                   <p>未进行【签退】操作</p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       -{forms['not_sign_out_fee'] ? forms['not_sign_out_fee'] : 0}
                       {forms['not_sign_out_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
-                </div> */}
+                  </p> */}
+                </div>
               </div>
             </CollapseItem>
-            {/* <CollapseItem
+            <CollapseItem
               name="3"
               border={false}
               v-slots={{
@@ -322,13 +322,13 @@ export default defineComponent({
                       米外
                     </span>
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       - {forms['sign_in_attendance'] ? forms['sign_in_attendance'] : 0}
                       {forms['sign_in_attendance_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
                 <div class={styles.textWrap}>
                   <p>
@@ -338,16 +338,16 @@ export default defineComponent({
                       米外
                     </span>
                   </p>
-                  <p>
+                  {/* <p>
                     扣除训练补助：
                     <span>
                       - {forms['sign_out_attendance'] ? forms['sign_out_attendance'] : 0}
                       {forms['sign_out_attendance_type'] == 'MONEY' ? '元' : '%'}
                     </span>
-                  </p>
+                  </p> */}
                 </div>
               </div>
-            </CollapseItem> */}
+            </CollapseItem>
           </Collapse>
         </div>
       </>