diff --git a/src/api/wms/customerStatementMain/index.ts b/src/api/wms/customerStatementMain/index.ts index e37a5b356..69f1714f6 100644 --- a/src/api/wms/customerStatementMain/index.ts +++ b/src/api/wms/customerStatementMain/index.ts @@ -65,4 +65,24 @@ export const importTemplate = () => { // 导入客户对账单前校验是否有相同客户代码和年月的数据存在 export const verifyDataExist = async (yearsMonthStr: String,customerCode:String) => { return await request.get({ url: `/wms/customer-statement-main/verifyDataExist?yearsMonthStr=` + yearsMonthStr+'&customerCode='+customerCode }) +} + +// 客户对账单重新比对 +export const recontrast = async (id: number) => { + return await request.get({ url: `/wms/customer-statement-main/recontrast?id=` + id}) +} + +// 客户对账单确认比对结果 +export const confirmationContrast = async (id: number) => { + return await request.get({ url: `/wms/customer-statement-main/confirmationContrast?id=` + id}) +} + +// 客户对账单废除数据 +export const nodeAbrogate = async (id: number) => { + return await request.get({ url: `/wms/customer-statement-main/nodeAbrogate?id=` + id}) +} + +// 客户对账单退回操作 +export const sendBack = async (id: number) => { + return await request.get({ url: `/wms/customer-statement-main/sendBack?id=` + id}) } \ No newline at end of file diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 73b968041..f6b45d5dc 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1404,6 +1404,18 @@ export function outBtn(option: any) { hasPermi: '' }) } +// 主列表-退回 +export function mainSendBackBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.退回`).replace('ts.', ''), + name: 'sendBack', + hide: false, + type: 'warning', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 默认按钮规则 function __defaultBtnOption(option: any, specific: any) { return { diff --git a/src/views/wms/deliversettlementManage/customerStatement/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/customerStatement/customerStatement/customerStatementMain.data.ts index 7940f25ab..b454b1130 100644 --- a/src/views/wms/deliversettlementManage/customerStatement/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerStatement/customerStatement/customerStatementMain.data.ts @@ -23,7 +23,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '客户代码', + label: '客户编号', field: 'customerCode', sort: 'custom', isSearch: true, @@ -43,7 +43,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ search: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } @@ -72,6 +72,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '重新比对更新时间', field: 'comparisonTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -85,6 +86,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '发布时间', field: 'publishTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -98,6 +100,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '已分摊时间', field: 'shareTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -111,6 +114,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '待开票时间', field: 'beInvoicedTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -124,6 +128,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '开票中时间', field: 'invoicedTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -137,6 +142,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '已开票时间', field: 'issuedInvoicedTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -150,6 +156,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '已作废时间', field: 'abrogateTime', sort: 'custom', + isTable:false, formatter: dateFormatter, form: { component: 'DatePicker', @@ -160,16 +167,21 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ }, }, { - label: '版本号', - field: 'versionNumber', + label: '操作人', + field: 'creator', sort: 'custom', }, { - label: '备注', - field: 'remark', + label: '版本号', + field: 'versionNumber', sort: 'custom', }, // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // }, + // { // label: '是否可用默认TRUE', // field: 'available', // sort: 'custom', @@ -205,7 +217,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 300, fixed: 'right' } } diff --git a/src/views/wms/deliversettlementManage/customerStatement/customerStatement/index.vue b/src/views/wms/deliversettlementManage/customerStatement/customerStatement/index.vue index 6c823c54b..9310f01fb 100644 --- a/src/views/wms/deliversettlementManage/customerStatement/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/customerStatement/customerStatement/index.vue @@ -1,67 +1,51 @@