Commit 2ecdd637b5a61b88cd0486989d6bbb25c4b2e8c1
1 parent
2d14be42
feat: update 1、订单选中导出
Showing
3 changed files
with
8 additions
and
3 deletions
src/views/project/order/ExportModal.vue
@@ -39,6 +39,9 @@ | @@ -39,6 +39,9 @@ | ||
39 | role: { | 39 | role: { |
40 | type: String, | 40 | type: String, |
41 | }, | 41 | }, |
42 | + ids: { | ||
43 | + type: Array<string | number>, | ||
44 | + }, | ||
42 | }, | 45 | }, |
43 | setup(props) { | 46 | setup(props) { |
44 | const orderStore = useOrderStoreWithOut(); | 47 | const orderStore = useOrderStoreWithOut(); |
@@ -138,6 +141,8 @@ | @@ -138,6 +141,8 @@ | ||
138 | } | 141 | } |
139 | }); | 142 | }); |
140 | 143 | ||
144 | + //导出选中的订单 | ||
145 | + fieldVO.orderIds = props.ids; | ||
141 | await orderExport({ fieldVO }); | 146 | await orderExport({ fieldVO }); |
142 | 147 | ||
143 | closeModal(); | 148 | closeModal(); |
src/views/project/order/index.vue
@@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
105 | /> | 105 | /> |
106 | <ProfitAnalysis @register="profitModalRegister" /> | 106 | <ProfitAnalysis @register="profitModalRegister" /> |
107 | <RateModal @register="rateModalRegister" /> | 107 | <RateModal @register="rateModalRegister" /> |
108 | - <ExportModal @register="exportModalRegister" :role="role" /> | 108 | + <ExportModal @register="exportModalRegister" :role="role" :ids="checkedKeys" /> |
109 | <CheckDetail @register="checkModalRegister" :onGoFormDetail="handleGoFormDetail" /> | 109 | <CheckDetail @register="checkModalRegister" :onGoFormDetail="handleGoFormDetail" /> |
110 | <HistoryDetail @register="historyDetailRegister" /> | 110 | <HistoryDetail @register="historyDetailRegister" /> |
111 | <FieldDetail @register="fieldDetailRegister" /> | 111 | <FieldDetail @register="fieldDetailRegister" /> |
vite.config.ts
@@ -20,8 +20,8 @@ export default defineApplicationConfig({ | @@ -20,8 +20,8 @@ export default defineApplicationConfig({ | ||
20 | server: { | 20 | server: { |
21 | proxy: { | 21 | proxy: { |
22 | '/basic-api/order': { | 22 | '/basic-api/order': { |
23 | - // target: 'http://localhost:8000', | ||
24 | - target: 'http://39.108.227.113:8000', | 23 | + target: 'http://localhost:8000', |
24 | + // target: 'http://39.108.227.113:8000', | ||
25 | // target: 'http://39.108.227.113:3000/mock/35', | 25 | // target: 'http://39.108.227.113:3000/mock/35', |
26 | // http://39.108.227.113:8000/order/erp/captcha/get_img_captcha_code | 26 | // http://39.108.227.113:8000/order/erp/captcha/get_img_captcha_code |
27 | changeOrigin: true, | 27 | changeOrigin: true, |