Merge remote-tracking branch 'origin/dev'

src/views/system/hospitalPerson/index.vue

@@ -115,6 +115,7 @@
       <!-- <el-table-column label="身份证号" align="center" prop="cardNo" /> -->
       <el-table-column label="人员职称" align="center" prop="academicTitle">
         <template slot-scope="scope">
+          {{ scope.row.academicTitle == "RESIDENT_PHYSICIAN" ? "住院医师" : "" }}
           {{ scope.row.academicTitle == "CHIEF_PHYSICIAN" ? "主任医师" : "" }}
           {{
           scope.row.academicTitle == "DEPUTY_CHIEF_PHYSICIAN"
@@ -221,7 +222,7 @@
         <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-form-item label="联系电话">
           <el-input
             maxlength="11"
             v-model="form.personPhone"
@@ -238,7 +239,7 @@
             placeholder="请输入人员地址"
           />
         </el-form-item>
-        <el-form-item label="身份证号" prop="cardNo">
+        <el-form-item label="身份证号">
           <el-input
             maxlength="18"
             oninput="value=value.replace(/[^\d]/g,'')"
@@ -290,19 +291,11 @@
           :key="index"
           style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
         >
-          <el-form-item
+          <el-form-item label="证书名称">
-            label="证书名称"
-            :rules="hospitalPersonCertificateList.certificateName"
-            :prop="`hospitalPersonCertificateList.${index}.certificateName`"
-          >
             <el-input maxlength="50" v-model="item.certificateName" placeholder="请输入证书名称" />
           </el-form-item>
 
-          <el-form-item
+          <el-form-item label="证书图片">
-            label="证书图片"
-            :rules="hospitalPersonCertificateList.certificateUrl"
-            :prop="`hospitalPersonCertificateList.${index}.certificateUrl`"
-          >
             <stationAcatar
               @imgUrl="imgUrl"
               @item="imgclassifyItem"
@@ -311,11 +304,7 @@
               :type="'certificateUrl'"
             />
           </el-form-item>
-          <el-form-item
+          <el-form-item label="证书显示顺序">
-            label="证书显示顺序"
-            :rules="hospitalPersonCertificateList.certificateSort"
-            :prop="`hospitalPersonCertificateList.${index}.certificateSort`"
-          >
             <el-input
               oninput="value=value.replace(/[^\d]/g,'')"
               maxlength="5"
@@ -549,6 +538,14 @@ export default {
           value: "DEPUTY_CHIEF_PHYSICIAN",
           label: "副主任医师"
         },
+        {
+          value: "ATTENDING_DOCTOR",
+          label: "主治医师"
+        },
+        {
+          value: "RESIDENT_PHYSICIAN",
+          label: "住院医师"
+        },
         {
           value: "PHYSICIAN",
           label: "医师"
@@ -556,11 +553,6 @@ export default {
         {
           value: "HEALER",
           label: "医士"
-        },
-
-        {
-          value: "ATTENDING_DOCTOR",
-          label: "主治医师"
         }
       ],
       value: "",
@@ -680,23 +672,6 @@ export default {
             trigger: "blur"
           }
         ],
-        personPhone: [
-          {
-            required: true,
-            validator: checkMobile,
-            message: "请输入联系电话",
-            trigger: "blur"
-          }
-        ],
-        cardNo: [
-          {
-            required: true,
-            message: "",
-            validator: isCardId,
-            trigger: "blur"
-          }
-        ],
-
         consultingFee: [
           {
             required: true,
@@ -704,103 +679,6 @@ export default {
             trigger: "blur"
           }
         ]
-      },
-      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",
-          // },
-        ]
       }
     };
   },
@@ -833,7 +711,6 @@ export default {
       // 存贮新上传的图片数组
       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 => {
@@ -846,20 +723,15 @@ export default {
       }
     },
     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(this.homenumber);
       if (this.homenumber) {
         this.queryParams.hospitalName = row.hospitalName;
         this.queryParams.hospitalId = row.id;
@@ -874,7 +746,6 @@ export default {
     },
     // 科室
     departmentclick(row) {
-      console.log(row);
       this.departmentId = row.id;
       if (this.homenumber) {
         this.queryParams.departmentName = row.departmentName;
@@ -926,7 +797,6 @@ export default {
     },
     // 新增医院按钮
     clickinnerVisible(item) {
-      console.log(item);
       this.queryParams.departmentName = "";
       this.form.departmentName = "请选择所属科室";
       this.info();
@@ -985,7 +855,6 @@ export default {
     info() {
       list(this.hospitalqueryParams).then(response => {
         this.infolist = response.rows;
-        console.log(this.infolist);
         this.total2 = response.total;
         this.loading = false;
       });
@@ -998,13 +867,11 @@ export default {
           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 => {});
       }
@@ -1095,11 +962,9 @@ export default {
     },
     /** 修改按钮操作 */
     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.departmentId = response.data.departmentId;
         this.hospitalId = response.data.hospitalId;