Merge branch 'master' into invoice

曾国涛
2 parents b1762459 f007db73
Showing 5 changed files with 179 additions and 20 deletions
src/pages/Invoice/components/AddInvoiceDrawerForm.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/index.tsx
 import { RESPONSE_CODE } from '@/constants/enum';
+import { PAYEE_OPTIONS } from '@/pages/Order/constant';
 import {
   postServiceInvoiceAddInvoice,
   postServiceOrderQuerySalesCode,
 } from '@/services';
+import { enumToSelect } from '@/utils';
 import { PlusOutlined } from '@ant-design/icons';
 import {
   DrawerForm,
@@ -97,9 +99,9 @@ export default ({ onClose }) =&gt; {
         });
         if (res.result === RESPONSE_CODE.SUCCESS) {
           message.success(res.message);
-          return true;
         } else {
           message.error(res.message);
+          return false;
         }
         onClose();
         // 不返回不会关闭弹框
@@ -129,12 +131,15 @@ export default ({ onClose }) =&gt; {
         placeholder="请输入购买方"
         rules={[{ required: true, message: '请输入购买方!' }]}
       />
-      <ProFormText
+      <ProFormSelect
+        placeholder="收款单位"
         name="payee"
-        width="md"
-        label="收款单位"
-        placeholder="请输入收款单位"
-        rules={[{ required: true, message: '请输入收款单位!' }]}
+        width="lg"
+        key="payee"
+        showSearch
+        label="开票收款单位"
+        tooltip="财务开票将依据这个字段，选择对应的公司开票"
+        options={enumToSelect(PAYEE_OPTIONS)}
       />
       <ProFormText
         name="contacts"
@@ -144,8 +149,8 @@ export default ({ onClose }) =&gt; {
         rules={[{ required: true, message: '请输入联系人!' }]}
       />
       <ProFormSelect
-        name="salesCode"
-        key="salesCode"
+        name="sale"
+        key="sale"
         width="lg"
         showSearch
         label="销售代表"
@@ -865,11 +865,11 @@ const InvoicePage = () =&gt; {
           scroll={{ x: 1400, y: 360 }}
           toolBarRender={() => [
             <AddInvoiceDrawerForm
-              key="addInvoiceDrawerForm"
               onClose={() => {
                 invoiceActionRef.current?.reload();
                 bankActionRef.current?.reload();
               }}
+              key="add"
             ></AddInvoiceDrawerForm>,
           ]}
         />
@@ -621,17 +621,6 @@ export default ({
           ''
         )}
  
-        <div>请特别注意订单总金额与订单金额。</div>
-        {!checkType(CHECK_TYPE.CONFIRM_DELIVER) ? (
-          <ProFormTextArea
-            width="lg"
-            name="name"
-            placeholder="若驳回，请填写驳回理由"
-          />
-        ) : (
-          <></>
-        )}
-
         {checkType(CHECK_TYPE.PREPAID_AUDIT) && (
           <>
             <Divider orientation="center">
+import {
+  DrawerForm,
+  ProForm,
+  ProFormDateRangePicker,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export default ({ subOrders, totalPayment, onClose }) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+
+  return (
+    <DrawerForm<{
+      name: string;
+      company: string;
+    }>
+      title="新建表单"
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 300,
+      }}
+      form={form}
+      /*trigger={
+                <Button type="primary">
+                    <PlusOutlined />
+                    新建表单
+                </Button>
+            }*/
+      open={true}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        await waitTime(2000);
+        console.log(values);
+        console.log(subOrders);
+        console.log(totalPayment);
+        message.success('提交成功');
+        onClose();
+        // 不返回不会关闭弹框
+        return true;
+      }}
+    >
+      <ProForm.Group>
+        <ProFormText
+          name="name"
+          width="md"
+          label="签约客户名称"
+          tooltip="最长为 24 位"
+          placeholder="请输入名称"
+        />
+        <ProFormText
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+          width="md"
+          name="company"
+          label="我方公司名称"
+          placeholder="请输入名称"
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormText
+          width="md"
+          name="contract"
+          label="合同名称"
+          placeholder="请输入名称"
+        />
+        <ProFormDateRangePicker name="contractTime" label="合同生效时间" />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormSelect
+          options={[
+            {
+              value: 'chapter',
+              label: '盖章后生效',
+            },
+          ]}
+          width="xs"
+          name="useMode"
+          label="合同约定生效方式"
+        />
+        <ProFormSelect
+          width="xs"
+          options={[
+            {
+              value: 'time',
+              label: '履行完终止',
+            },
+          ]}
+          formItemProps={{
+            style: {
+              margin: 0,
+            },
+          }}
+          name="unusedMode"
+          label="合同约定失效效方式"
+        />
+      </ProForm.Group>
+      <ProFormText width="sm" name="id" label="主合同编号" />
+      <ProFormText
+        name="project"
+        disabled
+        label="项目名称"
+        initialValue="xxxx项目"
+      />
+      <ProFormText
+        width="xs"
+        name="mangerName"
+        disabled
+        label="商务经理"
+        initialValue="启途"
+      />
+    </DrawerForm>
+  );
+};
 import ButtonConfirm from '@/components/ButtomConfirm';
 import { RESPONSE_CODE } from '@/constants/enum';
+import InvoicingDrawerForm from '@/pages/Order/components/InvoicingDrawerForm';
 import ReissueModal from '@/pages/Order/components/ReissueModal';
 import {
   postKingdeeRepSalBillOutbound,
@@ -122,6 +123,8 @@ const OrderPage = () =&gt; {
   const [allMainChecked, setAllMainChecked] = useState(false);
   const [imagesViewerModalVisible, setImagesViewerModalVisible] =
     useState<boolean>(false);
+  const [InvoicingDrawerFormVisible, setInvoicingDrawerFormVisible] =
+    useState<boolean>(false);
   const [data, setData] = useState([]); //列表数据
   const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
   const [financialMergeDrawerVisible, setFinancialMergeDrawerVisible] =
@@ -3969,6 +3972,19 @@ const OrderPage = () =&gt; {
       );
     }
  
+    <Button
+      type="primary"
+      key="out"
+      onClick={() => {
+        setIsEdit(false);
+        setIsMainOrder(true);
+        setInvoicingDrawerFormVisible(true);
+      }}
+      disabled={selectedSubOrderKeys?.length === 0}
+    >
+      申请开票
+    </Button>;
+
     if (rolePath?.includes('mergeInvoicing')) {
       toolBtns.push(
         <Button
@@ -4621,6 +4637,23 @@ const OrderPage = () =&gt; {
         />
       )}
  
+      {InvoicingDrawerFormVisible && (
+        <InvoicingDrawerForm
+          subOrders={
+            isMainOrder
+              ? [...subOrderSelectedMap.values()].flat()
+              : buildSubOrders()
+          }
+          totalPayment={getApplyInvoicingTotalPayment()}
+          onClose={() => {
+            setApplyForInvoicingVisible(false);
+            setIsMainOrder(false);
+            clearOptObject();
+            refreshTable();
+          }}
+        ></InvoicingDrawerForm>
+      )}
+
       {contextHolder}
       <FloatButton.BackTop visibilityHeight={0} />
     </div>