Commit 06e2d5558ca7bd75dbe0c4245be7cecf83c43563
1 parent
4f196bc5
feat: update 页面header调整，将用户和消息信息放到header中
Showing
1 changed file
with
30 additions
and
24 deletions
src/pages/Order/index.tsx
| @@ -2193,32 +2193,38 @@ const OrderPage = () => { | @@ -2193,32 +2193,38 @@ const OrderPage = () => { | ||
| 2193 | ) : ( | 2193 | ) : ( |
| 2194 | '' | 2194 | '' |
| 2195 | )} | 2195 | )} |
| 2196 | - <span | ||
| 2197 | - className="hover:cursor-pointer" | ||
| 2198 | - onClick={() => { | ||
| 2199 | - copyToClipboard(record.customerName); | ||
| 2200 | - message.info('收货人复制成功：' + record.customerName); | ||
| 2201 | - }} | 2196 | + <div |
| 2197 | + title={record.institution} | ||
| 2198 | + className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[150px]" | ||
| 2202 | > | 2199 | > |
| 2203 | - <span className="text-[#8C8C8C]">收货人：</span> | ||
| 2204 | - <span className="text-slate-700"> | ||
| 2205 | - {record.customerName + ' '} | ||
| 2206 | - | ||
| 2207 | - {!isSupplier() ? ( | ||
| 2208 | - <Tooltip className="order-tooltip" title="详情"> | ||
| 2209 | - <ContainerTwoTone | ||
| 2210 | - className="hover:curcor-pointer" | ||
| 2211 | - onClick={() => { | ||
| 2212 | - createOptObject(null, record.id); | ||
| 2213 | - setDeliverInfoDrawerVisible(true); | ||
| 2214 | - }} | ||
| 2215 | - /> | ||
| 2216 | - </Tooltip> | ||
| 2217 | - ) : ( | ||
| 2218 | - '' | ||
| 2219 | - )} | 2200 | + <span |
| 2201 | + className="hover:cursor-pointer" | ||
| 2202 | + onClick={() => { | ||
| 2203 | + copyToClipboard(record.customerName); | ||
| 2204 | + message.info('收货人复制成功：' + record.customerName); | ||
| 2205 | + }} | ||
| 2206 | + > | ||
| 2207 | + <span className="text-[#8C8C8C]">收货人：</span> | ||
| 2208 | + <span className="text-slate-700"> | ||
| 2209 | + {record.customerName + ' '} | ||
| 2210 | + | ||
| 2211 | + {!isSupplier() ? ( | ||
| 2212 | + <Tooltip className="order-tooltip" title="详情"> | ||
| 2213 | + <ContainerTwoTone | ||
| 2214 | + className="hover:curcor-pointer" | ||
| 2215 | + onClick={() => { | ||
| 2216 | + createOptObject(null, record.id); | ||
| 2217 | + setDeliverInfoDrawerVisible(true); | ||
| 2218 | + }} | ||
| 2219 | + /> | ||
| 2220 | + </Tooltip> | ||
| 2221 | + ) : ( | ||
| 2222 | + '' | ||
| 2223 | + )} | ||
| 2224 | + </span> | ||
| 2220 | </span> | 2225 | </span> |
| 2221 | - </span> | 2226 | + </div> |
| 2227 | + | ||
| 2222 | {isSupplier() ? ( | 2228 | {isSupplier() ? ( |
| 2223 | <div | 2229 | <div |
| 2224 | title={record.customerShippingAddress} | 2230 | title={record.customerShippingAddress} |