chore(release): 添加代买代购按钮

曾国涛
1 parent 1db34f99
Showing 2 changed files with 30 additions and 12 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',
         },
       ],
@@ -35,6 +35,7 @@ import {
   ProFormDateTimePicker,
   ProFormDigit,
   ProFormList,
+  ProFormRadio,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
@@ -102,6 +103,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     filePaths: [];
     notes: '';
     invoiceFirst: boolean;
+    proxy: '';
     list: [
       {
         productCode: '';
@@ -557,9 +559,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       form.setFieldValue(
         'customerShippingAddress',
         getDefaultString(option.province) +
-        getDefaultString(option.city) +
-        getDefaultString(option.district) +
-        getDefaultString(option.detail),
+          getDefaultString(option.city) +
+          getDefaultString(option.district) +
+          getDefaultString(option.detail),
       );
       form.setFieldValue('customerNameString', option.realName);
  
@@ -642,11 +644,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
  
       message.error(
         '用户余额不足，当前预减的金额为：' +
-        data.subPrice +
-        '，当前账号余额为：' +
-        data.nowMoney +
-        '，当前账号可赊账额度为：' +
-        data.creditLimit,
+          data.subPrice +
+          '，当前账号余额为：' +
+          data.nowMoney +
+          '，当前账号可赊账额度为：' +
+          data.creditLimit,
       );
       return false;
     }
@@ -833,6 +835,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 disabled={optType('after-sales-check')}
                 onClick={() => {
                   setSubmitBtnLoading(true);
+                  console.log(props);
                   props.submit();
                 }}
               >
@@ -1111,7 +1114,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           }}
           debounceTime={1000}
-          request={async (value, { }) => {
+          request={async (value, {}) => {
             const keywords = value.keyWords;
             if (keywords === '') {
               return [];
@@ -1867,7 +1870,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品参数"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                   />,
                   <ProFormDigit
@@ -1920,7 +1923,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品单位"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                     rules={[{ required: true, message: '商品单位必填' }]}
                   />,
@@ -1949,6 +1952,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="请选择发货仓库"