canrd-main / canrd-erp-front · Commits

Commit 6357ebc5755de670dd41bda15c1a23d5fc4cf028

Authored by 曾国涛
2 parents 9800349c bb005341
build: skipped

Merge branch 'znh' into zgt 

# Conflicts:
#	src/services/definition.ts
#	src/services/request.ts
Inline Side-by-side
Showing 4 changed files with 25 additions and 7 deletions
src/pages/Invoice/constant.tsx
  View file @6357ebc
@@ -175,14 +175,14 @@ export const BANK_STATEMENT_COLUMNS = [ @@ -175,14 +175,14 @@ export const BANK_STATEMENT_COLUMNS = [
175 width: 100, 175 width: 100,
176 }, 176 },
177 { 177 {
178 - dataIndex: 'collectionDate', 178 + dataIndex: 'collectionDatetime',
179 title: '收款时间', 179 title: '收款时间',
180 valueType: 'date', 180 valueType: 'date',
181 width: 100, 181 width: 100,
182 hideInSearch: true, 182 hideInSearch: true,
183 }, 183 },
184 { 184 {
185 - dataIndex: 'collectionDateSearch', 185 + dataIndex: 'collectionDatetimeSearch',
186 title: '收款时间', 186 title: '收款时间',
187 valueType: 'dateRange', 187 valueType: 'dateRange',
188 width: 100, 188 width: 100,
@@ -191,8 +191,8 @@ export const BANK_STATEMENT_COLUMNS = [ @@ -191,8 +191,8 @@ export const BANK_STATEMENT_COLUMNS = [
191 transform: (value) => { 191 transform: (value) => {
192 if (value) { 192 if (value) {
193 return { 193 return {
194 - collectionDateBegin: value[0],  
195 - collectionDateEnd: value[1], 194 + collectionDatetimeBegin: value[0],
  195 + collectionDatetimeEnd: value[1],
196 }; 196 };
197 } 197 }
198 }, 198 },
src/pages/Order/components/ReissueModal.tsx
  View file @6357ebc
@@ -32,7 +32,7 @@ export default ({ setVisible, mainOrder, onClose }) => { @@ -32,7 +32,7 @@ export default ({ setVisible, mainOrder, onClose }) => {
32 let temInvoiceSelectList = []; 32 let temInvoiceSelectList = [];
33 res.data.forEach((item) => { 33 res.data.forEach((item) => {
34 temInvoiceSelectList.push({ 34 temInvoiceSelectList.push({
35 - label: item.id, 35 + label: item.invoiceNumber,
36 value: item.id, 36 value: item.id,
37 }); 37 });
38 }); 38 });
src/pages/Order/constant.ts
  View file @6357ebc
@@ -147,6 +147,8 @@ export const LOGISTICS_STATUS_OPTIONS = { @@ -147,6 +147,8 @@ export const LOGISTICS_STATUS_OPTIONS = {
147 JINGDONG_LOGISTICS: '京东', 147 JINGDONG_LOGISTICS: '京东',
148 SF_EXPRESS: '顺丰', 148 SF_EXPRESS: '顺丰',
149 ZHONGTONG_LOGISTICS: '中通快递', 149 ZHONGTONG_LOGISTICS: '中通快递',
  150 + SHENTONG_LOGISTICS: '申通快递',
  151 + YUANTONG_LOGISTICS: '圆通快递',
150 DEBANG_LOGISTICS: '德邦物流', 152 DEBANG_LOGISTICS: '德邦物流',
151 YUNDA_LOGISTICS: '韵达快递', 153 YUNDA_LOGISTICS: '韵达快递',
152 OTHER_LOGISTICS: '其他物流方式', 154 OTHER_LOGISTICS: '其他物流方式',
src/services/definition.ts
  View file @6357ebc
@@ -948,6 +948,22 @@ export interface InvoiceRecordQueryRequest { @@ -948,6 +948,22 @@ export interface InvoiceRecordQueryRequest {
948 uid?: string; 948 uid?: string;
949 } 949 }
950 950
  951 +export interface InvoiceRecordQueryRequest {
  952 + /** @format date */
  953 + createTimeGe?: string;
  954 + /** @format date */
  955 + createTimeLe?: string;
  956 + /** @format int32 */
  957 + pageNumber?: number;
  958 + /** @format int32 */
  959 + pageSize?: number;
  960 + /**
  961 + * @description
  962 + * 用户id
  963 + */
  964 + uid?: string;
  965 +}
  966 +
951 export interface Item { 967 export interface Item {
952 billDate?: string; 968 billDate?: string;
953 billNo?: string; 969 billNo?: string;
@@ -1521,13 +1537,13 @@ export interface QueryBankStatementDto { @@ -1521,13 +1537,13 @@ export interface QueryBankStatementDto {
1521 * collection_date 1537 * collection_date
1522 * @format date 1538 * @format date
1523 */ 1539 */
1524 - collectionDateBegin?: string; 1540 + collectionDatetimeBegin?: string;
1525 /** 1541 /**
1526 * @description 1542 * @description
1527 * collection_date 1543 * collection_date
1528 * @format date 1544 * @format date
1529 */ 1545 */
1530 - collectionDateEnd?: string; 1546 + collectionDatetimeEnd?: string;
1531 /** @format int32 */ 1547 /** @format int32 */
1532 current?: number; 1548 current?: number;
1533 /** @format int64 */ 1549 /** @format int64 */