Merge remote-tracking branch 'origin/integral' into megerInteger

PurelzMgnead
2 parents 1ce40b7f 7515d12d
Showing 2 changed files with 19 additions and 1 deletions
.umirc.ts
src/pages/Order/Order/components/OrderDrawer.tsx
@@ -56,7 +56,6 @@ export default defineConfig({
         {
           name: '预警白名单',
           path: 'WarningWhitelist',
-          access: 'canReadAdminAndSalesManager',
           component: './Order/WarningWhitelist',
         },
         {
@@ -36,6 +36,7 @@ import {
   ProFormDateTimePicker,
   ProFormDigit,
   ProFormList,
+  ProFormRadio,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
@@ -106,6 +107,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     filePaths: [];
     notes: '';
     invoiceFirst: boolean;
+    proxy: '';
     list: [
       {
         productCode: '';
@@ -842,6 +844,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 disabled={optType('after-sales-check')}
                 onClick={() => {
                   setSubmitBtnLoading(true);
+                  console.log(props);
                   props.submit();
                 }}
               >
@@ -1983,6 +1986,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+                  <ProFormRadio.Group
+                    key="proxy"
+                    name="proxy"
+                    label="是否代买代购"
+                    initialValue={false}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
                   <ProFormSelect
                     key={'shippingWarehouse' + listMeta.index}
                     placeholder="请选择发货仓库"