diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 50fa9eb..4c55ada 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -232,7 +232,11 @@ export default { reset: '重置', saveDocument: '保存单据', selectMaterial: '选择物资', + selectMaterials: '请选择物资', + selectExistsMaterials: '所选物资已存在,请重新选择', + error1: '数量不能大于库存数量', recreateDocument: '重新建单', + operaSuccess: '操作成功', materialCode: '物资编号', materialName: '物资名称', batchNo: '批号', @@ -291,6 +295,12 @@ export default { auditTitle:'单据审核', selectExit:'出口', pleaseSelectExit:'请选择出口', + pleaseSelectData:'请选择至少一条数据', + alreadyAudited:'单据已审核,请勿重复审核', + alreadyCancelFail:'单据已审核,无法作废', + onlyOneCanAutoAllocation:'请选择一条数据', + auditStockOut:'"请选择审核状态为审核通过单据"', + alreadyAuditStockOut:'"单据已审核"', confirmExit:'提交', cancelExit:'取消', diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue index 637eb80..4f5a797 100644 --- a/ruoyi-ui/src/views/out/addOutStockout.vue +++ b/ruoyi-ui/src/views/out/addOutStockout.vue @@ -184,7 +184,7 @@ export default { /** 打开选择物资弹窗 */ handleSelectMaterials() { if (!this.formData.warehouseId) { - this.$modal.msgError("请先选择仓库"); + this.$modal.msgError(this.$t('addOutStockout.selectWarehouse')); return; } this.materialDialog = true; @@ -207,7 +207,7 @@ export default { /** 确认选择物资 */ confirmSelectMaterials() { if (this.selectedMaterials.length === 0) { - this.$modal.msgError("请选择物资"); + this.$modal.msgError(this.$t('addOutStockout.selectMaterials')); return; } // 过滤掉已经存在的物资 @@ -216,7 +216,7 @@ export default { }); if (newMaterials.length === 0) { - this.$modal.msgWarning("所选物资已存在,请重新选择"); + this.$modal.msgWarning(this.$t('addOutStockout.selectExistsMaterials')); return; } @@ -258,7 +258,7 @@ export default { // 如果修改后的数量大于初始数量,给出提示并重置为当前值 if (row.quantity > row.quantityOrignal) { - this.$modal.msgError("数量不能大于库存数量"); + this.$modal.msgError(this.$t('addOutStockout.error1')); row.quantity = row.quantityOrignal; } }, @@ -267,7 +267,7 @@ export default { this.$refs.formRef.validate(valid => { if (valid) { if (this.materialList.length === 0) { - this.$modal.msgError("请选择物资"); + this.$modal.msgError(this.$t('addOutStockout.selectMaterials')); return; } const data = { @@ -277,7 +277,7 @@ export default { // 这里需要调用保存接口 saveOutStock(data).then(response => { console.log(response) - this.$modal.msgSuccess("单据"+response.msg+"保存成功"); + this.$modal.msgSuccess(this.$t('addOutStockout.operaSuccess')+":"+response.msg); this.$tab.refreshPage(this.$route); // this.reset(); }); diff --git a/ruoyi-ui/src/views/out/exception/index.vue b/ruoyi-ui/src/views/out/exception/index.vue deleted file mode 100644 index e7e888d..0000000 --- a/ruoyi-ui/src/views/out/exception/index.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index 398ed8e..6235635 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -30,14 +30,6 @@ /> - - - - - - - - 1) { - this.$modal.msgError("请选择一条数据") + this.$modal.msgError(this.$t('outStockoutManage.onlyOneCanAutoAllocation')) return } const stockoutIds = this.selectedRows.map(row => row.stockoutId) - console.log("自动分配:", stockoutIds) let outstock = this.selectedRows[0] if (outstock.status !== "2") { - this.$modal.msgError("请选择审核状态为审核通过单据") + this.$modal.msgError(this.$t('outStockoutManage.auditStockOut')) return } let data = { @@ -437,17 +428,15 @@ export default { /** 手动分配按钮操作 */ handleManualAllot() { if (this.selectedRows.length === 0) { - this.$modal.msgError("请选择至少一条数据") + this.$modal.msgError(this.$t('outStockoutManage.pleaseSelectData')) return } const stockoutIds = this.selectedRows.map(row => row.stockoutId) let outstock = this.selectedRows[0] if (outstock.status !== "1") { - this.$modal.msgError("单据已审核") + this.$modal.msgError(this.$t('outStockoutManage.alreadyAuditStockOut')) return } - // TODO: 调用手动分配接口 - console.log("手动分配:", stockoutIds) }, /** 提交审核 */ @@ -460,7 +449,7 @@ export default { newStatus: this.currentAuditStatus, exitId: this.auditForm.exitId } - console.log("单据状态修改(含出口信息):", params) + // console.log("单据状态修改(含出口信息):", params) //调用单据状态改变接口 updateOutStockStatus(params).then(response => { @@ -489,12 +478,12 @@ export default { .filter(id => id !== null && id !== undefined && id !== '') )] - console.log("仓库ID集合:", warehouseIds) + //console.log("仓库ID集合:", warehouseIds) // 如果没有有效的仓库ID,清空出口选项 if (warehouseIds.length === 0) { this.exitOptions = [] - console.warn('没有找到有效的仓库ID,已清空出口选项') + //console.warn('没有找到有效的仓库ID,已清空出口选项') return } @@ -505,7 +494,7 @@ export default { // 如果没有对应key的默认为空数组,并给出提示 if (!this.allExitOptions[warehouseId]) { - console.warn(`仓库ID ${warehouseId} 没有配置出口选项,已设置为空数组`) + //console.warn(`仓库ID ${warehouseId} 没有配置出口选项,已设置为空数组`) } }