修改

src/views/system/classifyItem/index.vue

@@ -25,16 +25,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          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>
 
@@ -47,8 +39,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:classifyItem:add']"
-          >新增</el-button
+        >新增</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -59,8 +50,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:classifyItem:edit']"
-          >修改</el-button
+        >修改</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,8 +61,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:classifyItem:remove']"
-          >删除</el-button
+        >删除</el-button>
-        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -84,18 +73,11 @@
           v-hasPermi="['classify:info:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>-->
-      <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
 
-    <el-table
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="infoList"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="分类编码" align="center" prop="classifyCode" />
       <el-table-column label="分类名称" align="center" prop="classifyName" />
@@ -104,13 +86,9 @@
           >{{ scope.row.classifyType == "NURSE_AGNECY" ? "护理机构分类" : "" }}
           {{ scope.row.classifyType == "NURSE_ITEM" ? "护理项目分类" : "" }}
         </template>
-      </el-table-column> -->
+      </el-table-column>-->
       <el-table-column label="分类排序" align="center" prop="classifySort" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -118,16 +96,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:classifyItem:edit']"
-            >修改</el-button
+          >修改</el-button>
-          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:classifyItem:remove']"
-            >删除</el-button
+          >删除</el-button>
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -167,7 +143,7 @@
             :prop="`nurseClassifyInfoList.${index}.classifyName`"
           >
             <el-input
-              maxLength="30"
+              maxlength="30"
               style="width: 200px"
               v-model="item.classifyName"
               placeholder="请输入分类名称"
@@ -183,7 +159,7 @@
               v-model="item.classifySort"
               placeholder="请输入分类排序"
               oninput="value=value.replace(/[^\d]/g,'')"
-              maxLength="5"
+              maxlength="5"
             />
           </el-form-item>
           <el-form-item
@@ -234,11 +210,7 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="分类名称" prop="classifyName">
-          <el-input
+          <el-input v-model="form.classifyName" placeholder="请输入分类名称" maxlength="30" />
-            v-model="form.classifyName"
-            placeholder="请输入分类名称"
-            maxLength="30"
-          />
         </el-form-item>
         <el-form-item label="分类图标" prop="classifyPictureUrl">
           <stationAcatar
@@ -254,7 +226,7 @@
             v-model="form.classifySort"
             placeholder="请输入分类排序"
             oninput="value=value.replace(/[^\d]/g,'')"
-            maxLength="5"
+            maxlength="5"
           />
         </el-form-item>
       </el-form>
@@ -273,7 +245,7 @@ import {
   getInfo,
   delInfo,
   addInfo,
-  updateInfo,
+  updateInfo
 } from "@/api/system/classifyItem.js";
 import { updatePicture } from "@/api/system/station";
 export default {
@@ -287,7 +259,7 @@ export default {
       ids: [],
       // 非单个禁用
       single: true,
-      imgone:"",
+      imgone: "",
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
@@ -308,15 +280,15 @@ export default {
         parentId: null,
         classifyCode: null,
         classifyName: null,
-        
+
         classifyLevel: null,
         classifyType: null,
         classifyPictureUrl: null,
-        classifySort: null,
+        classifySort: null
       },
       // 表单参数
       form: {
-        nurseClassifyInfoList: [],
+        nurseClassifyInfoList: []
       },
       idd: 0,
       classifyPictureUrl: null,
@@ -328,46 +300,46 @@ export default {
             {
               required: true,
               message: "请输入分类名称",
-              trigger: "blur",
+              trigger: "blur"
-            },
+            }
           ],
           classifyPictureUrl: [
             {
               required: true,
               message: "请选择分类图标",
-              trigger: "blur",
+              trigger: "blur"
-            },
+            }
           ],
           classifySort: [
             {
               required: true,
               message: "请输入分类排序",
-              trigger: "blur",
+              trigger: "blur"
-            },
+            }
-          ],
+          ]
         },
         classifyName: [
           {
             required: true,
             message: "请输入分类名称",
-            trigger: "blur",
+            trigger: "blur"
-          },
+          }
         ],
         classifyPictureUrl: [
           {
             required: true,
             message: "请选择分类图标",
-            trigger: "blur",
+            trigger: "blur"
-          },
+          }
         ],
         classifySort: [
           {
             required: true,
             message: "请输入分类排序",
-            trigger: "blur",
+            trigger: "blur"
-          },
+          }
-        ],
+        ]
-      },
+      }
     };
   },
   created() {
@@ -385,7 +357,7 @@ export default {
         classifyName: "",
         classifyPictureUrl: "",
         classifySort: "",
-        idd: this.idd,
+        idd: this.idd
       };
       if (this.form.nurseClassifyInfoList.length == 5) {
         this.$message.error("最多批量添加5条");
@@ -399,7 +371,7 @@ export default {
     imgclassifyPictureitem(item) {
       let items = JSON.parse(item);
       if (items.idd && !items.id) {
-        this.form.nurseClassifyInfoList.forEach((e) => {
+        this.form.nurseClassifyInfoList.forEach(e => {
           if (e.idd == items.idd) {
             e.classifyPictureUrl = items.classifyPictureUrl;
           }
@@ -411,7 +383,7 @@ export default {
     /** 查询护理机构和护理项目分类信息列表 */
     getList() {
       this.loading = true;
-      listInfo(this.queryParams).then((response) => {
+      listInfo(this.queryParams).then(response => {
         this.infoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -424,18 +396,18 @@ export default {
         if (this.form.classifyPictureUrl != this.imgone) {
           obj.pictureUrlList.push(this.form.classifyPictureUrl);
         }
-        updatePicture(obj).then((res) => {
+        updatePicture(obj).then(res => {
           this.editopen = false;
         });
       }
       if (this.open) {
         var obj = { pictureUrlList: [] };
         if (this.form.nurseClassifyInfoList) {
-          this.form.nurseClassifyInfoList.forEach((e) => {
+          this.form.nurseClassifyInfoList.forEach(e => {
             obj.pictureUrlList.push(e.classifyPictureUrl);
           });
         }
-        updatePicture(obj).then((res) => {
+        updatePicture(obj).then(res => {
           this.open = false;
         });
       }
@@ -455,7 +427,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
+        updateTime: null
       };
       this.resetForm("form");
     },
@@ -471,7 +443,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -483,11 +455,9 @@ export default {
             classifyName: "",
             classifyPictureUrl: "",
             classifySort: "",
-            idd: this.idd,
+            idd: this.idd
-          },
+          }
-        ],
+        ]
-        
-
       };
       this.open = true;
       this.title = "添加护理项目分类信息";
@@ -496,7 +466,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getInfo(id).then((response) => {
+      getInfo(id).then(response => {
         this.form = response.data;
         this.imgone = this.form.classifyPictureUrl;
         this.classifyPictureUrl = response.data.classifyPictureUrl;
@@ -506,27 +476,27 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
+      this.form.classifySort = Number(this.form.classifySort);
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
-         
           if (this.form.id != null) {
-            updateInfo(this.form).then((response) => {
+            updateInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               if (this.form.classifyPictureUrl != this.imgone) {
                 var obj = { pictureUrlList: [] };
                 obj.pictureUrlList.push(this.imgone);
-                updatePicture(obj).then((res) => {});
+                updatePicture(obj).then(res => {});
               }
               this.editopen = false;
               this.getList();
             });
           } else {
-            if(this.form.nurseClassifyInfoList[0].classifySort){
+            if (this.form.nurseClassifyInfoList[0].classifySort) {
-              this.form.nurseClassifyInfoList[0].classifySort = parseInt(this.form.nurseClassifyInfoList[0].classifySort);
+              this.form.nurseClassifyInfoList[0].classifySort = parseInt(
+                this.form.nurseClassifyInfoList[0].classifySort
+              );
             }
-           
+            addInfo(this.form).then(response => {
-            addInfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -541,7 +511,7 @@ export default {
       console.log(row);
       this.$modal
         .confirm("是否确认删除？")
-        .then(function () {
+        .then(function() {
           return delInfo(ids);
         })
         .then(() => {
@@ -555,11 +525,11 @@ export default {
       this.download(
         "classify/info/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `info_${new Date().getTime()}.xlsx`
       );
-    },
+    }
-  },
+  }
 };
 </script>

src/views/system/poser/index.vue

@@ -9,14 +9,18 @@
       label-width="110px"
     >
       <el-form-item label="护理站名称" prop="nurseStationId">
-        <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
+        <el-button type class="stationbtn" @click="ParamsStation(true)">
+          {{
           queryParams.nurseStationName
-        }}</el-button>
+          }}
+        </el-button>
       </el-form-item>
       <el-form-item label="护理项目" prop="nurseItemId" label-width="100px">
-        <el-button type="" class="stationbtn" @click="ParamsStationxm(true)">{{
+        <el-button type class="stationbtn" @click="ParamsStationxm(true)">
+          {{
           queryParams.nurseItemName
-        }}</el-button>
+          }}
+        </el-button>
       </el-form-item>
       <el-form-item label="海报名称" prop="poserName">
         <el-input
@@ -27,18 +31,13 @@
         />
       </el-form-item>
       <el-form-item label="海报所属模块" prop="moduleType">
-        <el-select
+        <el-select v-model="queryParams.moduleType" placeholder="请选择" style="width: 208px">
-          v-model="queryParams.moduleType"
-          placeholder="请选择"
-          style="width: 208px"
-        >
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-          >
+          ></el-option>
-          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="海报编号" prop="poserCode">
@@ -50,16 +49,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          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>
     <el-row :gutter="10" class="mb8">
@@ -71,8 +62,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:poser:add']"
-          >新增</el-button
+        >新增</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -83,8 +73,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:poser:edit']"
-          >修改</el-button
+        >修改</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -95,8 +84,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:poser:remove']"
-          >删除</el-button
+        >删除</el-button>
-        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -108,57 +96,38 @@
           v-hasPermi="['system:poser:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>-->
-      <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
-    <el-table
+    <el-table v-loading="loading" :data="poserList" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="poserList"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-        label="所属护理站"
+      <el-table-column label="所属护理项目" align="center" prop="nurseItemName" />
-        align="center"
-        prop="nurseStationName"
-      />
-      <el-table-column
-        label="所属护理项目"
-        align="center"
-        prop="nurseItemName"
-      />
       <el-table-column label="海报名称" align="center" prop="poserName" />
       <el-table-column label="海报编号" align="center" prop="poserCode" />
       <el-table-column label="海报所属模块" align="center" prop="moduleType">
         <template slot-scope="scope">
           {{
-            scope.row.moduleType == "NURSE_AGENCY_MODULE" ? "护理机构模块" : ""
+          scope.row.moduleType == "NURSE_AGENCY_MODULE" ? "护理机构模块" : ""
           }}
           {{
-            scope.row.moduleType == "NURSE_ITEM_MODULE" ? "护理项目模块" : ""
+          scope.row.moduleType == "NURSE_ITEM_MODULE" ? "护理项目模块" : ""
           }}
           {{
-            scope.row.moduleType == "HEALTH_CONSUTION_MODULE"
+          scope.row.moduleType == "HEALTH_CONSUTION_MODULE"
-              ? "健康咨询模块"
+          ? "健康咨询模块"
-              : ""
+          : ""
           }}
           {{ scope.row.moduleType == "HOME_PAGE_MODULE" ? "首页模块" : "" }}
           {{
-            scope.row.moduleType == "NURSE_AGENCY_INTRODUCE_MODULE"
+          scope.row.moduleType == "NURSE_AGENCY_INTRODUCE_MODULE"
-              ? "护理机构简介模块"
+          ? "护理机构简介模块"
-              : ""
+          : ""
           }}
         </template>
       </el-table-column>
       <el-table-column label="海报显示顺序" align="center" prop="poserSort" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -166,16 +135,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:poser:edit']"
-            >修改</el-button
+          >修改</el-button>
-          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:poser:remove']"
-            >删除</el-button
+          >删除</el-button>
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -194,19 +161,9 @@
       :before-close="cancel"
       append-to-body
     >
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="海报名称" prop="poserName">
-          <el-input
+          <el-input v-model="form.poserName" placeholder="请输入海报名称" maxlength="50" />
-            v-model="form.poserName"
-            placeholder="请输入海报名称"
-            maxlength="50"
-          />
         </el-form-item>
 
         <el-form-item label="海报所属模块" prop="moduleType">
@@ -221,8 +178,7 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
+            ></el-option>
-            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="海报显示顺序" prop="poserSort">
@@ -230,7 +186,7 @@
             v-model="form.poserSort"
             placeholder="请输入海报显示顺序"
             oninput="value=value.replace(/[^\d]/g,'')"
-            maxLength="5"
+            maxlength="5"
           />
         </el-form-item>
         <el-form-item
@@ -243,7 +199,7 @@
         >
           <template>
             <el-button
-              type=""
+              type
               @click="ParamsStation(false)"
               :disabled="isEditFlag"
               style="
@@ -256,10 +212,9 @@
                 color: #c0c4cc;
               "
               v-if="form.nurseStationName == '请选择所属护理站'"
-              >{{ form.nurseStationName }}</el-button
+            >{{ form.nurseStationName }}</el-button>
-            >
             <el-button
-              type=""
+              type
               style="
                 width: 208px;
                 text-align: left;
@@ -271,8 +226,7 @@
               @click="ParamsStation(false)"
               :disabled="isEditFlag"
               v-else
-              >{{ form.nurseStationName }}</el-button
+            >{{ form.nurseStationName }}</el-button>
-            >
           </template>
         </el-form-item>
         <el-form-item
@@ -283,7 +237,7 @@
           <template>
             <el-button
               :disabled="isEditFlag"
-              type=""
+              type
               style="
                 width: 208px;
                 text-align: left;
@@ -295,11 +249,10 @@
               "
               @click="ParamsStationxm(false)"
               v-if="form.nurseItemName == '请选择所属护理项目'"
-              >{{ form.nurseItemName }}</el-button
+            >{{ form.nurseItemName }}</el-button>
-            >
             <el-button
               :disabled="isEditFlag"
-              type=""
+              type
               style="
                 width: 208px;
                 text-align: left;
@@ -310,17 +263,12 @@
               "
               @click="ParamsStationxm(false)"
               v-else
-              >{{ form.nurseItemName }}</el-button
+            >{{ form.nurseItemName }}</el-button>
-            >
+          </template>
-          </template></el-form-item
+        </el-form-item>
-        >
 
         <el-form-item label="海报图片" prop="posterPictureUrl">
-          <el-table
+          <el-table label-width="50px" style="margin-top: 20px" :data="form.posterPictureUrlLists">
-            label-width="50px"
-            style="margin-top: 20px"
-            :data="form.posterPictureUrlLists"
-          >
             <el-table-column label="图片" align="center" width="300">
               <template slot-scope="scope">
                 <stationAcatar
@@ -333,32 +281,20 @@
             </el-table-column>
             <el-table-column label="图片跳转标识" align="center" width="300">
               <template slot-scope="scope">
-                <el-select
+                <el-select v-model="scope.row.jumpType" placeholder="请选择" style="width: 208px">
-                  v-model="scope.row.jumpType"
-                  placeholder="请选择"
-                  style="width: 208px"
-                >
                   <el-option
                     v-for="item in jumpTypes"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  >
+                  ></el-option>
-                  </el-option>
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="250">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="addPictureUrl"
+                <el-button size="mini" type="text" @click="addPictureUrl">新增</el-button>
-                  >新增</el-button
+                <el-button size="mini" type="text" @click="delPictureUrl(scope.row)">删除</el-button>
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="delPictureUrl(scope.row)"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
@@ -370,8 +306,7 @@
             style="width: 540px"
             placeholder="请输入海报简介"
             v-model="form.posterIntroduce"
-          >
+          ></el-input>
-          </el-input>
         </el-form-item>
         <el-form-item label="海报视频">
           <!-- <video
@@ -381,7 +316,7 @@
             controls="controls"
           >
             您的浏览器不支持视频播放
-          </video> -->
+          </video>-->
           <stationAcatar
             style="width: 208px"
             @imgUrl="imgUrl2"
@@ -404,42 +339,19 @@
       append-to-body
       :before-close="clicknurseStationshow"
     >
-      <el-form
+      <el-form ref="form" :model="getListByUserquery" label-width="110px" :inline="true">
-        ref="form"
-        :model="getListByUserquery"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="护理站编码" prop="nurseStationCode">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationCode" placeholder="请输入护理站编码" />
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编码"
-          />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationName" placeholder="请输入护理站名称" />
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入护理站名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="nurseStationlist" @cell-dblclick="choicestationid">
-        v-loading="loading"
-        :data="nurseStationlist"
-        @cell-dblclick="choicestationid"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -455,31 +367,18 @@
               circle
               v-else
               @click="choicestationid(scope.row)"
-            >
+            ></el-button>
-            </el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
-          property="nurseStationCode"
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
-          label="护理站编码"
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
-        </el-table-column>
         <el-table-column
           property="address"
           label="护理站地址"
           align="center"
           :show-overflow-tooltip="true"
-        >
+        ></el-table-column>
-        </el-table-column>
       </el-table>
 
       <pagination
@@ -500,38 +399,17 @@
     >
       <el-form :model="nurseItemquery" label-width="150px" :inline="true">
         <el-form-item label="护理项目编码" prop="nurseItemCode">
-          <el-input
+          <el-input v-model="nurseItemquery.nurseItemCode" placeholder="请输入护理项目编码" />
-            v-model="nurseItemquery.nurseItemCode"
-            placeholder="请输入护理项目编码"
-          />
         </el-form-item>
         <el-form-item label="护理项目名称" prop="nurseItemName">
-          <el-input
+          <el-input v-model="nurseItemquery.nurseItemName" placeholder="请输入护理项目名称" />
-            v-model="nurseItemquery.nurseItemName"
-            placeholder="请输入护理项目名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="nurseItemlistInfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="nurseItemlistcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="nurseItemlistInfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="nurseItemlistcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="nurseItemlist" @cell-dblclick="choicenurseItem">
-        v-loading="loading"
-        :data="nurseItemlist"
-        @cell-dblclick="choicenurseItem"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -547,31 +425,14 @@
               circle
               v-else
               @click="choicenurseItem(scope.row)"
-            >
+            ></el-button>
-            </el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-          label="所属护理站"
-          align="center"
-          prop="nurseStationName"
-        />
         <!-- <el-table-column label="护理类型" align="center" prop="nurseTypeName" /> -->
-        <el-table-column
+        <el-table-column label="护理项目编号" align="center" prop="nurseItemCode" />
-          label="护理项目编号"
+        <el-table-column label="护理项目名称" align="center" prop="nurseItemName" />
-          align="center"
+        <el-table-column label="护理项目分类名称" align="center" prop="nurseItemName" />
-          prop="nurseItemCode"
-        />
-        <el-table-column
-          label="护理项目名称"
-          align="center"
-          prop="nurseItemName"
-        />
-        <el-table-column
-          label="护理项目分类名称"
-          align="center"
-          prop="nurseItemName"
-        />
         <el-table-column label="创建时间" align="center" prop="createTime" />
         <el-table-column label="创建人" align="center" prop="createBy" />
       </el-table>
@@ -595,7 +456,7 @@ import {
   addPoser,
   getListByUser,
   updatePoser,
-  updatePicture,
+  updatePicture
 } from "@/api/system/poser";
 import { list } from "@/api/system/nurseItem";
 import stationAcatar from "../stationAvatar/index.vue";
@@ -609,7 +470,7 @@ export default {
       loading: true,
       getListByUserquery: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       nurseStationlist: [],
       nurseStationshow: false,
@@ -645,7 +506,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         nurseItemCode: null,
-        nurseItemName: null,
+        nurseItemName: null
       },
       // 查询参数
       queryParams: {
@@ -662,7 +523,7 @@ export default {
         moduleType: null,
         poserSort: null,
         jumpLink: null,
-        jumpType: null,
+        jumpType: null
       },
       // 表单参数
       form: {
@@ -676,75 +537,75 @@ export default {
         nurseStationId: "",
         nurseStationName: "请选择所属护理站",
         nurseItemName: "请选择所属护理项目",
-        nurseItemId: "",
+        nurseItemId: ""
       },
       imgsurl: { pictureUrlList: [] },
       // 表单校验
       rules: {
         moduleType: [
-          { required: true, message: "请选择海报所属模块", trigger: "blur" },
+          { required: true, message: "请选择海报所属模块", trigger: "blur" }
         ],
         poserName: [
-          { required: true, message: "请输入海报名称", trigger: "blur" },
+          { required: true, message: "请输入海报名称", trigger: "blur" }
         ],
         nurseStationId: [
-          { required: true, message: "请选择所属护理站", trigger: "blur" },
+          { required: true, message: "请选择所属护理站", trigger: "blur" }
         ],
         posterIntroduce: [
-          { required: true, message: "请输入海报简介", trigger: "blur" },
+          { required: true, message: "请输入海报简介", trigger: "blur" }
         ],
 
         posterVideoUrl: [
-          { required: true, message: "请选择海报视频", trigger: "blur" },
+          { required: true, message: "请选择海报视频", trigger: "blur" }
         ],
         poserSort: [
-          { required: true, message: "请输入海报顺序", trigger: "blur" },
+          { required: true, message: "请输入海报顺序", trigger: "blur" }
         ],
         nurseItemId: [
-          { required: true, message: "请选择所属护理项目", trigger: "blur" },
+          { required: true, message: "请选择所属护理项目", trigger: "blur" }
-        ],
+        ]
       },
       options: [
         {
           value: "NURSE_AGENCY_MODULE",
-          label: "护理机构模块",
+          label: "护理机构模块"
         },
         {
           value: "NURSE_ITEM_MODULE",
-          label: "护理项目模块",
+          label: "护理项目模块"
         },
         {
           value: "HEALTH_CONSUTION_MODULE",
-          label: "健康咨询模块",
+          label: "健康咨询模块"
         },
         {
           value: "HOME_PAGE_MODULE",
-          label: "首页模块",
+          label: "首页模块"
         },
         {
           value: "NURSE_AGENCY_INTRODUCE_MODULE",
-          label: "护理机构简介模块",
+          label: "护理机构简介模块"
-        },
+        }
       ],
-      
+
-      objitem:[],
+      objitem: [],
       jumpTypes: [
         {
           value: "NEW_PEOPLE_WELFARE",
-          label: "新人福利",
+          label: "新人福利"
         },
         {
           value: "HOME_PAGE",
-          label: "首页",
+          label: "首页"
         },
         {
           value: "SHOPPING",
-          label: "商城",
+          label: "商城"
-        },
+        }
       ],
       //页面链接
       stationid: "",
-      imgone:[],
+      imgone: [],
       nurseitemid: "",
       homenumber: false,
       videourl: "",
@@ -755,10 +616,10 @@ export default {
       isShowUploadVideo: false,
       //显示上传按钮
       videoForm: {
-        showVideoPath: "", //回显的变量
+        showVideoPath: "" //回显的变量
       },
       // 存储新上传的图片数组
-      deletNewImgs:[],
+      deletNewImgs: []
     };
   },
   created() {
@@ -774,15 +635,17 @@ export default {
         if (this.form.posterPictureUrlLists.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
-          this.form.posterPictureUrlLists =
+          this.form.posterPictureUrlLists = this.form.posterPictureUrlLists.filter(
-            this.form.posterPictureUrlLists.filter((e) => e.idd != item.idd);
+            e => e.idd != item.idd
+          );
         }
       } else if (!item.idd && item.id) {
         if (this.form.posterPictureUrlLists.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
-          this.form.posterPictureUrlLists =
+          this.form.posterPictureUrlLists = this.form.posterPictureUrlLists.filter(
-            this.form.posterPictureUrlLists.filter((e) => e.id != item.id);
+            e => e.id != item.id
+          );
         }
       }
     },
@@ -792,7 +655,7 @@ export default {
       var obj = {
         posterPictureUrl: "",
         jumpType: "",
-        idd: this.idd,
+        idd: this.idd
       };
       if (this.form.posterPictureUrlLists.length >= 5) {
         this.$message.error("最多新增5条");
@@ -828,13 +691,13 @@ export default {
         pageNum: 1,
         pageSize: 10,
         nurseItemCode: null,
-        nurseItemName: null,
+        nurseItemName: null
       };
       this.nurseItemlistInfo();
     },
     //搜索
     nurseItemlistInfo() {
-      list(this.nurseItemquery).then((res) => {
+      list(this.nurseItemquery).then(res => {
         this.nurseItemlist = res.rows;
         this.nurseItemtotal = res.total;
       });
@@ -867,7 +730,7 @@ export default {
     },
     //护理站list
     info() {
-      getListByUser(this.getListByUserquery).then((res) => {
+      getListByUser(this.getListByUserquery).then(res => {
         this.nurseStationlist = res.rows;
         this.total4 = res.total;
       });
@@ -882,7 +745,7 @@ export default {
     stationcancel() {
       this.getListByUserquery = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       };
       this.info();
     },
@@ -909,15 +772,10 @@ export default {
     },
     //图片传值过来接收
     imgUrl(imgUrl) {
-      
+      let imgUrlData = JSON.parse(imgUrl);
-      console.log(JSON.parse(imgUrl),'url');
-      let imgUrlData=JSON.parse(imgUrl)
       // 存贮新上传的图片数组
-      this.deletNewImgs.push(imgUrlData.posterPictureUrl)
+      this.deletNewImgs.push(imgUrlData.posterPictureUrl);
-      console.log(this.deletNewImgs,'触发了上传时间')
+      this.objitem.push(imgUrlData.posterPictureUrl);
-      this.objitem.push(imgUrlData.posterPictureUrl)
-    
-      console.log(this.objitem)
     },
     imgUrl2(imgUrl) {
       this.videoForm.showVideoPath = baseurl + imgUrl;
@@ -926,7 +784,7 @@ export default {
     /** 查询泉医到家系统海报模块信息（包含咨询简介信息）列表 */
     getList() {
       this.loading = true;
-      listPoser(this.queryParams).then((response) => {
+      listPoser(this.queryParams).then(response => {
         this.poserList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -934,22 +792,17 @@ export default {
     },
     // 取消按钮
     cancel() {
-      console.log(this.objitem)
       var obj = { pictureUrlList: [] };
-        if (this.form.posterPictureUrlLists) {
+      if (this.form.posterPictureUrlLists) {
-          this.form.posterPictureUrlLists.forEach((e) => {
+        this.form.posterPictureUrlLists.forEach(e => {
-            obj.pictureUrlList.push(e.posterPictureUrl);
+          obj.pictureUrlList.push(e.posterPictureUrl);
-          });
+        });
-        }
+      }
-                     
+      if (obj.pictureUrlList.length > 0) {
-        console.log(this.deletNewImgs)
+        updatePicture({ pictureUrlList: this.deletNewImgs }).then(res => {
-        if(obj.pictureUrlList.length>0){
-          updatePicture({pictureUrlList:this.deletNewImgs}).then((res) => {
           this.open = false;
         });
-        }
+      }
-     
-      this.deletNewImgs=[],
       this.nurseItemquery.nurseStationId = null;
       this.imgs = { pictureUrlList: [] };
       this.open = false;
@@ -962,8 +815,8 @@ export default {
           {
             posterPictureUrl: "",
             jumpType: "",
-            idd: this.idd,
+            idd: this.idd
-          },
+          }
         ],
         id: null,
         poserName: null,
@@ -974,8 +827,9 @@ export default {
         nurseStationName: "请选择所属护理站",
         nurseStationId: null,
         nurseItemName: "请选择所属护理项目",
-        nurseItemId: null,
+        nurseItemId: null
       };
+      this.deletNewImgs = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -986,22 +840,22 @@ export default {
     resetQuery() {
       this.nurseItemquery = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       };
       this.stationid = "";
       this.nurseitemid = "";
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       };
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.nurseStationId);
+      this.ids = selection.map(item => item.nurseStationId);
-      this.itemids = selection.map((item) => item.nurseItemId);
+      this.itemids = selection.map(item => item.nurseItemId);
-      this.Types = selection.map((item) => item.moduleType);
+      this.Types = selection.map(item => item.moduleType);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1017,7 +871,7 @@ export default {
       const id = row.nurseStationId || this.ids;
       const itemid = row.nurseItemId || this.itemids;
       const type = row.moduleType || this.Types;
-      getPoser(type, id, itemid).then((response) => {
+      getPoser(type, id, itemid).then(response => {
         this.form = response.data;
         if (response.data.goodAttributeDetailsLists) {
           this.goodDetailsLists = response.data.goodAttributeDetailsLists;
@@ -1029,19 +883,19 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updatePoser(this.form).then((response) => {
+            updatePoser(this.form).then(response => {
-        //       var obj = { pictureUrlList: [] };
+              //       var obj = { pictureUrlList: [] };
-        // if (this.form.posterPictureUrlLists) {
+              // if (this.form.posterPictureUrlLists) {
-        //   this.form.posterPictureUrlLists.forEach((e) => {
+              //   this.form.posterPictureUrlLists.forEach((e) => {
-        //     obj.pictureUrlList.push(e.posterPictureUrl);
+              //     obj.pictureUrlList.push(e.posterPictureUrl);
-        //   });
+              //   });
-        // }
+              // }
-        // updatePicture({pictureUrlList:this.deletNewImgs}).then((res) => {
+              // updatePicture({pictureUrlList:this.deletNewImgs}).then((res) => {
-        //   this.open = false;
+              //   this.open = false;
-        // });
+              // });
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1049,10 +903,10 @@ export default {
           } else {
             if (this.form.poserSort) {
               this.form.poserSort = parseInt(this.form.poserSort);
-            }else{
+            } else {
-              this.form.poserSort=null
+              this.form.poserSort = null;
             }
-            addPoser(this.form).then((response) => {
+            addPoser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1063,18 +917,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row);
       const ids = row.id || this.ids;
       const nurseStationIds = row.nurseStationId || this.nurseStationIds;
       const moduleTypes = row.moduleType || this.moduleTypes;
       const nurseItemIds = row.nurseItemId || this.nurseItemIds;
       this.$modal
-        .confirm(
+        .confirm("是否确认删除？")
-          '是否确认删除泉医到家系统海报模块信息（包含咨询简介信息）编号为"' +
+        .then(function() {
-            ids +
-            '"的数据项？'
-        )
-        .then(function () {
           return delPoser(nurseStationIds, moduleTypes, nurseItemIds);
         })
         .then(() => {
@@ -1088,15 +937,15 @@ export default {
       this.download(
         "system/poser/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `poser_${new Date().getTime()}.xlsx`
       );
-    },
+    }
-  },
+  }
 };
 </script>
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 .avatar-uploader-icon {
   border: 1px dashed #d9d9d9 !important;
 }

src/views/system/stationItem/index.vue

@@ -8,14 +8,12 @@
       v-show="showSearch"
       label-width="110px"
     >
-      <el-form-item
+      <el-form-item label="护理站名称" prop="nurseStationId" label-width="100px">
-        label="护理站名称"
+        <el-button type class="stationbtn" @click="ParamsStation(true)">
-        prop="nurseStationId"
+          {{
-        label-width="100px"
-      >
-        <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
           queryParams.nurseStationName
-        }}</el-button>
+          }}
+        </el-button>
       </el-form-item>
       <el-form-item label="护理项目编号" prop="nurseItemCode">
         <el-input
@@ -34,16 +32,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          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>
     <el-row :gutter="10" class="mb8">
@@ -55,8 +45,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:stationItem:add']"
-          >新增</el-button
+        >新增</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,8 +56,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:stationItem:edit']"
-          >修改</el-button
+        >修改</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -79,8 +67,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:stationItem:remove']"
-          >删除</el-button
+        >删除</el-button>
-        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -90,19 +77,11 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:stationItem:importStationItem']"
-          >导入</el-button
+        >导入</el-button>
-        >
       </el-col>
-      <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
-    <el-table
+    <el-table v-loading="loading" :data="nurseItemList" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="nurseItemList"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="expand">
         <template slot-scope="props">
@@ -112,50 +91,26 @@
                 v-for="(item, index) in props.row.nurseStationItemPrices"
                 :key="index"
                 style="display: block"
-              >
+              >{{ item.serveDurationUnit }}</div>
-                {{ item.serveDurationUnit }}
-              </div>
             </el-form-item>
             <el-form-item label="价格(元)" style="margin-left: 30px">
               <div
                 v-for="(item, index) in props.row.nurseStationItemPrices"
                 :key="index"
                 style="display: block"
-              >
+              >{{ item.price }}</div>
-                {{ item.price }}
-              </div>
             </el-form-item>
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-        label="所属护理站"
-        align="center"
-        prop="nurseStationName"
-      />
       <!-- <el-table-column label="护理类型" align="center" prop="nurseTypeName" /> -->
-      <el-table-column
+      <el-table-column label="护理项目编号" align="center" prop="nurseItemCode" />
-        label="护理项目编号"
+      <el-table-column label="护理项目名称" align="center" prop="nurseItemName" />
-        align="center"
+      <el-table-column label="护理项目分类名称" align="center" prop="classifyName" />
-        prop="nurseItemCode"
-      />
-      <el-table-column
-        label="护理项目名称"
-        align="center"
-        prop="nurseItemName"
-      />
-      <el-table-column
-        label="护理项目分类名称"
-        align="center"
-        prop="classifyName"
-      />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -163,16 +118,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:stationItem:edit']"
-            >修改</el-button
+          >修改</el-button>
-          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:stationItem:remove']"
-            >删除</el-button
+          >删除</el-button>
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -191,17 +144,11 @@
       append-to-body
       :before-close="cancel"
     >
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="130px"
-        :inline="true"
-      >
         <el-form-item label="所属护理站" prop="nurseStationId" v-if="addxg == 'add'">
           <template>
             <el-button
-              type=""
+              type
               @click="nurseStationshowclick"
               style="
                 width: 208px;
@@ -213,10 +160,9 @@
                 this.form.nurseStationItem.nurseStationName ==
                 '请选择所属护理站'
               "
-              >{{ form.nurseStationItem.nurseStationName }}</el-button
+            >{{ form.nurseStationItem.nurseStationName }}</el-button>
-            >
             <el-button
-              type=""
+              type
               @click="nurseStationshowclick"
               v-else
               style="
@@ -228,14 +174,13 @@
                 text-overflow: ellipsis;
                 white-space: nowrap;
               "
-              >{{ form.nurseStationItem.nurseStationName }}</el-button
+            >{{ form.nurseStationItem.nurseStationName }}</el-button>
-            >
           </template>
         </el-form-item>
-        <el-form-item label="所属护理站"  required v-else>
+        <el-form-item label="所属护理站" required v-else>
           <template>
             <el-button
-              type=""
+              type
               disabled
               style="
                 width: 208px;
@@ -245,14 +190,13 @@
                 text-overflow: ellipsis;
                 white-space: nowrap;
               "
-              >{{ form.nurseStationItem.nurseStationName }}</el-button
+            >{{ form.nurseStationItem.nurseStationName }}</el-button>
-            >
           </template>
         </el-form-item>
-        <el-form-item label="护理项目分类"  >
+        <el-form-item label="护理项目分类">
           <template>
             <el-button
-              type=""
+              type
               style="
                 width: 208px;
                 text-align: left;
@@ -264,10 +208,9 @@
               "
               @click="clickClassifyshow"
               v-if="form.nurseStationItem.classifyName == '请选择护理项目分类'"
-              >{{ form.nurseStationItem.classifyName }}</el-button
+            >{{ form.nurseStationItem.classifyName }}</el-button>
-            >
             <el-button
-              type=""
+              type
               style="
                 width: 208px;
                 text-align: left;
@@ -278,14 +221,10 @@
               "
               @click="clickClassifyshow"
               v-else
-              >{{ form.nurseStationItem.classifyName }}</el-button
+            >{{ form.nurseStationItem.classifyName }}</el-button>
-            >
           </template>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="护理项目名称" prop="nurseStationItem.nurseItemName">
-          label="护理项目名称"
-          prop="nurseStationItem.nurseItemName"
-        >
           <el-input
             v-model="form.nurseStationItem.nurseItemName"
             placeholder="请输入护理项目名称"
@@ -293,56 +232,52 @@
           />
         </el-form-item>
         <el-form-item label="提前预约时长" prop="nurseStationItem.advanceAppointDuration">
-        <el-select
+          <el-select
-              v-model="form.nurseStationItem.advanceAppointDuration"
+            v-model="form.nurseStationItem.advanceAppointDuration"
-              placeholder="请选择提前预约时长"
+            placeholder="请选择提前预约时长"
+            style="width:208px"
+            clearable
+          >
+            <el-option
               style="width:208px"
-              clearable
+              v-for="item in optionlist"
-            >
+              :key="item.value"
-              <el-option
+              :label="item.label"
-               style="width:208px"
+              :value="item.value"
-                v-for="item in optionlist"
+            ></el-option>
-                :key="item.value"
+          </el-select>
-                :label="item.label"
+        </el-form-item>
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-     
-      
         <el-form-item label="预约人数上限" prop="nurseStationItem.appointmentLimitCount">
           <el-input
             placeholder="请输入预约人数上限"
-            v-model="form.nurseStationItem.appointmentLimitCount"
+            v-model.number="form.nurseStationItem.appointmentLimitCount"
             oninput="value=value.replace(/[^\d]/g,'')"
-            maxLength="8"
+            maxlength="8"
           />
         </el-form-item>
         <el-form-item label="预约时间间隔" prop="nurseStationItem.appointmentTimeInterval">
-        <el-select
+          <el-select
-        style="width:208px"
+            style="width:208px"
-              v-model="form.nurseStationItem.appointmentTimeInterval"
+            v-model="form.nurseStationItem.appointmentTimeInterval"
-              placeholder="请选择预约时间间隔"
+            placeholder="请选择预约时间间隔"
-            >
+          >
-              <el-option
+            <el-option
-                v-for="item in options"
+              v-for="item in options"
-                :key="item.value"
+              :key="item.value"
-                :label="item.label"
+              :label="item.label"
-                :value="item.value"
+              :value="item.value"
-              >
+            ></el-option>
-              </el-option>
+          </el-select>
-            </el-select>
+        </el-form-item>
-          </el-form-item>
+        <el-form-item label="排序" prop="nurseStationItem.sort">
-          <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             placeholder="请输入排序"
             v-model="form.nurseStationItem.sort"
             oninput="value=value.replace(/[^\d]/g,'')"
-            maxLength="5"
+            maxlength="5"
           />
         </el-form-item>
-          <el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl">
+        <el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl">
           <stationAcatar
             style="width: 208px"
             @imgUrl="imgUrl"
@@ -350,11 +285,7 @@
             :type="'itemPictureUrl'"
           />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="项目内容简介" prop="nurseStationItem.nurseItemContent">
-          label="项目内容简介"
-          prop="nurseStationItem.nurseItemContent"
-        >
-
           <editor
             @imgs="imgs"
             maxlength="300"
@@ -370,16 +301,9 @@
             :data="form.nurseStationItemPrices"
             style="margin-top: 20px; width: 900px"
           >
-            <el-table-column
+            <el-table-column property="serveDurationUnit" label="服务时长和单位" align="center">
-              property="serveDurationUnit"
-              label="服务时长和单位"
-              align="center"
-            >
               <template slot-scope="scope">
-                <el-input
+                <el-input v-model="scope.row.serveDurationUnit" maxlength="6"></el-input>
-                  v-model="scope.row.serveDurationUnit"
-                  maxlength="6"
-                ></el-input>
               </template>
             </el-table-column>
             <el-table-column property="price" label="价格" align="center">
@@ -395,92 +319,46 @@
             </el-table-column>
             <el-table-column property="description" label="描述" align="center">
               <template slot-scope="scope">
-                <el-input
+                <el-input v-model="scope.row.description" maxlength="300"></el-input>
-                  v-model="scope.row.description"
-                  maxlength="300"
-                ></el-input>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" @click="addnurseStationItemPrices">新增</el-button>
-                  size="mini"
+                <el-button size="mini" type="text" @click="delnurseStationItemPrices(scope.row)">删除</el-button>
-                  type="text"
-                  @click="addnurseStationItemPrices"
-                  >新增</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="delnurseStationItemPrices(scope.row)"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </el-form-item>
         <el-form-item label="护理项目耗材">
-          <el-button
+          <el-button type="primary" size="small" plain @click="listStationConsumableinfo">添加护理项目耗材</el-button>
-            type="primary"
-            size="small"
-            plain
-            @click="listStationConsumableinfo"
-            >添加护理项目耗材</el-button
-          >
           <el-table
             ref="singleTable"
             :data="form.nurseStationItemConsumables"
             style="margin-top: 20px; width: 900px"
           >
-            <el-table-column
+            <el-table-column property="nurseStationConsumableId" label="耗材包名称" align="center">
-              property="nurseStationConsumableId"
+              <template slot-scope="scope">{{ scope.row.consumableDetail }}</template>
-              label="耗材包名称"
-              align="center"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.consumableDetail }}
-              </template>
             </el-table-column>
 
-            <el-table-column
+            <el-table-column property="consumableCount" label="耗材包数量" align="center">
-              property="consumableCount"
-              label="耗材包数量"
-              align="center"
-            >
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.consumableCount"
                   oninput="value=value.replace(/[^\d]/g,'')"
-                  maxLength="9"
+                  maxlength="9"
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column property="consumablePrice" label="耗材包单位" align="center">
-              property="consumablePrice"
+              <template slot-scope="scope">{{ scope.row.consumableUnit }}</template>
-              label="耗材包单位"
-              align="center"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.consumableUnit }}
-              </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column property="consumablePrice" label="耗材包单价" align="center">
-              property="consumablePrice"
+              <template slot-scope="scope">{{ scope.row.consumablePrice }}</template>
-              label="耗材包单价"
-              align="center"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.consumablePrice }}
-              </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" @click="delConsumable(scope.row)">删除</el-button>
-                  size="mini"
-                  type="text"
-                  @click="delConsumable(scope.row)"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
@@ -501,38 +379,17 @@
     >
       <el-form :model="classifyquery" label-width="150px" :inline="true">
         <el-form-item label="护理项目分类编码" prop="classifyCode">
-          <el-input
+          <el-input v-model="classifyquery.classifyCode" placeholder="请输入护理项目分类编码" />
-            v-model="classifyquery.classifyCode"
-            placeholder="请输入护理项目分类编码"
-          />
         </el-form-item>
         <el-form-item label="护理项目分类名称" prop="classifyName">
-          <el-input
+          <el-input v-model="classifyquery.classifyName" placeholder="请输入护理项目分类名称" />
-            v-model="classifyquery.classifyName"
-            placeholder="请输入护理项目分类名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="classifylistInfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="classifylistcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="classifylistInfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="classifylistcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="classifylist" @cell-dblclick="choiceclassify">
-        v-loading="loading"
-        :data="classifylist"
-        @cell-dblclick="choiceclassify"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -548,22 +405,11 @@
               circle
               v-else
               @click="choiceclassify(scope.row)"
-            >
+            ></el-button>
-            </el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="classifyCode" label="护理项目分类编码" align="center"></el-table-column>
-          property="classifyCode"
+        <el-table-column property="classifyName" label="护理项目分类名称" align="center"></el-table-column>
-          label="护理项目分类编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classifyName"
-          label="护理项目分类名称"
-          align="center"
-        >
-        </el-table-column>
       </el-table>
       <pagination
         v-show="classifytotal > 0"
@@ -581,42 +427,19 @@
       append-to-body
       :before-close="clicknurseStationshow"
     >
-      <el-form
+      <el-form ref="form" :model="getListByUserquery" label-width="110px" :inline="true">
-        ref="form"
-        :model="getListByUserquery"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="护理站编码" prop="nurseStationCode">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationCode" placeholder="请输入护理站编码" />
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编码"
-          />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationName" placeholder="请输入护理站名称" />
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入护理站名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="nurseStationlist" @cell-dblclick="choicestationid">
-        v-loading="loading"
-        :data="nurseStationlist"
-        @cell-dblclick="choicestationid"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -632,31 +455,18 @@
               circle
               v-else
               @click="choicestationid(scope.row)"
-            >
+            ></el-button>
-            </el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
-          property="nurseStationCode"
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
-          label="护理站编码"
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
-        </el-table-column>
         <el-table-column
           property="address"
           label="护理站地址"
           align="center"
           :show-overflow-tooltip="true"
-        >
+        ></el-table-column>
-        </el-table-column>
       </el-table>
 
       <pagination
@@ -675,17 +485,9 @@
       append-to-body
       :before-close="clickstationConsumableshow"
     >
-      <el-form
+      <el-form ref="form" :model="StationConsumablequeryParams" label-width="110px" :inline="true">
-        ref="form"
-        :model="StationConsumablequeryParams"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="耗材包名称" prop="nurseStationId">
-          <el-input
+          <el-input v-model="StationConsumablequeryParams.consumableDetail" placeholder="请输入耗材包名称" />
-            v-model="StationConsumablequeryParams.consumableDetail"
-            placeholder="请输入耗材包名称"
-          />
         </el-form-item>
         <el-form-item>
           <el-button
@@ -693,14 +495,8 @@
             icon="el-icon-search"
             size="mini"
             @click="listStationConsumableinfo"
-            >搜索</el-button
+          >搜索</el-button>
-          >
+          <el-button icon="el-icon-refresh" size="mini" @click="listStationConsumableinfocancel">重置</el-button>
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="listStationConsumableinfocancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
       <el-table
@@ -729,31 +525,11 @@
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="护理站名称" align="center" prop="nurseStationName" />
-          label="护理站名称"
+        <el-table-column label="耗材包编号" align="center" prop="consumableCode" />
-          align="center"
+        <el-table-column label="耗材包名称" align="center" prop="consumableDetail" />
-          prop="nurseStationName"
+        <el-table-column label="耗材包单位" align="center" prop="consumableUnit" />
-        />
+        <el-table-column label="耗材包价格" align="center" prop="consumablePrice" />
-        <el-table-column
-          label="耗材包编号"
-          align="center"
-          prop="consumableCode"
-        />
-        <el-table-column
-          label="耗材包名称"
-          align="center"
-          prop="consumableDetail"
-        />
-        <el-table-column
-          label="耗材包单位"
-          align="center"
-          prop="consumableUnit"
-        />
-        <el-table-column
-          label="耗材包价格"
-          align="center"
-          prop="consumablePrice"
-        />
       </el-table>
       <el-button
         type="primary"
@@ -766,8 +542,7 @@
           height: 40px;
           font-size: 15px;
         "
-        >选择完成</el-button
+      >选择完成</el-button>
-      >
       <pagination
         v-show="total3 > 0"
         :total="total3"
@@ -777,12 +552,7 @@
       />
     </el-dialog>
     <!-- //导入 -->
-    <el-dialog
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      append-to-body
-    >
       <el-upload
         ref="upload"
         :limit="1"
@@ -796,7 +566,10 @@
         drag
       >
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link
@@ -804,8 +577,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >下载模板</el-link
+          >下载模板</el-link>
-          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">

src/views/system/stationItem/stationItemjs.js

@@ -19,8 +19,8 @@ export default {
     name: "NurseItem",
     data() {
         return {
-             // 弹出层判断新增还是修改
+            // 弹出层判断新增还是修改
-      isEditFlag: false,
+            isEditFlag: false,
             imgsurl: { pictureUrlList: [] },
             imageUrl: "",
             imgone: "",
@@ -127,25 +127,21 @@ export default {
                     nurseItemContent: "",
                     advanceAppointDuration: "",
                     itemPictureUrl: "",
-                    sort: "",
+                    sort: null,
                     nurseStationName: "请选择所属护理站",
                     classifyName: '请选择护理项目分类',
                     nurseClassifyId: '',
-                    appointmentLimitCount: "",
+                    appointmentLimitCount: null,
                     appointmentTimeInterval: "",
-
                 },
             },
             idd: 1,
             // 表单校验
             rules: {
-                nurseStationId: [
+                "nurseStationItem.classifyName": [
-                    { required: true, message: "所属护理站不能为空", trigger: "blur" },
-                ],
-                "nurseStationItem.classifyName":[
                     { required: true, message: "护理项目分类不能为空", trigger: "blur" },
                 ],
-                "nurseStationItem.nurseStationName":[
+                "nurseStationItem.nurseStationName": [
                     { required: true, message: "护理项目分类不能为空", trigger: "blur" },
                 ],
                 "nurseStationItem.nurseItemContent": [
@@ -157,8 +153,8 @@ export default {
                 // "nurseStationItem.advanceAppointDuration": [
                 //     { required: true, message: "提前预约时长不能为空", trigger: "blur" },
                 // ],
-                 // }, ],
+                // }, ],
-                 "nurseStationItem.appointmentTimeInterval": [{
+                "nurseStationItem.appointmentTimeInterval": [{
                     required: true,
                     trigger: "blur",
                     message: "请选择预约时间点间隔",
@@ -447,7 +443,8 @@ export default {
                     sort: null,
                     nurseStationName: "请选择所属护理站",
                     classifyName: '请选择护理项目分类',
-                    nurseClassifyId: ''
+                    nurseClassifyId: '',
+                    appointmentLimitCount: null,
                 },
                 nurseStationItemConsumables: [
                     // {
@@ -562,11 +559,6 @@ export default {
             this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
             this.$refs["form"].validate((valid) => {
                 if (valid) {
-                    if( this.form.nurseStationItem.appointmentLimitCount==""){
-                        this.form.nurseStationItem.appointmentLimitCount=null
-                      }else{
-                        this.form.nurseStationItem.appointmentLimitCount=parseInt(this.form.nurseStationItem.appointmentLimitCount)
-                      }
                     if (this.form.nurseStationItem.id != null) {
                         this.form.nurseStationItemPrices.forEach((e) => {
                             e.nurseStationItemId = this.form.nurseStationItem.id;
@@ -589,11 +581,9 @@ export default {
                             this.getList();
                         });
                     } else {
-                    
                         this.form.nurseStationItemPrices.forEach(e => {
                             e.price = Number(e.price)
                         })
-
                         addNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
                             this.$forceUpdate();
@@ -628,4 +618,3 @@ export default {
         },
     },
 };
-