canrd-main / canrd-erp-front · Commits

Commit 4bef077d29067bfcac133083536637687512a7d1

Authored by PurelzMgnead
1 parent 89caebc4
build: skipped

feat: 分期订单模板地址更新

Inline Side-by-side
Showing 4 changed files with 20 additions and 3 deletions
.umirc.ts
  View file @4bef077
@@ -15,6 +15,7 @@ export default defineConfig({ @@ -15,6 +15,7 @@ export default defineConfig({
15 proxy: { 15 proxy: {
16 '/api/': { 16 '/api/': {
17 target: 'http://localhost:8085/', 17 target: 'http://localhost:8085/',
  18 + // target: 'http://192.168.31.242:8085/',
18 // target: 'http://192.168.1.6:8085/', 19 // target: 'http://192.168.1.6:8085/',
19 // target: 'http://39.108.227.113:8085/', 20 // target: 'http://39.108.227.113:8085/',
20 changeOrigin: true, 21 changeOrigin: true,
src/pages/Instalment/components/upload/uploadApp.tsx
  View file @4bef077
@@ -24,7 +24,7 @@ const App: React.FC = ({ uploadFile }) => { @@ -24,7 +24,7 @@ const App: React.FC = ({ uploadFile }) => {
24 <p className="ant-upload-text">点击或者拖动文件到此处</p> 24 <p className="ant-upload-text">点击或者拖动文件到此处</p>
25 </Dragger> 25 </Dragger>
26 <a 26 <a
27 - 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" 27 + 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"
28 className="modul-a" 28 className="modul-a"
29 > 29 >
30 下载模板 30 下载模板
src/pages/Instalment/components/upload/uploadModel.tsx
  View file @4bef077
@@ -25,7 +25,7 @@ export default ({ toReload }) =&gt; { @@ -25,7 +25,7 @@ export default ({ toReload }) =&gt; {
25 name: string; 25 name: string;
26 company: string; 26 company: string;
27 }> 27 }>
28 - title="新建表单" 28 + title="导入数据表单"
29 trigger={ 29 trigger={
30 <Button 30 <Button
31 type="primary" 31 type="primary"
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @4bef077
@@ -44,7 +44,7 @@ import { @@ -44,7 +44,7 @@ import {
44 ProFormTextArea, 44 ProFormTextArea,
45 ProFormUploadDragger, 45 ProFormUploadDragger,
46 } from '@ant-design/pro-components'; 46 } from '@ant-design/pro-components';
47 -import { Group } from '@ant-design/pro-form'; 47 +import { Group, ProFormRadio } from '@ant-design/pro-form';
48 import { Button, Form, message, Modal } from 'antd'; 48 import { Button, Form, message, Modal } from 'antd';
49 import { cloneDeep } from 'lodash'; 49 import { cloneDeep } from 'lodash';
50 import { useEffect, useRef, useState } from 'react'; 50 import { useEffect, useRef, useState } from 'react';
@@ -2114,6 +2114,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; { @@ -2114,6 +2114,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
2114 rules={[{ required: true, message: '所属事业部必填' }]} 2114 rules={[{ required: true, message: '所属事业部必填' }]}
2115 disabled={optType('after-sales-check')} 2115 disabled={optType('after-sales-check')}
2116 />, 2116 />,
  2117 + <ProFormRadio.Group
  2118 + key="proxy"
  2119 + name="proxy"
  2120 + label="是否代买代购"
  2121 + initialValue={false}
  2122 + options={[
  2123 + {
  2124 + label: '是',
  2125 + value: true,
  2126 + },
  2127 + {
  2128 + label: '否',
  2129 + value: false,
  2130 + },
  2131 + ]}
  2132 + />,
2117 <ProFormSelect 2133 <ProFormSelect
2118 key={'shippingWarehouse' + listMeta.index} 2134 key={'shippingWarehouse' + listMeta.index}
2119 placeholder="请选择发货仓库" 2135 placeholder="请选择发货仓库"