Merge branch 'iteration_0307' into jenkins

src/school/attendance-rules/component/range.tsx

@@ -144,7 +144,7 @@ export default defineComponent({
             }}
           </Cell>
         </CellGroup>
-        <CellGroup inset>
+        {/* <CellGroup inset>
           <Cell>
             {{
               title: () => (
@@ -240,7 +240,7 @@ export default defineComponent({
               )
             }}
           </Cell>
-        </CellGroup>
+        </CellGroup> */}
 
         <Teleport to={'#app'}>
           <OSticky position="bottom">

src/school/attendance-rules/component/sigin-in-rule.tsx

@@ -248,7 +248,7 @@ export default defineComponent({
                     </span>
                     时间范围内签到属于<span>异常签到</span>
                   </div>
-                  <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
+                  {/* <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
                     单次扣减金额：
                     <Field
                       class={[styles.field, styles['field-m'], styles['field-w136']]}
@@ -278,7 +278,7 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                  </div>
+                  </div> */}
                 </div>
               )
             }}
@@ -318,7 +318,7 @@ export default defineComponent({
                     </span>
                     时间范围内签到属于<span>迟到</span>
                   </div>
-                  <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
+                  {/* <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
                     单次扣减金额：
                     <Field
                       class={[styles.field, styles['field-m'], styles['field-w136']]}
@@ -348,7 +348,7 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                  </div>
+                  </div> */}
                 </div>
               )
             }}
@@ -375,7 +375,7 @@ export default defineComponent({
                     后签到(含{addFormMinute('12:00:00', forms['late_sign_in'])}) 属于
                     <span>旷课</span>
                   </div>
-                  <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
+                  {/* <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
                     单次扣减金额：
                     <Field
                       class={[styles.field, styles['field-m'], styles['field-w136']]}
@@ -405,13 +405,13 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                  </div>
+                  </div> */}
                 </div>
               )
             }}
           </Cell>
         </CellGroup>
-        <CellGroup inset>
+        {/* <CellGroup inset>
           <Cell>
             {{
               title: () => <div class={[styles.ruleTitle]}>未签到</div>
@@ -454,7 +454,7 @@ export default defineComponent({
               )
             }}
           </Cell>
-        </CellGroup>
+        </CellGroup> */}
 
         <Teleport to={'#app'}>
           <OSticky position="bottom">

src/school/attendance-rules/component/sigin-out-rule.tsx

@@ -203,7 +203,7 @@ export default defineComponent({
                     </span>
                     时间范围内签退属于<span>异常签退</span>
                   </div>
-                  <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
+                  {/* <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
                     单次扣减金额：
                     <Field
                       class={[styles.field, styles['field-m'], styles['field-w136']]}
@@ -233,7 +233,7 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                  </div>
+                  </div> */}
                 </div>
               )
             }}
@@ -261,7 +261,7 @@ export default defineComponent({
                     前签退 (含{reduceFormMinute('12:00:00', forms['abnormal_sign_out'])}) 属于
                     <span>早退</span>
                   </div>
-                  <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
+                  {/* <div style={{ paddingTop: '20px' }} class={styles.flexDev}>
                     单次扣减金额：
                     <Field
                       class={[styles.field, styles['field-m'], styles['field-w136']]}
@@ -291,14 +291,14 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                  </div>
+                  </div> */}
                 </div>
               )
             }}
           </Cell>
         </CellGroup>
 
-        <CellGroup inset>
+        {/* <CellGroup inset>
           <Cell>
             {{
               title: () => <div class={[styles.ruleTitle]}>未签退</div>
@@ -341,7 +341,7 @@ export default defineComponent({
               )
             }}
           </Cell>
-        </CellGroup>
+        </CellGroup> */}
 
         <Teleport to={'#app'}>
           <OSticky position="bottom">

src/school/companion-teacher/companion-teacher-register.tsx

@@ -710,10 +710,10 @@ export default defineComponent({
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
-              、
+              {/* 、
               <span class={styles.c} onClick={() => onPreview('LABOR')}>
                 《劳务协议》
-              </span>
+              </span> */}
               {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》

src/school/manage-teacher/manage-teacher-register.tsx

@@ -474,10 +474,10 @@ export default defineComponent({
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
-              、
+              {/* 、
               <span class={styles.c} onClick={() => onPreview('LABOR')}>
                 《劳务协议》
-              </span>
+              </span> */}
               {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》

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>
                     课程
@@ -191,7 +191,7 @@ export default defineComponent({
                       {forms['not_sign_in_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
                   </p>
-                </div>
+                </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>
                     课程
@@ -294,10 +294,10 @@ export default defineComponent({
                       {forms['not_sign_out_fee_type'] == 'MONEY' ? '元' : '%'}
                     </span>
                   </p>
-                </div>
+                </div> */}
               </div>
             </CollapseItem>
-            <CollapseItem
+            {/* <CollapseItem
               name="3"
               border={false}
               v-slots={{
@@ -347,7 +347,7 @@ export default defineComponent({
                   </p>
                 </div>
               </div>
-            </CollapseItem>
+            </CollapseItem> */}
           </Collapse>
         </div>
       </>