diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 8aa4a6c..32c29b4 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -11,8 +11,7 @@
       style="display: none"
       ref="upload"
       v-if="this.type == 'url'"
-    >
-    </el-upload>
+    ></el-upload>
     <div class="editor" ref="editor" :style="styles"></div>
   </div>
 </template>
@@ -30,32 +29,32 @@ export default {
     /* 编辑器的内容 */
     value: {
       type: String,
-      default: "",
+      default: ""
     },
     /* 高度 */
     height: {
       type: Number,
-      default: null,
+      default: null
     },
     /* 最小高度 */
     minHeight: {
       type: Number,
-      default: null,
+      default: null
     },
     /* 只读 */
     readOnly: {
       type: Boolean,
-      default: false,
+      default: false
     },
     // 上传文件大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 5
     },
     /* 类型（base64格式、url格式） */
     type: {
       type: String,
-      default: "url",
+      default: "url"
     }
   },
   data() {
@@ -73,21 +72,21 @@ export default {
         modules: {
           // 工具栏配置
           toolbar: [
-            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"],                    // 引用  代码块
-            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-            [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image"]                       // 链接、图片、视频
-          ],
+            ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
+            ["blockquote", "code-block"], // 引用  代码块
+            [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
+            [{ indent: "-1" }, { indent: "+1" }], // 缩进
+            [{ size: ["small", false, "large", "huge"] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            [{ align: [] }], // 对齐方式
+            ["clean"], // 清除文本格式
+            ["link", "image"] // 链接、图片、视频
+          ]
         },
         placeholder: "请输入内容",
-        readOnly: this.readOnly,
-      },
+        readOnly: this.readOnly
+      }
     };
   },
   computed: {
@@ -100,7 +99,7 @@ export default {
         style.height = `${this.height}px`;
       }
       return style;
-    },
+    }
   },
   watch: {
     value: {
@@ -112,8 +111,8 @@ export default {
           }
         }
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
   mounted() {
     this.init();
@@ -126,9 +125,9 @@ export default {
       const editor = this.$refs.editor;
       this.Quill = new Quill(editor, this.options);
       // 如果设置了上传地址则自定义图片上传事件
-      if (this.type == 'url') {
+      if (this.type == "url") {
         let toolbar = this.Quill.getModule("toolbar");
-        toolbar.addHandler("image", (value) => {
+        toolbar.addHandler("image", value => {
           this.uploadType = "image";
           if (value) {
             this.$refs.upload.$children[0].$refs.input.click();
@@ -176,10 +175,12 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
-
+        quill.insertEmbed(
+          length,
+          "image",
+          process.env.VUE_APP_BASE_API + res.fileName
+        );
         this.$emit("imgs", res.fileName);
-
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {
@@ -188,13 +189,14 @@ export default {
     },
     handleUploadError() {
       this.$message.error("图片插入失败");
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style>
-.editor, .ql-toolbar {
+.editor,
+.ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
 }
diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js
index 97cf9bb..fd0bbe3 100644
--- a/src/views/system/goodsOrder/indexjs.js
+++ b/src/views/system/goodsOrder/indexjs.js
@@ -25,8 +25,7 @@ export default {
             innerrefund: false,
             orderList: [],
             refundlist: [],
-            orderTypelist: [
-                {
+            orderTypelist: [{
                     value: "INTEGRAL_EXCHANGE",
                     label: "积分兑换",
                 },
@@ -40,45 +39,45 @@ export default {
             ],
             ratelist: {}, //评分list
             orderStatuslist: [{
-                value: "WAIT_PAY",
-                label: "待付款",
-            },
-            {
-                value: "PAY",
-                label: "待发货",
-            },
-            {
-                value: "WAIT_RECEIVED_GOODS",
-                label: "待收货",
-            },
-            {
-                value: "RECEIVED_GOODS",
-                label: "待评价",
-            },
-            {
-                value: "EVALUATED",
-                label: "交易完成",
-            },
-            {
-                value: "CANCEL",
-                label: "已取消",
-            },
-            {
-                value: "WAIT_RETURNED_GOODS",
-                label: "待退货",
-            },
-            {
-                value: "RETURNED_GOODS",
-                label: "已退货",
-            },
-            {
-                value: "WAIT_REFUND",
-                label: "退款中",
-            },
-            {
-                value: "REFUNDED",
-                label: "退款成功",
-            },
+                    value: "WAIT_PAY",
+                    label: "待付款",
+                },
+                {
+                    value: "PAY",
+                    label: "待发货",
+                },
+                {
+                    value: "WAIT_RECEIVED_GOODS",
+                    label: "待收货",
+                },
+                {
+                    value: "RECEIVED_GOODS",
+                    label: "待评价",
+                },
+                {
+                    value: "EVALUATED",
+                    label: "交易完成",
+                },
+                {
+                    value: "CANCEL",
+                    label: "已取消",
+                },
+                {
+                    value: "WAIT_RETURNED_GOODS",
+                    label: "待退货",
+                },
+                {
+                    value: "RETURNED_GOODS",
+                    label: "已退货",
+                },
+                {
+                    value: "WAIT_REFUND",
+                    label: "退款中",
+                },
+                {
+                    value: "REFUNDED",
+                    label: "退款成功",
+                },
             ],
             // 遮罩层
             loading: true,
@@ -157,13 +156,6 @@ export default {
             this.queryParams.nurseStationId = item.id;
             this.nurseStationshow = false;
         },
-        //护理站list
-        info() {
-            getListByUser(this.getListByUserquery).then((res) => {
-                this.nurseStationlist = res.rows;
-                this.stationtotal = res.total;
-            });
-        },
         //页面所属护理站
         ParamsStation(item) {
             console.log(this.getListByUserquery)
@@ -224,7 +216,6 @@ export default {
                     return "微信小程序";
                 case "ALI_PAY_APPLET":
                     return "支付宝小程序";
-
                 default:
                     break;
             }
@@ -236,6 +227,8 @@ export default {
                     return "护理站";
                 case "SHOPPING_MALL":
                     return "商城";
+                case "HEALTH_CONSULTATION":
+                    return "健康咨询";
                 default:
                     break;
             }
@@ -258,7 +251,7 @@ export default {
                 this.ratelist = {}
                 if (row.orderStatus == 'EVALUATED') {
                     this.ratelist = res.data.orderEvaluatePictureInfoList
-                } else { }
+                } else {}
             });
         },
         // 查看录入物流单号弹框
@@ -298,7 +291,7 @@ export default {
         //确认退款 确定按钮
         submitRefundOrder() {
             var obj = {};
-            obj.orderType=this.refundlist.orderType;
+            obj.orderType = this.refundlist.orderType;
             obj.orderNo = this.refundlist.goOrderNo;
             obj.refundReason = this.refundlist.dictLabel;
             obj.refundPrice = this.refundlist.godTotalPrice;
@@ -419,21 +412,21 @@ export default {
             const ids = row.id || this.ids;
             this.$modal
                 .confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？')
-                .then(function () {
+                .then(function() {
                     return delGoodsOrder(ids);
                 })
                 .then(() => {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => { });
+                .catch(() => {});
         },
         /** 导出按钮操作 */
         handleExport() {
             this.download(
                 "system/goodsOrder/export", {
-                ...this.queryParams,
-            },
+                    ...this.queryParams,
+                },
                 `goodsOrder_${new Date().getTime()}.xlsx`
             );
         },
diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue
index 491fb7e..db8341c 100644
--- a/src/views/system/hospital/index.vue
+++ b/src/views/system/hospital/index.vue
@@ -116,31 +116,34 @@
     />
 
     <!-- 添加或修改医院信息管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <el-form-item label="医院名称" prop="hospitalName">
-          <el-input v-model="form.hospitalName" style="width:200px"  placeholder="请输入医院名称" />
+          <el-input v-model="form.hospitalName" style="width:200px" maxlength="50" placeholder="请输入医院名称" />
         </el-form-item>
         <!-- <el-form-item label="医院编码" prop="hospitalCode">
           <el-input v-model="form.hospitalCode" placeholder="请输入医院编码" />
         </el-form-item> -->
         <el-form-item label="医院地址" prop="hospitalAddress">
-          <el-input style="width:200px" v-model="form.hospitalAddress" placeholder="请输入医院地址" />
+          <el-input style="width:200px" v-model="form.hospitalAddress" maxlength="300" placeholder="请输入医院地址" />
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="form.phone" maxlength="11" style="width:200px"  placeholder="请输入联系电话" />
+          <el-input v-model="form.phone" maxlength="11" 
+          oninput="value=value.replace(/[^\d]/g,'')" style="width:200px"  placeholder="请输入联系电话" />
         </el-form-item>
         <el-form-item label="显示顺序" prop="hospitalSort">
-          <el-input v-model="form.hospitalSort" maxlength="5" style="width:200px" placeholder="请输入显示顺序" />
+          <el-input v-model.number="form.hospitalSort" maxlength="5" style="width:200px" placeholder="请输入显示顺序" />
         </el-form-item>
         <el-form-item label="医院简介" prop="hospitalIntroduce">
           <editor
             @imgs="imgs"
             :min-height="100"
             v-model="form.hospitalIntroduce"
+            style="width:1000px;"
           ></editor>
           <!-- <el-input v-model="form.hospitalIntroduce" type="textarea" placeholder="请输入内容" /> -->
         </el-form-item>
+
       
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -159,16 +162,16 @@ export default {
   components: {  editor },
   name: "Hospital",
   data() {
-     // 验证手机号的规则
-     var checkMobile = (rule, value, cb) => {
-      // 验证手机号的正则表达式
-      const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
-      if (regMobile.test(value)) {
-        return cb();
-      }
-      cb(new Error("请输入正确的联系电话"));
-    };
+    //  // 验证手机号的规则
+    //  var checkMobile = (rule, value, cb) => {
+    //   // 验证手机号的正则表达式
+    //   const regMobile =
+    //     /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+    //   if (regMobile.test(value)) {
+    //     return cb();
+    //   }
+    //   cb(new Error("请输入正确的联系电话"));
+    // };
     return {
       // 遮罩层
       loading: true,
@@ -221,7 +224,7 @@ export default {
         phone: [
           {
             required: true,  
-            validator: checkMobile,
+            // validator: checkMobile,
             message: "",
             trigger: "blur",
           },
@@ -339,7 +342,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除医院信息管理编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除此医院的信息？').then(function() {
         return delHospital(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue
index f197abe..00a45f4 100644
--- a/src/views/system/hospitalDepartment/index.vue
+++ b/src/views/system/hospitalDepartment/index.vue
@@ -8,7 +8,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-
       <el-form-item label="医院名称" prop="hospitalName">
         <el-input
           v-model="queryParams.hospitalName"
@@ -30,6 +29,7 @@
           v-model="queryParams.departmentName"
           placeholder="请输入科室名称"
           clearable
+          maxlength="50"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -113,17 +113,17 @@
         align="center"
         prop="departmentPerson"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="科室地址"
         align="center"
         prop="departmentAddress"
-      />
+      /> -->
       <!-- <el-table-column label="科室显示级别" align="center" prop="departmentLevel" /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="科室显示顺序"
         align="center"
         prop="departmentSort"
-      />
+      /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -162,7 +162,7 @@
     <el-dialog
       :title="title"
       :visible.sync="addopen"
-      width="900px"
+      width="1200px"
       append-to-body
       :before-close="cancel"
     >
@@ -220,6 +220,7 @@
               style="width: 250px"
               v-model="item.departmentName"
               placeholder="请输入科室名称"
+              maxlength="50"
             />
           </el-form-item>
           <el-form-item
@@ -228,8 +229,9 @@
             :prop="`hospitalDepartmentInfoList.${index}.departmentPhone`"
           >
             <el-input
-            maxlength="11"
+              maxlength="11"
               style="width: 250px"
+              oninput="value=value.replace(/[^\d]/g,'')"
               v-model="item.departmentPhone"
               placeholder="请输入科室联系电话"
             />
@@ -241,6 +243,7 @@
           >
             <el-input
               style="width: 250px"
+              maxlength="20"
               v-model="item.departmentPerson"
               placeholder="请输入科室负责人名称"
             />
@@ -252,6 +255,7 @@
           >
             <el-input
               style="width: 250px"
+              maxlength="300"
               v-model="item.departmentAddress"
               placeholder="请输入科室地址"
             />
@@ -262,10 +266,11 @@
             :prop="`hospitalDepartmentInfoList.${index}.departmentSort`"
           >
             <el-input
-            maxlength="5"
-              v-model="item.departmentSort"
+              maxlength="5"
+              oninput="value=value.replace(/[^\d]/g,'')"
+              v-model.number="item.departmentSort"
               placeholder="请输入科室显示顺序"
-              style="width:250px"
+              style="width: 250px"
             />
           </el-form-item>
           <el-button
@@ -399,8 +404,19 @@
       />
     </el-dialog>
     <!-- 修改护理站部门信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="所属医院" prop="hospitalName">
           <el-input
             v-model="form.hospitalName"
@@ -415,13 +431,14 @@
             v-model="form.departmentName"
             placeholder="请输入科室名称"
             style="width: 250px"
-            maxlength="15"
+            maxlength="50"
           />
         </el-form-item>
         <el-form-item label="科室负责人" prop="departmentPerson">
           <el-input
             v-model="form.departmentPerson"
             placeholder="请输入科室负责人"
+            maxlength="20"
             style="width: 250px"
           />
         </el-form-item>
@@ -429,6 +446,7 @@
           <el-input
             v-model="form.departmentPhone"
             placeholder="请输入联系电话"
+            oninput="value=value.replace(/[^\d]/g,'')"
             maxlength="11"
             style="width: 250px"
           />
@@ -438,12 +456,14 @@
             v-model="form.departmentAddress"
             placeholder="请输入科室地址"
             style="width: 250px"
+            maxlength="300"
           />
         </el-form-item>
         <el-form-item label="科室显示顺序" prop="departmentSort">
           <el-input
-          maxlength="5"
-            v-model="form.departmentSort"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            maxlength="5"
+            v-model.number="form.departmentSort"
             placeholder="请输入科室显示顺序"
             style="width: 250px"
           />
@@ -472,15 +492,15 @@ export default {
   name: "HospitalDepartment",
   data() {
     // 验证手机号的规则
-    var checkMobile = (rule, value, cb) => {
-      // 验证手机号的正则表达式
-      const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
-      if (regMobile.test(value)) {
-        return cb();
-      }
-      cb(new Error("请输入正确的联系电话"));
-    };
+    // var checkMobile = (rule, value, cb) => {
+    //   // 验证手机号的正则表达式
+    //   const regMobile =
+    //     /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+    //   if (regMobile.test(value)) {
+    //     return cb();
+    //   }
+    //   cb(new Error("请输入正确的联系电话"));
+    // };
     return {
       // 遮罩层
       loading: true,
@@ -489,8 +509,8 @@ export default {
       hospitalqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        hospitalCode:"",
-        hospitalName:"",
+        hospitalCode: "",
+        hospitalName: "",
       },
       infolist: [],
       // 非单个禁用
@@ -568,7 +588,7 @@ export default {
           departmentPhone: [
             {
               required: true,
-              validator: checkMobile,
+              // validator: checkMobile,
               trigger: "blur",
               message: "",
             },
@@ -599,7 +619,7 @@ export default {
         departmentPhone: [
           {
             required: true,
-            validator: checkMobile,
+            // validator: checkMobile,
             trigger: "blur",
             message: "",
           },
@@ -617,10 +637,8 @@ export default {
             required: true,
             message: "请输入科室显示顺序",
             trigger: "blur",
-            message: "",
           },
         ],
-
       },
     };
   },
@@ -647,11 +665,10 @@ export default {
       //   this.form.hospitalName = row.hospitalName;
       //   this.form.hospitalId = row.id;
       // } else {
-        this.form.hospitalDepartmentInfoList[
-          this.nnerVisibleindex
-        ].hospitalName = row.hospitalName;
-        this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId =
-          row.id;
+      this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalName =
+        row.hospitalName;
+      this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId =
+        row.id;
       // }
       this.innerVisible = false;
     },
@@ -694,8 +711,8 @@ export default {
       this.hospitalqueryParams = {
         pageNum: 1,
         pageSize: 10,
-        hospitalCode:"",
-        hospitalName:"",
+        hospitalCode: "",
+        hospitalName: "",
       };
       this.info();
     },
@@ -709,9 +726,9 @@ export default {
       });
     },
     info() {
-      list(this.hospitalqueryParams,).then((response) => {
+      list(this.hospitalqueryParams).then((response) => {
         this.infolist = response.rows;
-        console.log(this.infolist)
+        console.log(this.infolist);
         this.total2 = response.total;
         this.loading = false;
       });
@@ -751,9 +768,9 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        hospitalName:"",
-        departmentCode:"",
-        departmentName:"",
+        hospitalName: "",
+        departmentCode: "",
+        departmentName: "",
       };
       this.handleQuery();
     },
@@ -804,7 +821,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除科室信息管理编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除此科室的信息？")
         .then(function () {
           return delHospitalDepartment(ids);
         })
diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue
index 9a0928d..9f4b366 100644
--- a/src/views/system/hospitalPerson/index.vue
+++ b/src/views/system/hospitalPerson/index.vue
@@ -8,31 +8,43 @@
       v-show="showSearch"
       label-width="130px"
     >
+      <el-form-item label="所属医院" prop="hospitalId">
+        <el-button type class="stationbtn" @click="clickinnerVisible(true)">
+          {{ queryParams.hospitalName }}
+        </el-button>
+      </el-form-item>
+      <el-form-item label="所属科室" prop="departmentId" label-width="100px">
+        <el-button type class="stationbtn" @click="clicklist(true)">
+          {{ queryParams.departmentName }}
+        </el-button>
+      </el-form-item>
       <el-form-item label="人员名称" prop="personName">
         <el-input
           v-model="queryParams.personName"
           placeholder="请输入科室人员名称"
           clearable
+          maxlength="7"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="人员联系电话" prop="personPhone">
+      <el-form-item label="联系电话" prop="personPhone">
         <el-input
           v-model="queryParams.personPhone"
-          placeholder="请输入人员联系电话"
+          placeholder="请输入联系电话"
           clearable
+          oninput="value=value.replace(/[^\d]/g,'')"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="身份证号" prop="cardNo">
+      <!-- <el-form-item label="身份证号" prop="cardNo">
         <el-input
           v-model="queryParams.cardNo"
           placeholder="请输入身份证号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button
@@ -84,7 +96,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -94,7 +106,7 @@
           v-hasPermi="['system:hospitalPerson:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -112,9 +124,9 @@
       <el-table-column label="所属部门" align="center" prop="departmentName" />
       <el-table-column label="人员编码" align="center" prop="personCode" />
       <el-table-column label="人员名称" align="center" prop="personName" />
-      <el-table-column label="人员联系电话" align="center" prop="personPhone" />
-      <el-table-column label="人员地址" align="center" prop="personAddress" />
-      <el-table-column label="身份证号" align="center" prop="cardNo" />
+      <el-table-column label="联系电话" align="center" prop="personPhone" />
+      <!-- <el-table-column label="人员地址" align="center" prop="personAddress" /> -->
+      <!-- <el-table-column label="身份证号" align="center" prop="cardNo" /> -->
       <el-table-column label="人员职称" align="center" prop="academicTitle">
         <template slot-scope="scope">
           {{ scope.row.academicTitle == "CHIEF_PHYSICIAN" ? "主任医师" : "" }}
@@ -129,8 +141,7 @@
         </template>
       </el-table-column>
       <el-table-column label="咨询费用" align="center" prop="consultingFee" />
-      <!-- <el-table-column label="个人简介" align="center" prop="personIntroduce" /> -->
-      <el-table-column label="显示顺序" align="center" prop="personSort" />
+      <!-- <el-table-column label="显示顺序" align="center" prop="personSort" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -169,7 +180,8 @@
     <el-dialog
       :title="title"
       :visible.sync="addopen"
-      width="1100px"
+      width="1200px"
+      :before-close="cancel"
       append-to-body
     >
       <el-form
@@ -179,161 +191,185 @@
         label-width="140px"
         :inline="true"
       >
+        <el-form-item label="所属医院" prop="hospitalId">
+          <el-button
+            type=""
+            v-if="form.hospitalName == '请选择所属医院'"
+            @click="clickinnerVisible(false)"
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ form.hospitalName }}</el-button
+          >
+          <el-button
+            @click="clickinnerVisible(false)"
+            type=""
+            v-else
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ form.hospitalName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="所属科室" prop="departmentId">
+          <el-button
+            type=""
+            v-if="form.departmentName == '请选择所属科室'"
+            @click="clicklist(false)"
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ form.departmentName }}</el-button
+          >
+          <el-button
+            @click="clicklist(false)"
+            type=""
+            v-else
+            style="
+              width: 210px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ form.departmentName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="人员名称" prop="personName">
+          <el-input
+            v-model="form.personName"
+            maxlength="7"
+            placeholder="请输入人员名称"
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="personPhone">
+          <el-input
+            maxlength="11"
+            v-model="form.personPhone"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            placeholder="请输入联系电话"
+          />
+        </el-form-item>
+
+        <el-form-item label="人员地址" prop="personAddress">
+          <el-input
+            v-model="form.personAddress"
+            style="width: 210px"
+            maxlength="300"
+            placeholder="请输入人员地址"
+          />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardNo">
+          <el-input
+            maxlength="18"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            v-model="form.cardNo"
+            placeholder="请输入身份证号"
+          />
+        </el-form-item>
+        <el-form-item label="人员职称" prop="academicTitle">
+          <el-select
+            v-model="form.academicTitle"
+            placeholder="请选择"
+            style="width: 210px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="咨询费用" prop="consultingFee">
+          <el-input
+            maxlength="8"
+            :change="checkPrice()"
+            v-model="form.consultingFee"
+            placeholder="请输入咨询费用"
+          />
+        </el-form-item>
+        <el-form-item label="显示顺序" prop="personSort">
+          <el-input
+            oninput="value=value.replace(/[^\d]/g,'')"
+            maxlength="5"
+            v-model.number="form.personSort"
+            placeholder="请输入显示顺序"
+          />
+        </el-form-item>
+        <el-form-item label="人员头像" prop="personPictureUrl">
+          <stationAcatar
+            @imgUrl="imgUrl2"
+            :img="form.personPictureUrl"
+            :type="'personPictureUrl'"
+          />
+        </el-form-item>
+        <el-form-item label="个人简介" prop="personIntroduce">
+          <el-input
+            type="textarea"
+            :rows="5"
+            maxlength="30"
+            style="width: 540px"
+            placeholder="请输入个人简介"
+            v-model="form.personIntroduce"
+          ></el-input>
+        </el-form-item>
         <div
-          v-for="(item, index) in form.hospitalPersonInfoList"
+          v-for="(item, index) in form.hospitalPersonCertificateList"
           :key="index"
           style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
         >
           <el-form-item
-            label="所属医院"
-            :rules="rules.hospitalPersonInfoList.hospitalId"
-            :prop="`hospitalPersonInfoList.${index}.hospitalId`"
-          >
-            <el-button
-              type=""
-              v-if="item.hospitalName == '请选择所属医院'"
-              @click="clickinnerVisible(item, index)"
-              style="
-                width: 210px;
-                text-align: left;
-                height: 36px;
-                color: #c0c4cc;
-                overflow: hidden;
-              "
-              >{{ item.hospitalName }}</el-button
-            >
-            <el-button
-              @click="clickinnerVisible(item, index)"
-              type=""
-              v-else
-              style="
-                width: 210px;
-                text-align: left;
-                height: 36px;
-                padding-left: -10px;
-                overflow: hidden;
-              "
-              >{{ item.hospitalName }}</el-button
-            >
-          </el-form-item>
-          <el-form-item
-            label="所属科室"
-            :rules="rules.hospitalPersonInfoList.departmentId"
-            :prop="`hospitalPersonInfoList.${index}.departmentId`"
-          >
-            <el-button
-              type=""
-              v-if="item.departmentName == '请选择所属科室'"
-              @click="clicklist(item, index)"
-              style="
-                width: 210px;
-                text-align: left;
-                height: 36px;
-                color: #c0c4cc;
-                overflow: hidden;
-              "
-              >{{ item.departmentName }}</el-button
-            >
-            <el-button
-              @click="clicklist(item, index)"
-              type=""
-              v-else
-              style="
-                width: 210px;
-                text-align: left;
-                height: 36px;
-                padding-left: -10px;
-                overflow: hidden;
-              "
-              >{{ item.departmentName }}</el-button
-            >
-          </el-form-item>
-          <el-form-item
-            label="人员名称"
-            :rules="rules.hospitalPersonInfoList.personName"
-            :prop="`hospitalPersonInfoList.${index}.personName`"
-          >
-            <el-input  v-model="item.personName" placeholder="请输入人员名称" />
-          </el-form-item>
-          <el-form-item
-            label="人员联系电话"
-            :rules="rules.hospitalPersonInfoList.personPhone"
-            :prop="`hospitalPersonInfoList.${index}.personPhone`"
+            label="证书名称"
+            :rules="hospitalPersonCertificateList.certificateName"
+            :prop="`hospitalPersonCertificateList.${index}.certificateName`"
           >
             <el-input
-            maxlength="11"
-              v-model="item.personPhone"
-              placeholder="请输入人员联系电话"
+              maxlength="50"
+              v-model="item.certificateName"
+              placeholder="请输入证书名称"
+            />
+          </el-form-item>
+
+          <el-form-item
+            label="证书图片"
+            :rules="hospitalPersonCertificateList.certificateUrl"
+            :prop="`hospitalPersonCertificateList.${index}.certificateUrl`"
+          >
+            <stationAcatar
+            @imgUrl="imgUrl"
+              @item="imgclassifyItem"
+              :img="item.certificateUrl"
+              :item="item"
+              :type="'certificateUrl'"
             />
           </el-form-item>
           <el-form-item
-            label="人员地址"
-            :rules="rules.hospitalPersonInfoList.personAddress"
-            :prop="`hospitalPersonInfoList.${index}.personAddress`"
+            label="证书显示顺序"
+            :rules="hospitalPersonCertificateList.certificateSort"
+            :prop="`hospitalPersonCertificateList.${index}.certificateSort`"
           >
             <el-input
-              v-model="item.personAddress"
-              placeholder="请输入人员地址"
+              oninput="value=value.replace(/[^\d]/g,'')"
+              maxlength="5"
+              v-model.number="item.certificateSort"
+              placeholder="请输入证书显示顺序"
             />
           </el-form-item>
-          <el-form-item
-            label="身份证号"
-            :rules="rules.hospitalPersonInfoList.cardNo"
-            :prop="`hospitalPersonInfoList.${index}.cardNo`"
-          >
-            <el-input  maxlength="18" v-model="item.cardNo" placeholder="请输入身份证号" />
-          </el-form-item>
-          <el-form-item
-            label="人员职称"
-            :rules="rules.hospitalPersonInfoList.academicTitle"
-            :prop="`hospitalPersonInfoList.${index}.academicTitle`"
-          >
-            <el-select
-              v-model="item.academicTitle"
-              placeholder="请选择"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="咨询费用"
-            :rules="rules.hospitalPersonInfoList.consultingFee"
-            :prop="`hospitalPersonInfoList.${index}.consultingFee`"
-          >
-            <el-input
-            maxlength="10"
-              v-model="item.consultingFee"
-              placeholder="请输入咨询费用"
-            />
-          </el-form-item>
-          <el-form-item
-            label="显示顺序"
-            :rules="rules.hospitalPersonInfoList.personSort"
-            :prop="`hospitalPersonInfoList.${index}.personSort`"
-          >
-            <el-input
-            oninput="value=value.replace(/[^\d]/g,'')"
-            maxlength="5"
-             v-model="item.personSort" placeholder="请输入显示顺序" />
-          </el-form-item>
-          <el-form-item
-            label="个人简介"
-            :rules="rules.hospitalPersonInfoList.personIntroduce"
-            :prop="`hospitalPersonInfoList.${index}.personIntroduce`"
-          >
-            <editor
-              @imgs="imgs"
-              :min-height="100"
-              v-model="item.personIntroduce"
-            ></editor>
-          </el-form-item>
 
           <el-button
             type="primary"
@@ -411,7 +447,7 @@
             <el-button
               type="primary"
               style="width: 15px; height: 15px"
-              v-if="form.hospitalId == scope.row.id"
+              v-if="hospitalId == scope.row.id"
               circle
               @click="nurseclick(scope.row)"
             ></el-button>
@@ -443,13 +479,6 @@
           align="center"
         >
         </el-table-column>
-        <!-- <el-table-column
-          property="hospitalIntroduce"
-          label="医院介绍"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column> -->
         <el-table-column
           property="phone"
           label="联系电话"
@@ -466,7 +495,6 @@
         @pagination="info"
       />
     </el-dialog>
-
     <!-- 选择科室 -->
     <el-dialog
       title="选择科室"
@@ -523,7 +551,7 @@
             <el-button
               type="primary"
               style="width: 15px; height: 15px"
-              v-if="form.departmentId == scope.row.id"
+              v-if="departmentId == scope.row.id"
               circle
               @click="departmentclick(scope.row)"
             ></el-button>
@@ -571,366 +599,6 @@
         @pagination="departmentList"
       />
     </el-dialog>
-    <!-- 修改对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        :inline="true"
-      >
-        <el-form-item label="所属医院" prop="hospitalName">
-          <el-button
-            type=""
-            v-if="form.hospitalName == '请选择所属医院'"
-            @click="clickinnerVisiblexg()"
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              overflow: hidden;
-            "
-            >{{ foem.hospitalName }}</el-button
-          >
-          <el-button
-            @click="clickinnerVisiblexg()"
-            type=""
-            v-else
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            "
-            >{{ form.hospitalName }}</el-button
-          >
-        </el-form-item>
-        <el-form-item label="所属科室" prop="departmentName">
-          <el-button
-            type=""
-            v-if="form.departmentName == '请选择所属科室'"
-            @click="clickdepartmentlist()"
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              overflow: hidden;
-            "
-            >{{ form.departmentName }}</el-button
-          >
-          <el-button
-            @click="clickdepartmentlist()"
-            type=""
-            v-else
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            "
-            >{{ form.departmentName }}</el-button
-          >
-        </el-form-item>
-        <el-form-item label="人员名称" prop="personName">
-          <el-input
-            v-model="form.personName"
-            placeholder="请输入人员名称"
-            style="width: 250px"
-            maxlength="15"
-          />
-        </el-form-item>
-        <el-form-item label="人员联系电话" prop="personPhone">
-          <el-input
-            v-model="form.personPhone"
-            placeholder="请输入身份证号"
-            maxlength="11"
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="科室地址" prop="personAddress">
-          <el-input
-            v-model="form.personAddress"
-            placeholder="请输入科室地址"
-            style="width: 250px"
-          />
-        </el-form-item>
-
-        <el-form-item label="身份证" prop="cardNo">
-          <el-input
-            v-model="form.cardNo"
-            placeholder="请输入身份证号"
-            maxlength="18"
-            style="width: 250px"
-          />
-        </el-form-item>
-
-        <el-form-item label="人员职称" prop="academicTitle">
-          <el-select
-            v-model="form.academicTitle"
-            placeholder="请选择人员职称"
-            style="width: 250px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="咨询费用" prop="consultingFee">
-          <el-input
-            v-model="form.consultingFee"
-            placeholder="请输入咨询费用"
-            maxlength="10"
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="显示顺序" prop="personSort">
-          <el-input
-            v-model="form.personSort"
-            maxlength="5"
-            oninput="value=value.replace(/[^\d]/g,'')"
-            placeholder="请输入显示顺序"
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="个人简介" prop="personIntroduce">
-          <editor
-            @imgs="imgs"
-            :min-height="100"
-            v-model="form.personIntroduce"
-          ></editor>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--修改 选择医院 -->
-    <el-dialog
-      title="选择医院"
-      :visible.sync="innerVisiblexg"
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancelxg"
-    >
-      <el-form
-        ref="queryForm"
-        :model="hospitalqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="医院编码" prop="hospitalCode" label-width="120">
-          <el-input
-            v-model="hospitalqueryParams.hospitalCode"
-            placeholder="请输入科室编码"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="医院名称" prop="hospitalName" label-width="120">
-          <el-input
-            v-model="hospitalqueryParams.hospitalName"
-            placeholder="请输入医院名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuery"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              v-if="form.hospitalId == scope.row.id"
-              circle
-              @click="nurseclickxg(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclickxg(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="hospitalCode"
-          label="医院编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="hospitalName"
-          label="医院名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          property="hospitalAddress"
-          label="医院地址"
-          align="center"
-        >
-        </el-table-column>
-        <!-- <el-table-column
-          property="hospitalIntroduce"
-          label="医院介绍"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column> -->
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="hospitalqueryParams.pageNum"
-        :limit.sync="hospitalqueryParams.pageSize"
-        @pagination="info"
-      />
-    </el-dialog>
-    <!-- 修改科室 -->
-    <el-dialog
-      title="选择科室"
-      :visible.sync="innerVisibledepartmentxg"
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecanceldepartxg"
-    >
-      <el-form
-        ref="queryForm"
-        :model="departmentqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="科室编码" prop="departmentCode" label-width="120">
-          <el-input
-            v-model="departmentqueryParams.departmentCode"
-            placeholder="请输入科室编码"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName" label-width="120">
-          <el-input
-            v-model="departmentqueryParams.departmentName"
-            placeholder="请输入医院名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="departmentList"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="departresetQuery"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        :data="hospitalDepartmentList"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              v-if="form.departmentId == scope.row.id"
-              circle
-              @click="departmentclickxg(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="departmentclickxg(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="departmentCode"
-          label="科室编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          property="departmentPhone"
-          label="科室联系电话"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentAddress"
-          label="科室地址"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="departmentqueryParams.pageNum"
-        :limit.sync="departmentqueryParams.pageSize"
-        @pagination="departmentList"
-      />
-    </el-dialog>
   </div>
 </template>
 
@@ -945,8 +613,10 @@ import {
   updateHospitalPerson,
 } from "@/api/system/hospitalPerson";
 import editor from "@/components/Editor";
+import stationAcatar from "../stationAvatar/index.vue";
+import { updatePicture } from "@/api/system/station";
 export default {
-  components: { editor },
+  components: { editor, stationAcatar },
   name: "HospitalPerson",
   data() {
     //验证身份证
@@ -965,21 +635,22 @@ export default {
       }
     };
     // 验证手机号的规则
-    // var checkMobile = (rule, value, cb) => {
-    //   // 验证手机号的正则表达式
-    //   const regMobile =
-    //     // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
-    //     // /^((0\\d{2,3}(-)?\\d{7,8})|((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[2567]{1})(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\\d{8})$/;
-    //     /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/;
+    var checkMobile = (rule, value, cb) => {
+      // 验证手机号的正则表达式
+      const regMobile =
+        // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+        // /^((0\\d{2,3}(-)?\\d{7,8})|((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[2567]{1})(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\\d{8})$/;
+        /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/;
 
-    //   if (regMobile.test(value)) {
-    //     return cb();
-    //   }
-    //   cb(new Error("请输入正确的联系电话"));
-    // };
+      if (regMobile.test(value)) {
+        return cb();
+      }
+      cb(new Error("请输入正确的联系电话"));
+    };
     return {
       // 遮罩层
       loading: true,
+      idd: 0,
       nnerVisibleindex: "",
       departmentListindex: "",
       total2: 0,
@@ -1023,13 +694,20 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      imgone: "",
       // 健康咨询-科室人员信息表格数据
       hospitalPersonList: [],
       // 弹出层标题
       title: "",
+      deletNewImgs: [],
+      NewImgs:[],
+     objitempicture:[],
+      objitem: [],
       // 是否显示弹出层
       open: false,
       addopen: false,
+      homenumber: false,
+      deletupdata:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1038,6 +716,8 @@ export default {
         departmentId: null,
         personCode: null,
         personName: null,
+        departmentName: null,
+        hospitalName: null,
         personPhone: null,
         personAddress: null,
         cardNo: null,
@@ -1045,101 +725,33 @@ export default {
         consultingFee: null,
         personIntroduce: null,
         personSort: null,
+        personPictureUrl: null,
+        certificateSort: null,
+        certificateName: null,
+        certificateUrl: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        // hospitalPersonCertificateList:[],
+      },
       hospitalDepartmentList: [],
       hospitalqueryParams: {
         pageNum: 1,
         pageSize: 10,
         hospitalCode: "",
-        hospitalName: "",
+
       },
       departmentqueryParams: {
         pageNum: 1,
         pageSize: 10,
+        hospitalId: "",
         departmentCode: "",
         departmentName: "",
       },
       infolist: [],
+      deletUploadImages: [],
       // 表单校验
       rules: {
-        hospitalPersonInfoList: {
-          hospitalId: [
-            {
-              required: true,
-              message: "请选择所属医院",
-              trigger: "blur",
-            },
-          ],
-          departmentId: [
-            {
-              required: true,
-              message: "请选择所属科室",
-              trigger: "blur",
-            },
-          ],
-          personName: [
-            {
-              required: true,
-              message: "请选择科室人员名称",
-              trigger: "blur",
-            },
-          ],
-          personAddress: [
-            {
-              required: true,
-              message: "请选择科室人员地址",
-              trigger: "blur",
-            },
-          ],
-          academicTitle: [
-            {
-              required: true,
-              message: "请选择人员职称",
-              trigger: "blur",
-            },
-          ],
-          personIntroduce: [
-            {
-              required: true,
-
-              trigger: "blur",
-              message: "请选择个人简介",
-            },
-          ],
-          personSort: [
-            {
-              required: true,
-              message: "请选择排序",
-              trigger: "blur",
-            },
-          ],
-          personPhone: [
-            {
-              required: true,
-              // validator: checkMobile,
-              message: "请输入联系电话",
-              trigger: "blur",
-            },
-          ],
-          cardNo: [
-            {
-              required: true,
-              message: "",
-              validator: isCardId,
-              trigger: "blur",
-            },
-          ],
-
-          consultingFee: [
-            {
-              required: true,
-              message: "请选择咨询费用",
-              trigger: "blur",
-            },
-          ],
-        },
         hospitalId: [
           {
             required: true,
@@ -1178,9 +790,8 @@ export default {
         personIntroduce: [
           {
             required: true,
-
             trigger: "blur",
-            message: "请选择个人简介",
+            message: "请输入个人简介",
           },
         ],
         personSort: [
@@ -1193,8 +804,8 @@ export default {
         personPhone: [
           {
             required: true,
-            // validator: checkMobile,
-            message: "11",
+            validator: checkMobile,
+            message: "请输入联系电话",
             trigger: "blur",
           },
         ],
@@ -1215,6 +826,103 @@ export default {
           },
         ],
       },
+      hospitalId: [
+        {
+          required: true,
+          message: "请选择所属医院",
+          trigger: "blur",
+        },
+      ],
+      departmentId: [
+        {
+          required: true,
+          message: "请选择所属科室",
+          trigger: "blur",
+        },
+      ],
+      personName: [
+        {
+          required: true,
+          message: "请选择科室人员名称",
+          trigger: "blur",
+        },
+      ],
+      personAddress: [
+        {
+          required: true,
+          message: "请选择科室人员地址",
+          trigger: "blur",
+        },
+      ],
+      academicTitle: [
+        {
+          required: true,
+          message: "请选择人员职称",
+          trigger: "blur",
+        },
+      ],
+      personIntroduce: [
+        {
+          required: true,
+
+          trigger: "blur",
+          message: "请选择个人简介",
+        },
+      ],
+      personSort: [
+        {
+          required: true,
+          message: "请选择排序",
+          trigger: "blur",
+        },
+      ],
+      personPhone: [
+        {
+          required: true,
+          validator: checkMobile,
+          message: "11",
+          trigger: "blur",
+        },
+      ],
+      cardNo: [
+        {
+          required: true,
+          message: "",
+          validator: isCardId,
+          trigger: "blur",
+        },
+      ],
+
+      consultingFee: [
+        {
+          required: true,
+          message: "请选择咨询费用",
+          trigger: "blur",
+        },
+      ],
+      hospitalPersonCertificateList: {
+        certificateName: [
+          // {
+          //   required: true,
+          //   message: "请输入证书名称",
+          //   trigger: "blur",
+          // },
+        ],
+        certificateSort: [
+          // {
+          //   required: true,
+          //   message: "请输入证书顺序",
+          //   trigger: "blur",
+          // },
+        ],
+        certificateUrl: [
+          // {
+          //   required: true,
+          //   message: "请上传证书",
+          //   trigger: "blur",
+          // },
+        ],
+      },
     };
   },
   created() {
@@ -1222,81 +930,116 @@ export default {
     this.info();
   },
   methods: {
-    imgs(item) {
-      console.log(item);
-      this.imgsurl.pictureUrlList.push(item);
+    /**只能输入数字且有小数点最多保留两位*/
+    checkPrice() {
+      let checkPlan = "" + this.form.consultingFee;
+      checkPlan = checkPlan
+        .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符
+        .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的
+        .replace(/^\./g, "") // 保证第一个为数字而不是.
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".");
+      if (checkPlan.indexOf(".") < 0 && checkPlan !== "") {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        checkPlan = parseFloat(checkPlan) + "";
+      } else if (checkPlan.indexOf(".") >= 0) {
+        checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数
+      }
+      this.form.consultingFee = checkPlan;
+    },
+    //接收图片所属的item
+    imgclassifyItem(item) {
+      let imgUrlData = JSON.parse(item);
+      // 存贮新上传的图片数组
+      this.deletNewImgs.push(imgUrlData.certificateUrl);
+      this.objitem.push(imgUrlData.certificateUrl);
+      console.log(item, "接受图片item");
+      let items = JSON.parse(item);
+      if (items.idd && !items.id) {
+        this.form.hospitalPersonCertificateList.forEach((e) => {
+          if (e.idd == items.idd) {
+            e.certificateUrl = items.certificateUrl;
+          }
+        });
+      } else if (!items.idd && items.id) {
+        this.form.certificateUrl = items.certificateUrl;
+      }
+    },
+    imgUrl(imgUrl) {
+    console.log(imgUrl, "新上传");
+      this.form.certificateUrl = imgUrl;
+      this.deletupdata.push(imgUrl);
+      console.log(this.deletupdata)
+    },
+    imgUrl2(imgUrl) {
+      console.log(imgUrl, "新上传");
+      this.form.personPictureUrl = imgUrl;
+      this.deletUploadImages.push(imgUrl);
+      console.log(  this.deletUploadImages)
     },
 
     nurseclick(row) {
-      console.log(row);
-      this.form.hospitalPersonInfoList[this.nnerVisibleindex].hospitalName =
-        row.hospitalName;
-      this.form.hospitalPersonInfoList[this.nnerVisibleindex].hospitalId =
-        row.id;
-      this.innerVisible = false;
-    },
-    nurseclickxg(row) {
-      console.log(row);
-      this.form.hospitalName = row.hospitalName;
+      console.log(this.homenumber);
+      if (this.homenumber) {
+        this.queryParams.hospitalName = row.hospitalName;
+        this.queryParams.hospitalId = row.id;
+      } else {
+        this.hospitalId = row.id;
+        // this.form.hospitalId = row.id;
+        this.form.hospitalName = row.hospitalName;
+      }
       this.form.hospitalId = row.id;
-      this.innerVisiblexg = false;
+      this.innerVisible = false;
+      this.addresetQuery();
     },
     // 科室
     departmentclick(row) {
       console.log(row);
-      this.form.hospitalPersonInfoList[
-        this.departmentListindex
-      ].departmentName = row.departmentName;
-      this.form.hospitalPersonInfoList[this.departmentListindex].departmentId =
-        row.id;
-      // }
+      this.departmentId = row.id;
+      if (this.homenumber) {
+        this.queryParams.departmentName = row.departmentName;
+        this.queryParams.departmentId = row.id;
+        this.form.departmentId = row.id;
+      } else {
+        this.form.departmentId = row.id;
+        this.form.departmentName = row.departmentName;
+      }
       this.innerVisibledepartment = false;
     },
-    departmentclickxg(row) {
-      console.log(row);
-      this.form.departmentName = row.departmentName;
-      this.form.departmentId = row.id;
-      // }
-      this.innerVisibledepartmentxg = false;
-    },
+   
     //医院关闭
     innerVisiblecancel() {
       this.innerVisible = false;
-    },
-
-    innerVisiblecancelxg() {
-      this.innerVisiblexg = false;
+      
     },
     //科室关闭
     innerVisiblecanceldepart() {
       this.innerVisibledepartment = false;
     },
-    innerVisiblecanceldepartxg() {
-      this.innerVisibledepartmentxg = false;
-    },
+
     //删除deldisease
     deldisease(index) {
-      this.form.hospitalPersonInfoList.splice(index, 1);
+      this.form.hospitalPersonCertificateList.splice(index, 1);
     },
     adddisease() {
+      this.idd++;
       var obj = {
-        hospitalId: "",
-        departmentCode: "",
-        departmentId: "",
-        departmentName: "请选择所属科室",
-        departmentPerson: "",
-        departmentPhone: "",
-        hospitalName: "请选择所属医院",
+        certificateName: null,
+        certificateSort: null,
+        certificateUrl: null,
+        idd: this.idd,
       };
-      if (this.form.hospitalPersonInfoList.length == 5) {
+      if (this.form.hospitalPersonCertificateList.length == 5) {
         this.$message.error("最多只能5条");
       } else {
-        this.form.hospitalPersonInfoList.push(obj);
+        this.form.hospitalPersonCertificateList.push(obj);
       }
     },
     /** 查询健康咨询-科室人员信息列表 */
     getList() {
       this.loading = true;
+      // this.queryParams.hospitalId = this.form.hospitalId;
       listHospitalPerson(this.queryParams).then((response) => {
         this.hospitalPersonList = response.rows;
         this.total = response.total;
@@ -1304,39 +1047,39 @@ export default {
       });
     },
     // 新增医院按钮
-    clickinnerVisible(item, index) {
-      // this.addresetQuery();
-      this.form.hospitalId = item.hospitalId;
-      this.nnerVisibleindex = index;
-      console.log(this.nnerVisibleindex);
+    clickinnerVisible(item) {
+      console.log(item);
+      this.queryParams.departmentName="";
+      this.form.departmentName="请选择所属科室";
+      this.info();
       this.innerVisible = true;
-      // this.homenumber = item;
-    },
-    // 修改医院按钮
-    clickinnerVisiblexg(item) {
-      this.addresetQuery();
-      // this.form.hospitalId = item.hospitalId;
-      // this.nnerVisibleindex = index;
-      // console.log(this.nnerVisibleindex);
-      this.innerVisiblexg = true;
-      // this.homenumber = item;
+      this.homenumber = item;
+      if (this.homenumber) {
+        this.hospitalId = this.queryParams.hospitalId;
+      } else {
+        this.hospitalId = this.form.hospitalId;
+      }
     },
     //新增科室按钮
-    clicklist(item, index) {
-      this.departmentList();
-      this.form.departmentId = item.departmentId;
-      this.departmentListindex = index;
-      console.log(this.departmentListindex);
-      this.innerVisibledepartment = true;
-    },
-    // 修改科室按钮
-    clickdepartmentlist() {
-      this.departmentList();
-      // this.form.departmentId = item.departmentId;
-      this.innerVisibledepartmentxg = true;
+    clicklist(item) {
+      this.homenumber = item;
+      // this.departmentId=item.id
+      if (this.homenumber) {
+        this.hospitalId = this.queryParams.hospitalId;
+      } else {
+        this.hospitalId = this.form.hospitalId;
+      }
+      if (this.hospitalId) {
+        this.departmentList();
+        this.innerVisibledepartment = true;
+      } else {
+        this.$message.error("请先选择所属医院");
+      }
+      
     },
+    // 搜索
     departmentList() {
-      // this.loading = true;
+      this.departmentqueryParams.hospitalId = this.hospitalId;
       listHospitalDepartment(this.departmentqueryParams).then((response) => {
         this.hospitalDepartmentList = response.rows;
         this.total3 = response.total;
@@ -1372,38 +1115,66 @@ export default {
     },
     // 取消按钮
     cancel() {
+      var obj = { pictureUrlList: [] };
+      if (this.form.hospitalPersonCertificateList) {
+        this.form.hospitalPersonCertificateList.forEach((e) => {
+          obj.pictureUrlList.push(e.certificateUrl);
+        });
+      }
+      console.log("2222", this.deletNewImgs);
+      if (this.deletUploadImages.length > 0) {
+        updatePicture({ pictureUrlList: this.deletUploadImages }).then(
+          (res) => {
+          }
+        );
+      }
+      console.log("11111",this.NewImgs)
+      if (this.deletupdata.length > 0) {
+        updatePicture({ pictureUrlList: this.deletupdata }).then(
+          (res) => {
+          }
+        );
+      }
+      this.form.hospitalId = null;
+      this.departmentId = null;
+      this.imgsurl = { pictureUrlList: [] };
       this.addopen = false;
-      this.open = false;
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        hospitalPersonInfoList: [
+        id: null,
+        personCode: null,
+        personName: null,
+        personPhone: null,
+        personAddress: null,
+        cardNo: null,
+        academicTitle: null,
+        consultingFee: null,
+        personIntroduce: null,
+        personSort: null,
+        personPictureUrl: null,
+        createBy: null,
+        createTime: null,
+        departmentId: null,
+        hospitalId: null,
+        updateBy: null,
+        updateTime: null,
+        hospitalName: "请选择所属医院",
+        departmentName: "请选择所属科室",
+        hospitalPersonCertificateList: [
           {
-            id: null,
-            hospitalId: null,
-            departmentId: null,
-            personCode: null,
-            personName: null,
-            personPhone: null,
-            personAddress: null,
-            cardNo: null,
-            academicTitle: null,
-            consultingFee: null,
-            personIntroduce: null,
-            personSort: null,
-            createBy: null,
-            createTime: null,
-            updateBy: null,
-            updateTime: null,
-            hospitalName: "请选择所属医院",
-            departmentName: "请选择所属科室",
+            certificateName: null,
+            certificateSort: null,
+            certificateUrl: null,
           },
         ],
       };
-
-      // this.resetForm("form");
+      this.deletUploadImages = [];
+      
+      this.deletupdata = [];
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1412,6 +1183,16 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.departmentId="";
+      this.hospitalId = "";
+      this.departmentqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1423,37 +1204,48 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.form = {
+        hospitalPersonCertificateList: [
+          {
+            certificateSort: "",
+            certificateName: "",
+            certificateUrl: "",
+
+            idd: this.idd,
+          },
+        ],
+      };
+      this.departmentId="";
       this.reset();
       this.addopen = true;
-      this.title = "添加健康咨询-科室人员信息";
+      this.title = "添加科室人员信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row)
       this.reset();
       const id = row.id || this.ids;
       getHospitalPerson(id).then((response) => {
+        console.log(response)
         this.form = response.data;
-        this.open = true;
-        this.title = "修改健康咨询-科室人员信息";
+        this.departmentId = response.data.departmentId;
+        this.hospitalId = response.data.hospitalId;
+        this.imgone = this.form.certificateUrl;
+        this.addopen = true;
+        this.title = "修改科室人员信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      // if (this.form.id == null) {
-      //           this.form.departmentName = this.form.hospitalPersonInfoList[0].departmentName
-      //           this.form.personName = this.form.hospitalPersonInfoList[0].personName
-      //           this.form.personPhone = this.form.hospitalPersonInfoList[0].personPhone
-      //           this.form.personAddress = this.form.hospitalPersonInfoList[0].personAddress
-      //           this.form.cardNo = this.form.hospitalPersonInfoList[0].cardNo
-      //           this.form.academicTitle = this.form.hospitalPersonInfoList[0].academicTitle
-      //           this.form.consultingFee = this.form.hospitalPersonInfoList[0].consultingFee
-      //       }
+      if (this.form.consultingFee) {
+        this.form.consultingFee = Number(this.form.consultingFee);
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
             updateHospitalPerson(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.addopen = false;
               this.getList();
             });
           } else {
@@ -1470,9 +1262,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm(
-          '是否确认删除健康咨询-科室人员信息编号为"' + ids + '"的数据项？'
-        )
+        .confirm("是否确认删除此人员信息？")
         .then(function () {
           return delHospitalPerson(ids);
         })
@@ -1495,3 +1285,12 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.stationbtn {
+  width: 208px;
+  text-align: left;
+  height: 32px;
+  overflow: hidden;
+  font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index 0fed66e..5fa3172 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -223,8 +223,7 @@ export default {
             appointmentOrderDetails(id).then((res) => {
                 res.data.forEach((e) => {
                     if (e.serviceDate) {
-                        e.time =
-                            e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
+                        e.time = e.serviceDate + "-" + e.serviceStartTime;
                     }
                 });
                 this.query = res.data[0];
@@ -415,4 +414,4 @@ export default {
             );
         },
     },
-};
+};
\ No newline at end of file
diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue
index 0c14a69..f39198e 100644
--- a/src/views/system/poser/index.vue
+++ b/src/views/system/poser/index.vue
@@ -674,6 +674,7 @@ export default {
     },
     //选中护理项目
     choicenurseItem(e) {
+      console.log(e)
       this.nurseitemid = e.id;
       if (this.homenumber) {
         this.queryParams.nurseItemName = e.nurseItemName;
@@ -704,6 +705,8 @@ export default {
     },
     //所属护理站页面
     ParamsStation(item) {
+      this.queryParams.nurseItemName="";
+      this.form.nurseItemName="请选择所属护理项目";
       this.info();
       this.nurseStationshow = true;
       this.homenumber = item;
@@ -715,6 +718,7 @@ export default {
     },
     //所属护理项目页面
     ParamsStationxm(item) {
+      console.log(item)
       if (this.nurseItemquery.nurseStationId) {
         this.nurseItemlistInfo();
         this.homenumber = item;
@@ -803,6 +807,7 @@ export default {
           this.open = false;
         });
       }
+
       this.nurseItemquery.nurseStationId = null;
       this.imgs = { pictureUrlList: [] };
       this.open = false;
@@ -910,7 +915,7 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */ 
+    /** 删除按钮操作 */
     handleDelete(row) {
       var ids = row.id || this.ids;
       var nurseStationIds = row.nurseStationId || this.nurseStationIds;
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
index f3e9973..3958d11 100644
--- a/src/views/system/settings/index.vue
+++ b/src/views/system/settings/index.vue
@@ -437,7 +437,7 @@ export default {
         settingsName: [
           {
             required: true,
-            message: "请输入系统设置名称",
+            message: "请输入规则名称",
             trigger: "blur",
           },
         ],
@@ -451,7 +451,7 @@ export default {
         settingsType: [
           {
             required: true,
-            message: "请选择系统设置类型",
+            message: "请选择规则类型",
             trigger: "blur",
           },
         ],
@@ -487,14 +487,7 @@ export default {
       },
     };
   },
-  // computed: {
-  //   label() {
-  //     let label = "积分数量";
-  //     if (this.form.settingsType == "INVITE_FRIENDS") label = "邀请好友次数";
-  //     if (this.form.settingsType == "SIGN_IN_RULE") label = "赠送积分数量";
-  //     return label;
-  //   },
-  // },
+
 
   created() {
     this.getList();
@@ -594,6 +587,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(row)
       const ids = row.id || this.ids;
       const settingsNames=row.settingsName||this.settingsNames
       this.$modal
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 0b6d6e1..09a9d38 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -80,6 +80,7 @@
       <br />
       <el-row>
         <el-col :lg="2" :md="2">
+          
           <el-upload
             action="#"
             :http-request="requestUpload"
@@ -307,6 +308,12 @@ export default {
             if(this.types == "certificateUrl"){
               this.items.certificateUrl = response.imgUrl;
               this.$emit("item", JSON.stringify(this.items));
+              console.log(this.item)
+            }
+            if(this.types == "personPictureUrl"){
+              // this.items.personPictureUrl = response.imgUrl; 
+              this.$emit("item", JSON.stringify(this.items));
+           
             }
             this.openimg = false;
           });