diff --git a/.umirc.ts b/.umirc.ts index 58a3d42..6c2ab12 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -15,6 +15,7 @@ export default defineConfig({ proxy: { '/api/': { target: 'http://localhost:8085/', + // target: 'http://192.168.31.242:8085/', // target: 'http://192.168.1.6:8085/', // target: 'http://39.108.227.113:8085/', changeOrigin: true, @@ -56,7 +57,6 @@ export default defineConfig({ { name: '预警白名单', path: 'WarningWhitelist', - access: 'canReadAdminAndSalesManager', component: './Order/WarningWhitelist', }, { diff --git a/src/pages/Instalment/components/upload/uploadApp.tsx b/src/pages/Instalment/components/upload/uploadApp.tsx index 62fd063..729716b 100644 --- a/src/pages/Instalment/components/upload/uploadApp.tsx +++ b/src/pages/Instalment/components/upload/uploadApp.tsx @@ -24,7 +24,7 @@ const App: React.FC = ({ uploadFile }) => { <p className="ant-upload-text">点击或者拖动文件到此处</p> </Dragger> <a - href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2036232762&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=rtc7LNVK9g3flXQeHdeGOXFOocY%3D" + href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2052956820&OSSAccessKeyId=LTAI5t8KJVEXp3k5CT8pt9wG&Signature=Y3uJ4sOXBf8I6sxURlRhs%2BjRCrI%3D" className="modul-a" > 下载模板 diff --git a/src/pages/Instalment/components/upload/uploadModel.tsx b/src/pages/Instalment/components/upload/uploadModel.tsx index e3f1521..4662f21 100644 --- a/src/pages/Instalment/components/upload/uploadModel.tsx +++ b/src/pages/Instalment/components/upload/uploadModel.tsx @@ -25,7 +25,7 @@ export default ({ toReload }) => { name: string; company: string; }> - title="新建表单" + title="导入数据表单" trigger={ <Button type="primary" diff --git a/src/pages/Order/Order/components/OrderDrawer.tsx b/src/pages/Order/Order/components/OrderDrawer.tsx index 1fce9cf..bcdbdc3 100644 --- a/src/pages/Order/Order/components/OrderDrawer.tsx +++ b/src/pages/Order/Order/components/OrderDrawer.tsx @@ -36,6 +36,7 @@ import { ProFormDateTimePicker, ProFormDigit, ProFormList, + ProFormRadio, ProFormSelect, ProFormText, ProFormTextArea, @@ -106,6 +107,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { filePaths: []; notes: ''; invoiceFirst: boolean; + proxy: ''; list: [ { productCode: ''; @@ -842,6 +844,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { disabled={optType('after-sales-check')} onClick={() => { setSubmitBtnLoading(true); + console.log(props); props.submit(); }} > @@ -1983,6 +1986,22 @@ export default ({ onClose, data, subOrders, orderOptType }) => { 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="请选择发货仓库" diff --git a/src/pages/Order/OrderList/OrderDrawer.tsx b/src/pages/Order/OrderList/OrderDrawer.tsx index 0eb1622..b8cf6a6 100644 --- a/src/pages/Order/OrderList/OrderDrawer.tsx +++ b/src/pages/Order/OrderList/OrderDrawer.tsx @@ -44,7 +44,7 @@ import { ProFormTextArea, ProFormUploadDragger, } from '@ant-design/pro-components'; -import { Group } from '@ant-design/pro-form'; +import { Group, ProFormRadio } from '@ant-design/pro-form'; import { Button, Form, message, Modal } from 'antd'; import { cloneDeep } from 'lodash'; import { useEffect, useRef, useState } from 'react'; @@ -2114,6 +2114,22 @@ export default ({ onClose, data, subOrders, orderOptType }) => { 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="请选择发货仓库"