canrd-outside / order-erp-front · Commits

Commit 20bd399f34c00f095477de1d3bca563ca4e4a3d7

Authored by sanmu
1 parent 16f44981
build: skipped

feat: update style

Inline Side-by-side
Showing 7 changed files with 114 additions and 45 deletions
src/views/project/order/FormDetail/BaseFormPanel.vue
  View file @20bd399
... ... @@ -106,6 +106,7 @@
106 106 useForm({
107 107 labelWidth: 120,
108 108 schemas,
  109 + layout: 'vertical',
109 110 showActionButtonGroup: false,
110 111 actionColOptions: {
111 112 span: 24,
... ...
src/views/project/order/FormDetail/InspectionFormPanel.vue
  View file @20bd399
... ... @@ -49,6 +49,7 @@
49 49 const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
50 50 labelWidth: 120,
51 51 schemas,
  52 + layout: 'vertical',
52 53 showActionButtonGroup: false,
53 54 actionColOptions: {
54 55 span: 24,
... ...
src/views/project/order/FormDetail/ProfitFormPanel.vue
  View file @20bd399
... ... @@ -46,6 +46,7 @@
46 46 const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
47 47 labelWidth: 120,
48 48 schemas,
  49 + layout: 'vertical',
49 50 showActionButtonGroup: false,
50 51 actionColOptions: {
51 52 span: 24,
... ...
src/views/project/order/FormDetail/ReportFormPanel.vue
  View file @20bd399
... ... @@ -57,6 +57,7 @@
57 57 const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
58 58 labelWidth: 120,
59 59 schemas,
  60 + layout: 'vertical',
60 61 showActionButtonGroup: false,
61 62 actionColOptions: {
62 63 span: 24,
... ...
src/views/project/order/FormDetail/TrackFormPanel.vue
  View file @20bd399
... ... @@ -38,6 +38,7 @@
38 38 const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
39 39 labelWidth: 120,
40 40 schemas,
  41 + layout: 'vertical',
41 42 showActionButtonGroup: false,
42 43 actionColOptions: {
43 44 span: 24,
... ...
src/views/project/order/index.vue
  View file @20bd399
1 1 <template>
2   - <div>
  2 + <div class="order-page">
3 3 <BasicTable @register="registerTable" bordered>
4 4 <template #headerCell="{ column }">
5 5 <!-- <template v-if="column.key === 'address1'">
... ... @@ -340,5 +340,9 @@
340 340 width: 100px;
341 341 height: 100px;
342 342 }
  343 +
  344 + .order-page .vben-basic-table .ant-form-item .ant-picker {
  345 + width: 100%;
  346 + }
343 347 </style>
344 348 ./constant
... ...
src/views/project/order/tableData.tsx
  View file @20bd399
... ... @@ -484,6 +484,15 @@ const ORDER_LIST_INSPECT_FIELDS = [
484 484 ],
485 485 },
486 486 ];
  487 +
  488 +const ORDER_LIST_SCHEDULE = [
  489 + {
  490 + title: '进度条',
  491 + width: 100,
  492 + dataIndex: 'schedule',
  493 + },
  494 +];
  495 +
487 496 export function getOrderColumns(role: ROLE) {
488 497 if (role === ROLE.ADMIN || role === ROLE.BUSINESS) {
489 498 return [
... ... @@ -492,6 +501,7 @@ export function getOrderColumns(role: ROLE) {
492 501 ...ORDER_LIST_REPORT_FIELDS,
493 502 ...ORDER_LIST_TRACK_FIELDS,
494 503 ...ORDER_LIST_INSPECT_FIELDS,
  504 + ...ORDER_LIST_SCHEDULE,
495 505 ];
496 506 }
497 507  
... ... @@ -507,11 +517,17 @@ export function getOrderColumns(role: ROLE) {
507 517 }),
508 518 ...ORDER_LIST_TRACK_FIELDS,
509 519 ...ORDER_LIST_INSPECT_FIELDS,
  520 + ...ORDER_LIST_SCHEDULE,
510 521 ];
511 522 }
512 523  
513 524 if (role === ROLE.INSPECT) {
514   - return [...ORDER_LIST_BASE_FIELDS, ...ORDER_LIST_TRACK_FIELDS, ...ORDER_LIST_INSPECT_FIELDS];
  525 + return [
  526 + ...ORDER_LIST_BASE_FIELDS,
  527 + ...ORDER_LIST_TRACK_FIELDS,
  528 + ...ORDER_LIST_INSPECT_FIELDS,
  529 + ...ORDER_LIST_SCHEDULE,
  530 + ];
515 531 }
516 532  
517 533 return [];
... ... @@ -522,66 +538,77 @@ export const FIELDS_BASE_INFO = [
522 538 {
523 539 field: 'customerCode',
524 540 component: 'Select',
  541 + labelWidth: 150,
525 542 label: '客户编码',
526 543 rules: [{ required: true }],
527 544 },
528 545 {
529 546 field: 'projectNo',
530 547 component: 'Select',
  548 + labelWidth: 150,
531 549 label: '项目号',
532 550 rules: [{ required: true }],
533 551 },
534 552 {
535 553 field: 'productionDepartment',
536 554 component: 'Select',
  555 + labelWidth: 150,
537 556 label: '生产科',
538 557 rules: [{ required: true }],
539 558 },
540 559 {
541 560 field: 'modeleLo',
542 561 component: 'Input',
  562 + labelWidth: 150,
543 563 label: 'Modelo(REFERENCE)',
544 564 rules: [{ required: true }],
545 565 },
546 566 {
547 567 field: 'innerNo',
548 568 component: 'Select',
  569 + labelWidth: 150,
549 570 label: '内部编号',
550 571 rules: [{ required: true }],
551 572 },
552 573 {
553 574 field: 'customerPo',
554 575 component: 'Input',
  576 + labelWidth: 150,
555 577 label: '客户po号',
556 578 rules: [{ required: true }],
557 579 },
558 580 {
559 581 field: 'customerStyle',
560 582 component: 'Input',
  583 + labelWidth: 150,
561 584 label: '客户STYLE',
562 585 rules: [{ required: true }],
563 586 },
564 587 {
565 588 field: 'collection',
566 589 component: 'Input',
  590 + labelWidth: 250,
567 591 label: 'COLLECTION (style description)',
568 592 rules: [{ required: true }],
569 593 },
570 594 {
571 595 field: 'poColor',
572 596 component: 'Select',
  597 + labelWidth: 150,
573 598 label: 'PO COLOR',
574 599 rules: [{ required: true }],
575 600 },
576 601 {
577 602 field: 'cnColor',
578 603 component: 'Select',
  604 + labelWidth: 150,
579 605 label: '颜色中文',
580 606 rules: [{ required: true }],
581 607 },
582 608 {
583 609 field: 'picUrl',
584 610 component: 'FieldUpload',
  611 + labelWidth: 150,
585 612 label: '图片',
586 613 rules: [{ required: true }],
587 614 },
... ... @@ -589,35 +616,41 @@ export const FIELDS_BASE_INFO = [
589 616 field: 'productionComment',
590 617 component: 'Input',
591 618 rules: [{ required: true }],
  619 + labelWidth: 150,
592 620 label: '生产要求',
593 621 },
594 622 {
595 623 field: 'orderCount',
596 624 component: 'InputNumber',
597 625 rules: [{ required: true }],
  626 + labelWidth: 150,
598 627 label: '数量',
599 628 },
600 629 {
601 630 field: 'orderComposition',
602 631 component: 'Input',
603 632 rules: [{ required: true }],
  633 + labelWidth: 150,
604 634 label: '订单成分',
605 635 },
606 636 {
607 637 field: 'productStyle',
608 638 component: 'Select',
609 639 rules: [{ required: true }],
  640 + labelWidth: 150,
610 641 label: '款式类型',
611 642 },
612 643 {
613 644 field: 'productionDepartmentConsignTime',
614 645 component: 'DatePicker',
  646 + labelWidth: 150,
615 647 label: '生成科拖货时间',
616 648 rules: [{ required: true }],
617 649 },
618 650 {
619 651 field: 'orderHodTime',
620 652 component: 'DatePicker',
  653 + labelWidth: 150,
621 654 label: '订单上HOD时间',
622 655  
623 656 rules: [{ required: true }],
... ... @@ -625,6 +658,7 @@ export const FIELDS_BASE_INFO = [
625 658 {
626 659 field: 'outboundType',
627 660 component: 'Select',
  661 + labelWidth: 150,
628 662 label: '出库类型',
629 663  
630 664 rules: [{ required: true }],
... ... @@ -632,6 +666,7 @@ export const FIELDS_BASE_INFO = [
632 666 {
633 667 field: 'packetType',
634 668 component: 'Select',
  669 + labelWidth: 150,
635 670 label: '包装类型',
636 671 rules: [{ required: true }],
637 672 },
... ... @@ -643,6 +678,7 @@ export const FIELDS_REPORT_INFO = [
643 678 field: 'ideaSource',
644 679 component: 'Select',
645 680 optionField: 'ideaSource',
  681 + labelWidth: 150,
646 682 label: '想法来源',
647 683 // rules: [{ required: true }],
648 684 },
... ... @@ -650,12 +686,14 @@ export const FIELDS_REPORT_INFO = [
650 686 field: 'manualPreform',
651 687 component: 'Select',
652 688 optionField: 'manualPreform',
  689 + labelWidth: 150,
653 690 label: '手工初型',
654 691 // rules: [{ required: true }],
655 692 },
656 693 {
657 694 field: 'ideaManualRate',
658 695 component: 'Input',
  696 + labelWidth: 150,
659 697 label: '想法和手工比例分配',
660 698 // rules: [{ required: true }],
661 699 },
... ... @@ -685,11 +723,13 @@ export const FIELDS_TRACK_STAGE_INFO = [
685 723 field: 'esoSampleSendTime',
686 724 component: 'DatePicker',
687 725 label: 'EXTRA,SHOWROOM,ONLINE sample发送时间',
  726 + labelWidth: 350,
688 727 },
689 728 {
690 729 field: 'shippmentSampleSendTime',
691 730 component: 'DatePicker',
692 731 label: 'shippment sample 发送时间',
  732 + labelWidth: 250,
693 733 },
694 734 {
695 735 field: 'shippmentSampleConfirmResult',
... ... @@ -703,6 +743,7 @@ export const FIELDS_TRACK_STAGE_INFO = [
703 743 ],
704 744 },
705 745 label: 'shipment sample确认意见',
  746 + labelWidth: 250,
706 747 },
707 748 {
708 749 field: 'selfTestPassTime',
... ... @@ -749,6 +790,7 @@ export const FIELDS_TRACK_STAGE_INFO = [
749 790 field: 'barcodeStickerArrivalTime',
750 791 component: 'DatePicker',
751 792 label: 'Barcode sticker arrival time',
  793 + labelWidth: 250,
752 794 componentProps: {
753 795 options: [
754 796 {
... ... @@ -770,6 +812,7 @@ export const FIELDS_TRACK_STAGE_INFO = [
770 812 ],
771 813 },
772 814 label: '最晚包材到货时间',
  815 + labelWidth: 250,
773 816 },
774 817 {
775 818 field: 'latestBkTime',
... ... @@ -783,6 +826,7 @@ export const FIELDS_TRACK_STAGE_INFO = [
783 826 ],
784 827 },
785 828 label: '最晚订舱+报关资料时间',
  829 + labelWidth: 250,
786 830 },
787 831 ];
788 832  
... ... @@ -822,7 +866,7 @@ export const FIELDS_PROFIT_INFO = [
822 866 field: 'productionDepartmentCurrency',
823 867 component: 'Select',
824 868 label: '生成科货币单位',
825   - rules: [{ required: true }],
  869 + // rules: [{ required: true }],
826 870 componentProps: {
827 871 options: [
828 872 { label: '$', value: '$' },
... ... @@ -887,6 +931,7 @@ export const FIELDS_INSPECTION_INFO = [
887 931 component: 'Input',
888 932 label: '中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）',
889 933 // rules: [{ required: true }],
  934 + labelWidth: 400,
890 935 },
891 936 {
892 937 field: 'midCheckResult',
... ... @@ -941,11 +986,13 @@ export const FIELDS_INSPECTION_INFO = [
941 986 field: 'boxPacket',
942 987 component: 'Input',
943 988 label: '包装：卡片、条码、箱贴，箱单',
  989 + labelWidth: 300,
944 990 // rules: [{ required: true }],
945 991 },
946 992 {
947 993 field: 'endCheckResult',
948 994 component: 'Select',
  995 + labelWidth: 250,
949 996 label: '尾期验货结果PASS / FAIL',
950 997 optionField: 'endCheckResult',
951 998 // rules: [{ required: true }],
... ... @@ -978,28 +1025,31 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
978 1025 field: `createStartTime`,
979 1026 label: `生成开始时间`,
980 1027 component: 'DatePicker',
  1028 + widhth: '100%',
  1029 + style: { width: '100%' },
981 1030 colProps: {
982   - xl: 8,
983   - xxl: 8,
  1031 + span: 6,
984 1032 },
  1033 + labelWidth: 150,
985 1034 },
986 1035 {
987 1036 field: `createEndTime`,
988 1037 label: `生成结束时间`,
989 1038 component: 'DatePicker',
990 1039 colProps: {
991   - xl: 8,
992   - xxl: 8,
  1040 + span: 6,
993 1041 },
  1042 + labelWidth: 150,
994 1043 },
995 1044 {
996 1045 field: `orderStatus`,
997 1046 label: `单据状态`,
998 1047 component: 'Select',
999 1048 colProps: {
1000   - xl: 12,
1001   - xxl: 8,
  1049 + span: 6,
1002 1050 },
  1051 + labelWidth: 150,
  1052 +
1003 1053 componentProps: {
1004 1054 options: [
1005 1055 { label: '订单创建完成', value: 0 },
... ... @@ -1022,27 +1072,28 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1022 1072 label: `提交人名称`,
1023 1073 component: 'Input',
1024 1074 colProps: {
1025   - xl: 12,
1026   - xxl: 8,
  1075 + span: 6,
1027 1076 },
  1077 + labelWidth: 150,
1028 1078 },
1029 1079 {
1030 1080 field: `commitUserPhone`,
1031 1081 label: `提交人手机号码`,
1032 1082 component: 'Input',
1033 1083 colProps: {
1034   - xl: 12,
1035   - xxl: 8,
  1084 + span: 6,
1036 1085 },
  1086 + labelWidth: 150,
1037 1087 },
1038 1088 {
1039 1089 field: `customerCode`,
1040 1090 label: `客户编码`,
1041 1091 component: 'Select',
1042 1092 colProps: {
1043   - xl: 12,
1044   - xxl: 8,
  1093 + span: 6,
1045 1094 },
  1095 + labelWidth: 150,
  1096 +
1046 1097 componentProps: {
1047 1098 options: customerCode,
1048 1099 },
... ... @@ -1052,9 +1103,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1052 1103 label: `项目号`,
1053 1104 component: 'Select',
1054 1105 colProps: {
1055   - xl: 12,
1056   - xxl: 8,
  1106 + span: 6,
1057 1107 },
  1108 + labelWidth: 150,
  1109 +
1058 1110 componentProps: {
1059 1111 options: projectNo,
1060 1112 },
... ... @@ -1064,9 +1116,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1064 1116 label: `生产科`,
1065 1117 component: 'Select',
1066 1118 colProps: {
1067   - xl: 12,
1068   - xxl: 8,
  1119 + span: 6,
1069 1120 },
  1121 + labelWidth: 150,
  1122 +
1070 1123 componentProps: {
1071 1124 options: productionDepartment,
1072 1125 },
... ... @@ -1076,18 +1129,19 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1076 1129 label: `生成科拖货开始时间`,
1077 1130 component: 'DatePicker',
1078 1131 colProps: {
1079   - xl: 12,
1080   - xxl: 8,
  1132 + span: 6,
1081 1133 },
  1134 + labelWidth: 150,
1082 1135 },
1083 1136 {
1084 1137 field: `productionDepartmentConsignEndTime`,
1085 1138 label: `生成科拖货结束时间`,
1086 1139 component: 'DatePicker',
1087 1140 colProps: {
1088   - xl: 12,
1089   - xxl: 8,
  1141 + span: 6,
1090 1142 },
  1143 + labelWidth: 150,
  1144 +
1091 1145 componentProps: {
1092 1146 options: customerCode,
1093 1147 },
... ... @@ -1097,45 +1151,46 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1097 1151 label: `订单上HOD开始时间`,
1098 1152 component: 'DatePicker',
1099 1153 colProps: {
1100   - xl: 12,
1101   - xxl: 8,
  1154 + span: 6,
1102 1155 },
  1156 + labelWidth: 150,
1103 1157 },
1104 1158 {
1105 1159 field: `orderHodEndTime`,
1106 1160 label: `订单上HOD结束时间`,
1107 1161 component: 'DatePicker',
1108 1162 colProps: {
1109   - xl: 12,
1110   - xxl: 8,
  1163 + span: 6,
1111 1164 },
  1165 + labelWidth: 150,
1112 1166 },
1113 1167 {
1114 1168 field: `profitRateLqt`,
1115 1169 label: `最小利润率`,
1116 1170 component: 'InputNumber',
1117 1171 colProps: {
1118   - xl: 12,
1119   - xxl: 8,
  1172 + span: 6,
1120 1173 },
  1174 + labelWidth: 150,
1121 1175 },
1122 1176 {
1123 1177 field: `profitRateGqt`,
1124 1178 label: `最大利润率`,
1125 1179 component: 'InputNumber',
1126 1180 colProps: {
1127   - xl: 12,
1128   - xxl: 8,
  1181 + span: 6,
1129 1182 },
  1183 + labelWidth: 150,
1130 1184 },
1131 1185 {
1132 1186 field: `ideaSource`,
1133 1187 label: `想法来源`,
1134 1188 component: 'Select',
1135 1189 colProps: {
1136   - xl: 12,
1137   - xxl: 8,
  1190 + span: 6,
1138 1191 },
  1192 + labelWidth: 150,
  1193 +
1139 1194 componentProps: {
1140 1195 options: ideaSource,
1141 1196 },
... ... @@ -1145,9 +1200,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1145 1200 label: `手工初型`,
1146 1201 component: 'Select',
1147 1202 colProps: {
1148   - xl: 12,
1149   - xxl: 8,
  1203 + span: 6,
1150 1204 },
  1205 + labelWidth: 150,
  1206 +
1151 1207 componentProps: {
1152 1208 options: manualPreform,
1153 1209 },
... ... @@ -1157,9 +1213,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1157 1213 label: `pp样品确认意见`,
1158 1214 component: 'Select',
1159 1215 colProps: {
1160   - xl: 12,
1161   - xxl: 8,
  1216 + span: 6,
1162 1217 },
  1218 + labelWidth: 150,
  1219 +
1163 1220 componentProps: {
1164 1221 options: [
1165 1222 {
... ... @@ -1174,18 +1231,19 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1174 1231 label: `自测通过开始时间`,
1175 1232 component: 'DatePicker',
1176 1233 colProps: {
1177   - xl: 12,
1178   - xxl: 8,
  1234 + span: 6,
1179 1235 },
  1236 + labelWidth: 150,
1180 1237 },
1181 1238 {
1182 1239 field: `selfTestPassEndTime`,
1183 1240 label: `自测通过结束时间`,
1184 1241 component: 'DatePicker',
1185 1242 colProps: {
1186   - xl: 12,
1187   - xxl: 8,
  1243 + span: 6,
1188 1244 },
  1245 + labelWidth: 150,
  1246 +
1189 1247 componentProps: {
1190 1248 options: customerCode,
1191 1249 },
... ... @@ -1195,9 +1253,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1195 1253 label: `中期验货结果`,
1196 1254 component: 'Select',
1197 1255 colProps: {
1198   - xl: 12,
1199   - xxl: 8,
  1256 + span: 6,
1200 1257 },
  1258 + labelWidth: 150,
  1259 +
1201 1260 componentProps: {
1202 1261 options: midCheckResult,
1203 1262 },
... ... @@ -1207,9 +1266,10 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
1207 1266 label: `尾期验货结果`,
1208 1267 component: 'Select',
1209 1268 colProps: {
1210   - xl: 12,
1211   - xxl: 8,
  1269 + span: 6,
1212 1270 },
  1271 + labelWidth: 150,
  1272 +
1213 1273 componentProps: {
1214 1274 options: endCheckResult,
1215 1275 },
... ...