From 9c0a5c0d3e42526fc0baecd0019e273776d92d0d Mon Sep 17 00:00:00 2001 From: zj Date: Thu, 18 Dec 2025 10:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RuoYi-App-master/locales/zh-CN.json | 32 +- RuoYi-App-master/pages/in/bindPro.vue | 2 +- RuoYi-App-master/pages/out/ckMakeSure.vue | 4 +- RuoYi-App-master/pages/out/errorout.vue | 2 +- .../api/service/impl/ToErpServiceImpl.java | 26 +- .../api/service/impl/ToWmsServiceImpl.java | 102 +- .../bas/BasProduct/domain/BasProduct.java | 8 +- .../bas/cargoSpace/domain/BasCargoSpace.java | 212 +++ .../domain/BasContainerDetails.java | 8 +- .../bas/portrel/domain/BasProductPortRel.java | 2 +- .../CheckDifferenceRecordController.java | 2 +- .../controller/CheckStockinController.java | 2 +- .../check/stockcheck/domain/CheckStockin.java | 4 +- .../service/impl/CheckStockinServiceImpl.java | 87 +- .../domain/CheckStockinDetail.java | 4 +- .../mapper/CheckStockinDetailMapper.java | 2 + .../service/ICheckStockinDetailService.java | 2 + .../impl/CheckStockinDetailServiceImpl.java | 5 + .../domain/CheckStockinDetailFinish.java | 4 +- .../domain/CheckStockinFinish.java | 4 +- .../ruoyi/in/stockin/domain/InStockin.java | 59 +- .../stockindetail/domain/InStockinDetail.java | 6 +- .../domain/InStockinDetailFinish.java | 4 +- .../controller/InMydoJobController.java | 4 +- .../controller/OutMydoJobController.java | 2 +- .../com/ruoyi/job/mydojob/domain/MydoJob.java | 2 - .../job/mydojob/mapper/MydoJobMapper.java | 2 + .../job/mydojob/service/IMydoJobService.java | 2 + .../service/impl/MydoJobServiceImpl.java | 19 +- .../mydojobdetail/domain/MydoJobDetail.java | 6 +- .../domain/MydoJobDetailFinish.java | 4 +- .../kpi/service/impl/KpiServiceImpl.java | 6 +- .../domain/ViewHandAllotStock.java | 109 +- .../controller/OutStockoutController.java | 15 +- .../domain/OutStockoutDetail.java | 8 +- .../domain/OutStockoutDetailFinish.java | 4 +- .../out/submit/domain/OutPickSubmit.java | 4 +- .../stockin/domain/vo/ReceiveProductVo.java | 4 +- .../domain/ReceiveStockinDetail.java | 4 +- .../domain/ReceiveStockinDetailFinish.java | 4 +- .../StockSummary/domain/StockSummary.java | 8 +- .../domain/ViewFlatWarehouseInFlow.java | 2 +- .../domain/ViewFlatWarehouseOutFlow.java | 2 +- .../ViewInJobFlow/domain/ViewInJobFlow.java | 6 +- .../ViewOutJobFlow/domain/ViewOutJobFlow.java | 6 +- .../domain/ViewStockDetail.java | 8 +- .../domain/ViewStockinHistory.java | 8 +- .../domain/ViewStockoutHistory.java | 8 +- .../ruoyi/stock/stock/domain/BasStock.java | 12 +- .../stock/stock/mapper/BasStockMapper.java | 2 + .../stock/stock/service/IBasStockService.java | 2 + .../service/impl/BasStockServiceImpl.java | 5 + .../bas/cargoSpace/BasCargoSpaceMapper.xml | 37 +- .../mapper/check/CheckStockinDetailMapper.xml | 4 + .../mapper/check/CheckStockinMapper.xml | 2 +- .../resources/mapper/in/InStockinMapper.xml | 3 +- .../mapper/job/MydoJobFinishMapper.xml | 9 +- .../resources/mapper/job/MydoJobMapper.xml | 13 +- .../mapper/out/ViewHandAllotStockMapper.xml | 16 +- .../mapper/out/ViewProductAndStockMapper.xml | 15 +- .../resources/mapper/stock/BasStockMapper.xml | 4 + .../com/ruoyi/common/domain/ExtraField.java | 4 +- .../src/views/bas/BasProductCode/index.vue | 29 +- ruoyi-ui/src/views/bas/basCustomer/index.vue | 132 +- ruoyi-ui/src/views/bas/basProduct/index.vue | 30 +- .../src/views/bas/basstandPosition/index.vue | 6 +- ruoyi-ui/src/views/bas/cargoSpace/index.vue | 237 ++-- .../src/views/bas/containerDetails/index.vue | 12 +- ruoyi-ui/src/views/bas/port/index.vue | 12 +- ruoyi-ui/src/views/bas/roadway/index.vue | 150 +- ruoyi-ui/src/views/check/create/index.vue | 1242 +++++++++-------- ruoyi-ui/src/views/check/difference/index.vue | 2 +- ruoyi-ui/src/views/check/flat/index.vue | 14 +- ruoyi-ui/src/views/check/job/in/index.vue | 103 +- ruoyi-ui/src/views/check/job/out/index.vue | 218 ++- ruoyi-ui/src/views/check/stockCheck/index.vue | 78 +- ruoyi-ui/src/views/in/job/index.vue | 112 +- ruoyi-ui/src/views/in/receive/add/index.vue | 36 +- ruoyi-ui/src/views/in/receive/index.vue | 8 +- .../src/views/in/stockIn/add/index_new.vue | 135 +- ruoyi-ui/src/views/in/stockIn/index.vue | 183 +-- ruoyi-ui/src/views/job/outJobManagement.vue | 111 +- ruoyi-ui/src/views/out/addOutStockout.vue | 16 +- ruoyi-ui/src/views/out/outStockoutManage.vue | 16 +- ruoyi-ui/src/views/out/productAndStock.vue | 21 +- .../src/views/search/StockSummary/index.vue | 14 +- .../search/ViewFlatWarehouseInFlow/index.vue | 10 +- .../search/ViewFlatWarehouseOutFlow/index.vue | 10 +- .../src/views/search/ViewInJobFlow/index.vue | 6 +- .../src/views/search/ViewOutJobFlow/index.vue | 12 +- .../views/search/ViewStockDetail/index.vue | 14 +- .../views/search/ViewStockinHistory/index.vue | 20 +- .../search/ViewStockoutHistory/index.vue | 20 +- ruoyi-ui/src/views/stock/management/index.vue | 20 +- ruoyi-ui/src/views/stock/pointOut.vue | 141 +- ruoyi-ui/src/views/stock/record/index.vue | 4 +- 96 files changed, 2254 insertions(+), 1878 deletions(-) diff --git a/RuoYi-App-master/locales/zh-CN.json b/RuoYi-App-master/locales/zh-CN.json index cedb262..32f461d 100644 --- a/RuoYi-App-master/locales/zh-CN.json +++ b/RuoYi-App-master/locales/zh-CN.json @@ -124,8 +124,8 @@ "executing": "正执行", "noTasks": "暂无任务", "materialDetails": "物料详情", - "materialCode": "物料编码", - "materialName": "物料名称", + "materialCode": "品号", + "materialName": "品名", "quantity": "数量", "inboundSuccess": "入库成功", "inboundFailed": "入库失败", @@ -196,15 +196,15 @@ "subOrderInfo": "子单据信息", "warehouse": "仓库：", "orderNumber": "单据号：", - "materialCode": "物料编码：", - "materialName": "物料名称：", + "materialCode": "品号：", + "materialName": "品名：", "quantity": "数量：", "maxQuantity": "最大可输入", "noData": "暂无数据", "bind": "绑定", "cancel": "取消", "warehouseColumn": "仓库", - "materialNameColumn": "物料名称", + "materialNameColumn": "品名", "quantityColumn": "数量", "operationColumn": "操作", "unbind": "解绑", @@ -260,8 +260,8 @@ "desc": "退料入库", "rackCode": "料架条码：", "rackCodePlaceholder": "请输入或扫码输入料架条码", - "materialCode": "物料编码：", - "materialName": "物料名称：", + "materialCode": "品号：", + "materialName": "品名：", "quantity": "数量：", "quantityPlaceholder": "请输入数量", "submit": "提交", @@ -377,8 +377,8 @@ "title": "异常出库", "desc": "异常出库", "trayCodePlaceholder": "请输入或扫码输入托盘条码", - "materialCode": "物资编码", - "materialName": "物料名称", + "materialCode": "品号", + "materialName": "品名", "outQuantity": "出库数量", "pickQuantity": "拣选数量", "submit": "提交", @@ -418,15 +418,15 @@ "trayCodePlaceholder": "请输入或扫码输入托盘条码", "getTrayInfoFailed": "获取托盘信息失败", "addMaterial": "新增物料", - "materialCode": "物料编码", - "materialDesc": "物料名称", + "materialCode": "品号", + "materialDesc": "品名", "systemQuantity": "系统", "unit": "件", "clearQuantity": "清零", "confirmStocktaking": "确认盘点", "addMaterialTitle": "新增物料", - "materialCodeLabel": "物料编码", - "materialCodePlaceholder": "请输入物料编码", + "materialCodeLabel": "品号", + "materialCodePlaceholder": "请输入品号", "quantityLabel": "数量", "quantityPlaceholder": "请输入数量", "cancel": "取消", @@ -445,13 +445,13 @@ "selectWarehouse": "请选择仓库", "addMaterial": "新增物料", "noInventoryData": "暂无盘点数据", - "materialCode": "物料编码", - "materialName": "物料名称", + "materialCode": "品号", + "materialName": "品名", "inventoryQuantity": "库存数量", "countQuantity": "盘点数量", "countButton": "盘点", "addMaterialTitle": "新增物料", - "materialCodeLabel": "物料编码", + "materialCodeLabel": "品号", "quantityLabel": "数量", "cancel": "取消", "confirm": "确定", diff --git a/RuoYi-App-master/pages/in/bindPro.vue b/RuoYi-App-master/pages/in/bindPro.vue index c938136..9fd0376 100644 --- a/RuoYi-App-master/pages/in/bindPro.vue +++ b/RuoYi-App-master/pages/in/bindPro.vue @@ -18,7 +18,7 @@ - 物料名称： + 品名： {{productInfo.name}}
-
+
MODEL: {{ previewData.model }}
-
+
SERIAL: {{ previewData.serial }}
-
+
COLOR: {{ previewData.color }}
-
+
V: {{ previewData.v }} @@ -143,7 +143,7 @@ {{ previewData.ph }}
-
+
N.W.: {{ previewData.nW }} @@ -256,19 +256,19 @@ >
- + - + - + - + - + @@ -29,50 +32,62 @@ - 新增 + 新增 + - 修改 + 修改 + - 删除 + 删除 + - 导出 + 导出 + - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -89,13 +104,13 @@ - + - + - + @@ -108,49 +123,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
@@ -162,11 +177,11 @@ + diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 1d8df4b..65830f6 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -1,21 +1,88 @@ - - - - - - + + }, + created() { + this.getWarehouseOptions(); + }, + methods: { + /** 获取仓库选项 */ + getWarehouseOptions() { + var param = { + pageNum: 1, + pageSize: 99, + typeData: ['1', '2'] + } + listWarehouse(param).then(response => { + this.warehouseOptions = response.rows; + }); + }, + /** 打开选择物资弹窗 */ + handleSelectMaterials() { + // if (!this.formData.warehouseId) { + // this.$modal.msgError('请选择仓库'); + // return; + // } + if (!this.formData.checkType) { + this.$modal.msgError('请选择单据类型'); + return; + } + if (this.formData.checkType === '1') { + this.materialDialogByProduct = true; + // 设置查询参数中的仓库ID为主表选择的仓库 + this.queryParams.warehouseId = "01"; + this.getMaterialList(); + } else if (this.formData.checkType === '2') { + this.materialDialogByTrayCode = true; + // 设置查询参数中的仓库ID为主表选择的仓库 + this.queryParams.warehouseId = "01"; + this.getMaterialByTrayCodeList(); + } + }, + /** 获取物资列表 */ + getMaterialList() { + this.materialLoading = true; + if (this.formData.checkType === '1') { + listProductAndStockPd(this.queryParams).then(response => { + this.materialOptions = response.rows; + this.total = response.total; + this.materialLoading = false; + }); + } + }, + /* 获取托盘物资列表*/ + getMaterialByTrayCodeList() { + this.trayLoading = true; + if (this.formData.checkType === '2') { + this.trayQueryParams.warehouseId = "01"; + this.trayQueryParams.status = 2; + this.trayQueryParams.locked = 'N'; + + listCargoSpaceByRoadway(this.trayQueryParams).then(response => { + this.trayOptions = response.rows; + this.trayTotal = response.total; + this.trayLoading = false; + }); + } + }, + /** 物资选择变更 */ + handleSelectionChange(selection) { + this.selectedMaterials = selection; + }, + /** 托盘选择变更 */ + handleTraySelectionChange(selection) { + this.selectedTrays = selection; + }, + /** 托盘行点击事件 */ + handleRowClick(row) { + if (this.formData.checkType === '2' && row.trayCode) { + const params = { + pageNum: 1, + pageSize: 10, + trayCode: row.trayCode, + warehouseId: this.formData.warehouseId + }; + listManagement(params).then(response => { + this.trayDetailList = response.rows; + this.trayDetailVisible = true; + }); + } + }, + /** 确认选择物资 */ + confirmSelectMaterials() { + if (this.formData.checkType === '1') { + this.confirmSelectMaterialsByProduct(); + } else if (this.formData.checkType === '2') { + this.confirmSelectMaterialsByTray(); + } + }, + /** 确认选择物料物资 */ + confirmSelectMaterialsByProduct() { + if (this.selectedMaterials.length === 0) { + this.$modal.msgError('请选择物资'); + return; + } + // 过滤掉已经存在的物资 + const newMaterials = this.selectedMaterials.filter(item => { + return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity); + }); + + if (newMaterials.length === 0) { + this.$modal.msgWarning('选择的物资已存在'); + return; + } + + this.materialList = this.materialList.concat( + newMaterials.map(item => ({ + productId: item.productId, + productGuId: item.productGuid, + productName: item.productName, + quantity: item.quantity, + lotNo: item.lotNo, + onlyIdentity: item.onlyIdentity, + warehouseId: item.warehouseId, + cargoSpaceId: item.cargoSpaceId, + cargoSpaceName: item.cargoSpaceName, + spec: item.spare1, + // spare3: item.spare3, + spare1: item.spare4, + spare3: item.spare5, + spare4: item.spare6, + spare5: item.voltage, + spare6: item.power, + spare7: item.phase, + spare2: item.netWeight, + spare8: item.grossWeight, + spare9: item.distribution, + unit: item.model, + orderId: item.orderId + })) + ); + this.materialDialogByProduct = false; + this.selectedMaterials = []; + }, + /** 确认选择托盘物资 */ + confirmSelectMaterialsByTray() { + if (this.selectedTrays.length === 0) { + this.$modal.msgError('请选择托盘'); + return; + } + // 过滤掉已经存在的托盘 + const newTrays = this.selectedTrays.filter(item => { + return !this.materialList.some(existing => existing.trayCode === item.trayCode); + }); + + if (newTrays.length === 0) { + this.$modal.msgWarning('选择的托盘已存在'); + return; + } + + this.materialList = this.materialList.concat( + newTrays.map(item => ({ + productId: item.productId, + productGuId: item.productGuid, + productName: item.productName, + quantity: item.quantity, + lotNo: item.lotNo, + trayCode: item.trayCode, + warehouseId: item.warehouseId, + cargoSpaceId: item.cargoSpaceId, + cargoSpaceName: item.cargoSpaceName, + spec: item.spare1, + spare1: item.spare4, + spare3: item.spare5, + spare4: item.spare6, + spare5: item.voltage, + spare6: item.power, + spare7: item.phase, + spare2: item.netWeight, + spare8: item.grossWeight, + spare9: item.distribution, + unit: item.model, + // orderId: item.orderId + })) + ); + this.materialDialogByTrayCode = false; + this.selectedTrays = []; + }, + /** 取消选择物资 */ + cancelSelectMaterials() { + if (this.formData.checkType === '1') { + this.cancelSelectMaterialsByProduct(); + } else if (this.formData.checkType === '2') { + this.cancelSelectMaterialsByTray(); + } + }, + /** 取消选择物料物资 */ + cancelSelectMaterialsByProduct() { + this.selectedMaterials = []; + this.materialDialogByProduct = false; + }, + /** 取消选择托盘物资 */ + cancelSelectMaterialsByTray() { + this.selectedTrays = []; + this.materialDialogByTrayCode = false; + }, + /** 物资搜索按钮操作 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getMaterialList(); + }, + /** 物资重置按钮操作 */ + resetQuery() { + this.resetForm("queryForm"); + this.handleQuery(); + }, + /** 托盘搜索按钮操作 */ + handleTrayQuery() { + this.trayQueryParams.pageNum = 1; + this.getMaterialByTrayCodeList(); + }, + /** 托盘重置按钮操作 */ + resetTrayQuery() { + this.resetForm("trayQueryForm"); + this.handleTrayQuery(); + }, + /** 重置重置按钮操作 */ + resetPdRecordButton() { + resetPdRecord().then(response => { + this.$modal.msgSuccess('重置成功'); + this.handleQuery(); + }) + }, + /** 删除物资 */ + handleDelete(index) { + this.materialList.splice(index, 1); + }, + /** 保存单据 */ + handleSave() { + this.$refs.formRef.validate(valid => { + if (valid) { + if (this.materialList.length === 0) { + this.$modal.msgError('请选择物资'); + return; + } + const data = { + checkStockin: this.formData, + detailList: this.materialList + }; + console.log(data) + // 这里需要调用保存接口 + saveCheckStock(data).then(response => { + + this.$modal.msgSuccess('保存成功：' + response.msg); + this.$tab.refreshPage(this.$route); + // this.reset(); + }); + } + }); + }, + /** 单据类型变更处理 */ + handleCheckTypeChange(value) { + if (this.materialList.length > 0) { + this.$modal.msgWarning('已添加物资，不能更改单据类型'); + this.$nextTick(() => { + this.formData.checkType = this.oldCheckType; + }); + return; + } + this.oldCheckType = value; + }, + /** 重置数据 */ + reset() { + this.formData = { + warehouseId: null, + customerNo: null, + outType: null + }; + this.materialList = []; + }, + /** 重新建单 */ + handleReload() { + this.$tab.refreshPage(this.$route); + }, + } +}; + diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue index 34d7f01..5036b0a 100644 --- a/ruoyi-ui/src/views/out/addOutStockout.vue +++ b/ruoyi-ui/src/views/out/addOutStockout.vue @@ -45,8 +45,8 @@ - - + + @@ -79,18 +79,18 @@ - + - + @@ -132,9 +132,9 @@ - + - + diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index dd1c77e..4ab3165 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -21,7 +21,7 @@ - + - + @@ -168,8 +168,8 @@ - - + + @@ -275,8 +275,8 @@ - - + + @@ -380,7 +380,7 @@ export default { productName: null, startDate: null, finishDate: null, - status: '1' + status: null }, // 子表分页参数 detailQueryParams: { diff --git a/ruoyi-ui/src/views/out/productAndStock.vue b/ruoyi-ui/src/views/out/productAndStock.vue index 7e917d1..dd776cc 100644 --- a/ruoyi-ui/src/views/out/productAndStock.vue +++ b/ruoyi-ui/src/views/out/productAndStock.vue @@ -9,10 +9,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -25,22 +25,15 @@ @keyup.enter.native="handleQuery" /> - + - + {{'搜索'}} 重置 @@ -63,9 +56,9 @@ - + - + diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue index 8417993..ac95b92 100644 --- a/ruoyi-ui/src/views/search/StockSummary/index.vue +++ b/ruoyi-ui/src/views/search/StockSummary/index.vue @@ -5,7 +5,7 @@ 订单号 物料编号 - 物料名称 + 品名 批号 @@ -83,18 +83,18 @@ @keyup.enter.native="handleQuery" /> - + - + @@ -143,8 +143,8 @@ > - - + + diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue index 258218d..dad155b 100644 --- a/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue @@ -67,10 +67,10 @@ - + @@ -166,7 +166,7 @@ - + @@ -226,8 +226,8 @@ - - + + diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue index d00c9c0..bb47186 100644 --- a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue @@ -19,10 +19,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -52,7 +52,7 @@ - + @@ -105,8 +105,8 @@ - - + + diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue index 99ff118..33f7ee4 100644 --- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue @@ -223,10 +223,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -659,7 +659,7 @@ - + diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue index 3d51d1e..fb9391e 100644 --- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue @@ -231,18 +231,18 @@ @keyup.enter.native="handleQuery" /> - + - + @@ -679,8 +679,8 @@ - - + + diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue index cf9b361..a6e4e91 100644 --- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue @@ -37,18 +37,18 @@ /> --> - + - + @@ -139,7 +139,7 @@ - + @@ -294,8 +294,8 @@ - - + + diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue index 8894feb..d7f6313 100644 --- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue @@ -255,10 +255,10 @@ - + @@ -359,10 +359,10 @@ - + @@ -706,8 +706,8 @@ - - + + @@ -933,8 +933,8 @@ - - + + @@ -972,8 +972,8 @@ - - + + diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue index a420706..b4b685b 100644 --- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue @@ -141,10 +141,10 @@ - + @@ -245,10 +245,10 @@ - + @@ -582,8 +582,8 @@ - - + + @@ -739,8 +739,8 @@ - - + + @@ -778,8 +778,8 @@ - - + + diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue index e08cf78..2351eff 100644 --- a/ruoyi-ui/src/views/stock/management/index.vue +++ b/ruoyi-ui/src/views/stock/management/index.vue @@ -46,10 +46,10 @@ --> - + @@ -107,8 +107,8 @@ - - + + @@ -222,18 +222,18 @@ - + - + @@ -250,8 +250,8 @@ @row-click="handleProductRowClick" highlight-current-row max-height="400"> - - + + diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue index 05ade45..eec4256 100644 --- a/ruoyi-ui/src/views/stock/pointOut.vue +++ b/ruoyi-ui/src/views/stock/pointOut.vue @@ -1,33 +1,7 @@