From 28e8ab9c2adbb58f7114b8a2032fb0e22d1e9ebf Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 9 Nov 2022 18:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/stationConsumable/index.vue | 19 +++++++++--------
 src/views/system/stationItem/index.vue       | 22 +++++++-------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index efd0e83..2f9e7cd 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -524,15 +524,7 @@
         :inline="true"
         label-width="90px"
       >
-        <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
-            style="width: 180px"
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery2"
-          />
-        </el-form-item>
+       
         <el-form-item label="护理站编码" prop="nurseStationCode">
           <el-input
             style="width: 180px"
@@ -541,6 +533,15 @@
             clearable
             @keyup.enter.native="handleQuery2"
           />
+        </el-form-item>
+         <el-form-item label="护理站名称" prop="nurseStationName">
+          <el-input
+            style="width: 180px"
+            v-model="getListByUserquery.nurseStationName"
+            placeholder="请输入项目名称"
+            clearable
+            @keyup.enter.native="handleQuery2"
+          />
         </el-form-item>
         <el-form-item>
           <el-button
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 6c1ed6d..30b8e68 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -192,11 +192,6 @@
         align="center"
         prop="nurseItemName"
       />
-      <!-- <el-table-column
-        label="护理项目内容简介"
-        align="center"
-        prop="nurseItemContent"
-      /> -->
       <el-table-column
         label="提前预约时长(h)"
         align="center"
@@ -204,8 +199,6 @@
       />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-
-      <!-- <el-table-column label="排序" align="center" prop="sort" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -498,18 +491,19 @@
         label-width="110px"
         :inline="true"
       >
-        <el-form-item label="护理站名称" prop="nurseStationName">
+       
+        <el-form-item label="护理站编码" prop="nurseStationCode">
+          <el-input
+            v-model="getListByUserquery.nurseStationCode"
+            placeholder="请输入护理站编码"
+          />
+        </el-form-item>
+         <el-form-item label="护理站名称" prop="nurseStationName">
           <el-input
             v-model="getListByUserquery.nurseStationName"
             placeholder="请输入护理站名称"
           />
         </el-form-item>
-        <el-form-item label="护理站编号" prop="nurseStationCode">
-          <el-input
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编号"
-          />
-        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"