canrd-main / canrd-erp-front · Commits

Commit ba842ae69d05912508a232c2f1321119f57e40a8

Authored by PurelzMgnead
1 parent b25e70b1
build: skipped

feat: 售后

Inline Side-by-side
Showing 4 changed files with 46 additions and 16 deletions
.umirc.ts
  View file @ba842ae
... ... @@ -16,12 +16,12 @@ export default defineConfig({
16 16 '/api/': {
17 17 target: 'http://localhost:8085/',
18 18 // target: 'http://192.168.1.6:8085/',
19   - //target: 'http://39.108.227.113:8085/',
  19 + // target: 'http://39.108.227.113:8085/',
20 20 changeOrigin: true,
21 21 pathRewrite: { '^/api': '' },
22 22 },
23 23 '/previewApi/': {
24   - //target: 'http://39.108.227.113:8092/',
  24 + target: 'http://39.108.227.113:8092/',
25 25 changeOrigin: true,
26 26 pathRewrite: { '^/previewApi': '' },
27 27 },
... ... @@ -59,11 +59,11 @@ export default defineConfig({
59 59 access: 'canReadAdminAndSalesManager',
60 60 component: './Order/WarningWhitelist',
61 61 },
62   - /*{
  62 + {
63 63 name: '订单售后',
64 64 path: 'FeedBack',
65 65 component: './Order/FeedBack',
66   - },*/
  66 + },
67 67 ],
68 68 },
69 69 {
... ...
src/pages/Order/FeedBack/OrderDrawer.tsx
  View file @ba842ae
... ... @@ -122,6 +122,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
122 122  
123 123 let originSubOrders = cloneDeep(subOrders);
124 124  
  125 + let currentSubOrders = cloneDeep(subOrders);
  126 +
125 127 /**
126 128 * 获取当前的操作类型boolean值
127 129 * @param type 操作类型，如果与当前匹配返回true
... ... @@ -277,8 +279,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
277 279 function buildOrderData() {
278 280 // let mainInfoDisbled = optType('edit');
279 281 if (!optType('add')) {
280   - if (subOrders !== undefined && subOrders.length > 0) {
281   - copyData.subOrderInformationLists = subOrders;
  282 + if (currentSubOrders !== undefined && currentSubOrders.length > 0) {
  283 + copyData.subOrderInformationLists = currentSubOrders;
282 284 }
283 285  
284 286 //如果是复制，需要开票，不回显是否需要开票字段
... ... @@ -292,6 +294,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
292 294 }
293 295 }
294 296 }
  297 + console.log(copyData);
295 298 //主订单事业部默认显示子订单第一条的事业部
296 299 copyData.productBelongBusiness =
297 300 copyData.subOrderInformationLists[0].productBelongBusiness;
... ... @@ -358,7 +361,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
358 361 copyData = res.data.mainOrder;
359 362 copyData.subOrderInformationLists = res.data.subOrders;
360 363 originSubOrders = res.data.subOrders;
361   -
  364 + currentSubOrders = originSubOrders;
362 365 //客户显示
363 366 form.setFieldValue('erpCustomerId', {
364 367 label: copyData.erpCustomerName,
... ... @@ -1131,7 +1134,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1131 1134 console.log(form.getFieldValue('id'));
1132 1135 if (form.getFieldValue('id') !== undefined) {
1133 1136 const resp = await postDistrictSelOrderProvince({
1134   - data: form.getFieldValue('id'),
  1137 + data: {
  1138 + oId: form.getFieldValue('id'),
  1139 + orderType: orderOptType,
  1140 + },
1135 1141 });
1136 1142 if (resp && resp.data) {
1137 1143 if (resp.data.province) {
... ... @@ -1318,7 +1324,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1318 1324 console.log(form.getFieldValue('id'));
1319 1325 if (form.getFieldValue('id')) {
1320 1326 const resp = await postDistrictSelOrderProvince({
1321   - data: form.getFieldValue('id'),
  1327 + data: {
  1328 + oId: form.getFieldValue('id'),
  1329 + orderType: orderOptType,
  1330 + },
1322 1331 });
1323 1332 if (
1324 1333 resp.data.province !== null &&
... ... @@ -1378,7 +1387,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1378 1387 let districtOptions = [];
1379 1388 if (form.getFieldValue('id')) {
1380 1389 const resp = await postDistrictSelOrderProvince({
1381   - data: form.getFieldValue('id'),
  1390 + data: {
  1391 + oId: form.getFieldValue('id'),
  1392 + orderType: orderOptType,
  1393 + },
1382 1394 });
1383 1395 if (resp.data.city !== null && resp.data.city !== undefined) {
1384 1396 let res = await postDistrictSelectByNameAndLevel({
... ...
src/pages/Order/Order/components/OrderDrawer.tsx
  View file @ba842ae
... ... @@ -1140,7 +1140,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1140 1140 console.log(form.getFieldValue('id'));
1141 1141 if (form.getFieldValue('id') !== undefined) {
1142 1142 const resp = await postDistrictSelOrderProvince({
1143   - data: form.getFieldValue('id'),
  1143 + data: {
  1144 + oId: form.getFieldValue('id'),
  1145 + orderType: orderOptType,
  1146 + },
1144 1147 });
1145 1148 if (resp && resp.data) {
1146 1149 if (resp.data.province) {
... ... @@ -1327,7 +1330,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1327 1330 console.log(form.getFieldValue('id'));
1328 1331 if (form.getFieldValue('id')) {
1329 1332 const resp = await postDistrictSelOrderProvince({
1330   - data: form.getFieldValue('id'),
  1333 + data: {
  1334 + oId: form.getFieldValue('id'),
  1335 + orderType: orderOptType,
  1336 + },
1331 1337 });
1332 1338 if (
1333 1339 resp.data.province !== null &&
... ... @@ -1387,7 +1393,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1387 1393 let districtOptions = [];
1388 1394 if (form.getFieldValue('id')) {
1389 1395 const resp = await postDistrictSelOrderProvince({
1390   - data: form.getFieldValue('id'),
  1396 + data: {
  1397 + oId: form.getFieldValue('id'),
  1398 + orderType: orderOptType,
  1399 + },
1391 1400 });
1392 1401 if (resp.data.city !== null && resp.data.city !== undefined) {
1393 1402 let res = await postDistrictSelectByNameAndLevel({
... ...
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @ba842ae
... ... @@ -1162,7 +1162,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1162 1162 console.log(form.getFieldValue('id'));
1163 1163 if (form.getFieldValue('id') !== undefined) {
1164 1164 const resp = await postDistrictSelOrderProvince({
1165   - data: form.getFieldValue('id'),
  1165 + data: {
  1166 + oId: form.getFieldValue('id'),
  1167 + orderType: orderOptType,
  1168 + },
1166 1169 });
1167 1170 if (resp && resp.data) {
1168 1171 if (resp.data.province) {
... ... @@ -1349,7 +1352,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1349 1352 console.log(form.getFieldValue('id'));
1350 1353 if (form.getFieldValue('id')) {
1351 1354 const resp = await postDistrictSelOrderProvince({
1352   - data: form.getFieldValue('id'),
  1355 + data: {
  1356 + oId: form.getFieldValue('id'),
  1357 + orderType: orderOptType,
  1358 + },
1353 1359 });
1354 1360 if (
1355 1361 resp.data.province !== null &&
... ... @@ -1409,7 +1415,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1409 1415 let districtOptions = [];
1410 1416 if (form.getFieldValue('id')) {
1411 1417 const resp = await postDistrictSelOrderProvince({
1412   - data: form.getFieldValue('id'),
  1418 + data: {
  1419 + oId: form.getFieldValue('id'),
  1420 + orderType: orderOptType,
  1421 + },
1413 1422 });
1414 1423 if (resp.data.city !== null && resp.data.city !== undefined) {
1415 1424 let res = await postDistrictSelectByNameAndLevel({
... ...