Commit 16b6a350452bdc612bf894637c7c15e18bf54bb9

Authored by zhongnanhuang
1 parent 1c4d96bf

feat: update 首能账号调整

src/pages/Order/components/ProcureConvertModal.tsx
@@ -44,7 +44,7 @@ export default ({ setVisible, subOrders, onClose }) => { @@ -44,7 +44,7 @@ export default ({ setVisible, subOrders, onClose }) => {
44 submitTimeout={2000} 44 submitTimeout={2000}
45 onFinish={async (values) => { 45 onFinish={async (values) => {
46 let data; 46 let data;
47 - if (values.procureName === 'warehouseKeeper') { 47 + if (values.procureName === '仓库') {
48 //转给仓库 48 //转给仓库
49 data = await postServiceOrderProcureConvertWarehouseKeeper({ 49 data = await postServiceOrderProcureConvertWarehouseKeeper({
50 data: { 50 data: {
@@ -82,7 +82,6 @@ export default ({ setVisible, subOrders, onClose }) => { @@ -82,7 +82,6 @@ export default ({ setVisible, subOrders, onClose }) => {
82 let options = res.data?.map((item) => { 82 let options = res.data?.map((item) => {
83 return { label: item, value: item }; 83 return { label: item, value: item };
84 }); 84 });
85 - options.push({ label: '仓库', value: 'warehouseKeeper' });  
86 return options; 85 return options;
87 }} 86 }}
88 /> 87 />
src/pages/Order/index.tsx
@@ -2229,7 +2229,7 @@ const OrderPage = () => { @@ -2229,7 +2229,7 @@ const OrderPage = () => {
2229 {isSupplier() ? ( 2229 {isSupplier() ? (
2230 <div 2230 <div
2231 title={record.customerShippingAddress} 2231 title={record.customerShippingAddress}
2232 - className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[500px] hover:cursor-pointer" 2232 + className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[400px] hover:cursor-pointer"
2233 onClick={() => { 2233 onClick={() => {
2234 copyToClipboard(record.customerShippingAddress); 2234 copyToClipboard(record.customerShippingAddress);
2235 message.info( 2235 message.info(
@@ -3489,7 +3489,13 @@ const OrderPage = () =&gt; { @@ -3489,7 +3489,13 @@ const OrderPage = () =&gt; {
3489 const mainOrdersColumns: ProColumns<OrderType>[] = MAIN_ORDER_COLUMNS.map( 3489 const mainOrdersColumns: ProColumns<OrderType>[] = MAIN_ORDER_COLUMNS.map(
3490 (item) => { 3490 (item) => {
3491 //首能账号只能搜索订单编号 3491 //首能账号只能搜索订单编号
3492 - let canSearchIndex = ['id', 'salesCode', 'subNotes', 'orderStatus']; 3492 + let canSearchIndex = [
  3493 + 'id',
  3494 + 'salesCode',
  3495 + 'subNotes',
  3496 + 'orderStatus',
  3497 + 'createTime',
  3498 + ];
3493 if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) { 3499 if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) {
3494 item.search = false; 3500 item.search = false;
3495 } 3501 }
@@ -3725,6 +3731,15 @@ const OrderPage = () =&gt; { @@ -3725,6 +3731,15 @@ const OrderPage = () =&gt; {
3725 setOrderCheckType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT); 3731 setOrderCheckType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT);
3726 }, 3732 },
3727 }, 3733 },
  3734 + {
  3735 + label: '加急开票审核',
  3736 + key: '4',
  3737 + onClick: async () => {
  3738 + setIsMainOrder(true);
  3739 + setCheckVisible(true);
  3740 + setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
  3741 + },
  3742 + },
3728 ]; 3743 ];
3729 3744
3730 const auditProps = { 3745 const auditProps = {