Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

曾国涛
2 parents 3c8b3518 a9848f98
Showing 5 changed files with 34 additions and 9 deletions
src/pages/Instalment/components/checkModal/TableCheckModal.tsx
src/pages/Instalment/components/checkModal/checkModal.tsx
src/pages/Instalment/components/payWayDetail/payWayDetail.css
src/pages/Instalment/components/payWayDetail/payWayDetail.less
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
@@ -55,7 +55,8 @@ export default ({ id, toReload, isShow }) =&gt; {
                     }
                     toReload();
                   }
-                  return;
+                  props.submit();
+                  return true;
                 }}
               >
                 驳回
@@ -91,7 +92,7 @@ export default ({ id, toReload, isShow }) =&gt; {
           name="mark"
           label="备注"
           tooltip="请特别注意订单总金额与订单金额。"
-          placeholder="请输入名称"
+          placeholder="如驳回请输入原因"
         />
       </ModalForm>
     </Space>
@@ -46,7 +46,7 @@ export default ({ id, toReload }) =&gt; {
                     message.success('操作成功');
                   }
                   toReload();
-                  return;
+                  return true;
                 }}
               >
                 驳回
@@ -77,7 +77,7 @@ export default ({ id, toReload }) =&gt; {
           name="mark"
           label="备注"
           tooltip="请特别注意订单总金额与订单金额。"
-          placeholder="请输入名称"
+          placeholder="如驳回请输入原因"
         />
       </ModalForm>
     </Space>
@@ -10,6 +10,18 @@
   margin-bottom: 0 !important;
 }
  
-.dataChoose {
-  margin: 0;
+.payway-detail-index td .ant-form-item css-nllxry {
+  margin-bottom: 0 !important;
+}
+
+.payWaydataChoose {
+  margin: 0 !important;
+}
+
+.ant-form-item css-nllxry {
+  margin-bottom: 0 !important;
+}
+
+:where(.css-nllxry).ant-form-item {
+  margin-bottom: 0 !important;
 }
@@ -8,10 +8,22 @@
   .css-dev-only-do-not-override-nllxry {
     margin-bottom: 0 !important;
   }
+
+  .ant-form-item css-nllxry {
+    margin-bottom: 0 !important;
+  }
 }
  
-.dataChoose {
-  margin: 0;
+.payWaydataChoose {
+  margin: 0 !important;
+}
+
+.ant-form-item css-nllxry {
+  margin-bottom: 0 !important;
+}
+
+:where(.css-nllxry).ant-form-item {
+  margin-bottom: 0 !important;
 }
  
 // .pay-way-detail-index td .css-dev-only-do-not-override-nllxry{
@@ -212,7 +212,7 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
  
         return (
           <ProFormDatePicker
-            className="dataChoose"
+            className="payWaydataChoose"
             initialValue={record.payDate}
             value={record.payDate}
             placeholder={'请填写时间'}