feat: update

zhongnanhuang
1 parent 55a39af0
Showing 9 changed files with 167 additions and 31 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/DeliverInfoDrawer.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/FinancialMergeDrawer.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/components/ProcureCheckModal.tsx
src/pages/Order/components/ProcureConvertModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -3,8 +3,7 @@ import {
   postServiceOrderApplyInvoicing,
   postServiceOrderMergeApplyInvoicing,
 } from '@/services';
-import { getAliYunOSSFileNameFromUrl } from '@/utils';
-import { getReceivingCompany } from '@/utils/order';
+import { enumToSelect, getAliYunOSSFileNameFromUrl } from '@/utils';
 import {
   ModalForm,
   ProFormSelect,
@@ -13,6 +12,7 @@ import {
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
 import { cloneDeep } from 'lodash';
+import { PAYEE_OPTIONS } from '../constant';
 export default ({
   setCheckVisible,
   isEdit,
@@ -168,20 +168,20 @@ export default ({
         placeholder="请输入备注"
       />
       <ProFormSelect
-        placeholder="选择付款公司"
+        placeholder="选择收款单位"
         name="receivingCompany"
         width="lg"
         key="receivingCompany"
         label={
           <div>
-            <span>开票付款公司</span>
+            <span>开票收款单位</span>
             <span className="pl-2 text-xs text-gray-400">
-              财务开票将依据这个字段，选择对应的公司开票（若对[付款公司]没有要求，请选择[任意]）
+              财务开票将依据这个字段，选择对应的公司开票（若对[收款单位]没有要求，请任意选择一个）
             </span>
           </div>
         }
-        options={getReceivingCompany()}
-        rules={[{ required: true, message: '开票付款公司必填' }]}
+        options={enumToSelect(PAYEE_OPTIONS)}
+        rules={[{ required: true, message: '开票收款单位必填' }]}
       />
       <ProFormUploadDragger
         key="2"
+import { enumValueToLabel } from '@/utils';
+import { getReceivingCompanyOptions } from '@/utils/order';
 import { Col, Drawer, Row } from 'antd';
 export default ({ data, onClose }) => {
@@ -40,9 +42,14 @@ export default ({ data, onClose }) =&gt; {
           <Col span={18}>{data.bank}</Col>
           <Col span={6}>
-            <span className="className='text-[#333333]'">开票付款公司</span>
+            <span className="className='text-[#333333]'">开票收款单位</span>
+          </Col>
+          <Col span={18}>
+            {enumValueToLabel(
+              data.receivingCompany,
+              getReceivingCompanyOptions(),
+            )}
           </Col>
-          <Col span={18}>{data.receivingCompany}</Col>
           <Col span={6}>
             <span className="className='text-[#333333]'">银行账号</span>
@@ -4,7 +4,8 @@ import {
   postServiceOrderEditOrder,
   postServiceOrderInvoicing,
 } from '@/services';
-import { enumToSelect } from '@/utils';
+import { enumToSelect, enumValueToLabel } from '@/utils';
+import { getReceivingCompanyOptions } from '@/utils/order';
 import {
   DrawerForm,
   ProFormDatePicker,
@@ -35,6 +36,15 @@ export default ({
   }, [mainOrder]);
   const [form] = Form.useForm<{ name: string; company: string }>();
+
+  /**
+   * 自动选择收款公司
+   * @param receivingCompany
+   */
+  function chooseReceivingCompany(receivingCompany: any) {
+    form.setFieldValue('payee', receivingCompany);
+  }
+
   return (
     <DrawerForm<{
       name: string;
@@ -150,11 +160,35 @@ export default ({
               initialValue={subOrders[0]?.invoiceNumber}
               rules={[{ required: true, message: '发票号码必填' }]}
             />,
+            <div
+              key="salesChooseReceivingCompany"
+              hidden={subOrders[0].receivingCompany === null}
+            >
+              <span className={'pl-2 text-xs text-gray-400'}>
+                销售申请开票时选择了：
+                {enumValueToLabel(
+                  subOrders[0].receivingCompany,
+                  getReceivingCompanyOptions(),
+                )}
+              </span>
+              <span
+                hidden={subOrders[0].receivingCompany === 'ANY'}
+                className={
+                  'pl-2 text-xs text-[#1677ff] cursor-pointer hover:text-[#64abf7]'
+                }
+                onClick={() => {
+                  chooseReceivingCompany(subOrders[0].receivingCompany);
+                }}
+              >
+                选择
+              </span>
+            </div>,
             <ProFormSelect
               key="payee"
               placeholder="选择收款单位"
               name="payee"
               width="lg"
+              showSearch
               label="收款单位"
               options={enumToSelect(PAYEE_OPTIONS)}
               initialValue={subOrders[0]?.payee}
@@ -141,7 +141,6 @@ export default ({ dataList, setVisible, onClose }) =&gt; {
           { label: '部分开票', value: 'PARTIAL_INVOICING' },
         ]}
         initialValue={'COMPLETE_INVOICING'}
-        disabled
       />
       <ProFormTextArea width="lg" name="invoicingNotes" label="备注" />
     </DrawerForm>
@@ -19,7 +19,6 @@ import {
   getUserInfo,
 } from '@/utils';
 import { getTeacherCustomFieldNumber } from '@/utils/kingdee';
-import { getReceivingCompany } from '@/utils/order';
 import {
   DrawerForm,
   FormListActionType,
@@ -39,6 +38,7 @@ import {
   AFTE_SALES_PLAN_OPTIONS,
   INVOCING_STATUS_OPTIONS,
   INVOCING_STATUS_OPTIONS_OLD,
+  PAYEE_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
@@ -740,6 +740,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           width="lg"
           showSearch
           disabled={optType('after-sales-check')}
+          tooltip="空格将作为或条件。例如输入[北京 广东]，那么查找出来的将是包含[北京]或者包含[广东]的搜索结果"
           label={
             <>
               <span>客户</span>
@@ -782,6 +783,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             id: copyData?.customerId,
           }}
           fieldProps={{
+            filterOption() {
+              return true;
+            },
             optionItemRender(item) {
               if (item.type === 'add') {
                 return (
@@ -838,6 +842,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 key: keywords,
               });
             }
+
+            console.log(options);
             return options;
           }}
         />
@@ -957,18 +963,19 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         />
         <ProFormSelect
-          placeholder="付款公司"
+          placeholder="收款单位"
           name="receivingCompany"
           width="lg"
           key="receivingCompany"
-          label="开票付款公司"
+          showSearch
+          label="开票收款单位"
           tooltip="财务开票将依据这个字段，选择对应的公司开票"
-          options={getReceivingCompany()}
+          options={enumToSelect(PAYEE_OPTIONS)}
           disabled={optType('after-sales-check')}
           hidden={invoicingStatus === 'UN_INVOICE'}
         />
-        <ProFormText
+        <ProFormTextArea
           width="lg"
           name="invoiceIdentificationNumber"
           label="开票信息"
@@ -1098,6 +1105,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     name="productName"
                     disabled={optType('after-sales-check')}
                     placeholder="请搜索商品"
+                    tooltip="空格将作为或条件。例如输入[极片 电池]，那么查找出来的将是包含[极片]或者包含[电池]的搜索结果"
                     rules={[{ required: true, message: '商品名称必填' }]}
                     onChange={(_, option) => {
                       autoFillProductInfo(option, listMeta, listMeta.index);
@@ -1107,6 +1115,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       value: listMeta?.record?.materialId,
                     }}
                     fieldProps={{
+                      filterOption() {
+                        return true;
+                      },
                       optionItemRender(item) {
                         if (item.type === 'add') {
                           return (
@@ -113,12 +113,12 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
     >
       <ProFormSelect
         key="key"
-        label="供应商名称"
+        label="采购名称"
         width="lg"
         name="name"
         // options={options}
-        placeholder="请选择供应商"
-        rules={[{ required: true, message: '供应商必填' }]}
+        placeholder="请选择采购"
+        rules={[{ required: true, message: '采购名称必填' }]}
         request={async () => {
           const res = await postServiceOrderQuerySupplier();
           let options = res.data?.map((item) => {
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postServiceOrderProcureConvertProcure,
+  postServiceOrderProcureConvertWarehouseKeeper,
   postServiceOrderProvideProcurementRoles,
 } from '@/services';
 import {
@@ -50,13 +51,25 @@ export default ({ setVisible, subOrders, onClose }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        const data = await postServiceOrderProcureConvertProcure({
-          data: {
-            procureName: values.procureName,
-            procureConvertNotes: values.procureConvertNotes,
-            subIds: subOrderIds,
-          },
-        });
+        let data;
+        if (values.procureName === 'warehouseKeeper') {
+          //转给仓库
+          data = await postServiceOrderProcureConvertWarehouseKeeper({
+            data: {
+              subIds: subOrderIds,
+              checkNotes: values.procureConvertNotes,
+            },
+          });
+        } else {
+          data = await postServiceOrderProcureConvertProcure({
+            data: {
+              procureName: values.procureName,
+              procureConvertNotes: values.procureConvertNotes,
+              subIds: subOrderIds,
+            },
+          });
+        }
+
         if (data.result === RESPONSE_CODE.SUCCESS) {
           message.success(data.message);
           onClose();
@@ -74,9 +87,11 @@ export default ({ setVisible, subOrders, onClose }) =&gt; {
         rules={[{ required: true, message: '采购必填' }]}
         request={async () => {
           const res = await postServiceOrderProvideProcurementRoles();
-          return res.data?.map((item) => {
+          let options = res.data?.map((item) => {
             return { label: item, value: item };
           });
+          options.push({ label: '仓库', value: 'warehouseKeeper' });
+          return options;
         }}
       />
@@ -151,6 +151,14 @@ export const ORDER_STATUS_OPTIONS = {
   PROCURE_CONVERT_WAREHOUSE_KEEPER: '采购转仓库',
 };
+/**
+ * 采购筛选订单的主要订单状态
+ */
+export const PROCURE_PRIMARY_ORDER_STATUS_OPTIONS = {
+  PROCURE_UN_PROCESS: '采购未审核',
+  PROCURE_WAIT_SHIP: '采购待发货',
+};
+
 export const AFTE_SALES_PLAN_OPTIONS = {
   RETURNS_OR_REFUNDS: '退货/退款',
   EXCHANGE_GOODS: '换货',
@@ -17,6 +17,7 @@ import {
   enumValueToLabel,
   formatDateTime,
 } from '@/utils';
+import { getReceivingCompanyOptions } from '@/utils/order';
 import { getUserInfo } from '@/utils/user';
 import {
   ClockCircleTwoTone,
@@ -79,6 +80,7 @@ import {
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PROCURE_ORDER_STATUS,
+  PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
   TAGS_COLOR,
   getInvoicingType,
@@ -1363,11 +1365,39 @@ const OrderPage = () =&gt; {
               </Flex>
             </Flex>
             <Flex className="pl-6" align="center">
+              {userInfo.roleSmallVO.code === 'finance' ? (
+                <div
+                  title={enumValueToLabel(
+                    record.receivingCompany,
+                    getReceivingCompanyOptions(),
+                  )}
+                  className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[400px]"
+                >
+                  <span className="text-[#8C8C8C]">开票付款单位：</span>
+                  <span className="text-slate-700">
+                    {record.receivingCompany !== null
+                      ? enumValueToLabel(
+                          record.receivingCompany,
+                          getReceivingCompanyOptions(),
+                        )
+                      : '暂无'}
+                  </span>
+                </div>
+              ) : (
+                ''
+              )}
+
+              {userInfo.roleSmallVO.code === 'finance' ? (
+                <Divider type="vertical" />
+              ) : (
+                ''
+              )}
+
               <div title={record.notes}>
                 <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   <span className="text-[#8C8C8C]">备注：</span>
                   <span className="ml-2">
-                    {record.notes === undefined ? '暂无备注' : record.notes}
+                    {record.notes === null ? '暂无备注' : record.notes}
                   </span>
                 </div>
               </div>
@@ -1455,6 +1485,22 @@ const OrderPage = () =&gt; {
                     ''
                   )}
+                  {record.mainPath?.includes('orderChangeRequest') && false ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setOrderDrawerVisible(true);
+                        setOrderRow(record);
+                        setOrderOptType('order-change-normal');
+                      }}
+                    >
+                      申请修改
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {record.mainPath?.includes('leaderAudit') ? (
                     <Button
                       className="p-0"
@@ -1797,7 +1843,7 @@ const OrderPage = () =&gt; {
                   {record?.subOrderInformationLists[0].subPath?.includes(
                     'noNeedInvoicingEdit',
-                  ) ? (
+                  ) && false ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -1984,9 +2030,13 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
-                              'FINANCE_PROCESS'
+                              'FINANCE_PROCESS' &&
+                            selectedSubOrders[i].orderStatus !==
+                              'LEADER_AUDITED'
                           ) {
-                            message.error('请选择未审核的子订单进行审核');
+                            message.error(
+                              '请选择[未审核]、[财务待审核]、[领导已审核]的子订单进行审核',
+                            );
                             return;
                           }
                         }
@@ -2257,6 +2307,18 @@ const OrderPage = () =&gt; {
           },
         };
       }
+
+      /**
+       * 采购的订单状态筛选内容
+       */
+      if (
+        userInfo.roleSmallVO.code === 'procure' &&
+        item.dataIndex === 'orderStatus'
+      ) {
+        item.valueEnum = enumToProTableEnumValue(
+          PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
+        );
+      }
       return item;
     },
   );