修bug

ruoyi-admin-vue/src/views/inventory/locations/index.vue

@@ -213,7 +213,8 @@
                   </div>
                 </el-col>
                 <el-col :span="6">
-                  <div><strong>允许混放批次：</strong>{{ scope.row.allowMixedBatches || '-' }}</div>
+                  <div><strong>允许混放批次：</strong>
+                    <dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedBatches"/></div>
                 </el-col>
                 <el-col :span="6">
                   <div><strong>拣货区：</strong>{{ scope.row.pickingArea || '-' }}</div>
@@ -251,7 +252,11 @@
               <dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedProducts"/>
             </template>
           </el-table-column>
-          <el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" width="120" />
+          <el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" width="120" >
+             <template slot-scope="scope">
+              <dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedBatches"/>
+            </template>
+          </el-table-column>
           <el-table-column label="上架顺序" align="center" prop="putawayOrder" width="100" />
           <el-table-column label="拣货顺序" align="center" prop="pickingOrder" width="100" />
           
@@ -301,7 +306,7 @@
           <el-table-column label="温区" align="center" prop="temperatureZone" width="100" />
           <el-table-column label="应用状态" align="center" prop="isEnabled" width="100">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isEnabled"/>
+              <dict-tag :options="dict.type.is_enabled" :value="scope.row.isEnabled"/>
             </template>
           </el-table-column>
           <el-table-column label="排序" align="center" prop="sortNo" width="80" />
@@ -621,7 +626,7 @@ import { listMaterials } from "@/api/inventory/materials"
 export default {
   name: "Locations",
   components: { materialsSeletor, WarehouseSelector, ImportExcel },
-  dicts: ['sys_normal_disable', 'location_type', 'location_usage', 'yorn'],
+  dicts: ['sys_normal_disable', 'location_type', 'location_usage', 'yorn','is_enabled'],
   data() {
     return {
       loading: true,

ruoyi-admin-vue/src/views/inventory/owners/index.vue

@@ -79,7 +79,15 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-      
+        <!-- 新增英文名称查询项 -->
+        <el-form-item label="英文名称" prop="englishName">
+          <el-input
+            v-model="queryParams.englishName"
+            placeholder="请输入英文名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="税号" prop="taxNumber">
           <el-input
             v-model="queryParams.taxNumber"
@@ -111,6 +119,8 @@
           <el-table-column type="selection" width="55" align="center" fixed />
           <el-table-column label="货主编码" align="center" prop="ownerCode" width="120" fixed/>
           <el-table-column label="货主名称" align="center" prop="ownerName"width="220" />
+          <!-- 新增英文名称表格列 -->
+          <el-table-column label="英文名称" align="center" prop="englishName"width="220" />
           <el-table-column label="货主类型" align="center" prop="ownerType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.owner_type" :value="scope.row.ownerType"/>
@@ -178,6 +188,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 新增英文名称表单项 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="英文名称" prop="englishName">
+              <el-input v-model="form.englishName" placeholder="请输入英文名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="联系人" prop="contactPerson">
@@ -294,6 +312,7 @@ export default {
         pageSize: 10,
         ownerCode: null,
         ownerName: null,
+        englishName: null, // 新增英文名称查询参数
         ownerType: null,
         contactPerson: null,
         contactPhone: null,
@@ -316,6 +335,9 @@ export default {
         ownerName: [
           { required: true, message: '货主名称不能为空', trigger: 'blur' }
         ],
+        englishName: [ // 新增英文名称校验规则（非必填，可根据需求调整）
+          { required: false, message: '英文名称不能为空', trigger: 'blur' }
+        ],
         contactPerson: [
           { required: true, message: '联系人不能为空', trigger: 'blur' }
         ],
@@ -362,6 +384,7 @@ export default {
         id: null,
         ownerCode: null,
         ownerName: null,
+        englishName: null, // 新增英文名称表单重置
         ownerType: null,
         contactPerson: null,
         contactPhone: null,
@@ -390,6 +413,7 @@ export default {
         pageSize: 10,
         ownerCode: null,
         ownerName: null,
+        englishName: null, // 新增英文名称查询参数重置
         ownerType: null,
         contactPerson: null,
         contactPhone: null,

ruoyi-inventory/src/main/java/com/ruoyi/inventory/controller/OutboundOrdersController.java

@@ -148,7 +148,7 @@ public class OutboundOrdersController extends BaseController
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response)
     {
-        ExcelUtil<InboundTemplateVO> util = new ExcelUtil<InboundTemplateVO>(InboundTemplateVO.class);
+        ExcelUtil<OutboundTemplateVO> util = new ExcelUtil<OutboundTemplateVO>(OutboundTemplateVO.class);
         util.importTemplateExcel(response, "入库单及入库物料明细信息");
     }
 

ruoyi-inventory/src/main/java/com/ruoyi/inventory/controller/StorageLocationsController.java

@@ -146,6 +146,6 @@ public class StorageLocationsController extends BaseController
     public void importTemplate(HttpServletResponse response)
     {
         ExcelUtil<StorageLocationsLocationTemplateVO> util = new ExcelUtil<StorageLocationsLocationTemplateVO>(StorageLocationsLocationTemplateVO.class);
-        util.importTemplateExcel(response, "货主数据");
+        util.importTemplateExcel(response, "库位数据");
     }
 }