diff --git a/src/views/invoicing/cgd/NuInvoicingCgdInfo.api.ts b/src/views/invoicing/cgd/NuInvoicingCgdInfo.api.ts index 60329e0..8b0a0b0 100644 --- a/src/views/invoicing/cgd/NuInvoicingCgdInfo.api.ts +++ b/src/views/invoicing/cgd/NuInvoicingCgdInfo.api.ts @@ -1,16 +1,19 @@ import { defHttp } from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; +import { useMessage } from '/@/hooks/web/useMessage'; const { createConfirm } = useMessage(); enum Api { list = '/cgd/nuInvoicingCgdInfo/list', - save='/cgd/nuInvoicingCgdInfo/add', - edit='/cgd/nuInvoicingCgdInfo/edit', + listAndJh = '/cgd/nuInvoicingCgdInfo/listAndJh', + save = '/cgd/nuInvoicingCgdInfo/add', + edit = '/cgd/nuInvoicingCgdInfo/edit', deleteOne = '/cgd/nuInvoicingCgdInfo/delete', deleteBatch = '/cgd/nuInvoicingCgdInfo/deleteBatch', importExcel = '/cgd/nuInvoicingCgdInfo/importExcel', exportXls = '/cgd/nuInvoicingCgdInfo/exportXls', + sxd = '/cgd/nuInvoicingCgdSxd/list', + calcTotalPrice = '/cgd/nuInvoicingCgdInfo/calcTotalPrice', } /** @@ -24,6 +27,12 @@ export const getExportUrl = Api.exportXls; */ export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const listAndJh = (params) => defHttp.get({ url: Api.listAndJh, params }); + /** * 列表接口 * @param params @@ -35,11 +44,11 @@ export const list = (params) => defHttp.get({ url: Api.list, params }); * @param params * @param handleSuccess */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); -} +}; /** * 批量删除 @@ -54,12 +63,12 @@ export const batchDelete = (params, handleSuccess) => { okText: '确认', cancelText: '取消', onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); - } + }, }); -} +}; /** * 保存或者更新 @@ -69,4 +78,16 @@ export const batchDelete = (params, handleSuccess) => { export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); -} +}; + +/** + * 随行单 + * @param params + */ +export const sxdList = (params) => defHttp.get({ url: Api.sxd, params }); + +/** + * 已完结采购单+拣货 总价 + * @param params + */ +export const calcTotalPrice = (params) => defHttp.get({ url: Api.calcTotalPrice, params }); diff --git a/src/views/invoicing/fkd/NuInvoicingFkdMain.api.ts b/src/views/invoicing/fkd/NuInvoicingFkdMain.api.ts new file mode 100644 index 0000000..0f2dcf7 --- /dev/null +++ b/src/views/invoicing/fkd/NuInvoicingFkdMain.api.ts @@ -0,0 +1,89 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/fkd/nuInvoicingFkdMain/list', + save = '/fkd/nuInvoicingFkdMain/add', + edit = '/fkd/nuInvoicingFkdMain/edit', + deleteOne = '/fkd/nuInvoicingFkdMain/delete', + deleteBatch = '/fkd/nuInvoicingFkdMain/deleteBatch', + importExcel = '/fkd/nuInvoicingFkdMain/importExcel', + exportXls = '/fkd/nuInvoicingFkdMain/exportXls', + cancellation = '/fkd/nuInvoicingFkdMain/cancellation', + fkdCgdIds = '/fkd/nuInvoicingFkdInfo/queryCgdIds', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 获取采购单下付款单ids 逗号拼接 + * @param params + */ +export const queryFkdCgdIds = (params) => defHttp.get({ url: Api.fkdCgdIds, params }, { isTransformResponse: false }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); +}; + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); + }, + }); +}; + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +}; + +/** + * 作废 + * @param params + * @param isUpdate + */ +export const cancellation = (params) => { + return defHttp.post({ url: Api.cancellation, params }, { isTransformResponse: false }); +}; diff --git a/src/views/invoicing/fkd/NuInvoicingFkdMain.data.ts b/src/views/invoicing/fkd/NuInvoicingFkdMain.data.ts new file mode 100644 index 0000000..309c2c4 --- /dev/null +++ b/src/views/invoicing/fkd/NuInvoicingFkdMain.data.ts @@ -0,0 +1,42 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '付款单单号', + align: "center", + dataIndex: 'fkdNo' + }, + { + title: '供应商名称', + align: "center", + dataIndex: 'gysName' + }, + { + title: '总金额', + align: "center", + dataIndex: 'totalPrice' + }, + { + title: '付款状态', + align: "center", + dataIndex: 'status_dictText' + }, + { + title: '付款时间', + align: "center", + dataIndex: 'fksj' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + fkdNo: {title: '付款单单号',order: 0,view: 'text', type: 'string',}, + gysName: {title: '供应商名称',order: 2,view: 'text', type: 'string',}, + totalPrice: {title: '总金额',order: 5,view: 'number', type: 'number',}, + status: {title: '付款状态 0待付款 1作废 2已付款',order: 6,view: 'list', type: 'string',dictCode: 'invoicing_payment_status',}, + fksj: {title: '付款时间',order: 7,view: 'datetime', type: 'string',}, +}; diff --git a/src/views/invoicing/fkd/NuInvoicingFkdMainList.vue b/src/views/invoicing/fkd/NuInvoicingFkdMainList.vue new file mode 100644 index 0000000..87a5046 --- /dev/null +++ b/src/views/invoicing/fkd/NuInvoicingFkdMainList.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/views/invoicing/fkd/components/CgdTableList.vue b/src/views/invoicing/fkd/components/CgdTableList.vue new file mode 100644 index 0000000..b91e736 --- /dev/null +++ b/src/views/invoicing/fkd/components/CgdTableList.vue @@ -0,0 +1,76 @@ + + + \ No newline at end of file diff --git a/src/views/invoicing/fkd/components/NuInvoicingFkdMainForm.vue b/src/views/invoicing/fkd/components/NuInvoicingFkdMainForm.vue new file mode 100644 index 0000000..e607817 --- /dev/null +++ b/src/views/invoicing/fkd/components/NuInvoicingFkdMainForm.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/src/views/invoicing/fkd/components/NuInvoicingFkdMainModal.vue b/src/views/invoicing/fkd/components/NuInvoicingFkdMainModal.vue new file mode 100644 index 0000000..de35edf --- /dev/null +++ b/src/views/invoicing/fkd/components/NuInvoicingFkdMainModal.vue @@ -0,0 +1,117 @@ + + + + + + diff --git a/src/views/invoicing/fkd/components/NuInvoicingScfkdList.vue b/src/views/invoicing/fkd/components/NuInvoicingScfkdList.vue new file mode 100644 index 0000000..e218c83 --- /dev/null +++ b/src/views/invoicing/fkd/components/NuInvoicingScfkdList.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/views/invoicing/fkd/components/cgd.data.ts b/src/views/invoicing/fkd/components/cgd.data.ts new file mode 100644 index 0000000..3bcd2cb --- /dev/null +++ b/src/views/invoicing/fkd/components/cgd.data.ts @@ -0,0 +1,71 @@ +import { BasicColumn } from '/@/components/Table'; +import { FormSchema } from '/@/components/Table'; +import { rules } from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '采购单号', + align: 'center', + dataIndex: 'cgdNo', + }, + { + title: '供应商', + align: 'center', + dataIndex: 'gysName', + }, + { + title: '采购日期', + align: 'center', + dataIndex: 'qgDate', + }, + { + title: '拣货日期', + align: 'center', + dataIndex: 'jhTime', + customRender: ({ text }) => { + if (!text) return ''; + return text.toString().substring(0, 10); + }, + }, + { + title: '完结日期', + align: 'center', + dataIndex: 'wjTime', + customRender: ({ text }) => { + if (!text) return ''; + return text.toString().substring(0, 10); + }, + }, +]; + +//列表数据 +export const wlColumns: BasicColumn[] = [ + { + title: '物料名称', + align: 'center', + dataIndex: 'wlName', + }, + { + title: '到货单价', + align: 'center', + dataIndex: 'arrivalPrice', + }, + { + title: '采购单位', + align: 'center', + dataIndex: 'wlUnits', + }, + { + title: '入库数量', + align: 'center', + dataIndex: 'rksl', + }, + { + title: '小计(元)', + align: 'center', + dataIndex: 'xiaoJi', + + }, +]; diff --git a/src/views/invoicing/fkd/components/cgdInfo.vue b/src/views/invoicing/fkd/components/cgdInfo.vue new file mode 100644 index 0000000..b70669d --- /dev/null +++ b/src/views/invoicing/fkd/components/cgdInfo.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file