diff --git a/src/views/invoicing/cgd/NuInvoicingCgdInfo.data.ts b/src/views/invoicing/cgd/NuInvoicingCgdInfo.data.ts index 1c49fdd..76e36cb 100644 --- a/src/views/invoicing/cgd/NuInvoicingCgdInfo.data.ts +++ b/src/views/invoicing/cgd/NuInvoicingCgdInfo.data.ts @@ -133,12 +133,12 @@ export const rkcolumns: BasicColumn[] = [ dataIndex: 'procurementPrice', width: 90 }, - // { - // title: '到货价格', - // align: "center", - // dataIndex: 'arrivalPrice', - // width: 100 - // }, + { + title: '到货价格', + align: "center", + dataIndex: 'arrivalPrice', + width: 90 + }, { title: '采购数量', align: "center", diff --git a/src/views/invoicing/cgd/components/NuInvoicingCgdJhForm.vue b/src/views/invoicing/cgd/components/NuInvoicingCgdJhForm.vue index 31a66c7..3a33806 100644 --- a/src/views/invoicing/cgd/components/NuInvoicingCgdJhForm.vue +++ b/src/views/invoicing/cgd/components/NuInvoicingCgdJhForm.vue @@ -34,6 +34,11 @@ {{formData.procurementPrice}} + + + {{formData.arrivalPrice}} + + {{formData.purchaseQuantity}} @@ -52,7 +57,7 @@ - 入库 + 入库 销账 @@ -162,11 +167,6 @@ */ function edit(record) { console.log("🚀 ~ edit ~ record:", record) - var purchaseQuantity = record.purchaseQuantity; - record.yrksl = record.rksl; - var xzsl = record.xzsl; - var rksl = record.wrksl == 0 ? purchaseQuantity - xzsl : record.wrksl; - record.rksl = rksl; nextTick(() => { resetFields(); const tmpData = {}; @@ -175,8 +175,14 @@ tmpData[key] = record[key] } }) + var purchaseQuantity = record.purchaseQuantity; + record.yrksl = record.rksl; + var xzsl = record.xzsl; + var rksl = record.wrksl == 0 ? purchaseQuantity - xzsl : record.wrksl; //赋值 Object.assign(formData, tmpData); + formData.rksl = rksl; + formData.jhType = 0; }); } diff --git a/src/views/invoicing/cgd/components/NuInvoicingCgdRkdForm.vue b/src/views/invoicing/cgd/components/NuInvoicingCgdRkdForm.vue index 72c0e8f..07f7141 100644 --- a/src/views/invoicing/cgd/components/NuInvoicingCgdRkdForm.vue +++ b/src/views/invoicing/cgd/components/NuInvoicingCgdRkdForm.vue @@ -34,53 +34,6 @@ {{formData.gysLxrdh}} - - - - - @@ -99,18 +52,12 @@ - + diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.api.ts b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.api.ts index 89fa45b..f880a79 100644 --- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.api.ts +++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.api.ts @@ -14,6 +14,8 @@ enum Api { importExcel = '/invoicing/blWarehouseMaterialInfo/importExcel', exportXls = '/invoicing/blWarehouseMaterialInfo/exportXls', getConfiguredList = '/invoicing/configMaterialInfo/getConfiguredList', + getCkWlList = '/api/pad/invoicing/getCkWlList', + editXsjg='/api/pad/invoicing/editXsjg', } /** @@ -32,6 +34,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const getCkWlList = (params) => defHttp.get({ url: Api.getCkWlList, params }); /** * 仓库列表接口 @@ -93,4 +96,7 @@ export const saveOrUpdate = (params, isUpdate) => { */ export const editFzr = (params, isUpdate) => { return defHttp.post({ url: Api.editFzr, params }, { isTransformResponse: false }); +} +export const editXsjg = (params, isUpdate) => { + return defHttp.post({ url: Api.editXsjg, params }, { isTransformResponse: false }); } \ No newline at end of file diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts index 6b4f35e..3f44417 100644 --- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts +++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts @@ -8,7 +8,7 @@ export const columns: BasicColumn[] = [ { title: '护理单元', align: "center", - dataIndex: 'nuName' + dataIndex: 'nuId' }, { title: '单号', @@ -18,7 +18,7 @@ export const columns: BasicColumn[] = [ { title: '物料名称', align: "center", - dataIndex: 'wlId_dictText' + dataIndex: 'materialName' }, { title: '物料编码', @@ -46,6 +46,24 @@ export const columns: BasicColumn[] = [ dataIndex: 'kcsl', width: 100 }, + { + title: '采购价格', + align: "center", + dataIndex: 'procurementPrice', + width: 100 + }, + { + title: '到货价格', + align: "center", + dataIndex: 'arrivalPrice', + width: 100 + }, + { + title: '销售价格', + align: "center", + dataIndex: 'xsjg', + width: 100 + }, ]; export const columns2: BasicColumn[] = [ diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue index 17ca5ea..4dac92d 100644 --- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue +++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue @@ -5,32 +5,31 @@ - - + - + - + --> @@ -66,10 +65,10 @@ @@ -95,12 +98,13 @@ import { ref, reactive } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, superQuerySchema } from './BlWarehouseMaterialInfo.data'; -import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BlWarehouseMaterialInfo.api'; +import { getCkWlList, deleteOne, batchDelete } from './BlWarehouseMaterialInfo.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import BlWarehouseMaterialInfoModal from './components/BlWarehouseMaterialInfoModal.vue' import CheckWuliaoModal from './components/CheckWuliaoModal.vue' import DelWuliaoModal from './components/DelWuliaoModal.vue' import NuWarehouseMaterialCrkInfoListModal from '/@/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue' +import BlWarehouseXsjgModal from '/@/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgModal.vue' import { useUserStore } from '/@/store/modules/user'; import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; @@ -117,13 +121,14 @@ const registerModal = ref(); const registerAddModal = ref(); const registerDelModal = ref(); const registerCrkModal = ref(); +const xsjgModal = ref(); const userStore = useUserStore(); const { createConfirm, createMessage} = useMessage(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { title: '库房物料配置信息', - api: list, + api: getCkWlList, columns, canResize: false, useSearchForm: false, @@ -136,15 +141,6 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ return Object.assign(params, queryParam); }, }, - exportConfig: { - name: "库房物料配置信息", - url: getExportUrl, - params: queryParam, - }, - importConfig: { - url: getImportUrl, - success: handleSuccess - }, }); const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const labelCol = reactive({ @@ -158,69 +154,15 @@ const wrapperCol = reactive({ sm: 18, }); -// 高级查询配置 -const superQueryConfig = reactive(superQuerySchema); - -/** - * 高级查询事件 - */ -function handleSuperQuery(params) { - Object.keys(params).map((k) => { - queryParam[k] = params[k]; - }); - searchQuery(); -} - -/** - * 新增事件 - */ -function handleAdd() { - var params = { nuId: queryParam.nuId } - registerAddModal.value.disableSubmit = false; - registerAddModal.value.edit(params); -} -/** - * 新增事件 - */ -function handleDel() { - var params = { nuId: queryParam.nuId } - registerDelModal.value.disableSubmit = false; - registerDelModal.value.edit(params); -} - -/** - * 编辑事件 - */ -function handleEdit(record: Recordable) { - registerModal.value.disableSubmit = false; - registerModal.value.edit(record); -} - -/** - * 详情 - */ -function handleDetail(record: Recordable) { - registerModal.value.disableSubmit = true; - registerModal.value.edit(record); -} // 出入库记录 function handleCrkjl(record: Recordable) { registerCrkModal.value.disableSubmit = true; registerCrkModal.value.init(record); } -/** - * 删除事件 - */ -async function handleDelete(record) { - await deleteOne({ id: record.id }, handleSuccess); -} - -/** - * 批量删除事件 - */ -async function batchHandleDelete() { - await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); +function handleXsjg(record: Recordable) { + xsjgModal.value.disableSubmit = false; + xsjgModal.value.edit(record); } /** @@ -235,30 +177,17 @@ function handleSuccess() { */ function getTableAction(record) { return [ - // { - // label: '编辑', - // onClick: handleEdit.bind(null, record), - // auth: 'warehouseMaterialInfo:bl_warehouse_material_info:edit' - // }, - // { - // label: '详情', - // onClick: handleDetail.bind(null, record), - // }, { - label: '启用', - onClick: handleQyty.bind(null, record, 'Y'), - auth: 'warehouseMaterialInfo:bl_warehouse_material_info:edit', - ifShow: record.izEnabled == 'N' + label: '盘点', + onClick: handleCrkjl.bind(null, record), }, { - label: '停用', - onClick: handleQyty.bind(null, record, 'N'), - auth: 'warehouseMaterialInfo:bl_warehouse_material_info:edit', - ifShow: record.izEnabled == 'Y' + label: '出入库', + onClick: handleCrkjl.bind(null, record), }, { - label: '记录', - onClick: handleCrkjl.bind(null, record, '1'), + label: '销售价格', + onClick: handleXsjg.bind(null, record), }, ]; } diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.api.ts b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.api.ts index ed4bebb..0ea6460 100644 --- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.api.ts +++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.api.ts @@ -5,6 +5,7 @@ const { createConfirm } = useMessage(); enum Api { list = '/cgd/nuWarehouseMaterialCrkInfo/list', + queryCrkInfoList = '/api/pad/invoicing/queryCrkInfoList', save='/cgd/nuWarehouseMaterialCrkInfo/add', edit='/cgd/nuWarehouseMaterialCrkInfo/edit', deleteOne = '/cgd/nuWarehouseMaterialCrkInfo/delete', @@ -29,6 +30,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const queryCrkInfoList = (params) => defHttp.get({ url: Api.queryCrkInfoList, params }); /** * 删除单个 diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts index 0788791..0c1ee4e 100644 --- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts +++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts @@ -15,6 +15,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'nuId_dictText' }, + { + title: '单号', + align: "center", + dataIndex: 'ddNo' + }, { title: '物料', align: "center", @@ -25,15 +30,25 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'czqkcl' }, + { + title: '当前库存量', + align: "center", + dataIndex: 'dqkcl' + }, { title: '出入库数量', align: "center", dataIndex: 'crkNum' }, { - title: '当前库存量', + title: '挂账数量', align: "center", - dataIndex: 'dqkcl' + dataIndex: 'gzsl' + }, + { + title: '销账数量', + align: "center", + dataIndex: 'xzsl' }, { title: '出入库类型', @@ -41,10 +56,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'crkType_dictText' }, { - title: '备注', + title: '采购人', align: "center", - dataIndex: 'content' + dataIndex: 'cgBy' }, + // { + // title: '备注', + // align: "center", + // dataIndex: 'content' + // }, { title: '操作时间', align: "center", diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue index b92a4e0..7f4e831 100644 --- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue +++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue @@ -35,7 +35,7 @@ @@ -50,7 +50,7 @@ import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, superQuerySchema } from './NuWarehouseMaterialCrkInfo.data'; - import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuWarehouseMaterialCrkInfo.api'; + import { queryCrkInfoList, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuWarehouseMaterialCrkInfo.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import NuWarehouseMaterialCrkInfoModal from './components/NuWarehouseMaterialCrkInfoModal.vue' import { useUserStore } from '/@/store/modules/user'; @@ -65,7 +65,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { title: '库房物料出入库信息', - api: list, + api: queryCrkInfoList, columns, canResize:false, useSearchForm: false, @@ -79,15 +79,6 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT return Object.assign(params, queryParam); }, }, - exportConfig: { - name: "库房物料出入库信息", - url: getExportUrl, - params: queryParam, - }, - importConfig: { - url: getImportUrl, - success: handleSuccess - }, }); const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const labelCol = reactive({ @@ -101,26 +92,6 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT sm: 20, }); - // 高级查询配置 - const superQueryConfig = reactive(superQuerySchema); - - /** - * 高级查询事件 - */ - function handleSuperQuery(params) { - Object.keys(params).map((k) => { - queryParam[k] = params[k]; - }); - searchQuery(); - } - - /** - * 新增事件 - */ - function handleAdd() { - registerModal.value.disableSubmit = false; - registerModal.value.add(); - } /** * 编辑事件 @@ -145,12 +116,6 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT await deleteOne({ id: record.id }, handleSuccess); } - /** - * 批量删除事件 - */ - async function batchHandleDelete() { - await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); - } /** * 成功回调 @@ -210,8 +175,10 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT } function init(record) { + console.log("🚀 ~ init ~ record:", record) queryParam.nuId = record.nuId; queryParam.wlId = record.wlId; + queryParam.cgdId = record.cgdId; reload(); } diff --git a/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgForm.vue b/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgForm.vue new file mode 100644 index 0000000..3c447e8 --- /dev/null +++ b/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgForm.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgModal.vue b/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgModal.vue new file mode 100644 index 0000000..3167328 --- /dev/null +++ b/src/views/invoicing/warehouseMaterialInfo/components/BlWarehouseXsjgModal.vue @@ -0,0 +1,83 @@ + + + + + +