Merge branch 'bugfix-0610' into 'master'

fix: 修改首页按钮 See merge request !54

Merge branch 'bugfix-0610' into 'master'
fix: 修改首页按钮 See merge request !54
柏杨
2 parents d91e16c7 f53c9cf8
Showing 1 changed file with 42 additions and 35 deletions
src/pages/Order/OrderList/OrderList.tsx
@@ -909,14 +909,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {/* 商品名称 */}
             <div>
               <div
-                className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                className="overflow-hidden overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
                 onClick={() => {
                   copyToClipboard(optRecord.productName);
                   message.info('商品名称复制成功：' + optRecord.productName);
                 }}
                 title={optRecord.productName}
               >
-                <span className="font-medium text-black ">
+                <span className="font-medium text-black">
                   {optRecord.productName}
                 </span>
               </div>
@@ -976,7 +976,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             </div>
             <div
-              className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+              className="overflow-hidden overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
               title={optRecord.parameters}
               onClick={() => {
                 copyToClipboard(optRecord.parameters);
@@ -992,7 +992,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {!isSupplier() ? (
               <>
                 <div
-                  className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                  className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
                   title={optRecord.productPrice}
                 >
                   <span className="text-[#8C8C8C]">单价：</span>
@@ -1006,7 +1006,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             )}
             <div
-              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
               title={optRecord.quantity}
             >
               <span className="text-[#8C8C8C]">数量：</span>
@@ -1018,7 +1018,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {!isSupplier() ? (
               <div
-                className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
                 title={optRecord.subOrderPayment}
               >
                 <span className="text-[#8C8C8C]">合计：</span>
@@ -1032,7 +1032,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {optRecord.deliveryDate && (
               <div
-                className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
                 title={optRecord.deliveryDate}
               >
                 <span className="text-[#8C8C8C]">产品交期：</span>
@@ -1045,13 +1045,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {!isSupplier() ? (
               <>
                 {/* 支付方式 */}
-                <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   <span className="text-slate-700">
                     {optRecord.paymentMethodText}
                   </span>
                 </div>
                 {/* 支付渠道 */}
-                <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   <span className="text-slate-700">
                     {enumValueToLabel(
                       optRecord.paymentChannel,
@@ -1061,7 +1061,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 </div>
                 {/* 回款审核状态 */}
                 {optRecord.paymentReceiptStatus !== null ? (
-                  <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                     <Tag
                       className="hover:cursor-pointer"
                       onMouseEnter={(e: any) => {
@@ -1100,7 +1100,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <>
                 {/* 所属部门 */}
                 <div
-                  className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                  className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
                   title={enumValueToLabel(
                     optRecord.productBelongBusiness,
                     PRODUCT_BELONG_DEPARTMENT_OPTIONS,
@@ -1116,7 +1116,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 {/* 开票类型 */}
                 {optRecord.invoicingStatus !== null ? (
-                  <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                     <span className="text-slate-700">
                       {getInvoicingType(optRecord)}
                     </span>
@@ -1127,7 +1127,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 {/* 开票状态 */}
                 {optRecord.afterInvoicingStatus !== null ? (
-                  <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                     <Tooltip
                       title={
                         optRecord.invoicingUrgentCause !== null &&
@@ -1156,7 +1156,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 {/* 是否加急图标显示 */}
                 {optRecord.isUrgent ? (
-                  <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                     <Tooltip
                       title={'期望开票时间：' + formatdate(optRecord.deadline)}
                     >
@@ -1170,7 +1170,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
                 optRecord.shippingWarehouse !== null ? (
                   <div
-                    className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                    className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
                     title={enumValueToLabel(
                       optRecord.shippingWarehouse,
                       SHIPPING_WAREHOUSE_OPTIONS,
@@ -1188,7 +1188,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 )}
                 {/* 生产时间 */}
-                <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   {optRecord.productionStartTime !== null ||
                   optRecord.productionEndTime !== null ? (
                     <MyToolTip
@@ -1216,7 +1216,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           <Flex className="w-[10%]" vertical gap="small">
             {/* 开票状态 */}
             {!isSupplier() ? (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 <Tag
                   color={
                     optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
@@ -1233,13 +1233,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             )}
             {/* 订单状态 */}
-            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+            <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
               {getOrderStatusTag(optRecord)}
             </div>
             {/* 确认发票状态 */}
             {optRecord.invoiceConfirmStatusText !== null && (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 <Tag color={'success'} style={{ marginRight: '4px' }}>
                   {optRecord.invoiceConfirmStatusText}
                 </Tag>
@@ -1248,7 +1248,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {/* 确认发票状态 */}
             {optRecord.deliveryStatusText !== null && (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 <Tag color={'success'} style={{ marginRight: '4px' }}>
                   {optRecord.deliveryStatusText}
                 </Tag>
@@ -1257,7 +1257,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {/* 后置审核状态 */}
             {optRecord.postAuditStatus !== null ? (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 {getPostAuditStatusTag(optRecord)}
               </div>
             ) : (
@@ -1265,7 +1265,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             )}
             {/* 后置审核状态 */}
             {optRecord.orderStatus === 'PROCURE_REJECT' ? (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 <Tag color={'red'} style={{ marginRight: '4px' }}>
                   {'采购驳回'}
                 </Tag>
@@ -1277,7 +1277,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             {/**采购是否已下单状态 */}
             {optRecord.procureOrderStatus !== null &&
             optRecord.procureOrderStatus !== undefined ? (
-              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                 <Tag color="success">
                   {enumValueToLabel(
                     optRecord.procureOrderStatus,
@@ -1290,7 +1290,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             )}
             {/* 物流信息 */}
-            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+            <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
               {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
               optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
               optRecord.orderStatus === 'IN_AFTER_SALES' ||
@@ -1321,7 +1321,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               {/* 修改审核状态 */}
               {optRecord.modifiedAuditStatus !== null &&
               optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
-                <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   <Tooltip
                     title={recordOptNode ? recordOptNode : <Spin />}
                     onOpenChange={(open) => {
@@ -2254,7 +2254,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           </div>
           {!isSupplier() && (isSales() || isWarehousekeeper() || isAdmin()) && (
             <EditTwoTone
-              className="pl-1 pr-1 hover:curcor-pointer"
+              className="pr-1 pl-1 hover:curcor-pointer"
               onClick={() => {
                 setNotesEditVisible(true);
                 setSelectedRows([optRecord.id]);
@@ -2280,7 +2280,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <Divider type="vertical" />
-              <div className="overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer">
+              <div className="overflow-hidden overflow-ellipsis whitespace-normal hover:cursor-pointer">
                 <span className="text-[#8C8C8C]">
                   采购备注：
                   {optRecord.procureNotes === null
@@ -2291,7 +2291,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               {/* 编辑备注按钮 */}
               {(isProcure() || isAdmin()) && (
                 <EditTwoTone
-                  className="pl-1 pr-1 hover:curcor-pointer"
+                  className="pr-1 pl-1 hover:curcor-pointer"
                   onClick={() => {
                     setSelectedRows([optRecord.id]);
                     setNotes(optRecord.procureNotes);
@@ -2333,7 +2333,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           <Flex title={optRecord.notes} className="pt-2">
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
-                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
                   <Tooltip
                     title={optRecord.applyInvoicingNotes}
                     placement="topLeft"
@@ -2364,7 +2364,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               </div>
               <Divider type="vertical" className="mx-5" />
               <div className="flex items-center max-w-[500px]">
-                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
                   <Tooltip title={optRecord.checkNotes} placement="topLeft">
                     <span className="text-[#8C8C8C] mr-3">
                       财务审核备注：
@@ -2388,7 +2388,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           <Flex title={optRecord.notes} className="pt-2">
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
-                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
                   <Tooltip title={optRecord.reissueNotes} placement="topLeft">
                     <span className="text-[#8C8C8C]">
                       重新开票备注：
@@ -2423,7 +2423,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           <Flex title={optRecord.notes} className="pt-2">
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
-                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
                   <Tooltip
                     title={optRecord.feedbackRegistrationContent}
                     placement="topLeft"
@@ -2452,7 +2452,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     return (
       <ProTable
         id="sub-table"
-        className="w-full "
+        className="w-full"
         showHeader={false}
         columns={[
           {
@@ -2770,7 +2770,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               {record.goodsWeight !== null ? (
                 <div title={record.goodsWeight + 'kg'} className="pl-3">
                   <div
-                    className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                    className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
                     onClick={() => {
                       copyToClipboard(record.goodsWeight + 'kg');
                       message.info(
@@ -2789,7 +2789,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               {record.goodsVolume !== null ? (
                 <div title={record.goodsVolume + 'm³'} className="pl-3">
                   <div
-                    className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                    className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
                     onClick={() => {
                       copyToClipboard(record.goodsVolume + 'm³');
                       message.info(
@@ -4329,6 +4329,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           refreshTable();
         }}
         defaultValue={0}
+        style={{
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          gap: 8,
+          whiteSpace: 'nowrap',
+        }}
       >
         {radios}
       </Radio.Group>