修改

src/views/system/baseDiet/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="饮食建议名称" prop="dietName">
         <el-input
           v-model="queryParams.dietName"
@@ -58,8 +65,16 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
@@ -72,7 +87,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:baseDiet:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -83,7 +99,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:baseDiet:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -94,9 +111,10 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:baseDiet:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -104,22 +122,64 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:baseDiet:export']"
-        >导出</el-button>
+          >导出</el-button
-      </el-col>
+        >
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="baseDietList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="baseDietList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="饮食建议名称" align="center" prop="dietName" />
-      <el-table-column label="饮食原则" align="center" prop="dietPrinciple" />
+      <el-table-column
-      <el-table-column label="主食推荐" align="center" prop="mainFood" />
+        label="饮食原则"
-      <el-table-column label="蔬菜推荐" align="center" prop="vegetable" />
+        align="center"
-      <el-table-column label="水果推荐" align="center" prop="fruit" />
+        prop="dietPrinciple"
-      <el-table-column label="肉类推荐" align="center" prop="meat" />
+        :show-overflow-tooltip="true"
-      <el-table-column label="饮食说明" align="center" prop="dietRemark" />
+      />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="主食推荐"
+        align="center"
+        prop="mainFood"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="蔬菜推荐"
+        align="center"
+        prop="vegetable"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="水果推荐"
+        align="center"
+        prop="fruit"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="肉类推荐"
+        align="center"
+        prop="meat"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="饮食说明"
+        align="center"
+        prop="dietRemark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -127,20 +187,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:baseDiet:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:baseDiet:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -148,28 +210,75 @@
     />
 
     <!-- 添加或修改饮食知识库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="饮食建议名称" prop="dietName">
-          <el-input v-model="form.dietName" placeholder="请输入饮食建议名称" />
+          <el-input
+            v-model="form.dietName"
+            placeholder="请输入饮食建议名称"
+            maxlength="100"
+            style="width: 205px"
+          />
         </el-form-item>
         <el-form-item label="饮食原则" prop="dietPrinciple">
-          <el-input v-model="form.dietPrinciple" placeholder="请输入饮食原则" />
+          <el-input
+            v-model="form.dietPrinciple"
+            placeholder="请输入饮食原则"
+            type="textarea"
+            style="width: 500px"
+            maxlength="300"
+          />
         </el-form-item>
         <el-form-item label="主食推荐" prop="mainFood">
-          <el-input v-model="form.mainFood" placeholder="请输入主食推荐" />
+          <el-input
+            type="textarea"
+            v-model="form.mainFood"
+            placeholder="请输入主食推荐"
+            maxlength="300"
+            style="width: 500px"
+          />
         </el-form-item>
         <el-form-item label="蔬菜推荐" prop="vegetable">
-          <el-input v-model="form.vegetable" placeholder="请输入蔬菜推荐" />
+          <el-input
+            v-model="form.vegetable"
+            type="textarea"
+            style="width: 500px"
+            placeholder="请输入蔬菜推荐"
+            maxlength="300"
+          />
         </el-form-item>
         <el-form-item label="水果推荐" prop="fruit">
-          <el-input v-model="form.fruit" placeholder="请输入水果推荐" />
+          <el-input
+            v-model="form.fruit"
+            type="textarea"
+            style="width: 500px"
+            placeholder="请输入水果推荐"
+            maxlength="300"
+          />
         </el-form-item>
         <el-form-item label="肉类推荐" prop="meat">
-          <el-input v-model="form.meat" placeholder="请输入肉类推荐" />
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.meat"
+            placeholder="请输入肉类推荐"
+            maxlength="300"
+          />
         </el-form-item>
         <el-form-item label="饮食说明" prop="dietRemark">
-          <el-input v-model="form.dietRemark" placeholder="请输入饮食说明" />
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.dietRemark"
+            placeholder="请输入饮食说明"
+            maxlength="300"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -181,7 +290,13 @@
 </template>
 
 <script>
-import { listBaseDiet, getBaseDiet, delBaseDiet, addBaseDiet, updateBaseDiet } from "@/api/system/baseDiet";
+import {
+  listBaseDiet,
+  getBaseDiet,
+  delBaseDiet,
+  addBaseDiet,
+  updateBaseDiet,
+} from "@/api/system/baseDiet";
 
 export default {
   name: "BaseDiet",
@@ -221,7 +336,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        dietName: [
+          { required: true, message: "饮食建议名称不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -231,7 +349,7 @@ export default {
     /** 查询饮食知识库列表 */
     getList() {
       this.loading = true;
-      listBaseDiet(this.queryParams).then(response => {
+      listBaseDiet(this.queryParams).then((response) => {
         this.baseDietList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -256,7 +374,7 @@ export default {
         createTime: null,
         createBy: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -272,9 +390,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -285,8 +403,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
-      getBaseDiet(id).then(response => {
+      getBaseDiet(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改饮食知识库";
@@ -294,16 +412,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBaseDiet(this.form).then(response => {
+            updateBaseDiet(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBaseDiet(this.form).then(response => {
+            addBaseDiet(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -315,19 +433,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除饮食知识库编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除饮食知识库编号为"' + ids + '"的数据项？')
+        .then(function () {
           return delBaseDiet(ids);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/baseDiet/export', {
+      this.download(
-        ...this.queryParams
+        "system/baseDiet/export",
-      }, `baseDiet_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
-  }
+        },
+        `baseDiet_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/baseDrug/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="药品名称" prop="drugName">
         <el-input
           v-model="queryParams.drugName"
@@ -82,8 +89,16 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
@@ -96,7 +111,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:baseDrug:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -107,7 +123,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:baseDrug:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -118,9 +135,10 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:baseDrug:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -128,25 +146,82 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:baseDrug:export']"
-        >导出</el-button>
+          >导出</el-button
-      </el-col>
+        >
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="baseDrugList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="baseDrugList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="药品名称" align="center" prop="drugName" />
-      <el-table-column label="适用症" align="center" prop="purpose" />
+      <el-table-column
-      <el-table-column label="给药途径" align="center" prop="applyWay" />
+        label="适用症"
-      <el-table-column label="用药频次" align="center" prop="applyFrequency" />
+        align="center"
-      <el-table-column label="服药说明" align="center" prop="applyRemark" />
+        prop="purpose"
-      <el-table-column label="用法用量(服法剂量)" align="center" prop="dosage" />
+        :show-overflow-tooltip="true"
-      <el-table-column label="副作用(不良反应)" align="center" prop="sideEffects" />
+      />
-      <el-table-column label="禁忌症" align="center" prop="contraindications" />
+      <el-table-column
-      <el-table-column label="存储条件" align="center" prop="storage" />
+        label="给药途径"
-      <el-table-column label="漏服或过服的处理方法" align="center" prop="emergency" />
+        align="center"
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        prop="applyWay"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="用药频次"
+        align="center"
+        prop="applyFrequency"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="服药说明"
+        align="center"
+        prop="applyRemark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="用法用量(服法剂量)"
+        :show-overflow-tooltip="true"
+        align="center"
+        prop="dosage"
+      />
+      <el-table-column
+        label="副作用(不良反应)"
+        :show-overflow-tooltip="true"
+        align="center"
+        prop="sideEffects"
+      />
+      <el-table-column
+        label="禁忌症"
+        align="center"
+        prop="contraindications"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="存储条件"
+        align="center"
+        prop="storage"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="漏服或过服的处理方法"
+        align="center"
+        :show-overflow-tooltip="true"
+        prop="emergency"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -154,20 +229,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:baseDrug:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:baseDrug:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -175,37 +252,100 @@
     />
 
     <!-- 添加或修改药品库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="135px" :inline="true">
+      :title="title"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="135px"
+        :inline="true"
+      >
         <el-form-item label="药品名称" prop="drugName">
-          <el-input v-model="form.drugName" placeholder="请输入药品名称" />
+          <el-input
-        </el-form-item>
+            v-model="form.drugName"
-        <el-form-item label="适用症" prop="purpose">
+            placeholder="请输入药品名称"
-          <el-input v-model="form.purpose" placeholder="请输入适用症" />
+            maxlength="100"
+          />
         </el-form-item>
+
         <el-form-item label="给药途径" prop="applyWay">
-          <el-input v-model="form.applyWay" placeholder="请输入给药途径" />
+          <el-input
-        </el-form-item>
+            v-model="form.applyWay"
-        <el-form-item label="用药频次" prop="applyFrequency">
+            placeholder="请输入给药途径"
-          <el-input v-model="form.applyFrequency" placeholder="请输入用药频次" />
+            maxlength="100"
-        </el-form-item>
+          />
-        <el-form-item label="服药说明" prop="applyRemark">
-          <el-input v-model="form.applyRemark" placeholder="请输入服药说明" />
         </el-form-item>
+
         <el-form-item label="用法用量(服法剂量)" prop="dosage">
-          <el-input v-model="form.dosage" placeholder="请输入用法用量(服法剂量)" />
+          <el-input
+            v-model="form.dosage"
+            placeholder="请输入用法用量(服法剂量)"
+            maxlength="200"
+          />
         </el-form-item>
         <el-form-item label="副作用(不良反应)" prop="sideEffects">
-          <el-input v-model="form.sideEffects" placeholder="请输入副作用(不良反应)" />
+          <el-input
+            v-model="form.sideEffects"
+            placeholder="请输入副作用(不良反应)"
+            maxlength="300"
+          />
         </el-form-item>
         <el-form-item label="禁忌症" prop="contraindications">
-          <el-input v-model="form.contraindications" placeholder="请输入禁忌症" />
+          <el-input
+            v-model="form.contraindications"
+            placeholder="请输入禁忌症"
+            maxlength="300"
+          />
+        </el-form-item>
+        <el-form-item label="用药频次" prop="applyFrequency">
+          <el-input
+            v-model="form.applyFrequency"
+            placeholder="请输入用药频次"
+            maxlength="100"
+          />
+        </el-form-item>
+        <el-form-item label="适用症" prop="purpose">
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.purpose"
+            placeholder="请输入适用症"
+            maxlength="500"
+          />
+        </el-form-item>
+    
+        <el-form-item label="服药说明" prop="applyRemark">
+          <el-input
+            type="textarea"
+            style="width:500px"
+            v-model="form.applyRemark"
+            placeholder="请输入服药说明"
+            maxlength="200"
+          />
         </el-form-item>
         <el-form-item label="存储条件" prop="storage">
-          <el-input v-model="form.storage" placeholder="请输入存储条件" />
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.storage"
+            placeholder="请输入存储条件"
+            maxlength="200"
+          />
         </el-form-item>
+     
         <el-form-item label="漏服或过服的处理方法" prop="emergency">
-          <el-input v-model="form.emergency" placeholder="请输入漏服或过服的处理方法" />
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.emergency"
+            placeholder="请输入漏服或过服的处理方法"
+            maxlength="300"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,7 +357,13 @@
 </template>
 
 <script>
-import { listBaseDrug, getBaseDrug, delBaseDrug, addBaseDrug, updateBaseDrug } from "@/api/system/baseDrug";
+import {
+  listBaseDrug,
+  getBaseDrug,
+  delBaseDrug,
+  addBaseDrug,
+  updateBaseDrug,
+} from "@/api/system/baseDrug";
 
 export default {
   name: "BaseDrug",
@@ -260,7 +406,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        drugName: [
+          { required: true, message: "药品知识名称不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -270,7 +419,7 @@ export default {
     /** 查询药品库列表 */
     getList() {
       this.loading = true;
-      listBaseDrug(this.queryParams).then(response => {
+      listBaseDrug(this.queryParams).then((response) => {
         this.baseDrugList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -298,7 +447,7 @@ export default {
         createTime: null,
         createBy: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -314,9 +463,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -327,8 +476,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
-      getBaseDrug(id).then(response => {
+      getBaseDrug(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改药品库";
@@ -336,16 +485,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBaseDrug(this.form).then(response => {
+            updateBaseDrug(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBaseDrug(this.form).then(response => {
+            addBaseDrug(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -357,19 +506,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除药品库编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除药品库编号为"' + ids + '"的数据项？')
+        .then(function () {
           return delBaseDrug(ids);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/baseDrug/export', {
+      this.download(
-        ...this.queryParams
+        "system/baseDrug/export",
-      }, `baseDrug_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
-  }
+        },
+        `baseDrug_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/baseNursing/index.vue

@@ -80,7 +80,7 @@
           v-hasPermi="['system:baseNursing:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -89,18 +89,18 @@
           @click="handleExport"
           v-hasPermi="['system:baseNursing:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="baseNursingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
-      <el-table-column label="护理知识名称" align="center" prop="nursingName" />
+      <el-table-column label="护理知识名称" align="center" prop="nursingName"  :show-overflow-tooltip="true"/>
-      <el-table-column label="烟酒指导" align="center" prop="tobaccoWine" />
+      <el-table-column label="烟酒指导" align="center" prop="tobaccoWine"  :show-overflow-tooltip="true"/>
-      <el-table-column label="睡眠指导" align="center" prop="sleep" />
+      <el-table-column label="睡眠指导" align="center" prop="sleep" :show-overflow-tooltip="true"/>
       <el-table-column label="情绪指导" align="center" prop="emotion" />
-      <el-table-column label="居家安全指导" align="center" prop="homeSafeguard" />
+      <el-table-column label="居家安全指导" align="center" prop="homeSafeguard" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,21 +131,21 @@
 
     <!-- 添加或修改护理知识库对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="护理知识名称" prop="nursingName">
-          <el-input v-model="form.nursingName" placeholder="请输入护理知识名称" />
+          <el-input v-model="form.nursingName" placeholder="请输入护理知识名称"   maxlength="100"/>
         </el-form-item>
         <el-form-item label="烟酒指导" prop="tobaccoWine">
-          <el-input v-model="form.tobaccoWine" placeholder="请输入烟酒指导" />
+          <el-input v-model="form.tobaccoWine" placeholder="请输入烟酒指导"  type="textarea" maxlength="300" />
         </el-form-item>
         <el-form-item label="睡眠指导" prop="sleep">
-          <el-input v-model="form.sleep" placeholder="请输入睡眠指导" />
+          <el-input v-model="form.sleep" placeholder="请输入睡眠指导"   type="textarea"  maxlength="200"/>
         </el-form-item>
         <el-form-item label="情绪指导" prop="emotion">
-          <el-input v-model="form.emotion" placeholder="请输入情绪指导" />
+          <el-input v-model="form.emotion" placeholder="请输入情绪指导"   type="textarea"  maxlength="200"/>
         </el-form-item>
         <el-form-item label="居家安全指导" prop="homeSafeguard">
-          <el-input v-model="form.homeSafeguard" placeholder="请输入居家安全指导" />
+          <el-input v-model="form.homeSafeguard" placeholder="请输入居家安全指导"  type="textarea"   maxlength="300"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -195,6 +195,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        nursingName:[
+        { required: true, message: "护理知识名称不能为空", trigger: "blur" },
+        ],
       }
     };
   },

src/views/system/baseSport/index.vue

@@ -24,15 +24,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="运动类型名称" prop="sportTypeName">
+      <!-- <el-form-item label="运动类型名称" prop="sportTypeName">
         <el-input
           v-model="queryParams.sportTypeName"
           placeholder="请输入运动类型名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
-      <el-form-item label="运动方式" prop="sportWay">
+      <!-- <el-form-item label="运动方式" prop="sportWay">
         <el-input
           v-model="queryParams.sportWay"
           placeholder="请输入运动方式"
@@ -47,7 +47,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="每次运动时长" prop="sportDuration">
         <el-input
           v-model="queryParams.sportDuration"
@@ -138,7 +138,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -148,7 +148,7 @@
           v-hasPermi="['system:baseSport:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -162,28 +162,54 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
-      <el-table-column label="运动名称" align="center" prop="sportName" />
+      <el-table-column
+        label="运动名称"
+        align="center"
+        prop="sportName"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="运动类型ID" align="center" prop="sportTypeId" /> -->
       <el-table-column
         label="运动类型名称"
         align="center"
         prop="sportTypeName"
       />
-      <el-table-column label="运动方式" align="center" prop="sportWay" />
+      <el-table-column
-      <el-table-column label="运动频率" align="center" prop="sportFrequency" />
+        label="运动方式"
+        align="center"
+        prop="sportWay"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="运动频率"
+        align="center"
+        prop="sportFrequency"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="每次运动时长"
         align="center"
         prop="sportDuration"
       />
       <el-table-column label="运动时间" align="center" prop="sportTime" />
-      <el-table-column label="运动强度" align="center" prop="sportIntensity" />
+      <el-table-column
+        label="运动强度"
+        align="center"
+        prop="sportIntensity"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="运动注意事项"
         align="center"
+        :show-overflow-tooltip="true"
         prop="sportAttention"
       />
-      <el-table-column label="动作说明" align="center" prop="sportRemark" />
+      <el-table-column
+        label="动作说明"
+        align="center"
+        prop="sportRemark"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -222,7 +248,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1000px"
+      width="800px"
       append-to-body
     >
       <el-form
@@ -233,14 +259,18 @@
         :inline="true"
       >
         <el-form-item label="运动名称" prop="sportName">
-          <el-input v-model="form.sportName" placeholder="请输入运动名称" />
+          <el-input
+            v-model="form.sportName"
+            placeholder="请输入运动名称"
+            maxlength="50"
+          />
         </el-form-item>
         <el-form-item label="运动类型" prop="sportTypeId">
           <el-select
             v-model="form.sportTypeId"
             placeholder="请选择运动类型"
             @change="changeoptions"
-            style="width: 208px;"
+            style="width: 208px"
           >
             <el-option
               v-for="item in options"
@@ -259,37 +289,59 @@
           />
         </el-form-item> -->
         <el-form-item label="运动方式" prop="sportWay">
-          <el-input v-model="form.sportWay" placeholder="请输入运动方式" />
+          <el-input
+            v-model="form.sportWay"
+            placeholder="请输入运动方式"
+            maxlength="200"
+          />
         </el-form-item>
         <el-form-item label="运动频率" prop="sportFrequency">
           <el-input
             v-model="form.sportFrequency"
             placeholder="请输入运动频率"
+            maxlength="100"
           />
         </el-form-item>
         <el-form-item label="每次运动时长" prop="sportDuration">
           <el-input
             v-model="form.sportDuration"
+            maxlength="50"
             placeholder="请输入每次运动时长"
           />
         </el-form-item>
         <el-form-item label="运动时间" prop="sportTime">
-          <el-input v-model="form.sportTime" placeholder="请输入运动时间" />
+          <el-input
+            v-model="form.sportTime"
+            placeholder="请输入运动时间"
+            maxlength="50"
+          />
         </el-form-item>
         <el-form-item label="运动强度" prop="sportIntensity">
           <el-input
+            type="textarea"
+            style="width: 500px"
             v-model="form.sportIntensity"
+            maxlength="100"
             placeholder="请输入运动强度"
           />
         </el-form-item>
         <el-form-item label="运动注意事项" prop="sportAttention">
           <el-input
+            type="textarea"
+            style="width: 500px"
+            maxlength="200"
             v-model="form.sportAttention"
             placeholder="请输入运动注意事项"
           />
         </el-form-item>
         <el-form-item label="动作说明" prop="sportRemark">
-          <el-input v-model="form.sportRemark" placeholder="请输入动作说明" />
+          <el-input
+            type="textarea"
+            style="width: 500px"
+            v-model="form.sportRemark"
+            placeholder="请输入动作说明"
+            maxlength="200"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -349,7 +401,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        sportName: [
+          { required: true, message: "运动名称不能为空", trigger: "blur" },
+        ],
+      },
       options: [],
     };
   },
@@ -361,7 +417,7 @@ export default {
     changeoptions(e) {
       console.log(e);
       this.form.sportTypeName = this.options.find(
-        (el) => el.dictCode== e
+        (el) => el.dictCode == e
       ).dictLabel;
       console.log(this.form.sportTypeName);
     },