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

src/views/system/stationItem/index.vue

@@ -253,7 +253,8 @@
         label-width="130px"
         :inline="true"
       >
-        <el-form-item label="所属护理站" prop="nurseStationItem.nurseStationId">
+        <!-- prop="nurseStationItem.nurseStationId" -->
+        <el-form-item label="所属护理站" required>
           <template>
             <el-button
               type=""
@@ -297,9 +298,9 @@
             maxlength="50"
           />
         </el-form-item>
-        <el-form-item label="护理类型" prop="nurseStationItem.nurseTypeId">
+        <el-form-item label="护理类型" prop="nurseTypeId">
           <el-select
-            v-model="form.nurseStationItem.nurseTypeId"
+            v-model="form.nurseTypeId"
             clearable
             placeholder="请选择护理类型"
             style="width: 208px"
@@ -413,7 +414,7 @@
             </el-table-column>
           </el-table>
         </el-form-item>
-        <el-form-item label="项目头像" required>
+        <el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl">
           <stationAcatar
             @imgUrl="imgUrl"
             :img="form.nurseStationItem.itemPictureUrl"
@@ -859,10 +860,13 @@ export default {
         "nurseStationItem.advanceAppointDuration": [
           { required: true, message: "提前预约时长不能为空", trigger: "blur" },
         ],
-        "nurseStationItem.nurseStationId": [
-          { required: true, message: "请选择所属护理站", trigger: "blur" },
+        "nurseStationItem.itemPictureUrl":[{
+          required: true, trigger: "blur", message: "请选择项目头像"
+        }],
+        nurseStationId: [
+          { required: true, trigger: "blur", message: "请选择所属护理站" },
         ],
-        "nurseStationItem.nurseTypeId": [
+        nurseTypeId: [
           { required: true, message: "请选择护理类型", trigger: "blur" },
         ],
       },
@@ -946,6 +950,7 @@ export default {
     //护理站页面选择护理站
     choicestationid(item) {
       this.form.nurseStationItem.nurseStationId = item.id;
+      // this.form.nurseStationId = item.id;
       this.form.nurseStationItem.nurseStationName = item.nurseStationName;
       this.StationConsumablequeryParams.nurseStationId = item.id;
       // console.log(item);
@@ -1030,11 +1035,9 @@ export default {
     },
     // 取消按钮
     cancel() {
+      // this.$refs["form"].clearValidate();
       this.open = false;
       this.reset();
-      if (this.$refs["form"]) {
-        this.$refs["form"].clearValidate();
-      }
     },
     //时长价格
     addnurseStationItemPrices(item, index) {
@@ -1072,13 +1075,13 @@ export default {
     reset() {
       this.form = {
         nurseStationItem: {
-          nurseStationId: "",
-          nurseTypeId: "",
-          nurseItemName: "",
-          nurseItemContent: "",
-          advanceAppointDuration: "",
-          itemPictureUrl: "",
-          sort: "",
+          nurseStationId: null,
+          nurseTypeId: null,
+          nurseItemName: null,
+          nurseItemContent: null,
+          advanceAppointDuration: null,
+          itemPictureUrl: null,
+          sort: null,
           nurseStationName: "请选择所属护理站",
         },
         nurseStationItemConsumables: [
@@ -1090,9 +1093,9 @@ export default {
         ],
         nurseStationItemPrices: [
           {
-            serveDurationUnit: "",
-            price: "",
-            description: "",
+            serveDurationUnit: null,
+            price: null,
+            description: null,
             ids: this.ids,
           },
         ],
@@ -1181,6 +1184,9 @@ export default {
       this.form.nurseStationItemConsumables.forEach((e) => {
         e.nurseStationConsumableId = e.id;
       });
+      this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
+      // this.form.nurseStationItem.nurseStationId = this.form.nurseStationId;
+
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
         console.log(valid);
@@ -1285,4 +1291,4 @@ export default {
   height: 178px;
   display: block;
 }
-</style>
+</style>