Merge branch 'main' of http://47.109.205.240:3000/Web/operation-system

src/router/index.js

@@ -540,6 +540,31 @@ export const constantRoutes = [
 
     ],
   },
+  //内容管理，没有子菜单
+  // {
+  //   path: '/content',
+  //   name: "content",
+  //   meta: {
+  //     title: "内容管理",
+  //     icon: "education",
+  //   },
+  //   component: Layout,
+  //   children: [
+  //     {
+  //       path: 'content/index',
+  //       component: () => import('@/views/content/index'),
+  //       name: 'content',
+  //       hidden: false,
+  //       meta: {
+  //         title: "内容管理",
+  //         icon: "",
+  //         noCache: false,
+  //         link: null,
+  //       },
+  //     },
+  //   ],
+  // }
+ 
 ]
 
 // 动态路由，基于用户权限动态去加载

src/views/brand/management/index.vue

@@ -124,6 +124,9 @@
         <el-form-item label="制度名称" prop="title">
           <el-input v-model="dialogForm.title" autocomplete="off" placeholder="请输入品牌名称" />
         </el-form-item>
+        <el-form-item label="制度描述" prop="descStr">
+          <el-input type="textarea" v-model="dialogForm.descStr" autocomplete="off" placeholder="请输入制度描述" />
+        </el-form-item>
         <el-form-item label="上传文件" prop="files">
           <!-- <myUploadFile v-model="dialogForm.files"></myUploadFile> -->
            <el-upload
@@ -198,6 +201,7 @@ const dialogTitle = ref("添加品牌");
 let dialogForm = reactive({
     id: "",
     title: "",
+    descStr: "",
     files:[],
 
 });
@@ -205,6 +209,9 @@ const dialogFormRules = ref({
     title:  [
         { required: true, message: "请输入品牌名称", trigger: "blur" },
     ],
+    descStr:  [
+        { required: true, message: "请输入品牌描述", trigger: "blur" },
+    ],
     files:  [
         { required: true, message: "请上传文件", trigger: "blur" },
     ],
@@ -277,6 +284,7 @@ const columns = ref([
   { prop: "id", label: "ID" },
   { prop: "title", label: "制度名称" },
   // { prop: "code", label: "品牌编码", width: "120" },
+  { prop: "descStr", label: "描述", width: "150" },
   { prop: "createTime", label: "提交时间" },
 //   { prop: "applicationNum", label: "申请数量" },
 //   { prop: "useNum", label: "使用数量" },
@@ -353,8 +361,13 @@ const onSaveCategory = async () => {
 
   //处理dialogForm.files
   dialogForm.files.forEach((item, index) => {
+    //判断item不存在存在fileName这个属性的时候，将item.name赋给item.fileName，否则不做处理
     item.fileName = item.name;
+    if (item.hasOwnProperty('response')) {
       item.fileUrl = item.response.data.url;
+    }
+    // item.fileName = item.name;
+    // item.fileUrl = item.response.data.url;
   })
   console.log('dialogForm.files',dialogForm.files);
   
@@ -456,6 +469,7 @@ const resetDlg= () => {
   Object.assign(dialogForm, {  // 保持响应性，手动清空字段
     id: "",
     title: "",
+    descStr: "",
     files: [],
     code: ""
   });

src/views/content/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div class="content">
+    待开发
+  </div>
+</template>