Merge branch 'bugfix-0528priavtepocket' into 'dev'

Bugfix 0528priavtepocket See merge request !43

Merge branch 'bugfix-0528priavtepocket' into 'dev'
Bugfix 0528priavtepocket See merge request !43
boyang
2 parents 16152a88 8a7c2431
Showing 3 changed files with 11 additions and 24 deletions
src/pages/Order/Order/components/CheckModal.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/index.less
@@ -84,27 +84,6 @@ export default ({
     // let res = await postServiceOrderQueryAfterSalesInfoSnapshot({
     //   data: { subOrderIds: subOrderIds },
     // });
-
-    // 检查subOrders是否存在且有元素
-    if (!subOrders || !subOrders.length) {
-      // 如果是预存审核类型，直接返回，不需要处理售后信息
-      if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
-        return;
-      }
-
-      // 对于其他类型，设置一个空的售后信息
-      setAfterSalesInfo(
-        <div className="my-5">
-          <Row gutter={[16, 24]}>
-            <Col span={24}>
-              <span>暂无售后信息</span>
-            </Col>
-          </Row>
-        </div>,
-      );
-      return;
-    }
-
     //附件
     let annex = subOrders[0]?.afterSalesAnnexList || [];
     let index = 1;
@@ -151,8 +130,6 @@ export default ({
   useEffect(() => {
     if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
       setAPopoverTitle('确认发货');
-    } else if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
-      setAPopoverTitle('预存审核');
     }
     getOrderAfterSalesInfo();
@@ -2401,7 +2401,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     name="discount"
                     label="是否竞标/打折"
                     //hidden={true}
-                    initialValue={true}
                     options={[
                       {
                         label: '是',
@@ -3,6 +3,15 @@
   margin-inline: 0 !important;
 }
+// 修复表格单元格超出边界问题
+.order-page-container .ant-table-cell {
+  word-break: break-word;
+  white-space: normal !important;
+  overflow: hidden;
+  max-width: 500px; // 设置最大宽度，防止单元格过宽
+  box-sizing: border-box;
+}
+
 .order-page-container td {
   font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
     'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
@@ -54,6 +63,8 @@
 .order-page-container .ant-table-thead .ant-table-cell {
   background-color: #fff !important;
   border-radius: 8px !important;
+  overflow: hidden;
+  white-space: normal !important;
 }
 #sub-table tbody td {