Merge remote-tracking branch 'origin/master'

src/api/company/logisticsCompany/types.ts

@@ -4,6 +4,11 @@ export interface LogisticsCompanyVO {
    */
   id: string | number;
 
+  /**
+   * 物流公司编号
+   */
+  logisticsNo: string;
+
   /**
    * 物流公司编码
    */
@@ -41,6 +46,11 @@ export interface LogisticsCompanyForm extends BaseEntity {
    */
   id?: string | number;
 
+  /**
+   * 物流公司编号
+   */
+  logisticsNo?: string;
+
   /**
    * 物流公司编码
    */
@@ -73,6 +83,10 @@ export interface LogisticsCompanyForm extends BaseEntity {
 }
 
 export interface LogisticsCompanyQuery extends PageQuery {
+  /**
+   * 物流公司编号
+   */
+  logisticsNo?: string;
   /**
    * 物流公司编码
    */

src/views/company/comPost/index.vue

@@ -3,7 +3,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="20"><span>岗位设定信息列表</span> </el-col>
+          <el-col :span="22"><span>岗位设定信息列表</span> </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:comPost:add']">新增</el-button>
           </el-col>

src/views/company/logisticsCompany/index.vue

@@ -12,9 +12,10 @@
 
       <el-table v-loading="loading" border :data="logisticsCompanyList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="物流公司编码" align="center" prop="logisticsCode" />
-        <el-table-column label="物流公司名称" align="center" prop="logisticsName" />
-        <el-table-column label="物流公司描述" align="center" prop="logisticsDescription" />
+        <el-table-column label="编号" align="center" prop="logisticsNo" />
+        <el-table-column label="公司名称" align="center" prop="logisticsName" />
+        <el-table-column label="公司编码" align="center" prop="logisticsCode" />
+        <el-table-column label="描述" align="center" prop="logisticsDescription" />
         <el-table-column label="是否显示" align="center" prop="isShow">
           <template #default="scope">
             <el-switch v-model="scope.row.isShow" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -33,10 +34,13 @@
     <!-- 添加或修改物流公司对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
       <el-form ref="logisticsCompanyFormRef" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="物流公司名称" prop="logisticsName">
+        <el-form-item label="公司名称" prop="logisticsName">
           <el-input v-model="form.logisticsName" placeholder="请输入物流公司名称" />
         </el-form-item>
-        <el-form-item label="物流公司描述" prop="logisticsDescription">
+        <el-form-item label="公司编码" prop="logisticsCode">
+          <el-input v-model="form.logisticsCode" placeholder="请输入物流公司编码" />
+        </el-form-item>
+        <el-form-item label="描述" prop="logisticsDescription">
           <el-input v-model="form.logisticsDescription" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="是否显示" prop="isShow">
@@ -88,6 +92,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: LogisticsCompanyForm = {
   id: undefined,
+  logisticsNo: undefined,
   logisticsCode: undefined,
   logisticsName: undefined,
   logisticsDescription: undefined,

src/views/file/info/index.vue

@@ -339,9 +339,9 @@
         </el-form-item>
 
         <!-- 分类编码 -->
-        <el-form-item label="分类编码" prop="code" required>
+        <!-- <el-form-item label="分类编码" prop="code" required>
           <el-input v-model="categoryForm.code" placeholder="请输入分类编码（英文大写）" />
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- 父级分类 -->
         <el-form-item label="父级分类" prop="parentId">
@@ -362,7 +362,7 @@
         </el-form-item>
 
         <!-- 分类类型 -->
-        <el-form-item label="分类类型" prop="type" required>
+        <!-- <el-form-item label="分类类型" prop="type" required>
           <el-select v-model="categoryForm.type" placeholder="请选择分类类型" style="width: 100%">
             <el-option label="图片文件" :value="1" />
             <el-option label="视频文件" :value="2" />
@@ -370,7 +370,7 @@
             <el-option label="文档文件" :value="4" />
             <el-option label="其他文件" :value="5" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- 排序 -->
         <el-form-item label="排序" prop="sort">
@@ -378,9 +378,9 @@
         </el-form-item>
 
         <!-- 描述 -->
-        <el-form-item label="描述" prop="description">
+        <!-- <el-form-item label="描述" prop="description">
           <el-input v-model="categoryForm.description" type="textarea" :rows="3" placeholder="请输入分类描述（可选）" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
 
       <template #footer>
@@ -2158,14 +2158,15 @@ const filteredTopCategories = computed(() => {
 
 // 根据当前顶级分类过滤子分类
 const filteredCategoryTree = computed(() => {
-  console.log('filteredCategoryTree computed - currentTopCategory:', currentTopCategory.value);
-  console.log('filteredCategoryTree computed - categoryTree:', categoryTree.value);
-
   if (!currentTopCategory.value || !categoryTree.value || categoryTree.value.length === 0) {
-    console.log('filteredCategoryTree computed - returning empty array');
     return [];
   }
 
+  // 如果没有选择顶级分类（全部文件），显示所有分类
+  // if (!currentTopCategory.value) {
+  //   return categoryTree.value;
+  // }
+
   // 从树形结构中获取当前顶级分类的子分类
   const getSubCategories = (parentId) => {
     // 在顶级分类中查找对应的分类
@@ -2200,9 +2201,10 @@ const uploadCategoryOptions = computed(() => {
 
 // 上传对话框中的树形分类数据（仅允许选择叶子节点：非叶子设置为 disabled）
 const uploadCategoryTree = computed(() => {
-  if (!currentTopCategory.value || !categoryTree.value || categoryTree.value.length === 0) {
+  if (!categoryTree.value || categoryTree.value.length === 0) {
     return [];
   }
+
   const mapWithDisabled = (nodes) => {
     if (!Array.isArray(nodes)) return [];
     return nodes.map((node) => {
@@ -2215,6 +2217,13 @@ const uploadCategoryTree = computed(() => {
       };
     });
   };
+
+  // 如果没有选择顶级分类（全部文件），显示所有分类
+  if (!currentTopCategory.value) {
+    return mapWithDisabled(categoryTree.value);
+  }
+
+  // 如果选择了顶级分类，只显示该分类下的子分类
   const parentCategory = categoryTree.value.find((category) => category.id === currentTopCategory.value.id);
   const children = parentCategory && Array.isArray(parentCategory.children) ? parentCategory.children : [];
   return mapWithDisabled(children);