Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/system/goodsOrder/index.vue
#	src/views/system/order/index.vue
#	src/views/system/person/index.vue

src/views/system/person/index.vue

@@ -891,11 +891,16 @@
             >{{ departmentName }}</el-button
           >
         </el-form-item>
+        <el-form-item label="姓名" prop="nursePersonName" >
+          <el-input
+            maxlength="15"
+            v-model="form.nursePersonName"
+            placeholder="请输入姓名"
+          />
+        </el-form-item>
         <el-form-item
           label="护理人职称"
           prop="nursePersonType"
-          label-width="120px"
-          style="margin-left: -22px"
         >
           <el-select
             v-model="form.nursePersonType"
@@ -935,7 +940,6 @@
             maxlength="11"
           />
         </el-form-item>
-
         <el-form-item label="居住地址" prop="address">
           <el-input
             v-model="form.address"
@@ -1148,13 +1152,6 @@ export default {
       index: "",
       // 表单校验
       rules: {
-        nursePersonName: [
-          {
-            required: true,
-            message: "护理站人员名称不能为空",
-            trigger: "blur",
-          },
-        ],
         departmentName: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],

src/views/system/station/index.vue

@@ -250,13 +250,13 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-search"
             @click="looknurseStationLabelList(scope.row)"
             >查看标签信息</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
@@ -311,7 +311,7 @@
     </el-dialog>
 
     <!-- 查看标签信息 -->
-    <el-dialog
+    <!-- <el-dialog
       title="标签信息"
       :visible.sync="nurseStationLabelopen"
       width="700px"
@@ -335,7 +335,7 @@
           >关闭窗口</el-button
         >
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- 新增护理站信息对话框 -->
     <el-dialog
@@ -907,14 +907,14 @@ export default {
       console.log(this.looknurseStationLabel);
     },
     //查看标签
-    looknurseStationLabelList(item) {
+    // looknurseStationLabelList(item) {
-      console.log(item);
+    //   console.log(item);
-      nurseStationlabel(item.id).then((res) => {
+    //   nurseStationlabel(item.id).then((res) => {
-        this.looknurseStationLabel = res.rows;
+    //     this.looknurseStationLabel = res.rows;
-        this.nurseStationLabelopen = true;
+    //     this.nurseStationLabelopen = true;
-        console.log(this.looknurseStationLabel);
+    //     console.log(this.looknurseStationLabel);
-      });
+    //   });
-    },
+    // },
     //查看类型
     looktype(item) {
       // console.log(item);

src/views/system/stationItem/index.vue

@@ -1189,6 +1189,7 @@ export default {
           } else {
             addNurseItem(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
+              this.$forceUpdate()
               this.open = false;
               this.getList();
             });