Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into sdl_20220916_护理站人员功能

src/views/system/nurseType/index.vue

@@ -8,14 +8,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <!-- <el-form-item label="创建人id" prop="userId">
+  
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="护理类型编码" prop="nurseTypeCode">
         <el-input
           v-model="queryParams.nurseTypeCode"
@@ -159,13 +152,15 @@
 
     <!-- 添加或修改护理类型信息对话框 -->
     <el-dialog :title="title" :visible.sync="open2" width="450px" 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">
         <div
           v-for="(item, index) in form.nurseTypeList"
           :key="index"
           style="margin-top:10px"
         >
-        <el-form-item label="护理类型名称" prop="nurseTypeName">
+        <el-form-item label="护理类型名称" 
+        :rules="rules.nurseTypeList.nurseTypeName"
+        :prop="`nurseTypeList.${index}.nurseTypeName`">
             <el-input
               v-model="item.nurseTypeName"
               placeholder="请输入护理类型名称"
@@ -201,7 +196,7 @@
     </el-dialog>
   <!-- 修改疾病信息字典对话框 -->
   <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="nurseTypeName">
             <el-input
               v-model="form.nurseTypeName"
@@ -277,6 +272,13 @@ export default {
             },
           ],
         },
+        nurseTypeName: [
+            {
+              required: true,
+              message: "请输入护理类型名称",
+              trigger: "blur",
+            },
+          ],
       },
     };
   },
@@ -384,7 +386,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除护理类型信息编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除护理类型信息的数据项？')
         .then(function () {
           return delNurseType(ids);
         })

src/views/system/order/index.vue

@@ -53,10 +53,7 @@
         >
       </el-form-item>
     </el-form>
-    <!-- <right-toolbar
+ 
-      :showSearch.sync="showSearch"
-      @queryTable="getList"
-    ></right-toolbar> -->
 
     <el-table
       v-loading="loading"