Merge remote-tracking branch 'origin/dev' into dev

曾国涛
2 parents cd284914 86129810
Showing 5 changed files with 421 additions and 176 deletions
.umirc.ts
src/pages/Order/FeedBack/OrderList.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderWarning/components/OrderDrawer.tsx
@@ -139,9 +139,20 @@ export default defineConfig({
     {
       name: '课题组管理',
       path: '/researchGroup',
-      component: './ResearchGroup',
       icon: 'AccountBookOutlined',
       access: 'canReadAdminAndSales',
+      routes: [
+        {
+          name: '课题组列表',
+          path: 'researchGroup',
+          component: './ResearchGroup/ResearchGroup',
+        },
+        {
+          name: '课题组风险名单',
+          path: 'researchGroupAccess',
+          component: './ResearchGroup/ResearchGroupAccess',
+        },
+      ],
     },
     {
       name: '分期账单',
@@ -2585,9 +2585,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                         </span>
                       </div>
                       <span>
-                        <span className="text-[#8C8C8C]">联系人：</span>
+                        <span className="text-[#8C8C8C]">课题组：</span>
                         <span className="text-slate-700">
-                          {record.institutionContactName + ' '}
+                          {record.institutionContactName
+                            ? record.institutionContactName + ' '
+                            : '空'}
                         </span>
                       </span>
                     </>
@@ -768,73 +768,69 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       }>
         open
         width={1000}
-        title={drawerTitle}
-        resize={{
-          onResize() {
-            console.log('resize!');
-          },
-          maxWidth: window.innerWidth * 0.8,
-          minWidth: 400,
+        modalProps={{
+          destroyOnClose: true,
+          maskClosable: true,
+          title: (
+            <div
+              style={{ display: 'flex', alignItems: 'center', width: '100%' }}
+            >
+              <span>{drawerTitle}</span>
+              {hasLocalData && (
+                <Button
+                  key="useLocalData"
+                  type="link"
+                  onClick={() => {
+                    useLocalFormData();
+                  }}
+                >
+                  使用草稿
+                </Button>
+              )}
+            </div>
+          ),
         }}
         onFinishFailed={() => {
           message.error('表单项存在错误，请检查');
           setSubmitBtnLoading(false);
         }}
         submitter={{
-          render: (props) => {
-            return [
-              <Button
-                key="cancel"
-                onClick={() => {
-                  onClose();
-                }}
-              >
-                取消
-              </Button>,
-              <Button
-                key="localSave"
-                loading={localSaveLoading}
-                hidden={!optType('add') && !optType('copy')}
-                onClick={() => {
-                  setLocalSaveLoading(true);
-                  saveFormDataToLocal();
-                }}
-              >
-                本地保存
-              </Button>,
-              <Button
-                key="ok"
-                type="primary"
-                loading={submitBtnLoading}
-                disabled={optType('after-sales-check')}
-                onClick={() => {
-                  setSubmitBtnLoading(true);
-                  props.submit();
-                }}
-              >
-                提交
-              </Button>,
-            ];
-          },
-        }}
-        form={form}
-        autoFocusFirstInput
-        drawerProps={{
-          destroyOnClose: true,
-          maskClosable: false,
-          extra: [
+          render: (props) => [
+            <Button
+              key="cancel"
+              onClick={() => {
+                onClose();
+              }}
+            >
+              取消
+            </Button>,
             <Button
-              key="useLocalData"
-              hidden={!hasLocalData}
-              type="link"
+              key="localSave"
+              loading={localSaveLoading}
+              hidden={!optType('add') && !optType('copy')}
               onClick={() => {
-                useLocalFormData();
+                setLocalSaveLoading(true);
+                saveFormDataToLocal();
               }}
             >
-              使用草稿
+              本地保存
+            </Button>,
+            <Button
+              key="ok"
+              type="primary"
+              loading={submitBtnLoading}
+              disabled={optType('after-sales-check')}
+              onClick={() => {
+                setSubmitBtnLoading(true);
+                props.submit();
+              }}
+            >
+              提交
             </Button>,
           ],
         }}
+        form={form}
+        autoFocusFirstInput
         submitTimeout={2000}
         onFinish={async (values) => {
           let res = {};
@@ -2627,9 +2627,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                         </span>
                       </div>
                       <span>
-                        <span className="text-[#8C8C8C]">联系人：</span>
+                        <span className="text-[#8C8C8C]">课题组：</span>
                         <span className="text-slate-700">
-                          {record.institutionContactName + ' '}
+                          {record.institutionContactName
+                            ? record.institutionContactName + ' '
+                            : '空'}
                         </span>
                       </span>
                     </>
@@ -11,6 +11,10 @@ import {
   postKingdeeRepMaterialUnit,
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
+  postResearchGroupsNameSet,
+  postServiceConstCompanyType,
+  postServiceConstOrderSource,
+  postServiceConstPlatformType,
   postServiceOrderAddOrder,
   postServiceOrderAfterSalesQuerySnapshotOrder,
   postServiceOrderApplyAfterSales,
@@ -28,17 +32,21 @@ import { getTeacherCustomFieldNumber } from &#39;@/utils/kingdee&#39;;
 import { getSalesCodeOptions } from '@/utils/order';
 import { getDefaultString } from '@/utils/StringUtil';
 import {
-  DrawerForm,
   FormListActionType,
+  ModalForm,
   ProCard,
+  ProFormDatePicker,
   ProFormDateTimePicker,
+  ProFormDependency,
   ProFormDigit,
   ProFormList,
+  ProFormRadio,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
+import { Group } from '@ant-design/pro-form';
 import { Button, Form, message, Modal } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
@@ -48,15 +56,15 @@ import {
   INVOCING_STATUS_OPTIONS_OLD,
   PAYEE_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
-  PAYMENT_METHOD_OPTIONS,
+  PAYMENT_METHOD_OPTIONS_4_ADD,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
   SHIPPING_WAREHOUSE_OPTIONS,
-} from '../../constant';
+} from '../constant';
 import KingdeeCustomerModal from './KingdeeCustomerModal';
 export default ({ onClose, data, subOrders, orderOptType }) => {
   const [invoicingStatus, setInvoicingStatus] = useState('');
-  const [salesCodeOptions] = useState([]);
+  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
   const [submitBtnLoading, setSubmitBtnLoading] = useState(false);
   const [drawerTitle, setDrawerTitle] = useState('');
   const [hasLocalData, setHasLocalData] = useState(false);
@@ -80,41 +88,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   const [district, setDistrict] = useState('');
   // const [productCustomerContactOptions, setProductCustomerContactOptions] =
   //   useState([]); //客户的收货人选项
-  const [form] = Form.useForm<{
-    isLocalData: boolean;
-    salesCode: '';
-    customerName: '';
-    customerContactNumber: '';
-    institution: '';
-    institutionContactName: '';
-    customerShippingAddress: '';
-    totalPayment: '';
-    paymentChannel: '';
-    paymentMethod: '';
-    productBelongBusiness: '';
-    invoicingStatus: '';
-    invoiceIdentificationNumber: '';
-    invoicingTime: '';
-    bank: '';
-    bankAccountNumber: '';
-    deleteSubOrderLists: [];
-    filePaths: [];
-    notes: '';
-    invoiceFirst: boolean;
-    list: [
-      {
-        productCode: '';
-        productName: '';
-        quantity: '';
-        productPrice: '';
-        parameters: '';
-        subOrderPayment: '';
-        unit: '';
-        serialNumber: '';
-        notes: '';
-      },
-    ];
-  }>();
+  const [form] = Form.useForm();
   const [accountOptions, setAccountOptions] = useState<any>([]);
   let copyData = cloneDeep(data);
@@ -134,7 +108,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    */
   const loadSalesCodeOptions = async () => {
     let options = await getSalesCodeOptions();
-    console.log('options      ', JSON.stringify(options));
+    setSalesCodeOptions(options);
+
     if (optType('copy') || optType('edit')) {
       let includeFlag = false;
       //销售代码校验，如果是旧的销售代码，则提示并清空
@@ -623,6 +598,21 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     form.setFieldValue('totalPayment', totalPayment);
   }
+  /*function computeTotalPayment() {
+    let list = form.getFieldValue('list');
+    let totalPaymentInMicro = 0; // 以"1 万分"为单位计算
+
+    list?.forEach((subOrder: any) => {
+      let subOrderPayment = subOrder?.subOrderPayment;
+      if (subOrderPayment !== '' && subOrderPayment !== undefined) {
+        totalPaymentInMicro += Math.round(subOrderPayment * 10000); // 转换成整数（1 万分）
+      }
+    });
+
+    let totalPayment = totalPaymentInMicro / 10000; // 计算完后转换回元
+    form.setFieldValue('totalPayment', totalPayment.toFixed(2)); // 保留 4 位小数
+  }*/
+
   /**
    * 检查用户额度
    * @param option
@@ -751,18 +741,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     }
   }
-  const validateContactNumber = (_: any, value: any) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    const phoneRegex = /^\d{1,11}(-\d{1,11})?$/;
-
-    if (emailRegex.test(value) || phoneRegex.test(value)) {
-      return Promise.resolve();
-    }
-    return Promise.reject(
-      new Error('联系方式必须是邮箱或手机号格式（不能包含空格等特殊符号）'),
-    );
-  };
-
   /**
    * 刪除草稿数据
    */
@@ -782,22 +760,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   return (
     <>
-      <DrawerForm<{
+      <ModalForm<{
         isLocalData: any;
         deleteSubOrderLists: any;
         name: string;
         company: string;
       }>
         open
-        width="35%"
-        title={drawerTitle}
-        resize={{
-          onResize() {
-            console.log('resize!');
-          },
-          maxWidth: window.innerWidth * 0.8,
-          minWidth: 400,
-        }}
+        width={1000}
         onFinishFailed={() => {
           message.error('表单项存在错误，请检查');
           setSubmitBtnLoading(false);
@@ -841,21 +811,27 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         }}
         form={form}
         autoFocusFirstInput
-        drawerProps={{
+        modalProps={{
           destroyOnClose: true,
-          maskClosable: false,
-          extra: [
-            <Button
-              key="useLocalData"
-              hidden={!hasLocalData}
-              type="link"
-              onClick={() => {
-                useLocalFormData();
-              }}
+          maskClosable: true,
+          title: (
+            <div
+              style={{ display: 'flex', alignItems: 'center', width: '100%' }}
             >
-              使用草稿
-            </Button>,
-          ],
+              <span>{drawerTitle}</span>
+              {hasLocalData && (
+                <Button
+                  key="useLocalData"
+                  type="link"
+                  onClick={() => {
+                    useLocalFormData();
+                  }}
+                >
+                  使用草稿
+                </Button>
+              )}
+            </div>
+          ),
         }}
         submitTimeout={2000}
         onFinish={async (values) => {
@@ -869,11 +845,46 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             });
             return item;
           });
-
+          list = list.map((item, index) => {
+            // //记录部门修改时间
+            if (
+              optType('edit') &&
+              copyData?.subOrderInformationLists[index]
+                ?.productBelongBusiness &&
+              item.productBelongBusiness !==
+                copyData?.subOrderInformationLists[index]?.productBelongBusiness
+            ) {
+              const date = new Date();
+              const year = date.getFullYear();
+              const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
+              const day = String(date.getDate()).padStart(2, '0');
+              const hours = String(date.getHours()).padStart(2, '0');
+              const minutes = String(date.getMinutes()).padStart(2, '0');
+              const seconds = String(date.getSeconds()).padStart(2, '0');
+
+              const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+              values.productBelongBusinessUpdateTime = formattedDate;
+            } else if (optType('add') || optType('copy')) {
+              const date = new Date();
+              const year = date.getFullYear();
+              const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
+              const day = String(date.getDate()).padStart(2, '0');
+              const hours = String(date.getHours()).padStart(2, '0');
+              const minutes = String(date.getMinutes()).padStart(2, '0');
+              const seconds = String(date.getSeconds()).padStart(2, '0');
+              const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+              values.productBelongBusinessUpdateTime = formattedDate;
+            } else {
+              values.productBelongBusinessUpdateTime =
+                data.productBelongBusinessUpdateTime;
+            }
+            return item;
+          });
           values.list = list;
           values.institution = values.institution?.trim();
           values.institutionContactName = values.institutionContactName?.trim();
           values.customerName = values.customerNameString.trim();
+
           // values.customerShippingAddress =
           //   province + city + district + values.customerShippingAddress;
@@ -907,7 +918,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             });
             let diff = originIds.filter((item) => !curIds.includes(item));
             values.deleteSubOrderLists = diff;
-
             if (optType('edit')) {
               values.province = province;
               values.city = city;
@@ -1129,7 +1139,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             console.log(form.getFieldValue('id'));
             if (form.getFieldValue('id') !== undefined) {
               const resp = await postDistrictSelOrderProvince({
-                data: form.getFieldValue('id'),
+                data: {
+                  oId: form.getFieldValue('id'),
+                  orderType: orderOptType,
+                },
               });
               if (resp && resp.data) {
                 if (resp.data.province) {
@@ -1193,10 +1206,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               loadAccountOptions(v.target.value);
             },
           }}
-          rules={[
-            { required: true, message: '联系方式必填' },
-            { validator: validateContactNumber },
-          ]}
+          rules={[{ required: true, message: '联系方式必填' }]}
         />
         <ProFormText
           width="lg"
@@ -1206,45 +1216,163 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           placeholder="请输入单位"
           rules={[{ required: true, message: '单位必填' }]}
         />
-        <ProFormText
+        {/*<ProFormText
           width="lg"
           key="institutionContactName"
           name="institutionContactName"
           label="课题组"
           placeholder="请输入课题组"
           rules={[{ required: true, message: '课题组必填' }]}
-        />
-        {/*<ProFormSelect
-            key={'institutionContactName'}
+        />*/}
+        <Group>
+          <ProFormSelect
+            request={async () => {
+              const res = await postServiceConstCompanyType();
+              return Object.entries(res?.data).map(([value, label]) => ({
+                label,
+                value,
+              }));
+            }}
             width="md"
-            showSearch
-            name="institutionContactName"
-            rules={[{ required: true, message: '请输入课题组名称!' }]}
-            request={async (value) => {
-              const keywords = value.keyWords;
-              const res = await postResearchGroupsNameSet({
-                data: {
-                  groupName: keywords,
-                },
-              });
-              let options = res?.data?.map((c: any) => {
-                return {
-                  label: c,
-                  value: c,
-                  key: c,
-                };
-              });
-              return options;
+            onChange={() => {
+              form.setFieldValue('platformType', '');
             }}
-            fieldProps={{
-              filterOption() {
-                return true;
-              },
+            rules={[{ required: true, message: '单位类型必填' }]}
+            name="companyType"
+            label="单位类型"
+          />
+          <ProFormDependency name={['companyType']}>
+            {({ companyType }) => {
+              const renderInstitutionContactName = () => (
+                <>
+                  <ProFormSelect
+                    key="institutionContactName"
+                    width="md"
+                    showSearch
+                    name="institutionContactName"
+                    rules={[{ required: true, message: '请输入课题组名称!' }]}
+                    request={async (value) => {
+                      const keywords = value?.keyWords || '';
+                      const res = await postResearchGroupsNameSet({
+                        data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
+                      });
+                      return Object.entries(res?.data || {}).map(
+                        ([researchGroupsId, researchGroupsName]) => ({
+                          label: researchGroupsName,
+                          value: researchGroupsName, // 使用 researchGroupsId 作为 value
+                          key: researchGroupsId,
+                          id: researchGroupsId,
+                        }),
+                      );
+                    }}
+                    fieldProps={{
+                      filterOption: () => true,
+                      onChange: (_, option) => {
+                        form.setFieldsValue({
+                          researchGroupId: option?.id || '',
+                        });
+                      },
+                    }}
+                    debounceTime={1000}
+                    label="课题组名称"
+                    placeholder="请输入名称"
+                  />
+                  <ProFormText
+                    hidden={true}
+                    key="researchGroupId"
+                    name="researchGroupId"
+                  ></ProFormText>
+                </>
+              );
+              const renderPlatformType = (fieldKey) => (
+                <ProFormSelect
+                  key={fieldKey}
+                  width="md"
+                  showSearch
+                  name="platformType"
+                  rules={[{ required: true, message: '请选择平台类型!' }]}
+                  request={async () => {
+                    const res = await postServiceConstPlatformType({
+                      query: { companyType },
+                    });
+                    return Object.entries(res?.data).map(([value, label]) => ({
+                      label,
+                      value,
+                    }));
+                  }}
+                  fieldProps={{
+                    filterOption: (input, option) =>
+                      option?.label.toLowerCase().includes(input.toLowerCase()), // 自定义搜索过滤逻辑
+                  }}
+                  debounceTime={1000}
+                  label="平台类型"
+                  placeholder="请输入平台类型"
+                />
+              );
+
+              if (companyType === 'school') {
+                return renderInstitutionContactName();
+              } else if (
+                ['firm', 'ECommercePlatform', 'otherPlatform'].includes(
+                  companyType,
+                )
+              ) {
+                return (
+                  <Group>
+                    {['ECommercePlatform', 'otherPlatform'].includes(
+                      companyType,
+                    ) && renderPlatformType(`platformType_${companyType}`)}
+                    <ProFormText
+                      width="md"
+                      name="institutionContactName"
+                      label="课题组名称"
+                      placeholder="请输入名称"
+                    />
+                  </Group>
+                );
+              } else if (companyType === 'officialWebsite') {
+                return (
+                  <Group>
+                    <ProFormSelect
+                      request={async () => {
+                        const res = await postServiceConstOrderSource();
+                        return Object.entries(res?.data).map(
+                          ([value, label]) => ({
+                            label,
+                            value,
+                          }),
+                        );
+                      }}
+                      width="md"
+                      name="orderSource"
+                      label="订单来源"
+                    />
+                    <ProFormDependency name={['orderSource']}>
+                      {({ orderSource }) => {
+                        if (orderSource === 'school') {
+                          return renderInstitutionContactName();
+                        } else if (orderSource === 'company') {
+                          return (
+                            <ProFormText
+                              width="md"
+                              name="institutionContactName"
+                              label="课题组名称"
+                              placeholder="请输入名称"
+                            />
+                          );
+                        }
+                        return null;
+                      }}
+                    </ProFormDependency>
+                  </Group>
+                );
+              } else {
+                return renderInstitutionContactName();
+              }
             }}
-            debounceTime={1000}
-            label="课题组名称"
-            placeholder="请输入名称"
-        />*/}
+          </ProFormDependency>
+        </Group>
+
         <div
           style={{
             display: 'flex',
@@ -1315,7 +1443,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               console.log(form.getFieldValue('id'));
               if (form.getFieldValue('id')) {
                 const resp = await postDistrictSelOrderProvince({
-                  data: form.getFieldValue('id'),
+                  data: {
+                    oId: form.getFieldValue('id'),
+                    orderType: orderOptType,
+                  },
                 });
                 if (
                   resp.data.province !== null &&
@@ -1375,7 +1506,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               let districtOptions = [];
               if (form.getFieldValue('id')) {
                 const resp = await postDistrictSelOrderProvince({
-                  data: form.getFieldValue('id'),
+                  data: {
+                    oId: form.getFieldValue('id'),
+                    orderType: orderOptType,
+                  },
                 });
                 if (resp.data.city !== null && resp.data.city !== undefined) {
                   let res = await postDistrictSelectByNameAndLevel({
@@ -1477,7 +1611,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
+          options={enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD)}
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
@@ -1561,7 +1695,34 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               form.setFieldValue('invoiceFirst', false);
             }
           }}
-          rules={[{ required: true, message: '是否需要开票必填' }]}
+          rules={[
+            { required: true, message: '是否需要开票必填' },
+            {
+              validator: (_, value) => {
+                // 自定义校验逻辑
+                if (
+                  form.getFieldValue('paymentMethod') ===
+                    'WITHHOLDING_ADVANCE_DEPOSIT' &&
+                  value !== 'UN_INVOICE'
+                ) {
+                  return Promise.reject('扣预存订单不能开票');
+                }
+                return Promise.resolve();
+              },
+            },
+            {
+              validator: (_, value) => {
+                // 自定义校验逻辑
+                if (
+                  form.getFieldValue('totalPayment') === 0 &&
+                  value !== 'UN_INVOICE'
+                ) {
+                  return Promise.reject('金额为0订单不能开票');
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
         />
         <ProFormSelect
           placeholder="是否开票后发货"
@@ -1750,6 +1911,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       value: listMeta?.record?.materialId,
                     }}
                     fieldProps={{
+                      popupMatchSelectWidth: false,
+                      listHeight: 400,
+                      dropdownStyle: { width: '55%' },
                       filterOption() {
                         return true;
                       },
@@ -1946,6 +2110,76 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+
+                  <Group key="selfDevelop">
+                    <ProFormRadio.Group
+                      key="selfDevelop"
+                      name="selfDevelop"
+                      label="是否自研产品"
+                      initialValue={false}
+                      options={[
+                        {
+                          label: '是',
+                          value: true,
+                        },
+                        {
+                          label: '否',
+                          value: false,
+                        },
+                      ]}
+                      rules={[{ required: true, message: '是否自研产品必填' }]}
+                    />
+                    <ProFormDependency name={['selfDevelop']}>
+                      {({ selfDevelop }) => {
+                        if (selfDevelop) {
+                          return (
+                            <ProFormDatePicker
+                              name="deliveryDatetime"
+                              label="产品交期（填写前请先与工程师沟通）"
+                              rules={[
+                                { required: true, message: '产品交期必填' },
+                              ]}
+                            />
+                          );
+                        }
+                      }}
+                    </ProFormDependency>
+                  </Group>,
+                  <ProFormRadio.Group
+                    key="proxy"
+                    name="proxy"
+                    label="是否代买代购"
+                    //hidden={true}
+                    initialValue={true}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
+                  <ProFormRadio.Group
+                    key="discount"
+                    name="discount"
+                    label="是否竞标/打折"
+                    //hidden={true}
+                    initialValue={true}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
+
                   <ProFormSelect
                     key={'shippingWarehouse' + listMeta.index}
                     placeholder="请选择发货仓库"
@@ -1997,7 +2231,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           actionRef={actionRef}
         ></ProFormList>
-      </DrawerForm>
+      </ModalForm>
       {kingdeeCstomerModalVisible && (
         <KingdeeCustomerModal
           setVisible={setKingdeeCstomerModalVisible}