canrd-main / canrd-erp-front · Commits

Commit 23c2a669998fb06a049f7343f67c980b2506ec3d

Authored by boyang
2 parents d91e16c7 f53c9cf8
build: skipped

Merge branch 'bugfix-0610' into 'master' 

fix: 修改首页按钮



See merge request !54
Inline Side-by-side
Showing 1 changed file with 42 additions and 35 deletions
src/pages/Order/OrderList/OrderList.tsx
  View file @23c2a66
... ... @@ -909,14 +909,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
909 909 {/* 商品名称 */}
910 910 <div>
911 911 <div
912   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
  912 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
913 913 onClick={() => {
914 914 copyToClipboard(optRecord.productName);
915 915 message.info('商品名称复制成功：' + optRecord.productName);
916 916 }}
917 917 title={optRecord.productName}
918 918 >
919   - <span className="font-medium text-black ">
  919 + <span className="font-medium text-black">
920 920 {optRecord.productName}
921 921 </span>
922 922 </div>
... ... @@ -976,7 +976,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
976 976 </div>
977 977  
978 978 <div
979   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
  979 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
980 980 title={optRecord.parameters}
981 981 onClick={() => {
982 982 copyToClipboard(optRecord.parameters);
... ... @@ -992,7 +992,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
992 992 {!isSupplier() ? (
993 993 <>
994 994 <div
995   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  995 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
996 996 title={optRecord.productPrice}
997 997 >
998 998 <span className="text-[#8C8C8C]">单价：</span>
... ... @@ -1006,7 +1006,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1006 1006 )}
1007 1007  
1008 1008 <div
1009   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  1009 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
1010 1010 title={optRecord.quantity}
1011 1011 >
1012 1012 <span className="text-[#8C8C8C]">数量：</span>
... ... @@ -1018,7 +1018,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1018 1018  
1019 1019 {!isSupplier() ? (
1020 1020 <div
1021   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  1021 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
1022 1022 title={optRecord.subOrderPayment}
1023 1023 >
1024 1024 <span className="text-[#8C8C8C]">合计：</span>
... ... @@ -1032,7 +1032,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1032 1032  
1033 1033 {optRecord.deliveryDate && (
1034 1034 <div
1035   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  1035 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
1036 1036 title={optRecord.deliveryDate}
1037 1037 >
1038 1038 <span className="text-[#8C8C8C]">产品交期：</span>
... ... @@ -1045,13 +1045,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1045 1045 {!isSupplier() ? (
1046 1046 <>
1047 1047 {/* 支付方式 */}
1048   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1048 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1049 1049 <span className="text-slate-700">
1050 1050 {optRecord.paymentMethodText}
1051 1051 </span>
1052 1052 </div>
1053 1053 {/* 支付渠道 */}
1054   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1054 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1055 1055 <span className="text-slate-700">
1056 1056 {enumValueToLabel(
1057 1057 optRecord.paymentChannel,
... ... @@ -1061,7 +1061,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1061 1061 </div>
1062 1062 {/* 回款审核状态 */}
1063 1063 {optRecord.paymentReceiptStatus !== null ? (
1064   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1064 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1065 1065 <Tag
1066 1066 className="hover:cursor-pointer"
1067 1067 onMouseEnter={(e: any) => {
... ... @@ -1100,7 +1100,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1100 1100 <>
1101 1101 {/* 所属部门 */}
1102 1102 <div
1103   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  1103 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
1104 1104 title={enumValueToLabel(
1105 1105 optRecord.productBelongBusiness,
1106 1106 PRODUCT_BELONG_DEPARTMENT_OPTIONS,
... ... @@ -1116,7 +1116,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1116 1116  
1117 1117 {/* 开票类型 */}
1118 1118 {optRecord.invoicingStatus !== null ? (
1119   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1119 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1120 1120 <span className="text-slate-700">
1121 1121 {getInvoicingType(optRecord)}
1122 1122 </span>
... ... @@ -1127,7 +1127,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1127 1127  
1128 1128 {/* 开票状态 */}
1129 1129 {optRecord.afterInvoicingStatus !== null ? (
1130   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1130 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1131 1131 <Tooltip
1132 1132 title={
1133 1133 optRecord.invoicingUrgentCause !== null &&
... ... @@ -1156,7 +1156,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1156 1156  
1157 1157 {/* 是否加急图标显示 */}
1158 1158 {optRecord.isUrgent ? (
1159   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1159 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1160 1160 <Tooltip
1161 1161 title={'期望开票时间：' + formatdate(optRecord.deadline)}
1162 1162 >
... ... @@ -1170,7 +1170,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1170 1170 {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
1171 1171 optRecord.shippingWarehouse !== null ? (
1172 1172 <div
1173   - className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
  1173 + className="overflow-hidden overflow-ellipsis whitespace-no-wrap"
1174 1174 title={enumValueToLabel(
1175 1175 optRecord.shippingWarehouse,
1176 1176 SHIPPING_WAREHOUSE_OPTIONS,
... ... @@ -1188,7 +1188,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1188 1188 )}
1189 1189  
1190 1190 {/* 生产时间 */}
1191   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1191 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1192 1192 {optRecord.productionStartTime !== null ||
1193 1193 optRecord.productionEndTime !== null ? (
1194 1194 <MyToolTip
... ... @@ -1216,7 +1216,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1216 1216 <Flex className="w-[10%]" vertical gap="small">
1217 1217 {/* 开票状态 */}
1218 1218 {!isSupplier() ? (
1219   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1219 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1220 1220 <Tag
1221 1221 color={
1222 1222 optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
... ... @@ -1233,13 +1233,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1233 1233 )}
1234 1234  
1235 1235 {/* 订单状态 */}
1236   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1236 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1237 1237 {getOrderStatusTag(optRecord)}
1238 1238 </div>
1239 1239  
1240 1240 {/* 确认发票状态 */}
1241 1241 {optRecord.invoiceConfirmStatusText !== null && (
1242   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1242 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1243 1243 <Tag color={'success'} style={{ marginRight: '4px' }}>
1244 1244 {optRecord.invoiceConfirmStatusText}
1245 1245 </Tag>
... ... @@ -1248,7 +1248,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1248 1248  
1249 1249 {/* 确认发票状态 */}
1250 1250 {optRecord.deliveryStatusText !== null && (
1251   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1251 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1252 1252 <Tag color={'success'} style={{ marginRight: '4px' }}>
1253 1253 {optRecord.deliveryStatusText}
1254 1254 </Tag>
... ... @@ -1257,7 +1257,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1257 1257  
1258 1258 {/* 后置审核状态 */}
1259 1259 {optRecord.postAuditStatus !== null ? (
1260   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1260 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1261 1261 {getPostAuditStatusTag(optRecord)}
1262 1262 </div>
1263 1263 ) : (
... ... @@ -1265,7 +1265,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1265 1265 )}
1266 1266 {/* 后置审核状态 */}
1267 1267 {optRecord.orderStatus === 'PROCURE_REJECT' ? (
1268   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1268 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1269 1269 <Tag color={'red'} style={{ marginRight: '4px' }}>
1270 1270 {'采购驳回'}
1271 1271 </Tag>
... ... @@ -1277,7 +1277,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1277 1277 {/**采购是否已下单状态 */}
1278 1278 {optRecord.procureOrderStatus !== null &&
1279 1279 optRecord.procureOrderStatus !== undefined ? (
1280   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1280 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1281 1281 <Tag color="success">
1282 1282 {enumValueToLabel(
1283 1283 optRecord.procureOrderStatus,
... ... @@ -1290,7 +1290,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1290 1290 )}
1291 1291  
1292 1292 {/* 物流信息 */}
1293   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1293 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1294 1294 {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
1295 1295 optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
1296 1296 optRecord.orderStatus === 'IN_AFTER_SALES' ||
... ... @@ -1321,7 +1321,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1321 1321 {/* 修改审核状态 */}
1322 1322 {optRecord.modifiedAuditStatus !== null &&
1323 1323 optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
1324   - <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1324 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1325 1325 <Tooltip
1326 1326 title={recordOptNode ? recordOptNode : <Spin />}
1327 1327 onOpenChange={(open) => {
... ... @@ -2254,7 +2254,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2254 2254 </div>
2255 2255 {!isSupplier() && (isSales() || isWarehousekeeper() || isAdmin()) && (
2256 2256 <EditTwoTone
2257   - className="pl-1 pr-1 hover:curcor-pointer"
  2257 + className="pr-1 pl-1 hover:curcor-pointer"
2258 2258 onClick={() => {
2259 2259 setNotesEditVisible(true);
2260 2260 setSelectedRows([optRecord.id]);
... ... @@ -2280,7 +2280,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2280 2280  
2281 2281 <Divider type="vertical" />
2282 2282  
2283   - <div className="overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer">
  2283 + <div className="overflow-hidden overflow-ellipsis whitespace-normal hover:cursor-pointer">
2284 2284 <span className="text-[#8C8C8C]">
2285 2285 采购备注：
2286 2286 {optRecord.procureNotes === null
... ... @@ -2291,7 +2291,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2291 2291 {/* 编辑备注按钮 */}
2292 2292 {(isProcure() || isAdmin()) && (
2293 2293 <EditTwoTone
2294   - className="pl-1 pr-1 hover:curcor-pointer"
  2294 + className="pr-1 pl-1 hover:curcor-pointer"
2295 2295 onClick={() => {
2296 2296 setSelectedRows([optRecord.id]);
2297 2297 setNotes(optRecord.procureNotes);
... ... @@ -2333,7 +2333,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2333 2333 <Flex title={optRecord.notes} className="pt-2">
2334 2334 <div className="flex items-center">
2335 2335 <div className="flex items-center max-w-[500px]">
2336   - <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
  2336 + <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
2337 2337 <Tooltip
2338 2338 title={optRecord.applyInvoicingNotes}
2339 2339 placement="topLeft"
... ... @@ -2364,7 +2364,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2364 2364 </div>
2365 2365 <Divider type="vertical" className="mx-5" />
2366 2366 <div className="flex items-center max-w-[500px]">
2367   - <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
  2367 + <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
2368 2368 <Tooltip title={optRecord.checkNotes} placement="topLeft">
2369 2369 <span className="text-[#8C8C8C] mr-3">
2370 2370 财务审核备注：
... ... @@ -2388,7 +2388,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2388 2388 <Flex title={optRecord.notes} className="pt-2">
2389 2389 <div className="flex items-center">
2390 2390 <div className="flex items-center max-w-[500px]">
2391   - <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
  2391 + <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
2392 2392 <Tooltip title={optRecord.reissueNotes} placement="topLeft">
2393 2393 <span className="text-[#8C8C8C]">
2394 2394 重新开票备注：
... ... @@ -2423,7 +2423,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2423 2423 <Flex title={optRecord.notes} className="pt-2">
2424 2424 <div className="flex items-center">
2425 2425 <div className="flex items-center max-w-[500px]">
2426   - <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
  2426 + <div className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap">
2427 2427 <Tooltip
2428 2428 title={optRecord.feedbackRegistrationContent}
2429 2429 placement="topLeft"
... ... @@ -2452,7 +2452,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2452 2452 return (
2453 2453 <ProTable
2454 2454 id="sub-table"
2455   - className="w-full "
  2455 + className="w-full"
2456 2456 showHeader={false}
2457 2457 columns={[
2458 2458 {
... ... @@ -2770,7 +2770,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2770 2770 {record.goodsWeight !== null ? (
2771 2771 <div title={record.goodsWeight + 'kg'} className="pl-3">
2772 2772 <div
2773   - className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
  2773 + className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
2774 2774 onClick={() => {
2775 2775 copyToClipboard(record.goodsWeight + 'kg');
2776 2776 message.info(
... ... @@ -2789,7 +2789,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2789 2789 {record.goodsVolume !== null ? (
2790 2790 <div title={record.goodsVolume + 'm³'} className="pl-3">
2791 2791 <div
2792   - className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
  2792 + className="overflow-hidden max-w-md overflow-ellipsis whitespace-no-wrap hover:cursor-pointer"
2793 2793 onClick={() => {
2794 2794 copyToClipboard(record.goodsVolume + 'm³');
2795 2795 message.info(
... ... @@ -4329,6 +4329,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
4329 4329 refreshTable();
4330 4330 }}
4331 4331 defaultValue={0}
  4332 + style={{
  4333 + display: 'flex',
  4334 + flexDirection: 'row',
  4335 + alignItems: 'center',
  4336 + gap: 8,
  4337 + whiteSpace: 'nowrap',
  4338 + }}
4332 4339 >
4333 4340 {radios}
4334 4341 </Radio.Group>
... ...