出库模块国际化

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:'取消',
 

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();
           });

ruoyi-ui/src/views/out/exception/index.vue

@@ -1,329 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库id" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存id" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入库存id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="托盘" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料id" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用1" prop="spare1">
-        <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入备用1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用2" prop="spare2">
-        <el-input
-          v-model="queryParams.spare2"
-          placeholder="请输入备用2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用3" prop="spare3">
-        <el-input
-          v-model="queryParams.spare3"
-          placeholder="请输入备用3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['out:exception:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['out:exception:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['out:exception:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['out:exception:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="exceptionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="出库异常id" align="left" prop="outGuid" />
-      <el-table-column label="仓库id" align="left" prop="warehouseId" />
-      <el-table-column label="库存id" align="left" prop="stockId" />
-      <el-table-column label="托盘" align="left" prop="trayCode" />
-      <el-table-column label="物料id" align="left" prop="productId" />
-      <el-table-column label="备用1" align="left" prop="spare1" />
-      <el-table-column label="备用2" align="left" prop="spare2" />
-      <el-table-column label="备用3" align="left" prop="spare3" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['out:exception:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['out:exception:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改出库异常对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="仓库id" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
-        </el-form-item>
-        <el-form-item label="库存id" prop="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存id" />
-        </el-form-item>
-        <el-form-item label="托盘" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘" />
-        </el-form-item>
-        <el-form-item label="物料id" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料id" />
-        </el-form-item>
-        <el-form-item label="备用1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入备用1" />
-        </el-form-item>
-        <el-form-item label="备用2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="请输入备用2" />
-        </el-form-item>
-        <el-form-item label="备用3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="请输入备用3" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listException, getException, delException, addException, updateException } from "@/api/out/exception"
-
-export default {
-  name: "Exception",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 出库异常表格数据
-      exceptionList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        warehouseId: null,
-        stockId: null,
-        trayCode: null,
-        productId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询出库异常列表 */
-    getList() {
-      this.loading = true
-      listException(this.queryParams).then(response => {
-        this.exceptionList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        outGuid: null,
-        warehouseId: null,
-        stockId: null,
-        trayCode: null,
-        productId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null
-      }
-      this.resetForm("form")
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.outGuid)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加出库异常"
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const outGuid = row.outGuid || this.ids
-      getException(outGuid).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改出库异常"
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.outGuid != null) {
-            updateException(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addException(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const outGuids = row.outGuid || this.ids
-      this.$modal.confirm('是否确认删除出库异常编号为"' + outGuids + '"的数据项？').then(function() {
-        return delException(outGuids)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('out/exception/export', {
-        ...this.queryParams
-      }, `exception_${new Date().getTime()}.xlsx`)
-    }
-  }
-}
-</script>

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -30,14 +30,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="客户编码" prop="customerNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.customerNo"-->
-<!--          placeholder="请输入客户编码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item :label="$t('outStockoutManage.customerName')" prop="customerName">
         <el-input
           v-model="queryParams.inputCustomerName"
@@ -251,7 +243,7 @@ export default {
       // 审核表单验证规则
       auditRules: {
         exitId: [
-          { required: true, message: '请选择出口', trigger: 'change' }
+          { required: true, message: this.$t('outStockoutManage.pleaseSelectExit'), trigger: 'change' }
         ]
       },
       // 出口选项
@@ -361,13 +353,13 @@ export default {
     /** 单据状态修改按钮操作 */
     handleAudit(status) {
       if (this.selectedRows.length === 0) {
-        this.$modal.msgError("请选择至少一条数据")
+        this.$modal.msgError(this.$t('outStockoutManage.pleaseSelectData'))
         return
       }
 
      for(var i=0;i<this.selectedRows.length;i++){
        if (this.selectedRows[i].status != "1" && status == "2") {
-        this.$modal.msgError(this.selectedRows[i].stockoutId+"单据已审核，请勿重复审核")
+        this.$modal.msgError(this.selectedRows[i].stockoutId+this.$t('outStockoutManage.alreadyAudited'))
         return
       }
 
@@ -376,7 +368,7 @@ export default {
       //   return
       // }
        if (this.selectedRows[i].status != "1" && status == "5"){
-         this.$modal.msgError(this.selectedRows[i].stockoutId+"单据已审核，无法作废")
+         this.$modal.msgError(this.selectedRows[i].stockoutId+this.$t('outStockoutManage.alreadyCancelFail'))
          return;
        }
      }
@@ -408,18 +400,17 @@ export default {
     /** 自动分配按钮操作 */
     handleAutoAllot() {
       if (this.selectedRows.length === 0) {
-        this.$modal.msgError("请选择一条数据")
+        this.$modal.msgError(this.$t('outStockoutManage.pleaseSelectData'))
         return
       }
       if (this.selectedRows.length > 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} 没有配置出口选项，已设置为空数组`)
           }
         }