diff --git a/.env.development b/.env.development index 52d7d18..5985bd6 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = /ope VITE_PROXY = [["/opeapi","http://localhost:8081/opeapi"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8081/opeapi +VITE_GLOB_DOMAIN_URL=http://localhost:3101/opeapi #后台接口父地址(必填) VITE_GLOB_API_URL=/opeapi diff --git a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.api.ts b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.api.ts new file mode 100644 index 0000000..c2c90f7 --- /dev/null +++ b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/allMaterialInfo/nuBizAllMaterialInfo/list', + save='/allMaterialInfo/nuBizAllMaterialInfo/add', + edit='/allMaterialInfo/nuBizAllMaterialInfo/edit', + deleteOne = '/allMaterialInfo/nuBizAllMaterialInfo/delete', + deleteBatch = '/allMaterialInfo/nuBizAllMaterialInfo/deleteBatch', + importExcel = '/allMaterialInfo/nuBizAllMaterialInfo/importExcel', + exportXls = '/allMaterialInfo/nuBizAllMaterialInfo/exportXls', +} + +/** + * 导出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 }); + +/** + * 删除单个 + * @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 }); +} diff --git a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts new file mode 100644 index 0000000..945c1e2 --- /dev/null +++ b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.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: 'materialName' + }, + { + title: '规格型号', + align: "center", + dataIndex: 'specificationModel' + }, + { + title: '品牌型号', + align: "center", + dataIndex: 'brandType' + }, + { + title: '销售单价', + align: "center", + dataIndex: 'salesUnitPrice' + }, + { + title: '销售单位', + align: "center", + dataIndex: 'salesUnit' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + materialName: {title: '货品名称',order: 0,view: 'text', type: 'string',}, + specificationModel: {title: '规格型号',order: 1,view: 'text', type: 'string',}, + brandType: {title: '品牌型号',order: 2,view: 'text', type: 'string',}, + salesUnitPrice: {title: '销售单价',order: 3,view: 'number', type: 'number',}, + salesUnit: {title: '销售单位',order: 4,view: 'text', type: 'string',}, +}; diff --git a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfoList.vue b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfoList.vue new file mode 100644 index 0000000..ed7fac4 --- /dev/null +++ b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfoList.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue new file mode 100644 index 0000000..62baae7 --- /dev/null +++ b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoModal.vue b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoModal.vue new file mode 100644 index 0000000..35e6713 --- /dev/null +++ b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersInfo.data.ts b/src/views/admin/bizSuppliers/NuBizSuppliersInfo.data.ts index c897371..48f216c 100644 --- a/src/views/admin/bizSuppliers/NuBizSuppliersInfo.data.ts +++ b/src/views/admin/bizSuppliers/NuBizSuppliersInfo.data.ts @@ -23,12 +23,14 @@ export const columns: BasicColumn[] = [ { title: '负责人', align: "center", - dataIndex: 'personInCharge' + dataIndex: 'personInCharge', + width: 100 }, { title: '联系电话', align: "center", - dataIndex: 'contactNumber' + dataIndex: 'contactNumber', + width: 100 }, // { // title: '供应状态', @@ -50,11 +52,13 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'imgPath', customRender: render.renderImage, + width: 100 }, { - title: '创建日期', + title: '入驻日期', align: "center", - dataIndex: 'createTime' + dataIndex: 'createTime', + width: 160 }, ]; diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue index 07872be..6a00ba9 100644 --- a/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue +++ b/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue @@ -51,6 +51,7 @@ + @@ -62,6 +63,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuBizSuppliersInfo.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import NuBizSuppliersInfoModal from './components/NuBizSuppliersInfoModal.vue' + import NuBizSuppliersMateriallInfoModal from './NuBizSuppliersMateriallInfoModal.vue' import { useUserStore } from '/@/store/modules/user'; import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; @@ -69,6 +71,7 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const wlRegisterModal = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -108,18 +111,6 @@ sm: 16, }); - // 高级查询配置 - const superQueryConfig = reactive(superQuerySchema); - - /** - * 高级查询事件 - */ - function handleSuperQuery(params) { - Object.keys(params).map((k) => { - queryParam[k] = params[k]; - }); - searchQuery(); - } /** * 新增事件 @@ -130,11 +121,11 @@ } /** - * 编辑事件 + * 物料事件 */ - function handleEdit(record: Recordable) { - registerModal.value.disableSubmit = false; - registerModal.value.edit(record); + function handleWlEdit(record: Recordable) { + wlRegisterModal.value.disableSubmit = false; + wlRegisterModal.value.edit(record); } /** @@ -174,12 +165,11 @@ { label: '详情', onClick: handleDetail.bind(null, record), - } - // { - // label: '编辑', - // onClick: handleEdit.bind(null, record), - // auth: 'bizSuppliers:nu_biz_suppliers_info:edit' - // }, + }, + { + label: '物料', + onClick: handleWlEdit.bind(null, record), + }, ]; } diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts new file mode 100644 index 0000000..97abc3b --- /dev/null +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/bizSuppliers/nuBizSuppliersMaterialInfo/list', + save='/bizSuppliers/nuBizSuppliersMaterialInfo/add', + edit='/bizSuppliers/nuBizSuppliersMaterialInfo/edit', + deleteOne = '/bizSuppliers/nuBizSuppliersMaterialInfo/delete', + deleteBatch = '/bizSuppliers/nuBizSuppliersMaterialInfo/deleteBatch', + importExcel = '/bizSuppliers/nuBizSuppliersMaterialInfo/importExcel', + exportXls = '/allMaterialInfo/nuBizAllMaterialInfo/exportXls', +} + +/** + * 导出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 }); + +/** + * 删除单个 + * @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 }); +} diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts new file mode 100644 index 0000000..c7e494d --- /dev/null +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts @@ -0,0 +1,52 @@ +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: 'suppliersId_dictText' + }, + { + title: '货品名称', + align: "center", + dataIndex: 'materialName' + }, + { + title: '规格型号', + align: "center", + dataIndex: 'specificationModel', + width: 140 + }, + { + title: '品牌型号', + align: "center", + dataIndex: 'brandType', + width: 140 + }, + { + title: '销售单价', + align: "center", + dataIndex: 'salesUnitPrice', + width: 100 + }, + { + title: '销售单位', + align: "center", + dataIndex: 'salesUnit', + width: 100 + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + suppliersId: {title: '供应商',order: 0,view: 'list', type: 'string',dictTable: "nu_biz_suppliers_info", dictCode: 'id', dictText: 'suppliers_name',}, + materialName: {title: '货品名称',order: 1,view: 'text', type: 'string',}, + specificationModel: {title: '规格型号',order: 2,view: 'text', type: 'string',}, + brandType: {title: '品牌型号',order: 3,view: 'text', type: 'string',}, + salesUnitPrice: {title: '销售单价',order: 4,view: 'number', type: 'number',}, + salesUnit: {title: '销售单位',order: 5,view: 'text', type: 'string',}, +}; diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue new file mode 100644 index 0000000..7d394ef --- /dev/null +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue b/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue new file mode 100644 index 0000000..281eda8 --- /dev/null +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue @@ -0,0 +1,76 @@ + + + + + + diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue new file mode 100644 index 0000000..d19116c --- /dev/null +++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoModal.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoModal.vue new file mode 100644 index 0000000..92788b3 --- /dev/null +++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoModal.vue @@ -0,0 +1,77 @@ + + + + + +