Merge remote-tracking branch 'origin/jihan_0307_运营管理端健康咨询功能开发' into jihan_0307_运营管理端健康咨询功能开发

src/views/system/hospital/index.vue

@@ -119,16 +119,17 @@
     <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.number="form.hospitalSort" maxlength="5" style="width:200px" placeholder="请输入显示顺序" />
@@ -161,16 +162,16 @@ export default {
   components: {  editor },
   name: "Hospital",
   data() {
-     // 验证手机号的规则
+    //  // 验证手机号的规则
-     var checkMobile = (rule, value, cb) => {
+    //  var checkMobile = (rule, value, cb) => {
-      // 验证手机号的正则表达式
+    //   // 验证手机号的正则表达式
-      const regMobile =
+    //   const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+    //     /^(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)) {
+    //   if (regMobile.test(value)) {
-        return cb();
+    //     return cb();
-      }
+    //   }
-      cb(new Error("请输入正确的联系电话"));
+    //   cb(new Error("请输入正确的联系电话"));
-    };
+    // };
     return {
       // 遮罩层
       loading: true,
@@ -223,7 +224,7 @@ export default {
         phone: [
           {
             required: true,  
-            validator: checkMobile,
+            // validator: checkMobile,
             message: "",
             trigger: "blur",
           },

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>
@@ -220,6 +220,7 @@
               style="width: 250px"
               v-model="item.departmentName"
               placeholder="请输入科室名称"
+              maxlength="50"
             />
           </el-form-item>
           <el-form-item
@@ -230,6 +231,7 @@
             <el-input
               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="请输入科室地址"
             />
@@ -263,9 +267,10 @@
           >
             <el-input
               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="1200px" append-to-body>
+    <el-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
+      :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,10 +456,12 @@
             v-model="form.departmentAddress"
             placeholder="请输入科室地址"
             style="width: 250px"
+            maxlength="300"
           />
         </el-form-item>
         <el-form-item label="科室显示顺序" prop="departmentSort">
           <el-input
+            oninput="value=value.replace(/[^\d]/g,'')"
             maxlength="5"
             v-model.number="form.departmentSort"
             placeholder="请输入科室显示顺序"
@@ -472,15 +492,15 @@ export default {
   name: "HospitalDepartment",
   data() {
     // 验证手机号的规则
-    var checkMobile = (rule, value, cb) => {
+    // var checkMobile = (rule, value, cb) => {
-      // 验证手机号的正则表达式
+    //   // 验证手机号的正则表达式
-      const regMobile =
+    //   const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+    //     /^(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)) {
+    //   if (regMobile.test(value)) {
-        return cb();
+    //     return cb();
-      }
+    //   }
-      cb(new Error("请输入正确的联系电话"));
+    //   cb(new Error("请输入正确的联系电话"));
-    };
+    // };
     return {
       // 遮罩层
       loading: true,
@@ -489,8 +509,8 @@ export default {
       hospitalqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        hospitalCode:"",
+        hospitalCode: "",
-        hospitalName:"",
+        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,9 +665,8 @@ export default {
       //   this.form.hospitalName = row.hospitalName;
       //   this.form.hospitalId = row.id;
       // } else {
-        this.form.hospitalDepartmentInfoList[
+      this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalName =
-          this.nnerVisibleindex
+        row.hospitalName;
-        ].hospitalName = row.hospitalName;
       this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId =
         row.id;
       // }
@@ -694,8 +711,8 @@ export default {
       this.hospitalqueryParams = {
         pageNum: 1,
         pageSize: 10,
-        hospitalCode:"",
+        hospitalCode: "",
-        hospitalName:"",
+        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:"",
+        hospitalName: "",
-        departmentCode:"",
+        departmentCode: "",
-        departmentName:"",
+        departmentName: "",
       };
       this.handleQuery();
     },
@@ -804,7 +821,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除此科室的信息？')
+        .confirm("是否确认删除此科室的信息？")
         .then(function () {
           return delHospitalDepartment(ids);
         })

src/views/system/hospitalPerson/index.vue

@@ -32,6 +32,7 @@
           v-model="queryParams.personPhone"
           placeholder="请输入联系电话"
           clearable
+          oninput="value=value.replace(/[^\d]/g,'')"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -257,6 +258,7 @@
           <el-input
             maxlength="11"
             v-model="form.personPhone"
+            oninput="value=value.replace(/[^\d]/g,'')"
             placeholder="请输入联系电话"
           />
         </el-form-item>
@@ -293,7 +295,7 @@
         </el-form-item>
         <el-form-item label="咨询费用" prop="consultingFee">
           <el-input
-            maxlength="10"
+            maxlength="8"
             :change="checkPrice()"
             v-model="form.consultingFee"
             placeholder="请输入咨询费用"
@@ -309,7 +311,7 @@
         </el-form-item>
         <el-form-item label="人员头像" prop="personPictureUrl">
           <stationAcatar
-            @imgUrl="imgUrl"
+            @imgUrl="imgUrl2"
             :img="form.personPictureUrl"
             :type="'personPictureUrl'"
           />
@@ -335,7 +337,7 @@
             :prop="`hospitalPersonCertificateList.${index}.certificateName`"
           >
             <el-input
-              maxlength="90"
+              maxlength="50"
               v-model="item.certificateName"
               placeholder="请输入证书名称"
             />
@@ -603,438 +605,8 @@
         @pagination="departmentList"
       />
     </el-dialog>
-    <!-- 修改对话框 -->
-    <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-button
-            type=""
-            v-if="form.hospitalName == '请选择所属医院'"
-            @click="clickinnerVisible(false)"
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              overflow: hidden;
-            "
-            >{{ form.hospitalName }}</el-button
-          >
-          <el-button
-            @click="clickinnerVisible(false)"
-            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="clicklist(false)"
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              overflow: hidden;
-            "
-            >{{ form.departmentName }}</el-button
-          >
-          <el-button
-            @click="clicklist(false)"
-            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"
-            maxlength="7"
-            placeholder="请输入人员名称"
-            style="width: 250px"
-          />
-        </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"
-            maxlength="300"
-          />
-        </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"
-            :change="checkPrice()"
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="显示顺序" prop="personSort">
-          <el-input
-            v-model.number="form.personSort"
-            maxlength="5"
-            oninput="value=value.replace(/[^\d]/g,'')"
-            placeholder="请输入显示顺序"
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="人员头像" prop="personPictureUrl">
-          <stationAcatar
-            @imgUrl="imgUrl"
-            :img="form.personPictureUrl"
-            :type="'personPictureUrl'"
-          />
-        </el-form-item>
-        <el-form-item
-          label="个人简介"
-          prop="personIntroduce"
-          style="margin-top: 10px; margin-left: 10px"
-        >
-          <el-input
-            type="textarea"
-            :rows="5"
-            style="width: 540px"
-            placeholder="请输入个人简介"
-            v-model="form.personIntroduce"
-          ></el-input>
-        </el-form-item>
-
-        <div
-          v-for="(item, index) in form.hospitalPersonCertificateList"
-          :key="index"
-          style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
-        >
-          <el-form-item
-            label="证书名称"
-            prop="hospitalPersonCertificateList[0].certificateName"
-          >
-            <el-input
-              maxlength="90"
-              v-model="item.certificateName"
-              placeholder="请输入证书名称"
-            />
-          </el-form-item>
-
-          <el-form-item
-            label="证书图片"
-            prop="hospitalPersonCertificateList[0].certificateUrl"
-          >
-            <stationAcatar
-              @imgUrl="imgUrl"
-              @item="imgclassifyItem"
-              :img="item.certificateUrl"
-              :item="item"
-              :type="'certificateUrl'"
-            />
-          </el-form-item>
-          <el-form-item
-            label="证书显示顺序"
-            prop="hospitalPersonCertificateList[0].certificateSort"
-          >
-            <el-input
-              oninput="value=value.replace(/[^\d]/g,'')"
-              maxlength="5"
-              v-model.number="item.certificateSort"
-              placeholder="请输入证书显示顺序"
-            />
-          </el-form-item>
-          <!-- <el-button
-            type="primary"
-            circle
-            plain
-            icon="el-icon-circle-plus-outline"
-            @click="adddisease"
-            v-if="index == 0"
-          ></el-button>
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            circle
-            plain
-            @click="deldisease(index)"
-            v-if="index != 0"
-          ></el-button> -->
-        </div>
-      </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="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="departmentId == scope.row.id"
-              circle
-              @click="departmentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="departmentclick(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>
 
@@ -1071,18 +643,18 @@ export default {
       }
     };
     // 验证手机号的规则
-    // var checkMobile = (rule, value, cb) => {
+    var checkMobile = (rule, value, cb) => {
-    //   // 验证手机号的正则表达式
+      // 验证手机号的正则表达式
-    //   const regMobile =
+      const regMobile =
-    //     // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+        // /^(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]{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})$/;
+        /^((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)) {
+      if (regMobile.test(value)) {
-    //     return cb();
+        return cb();
-    //   }
+      }
-    //   cb(new Error("请输入正确的联系电话"));
+      cb(new Error("请输入正确的联系电话"));
-    // };
+    };
     return {
       // 遮罩层
       loading: true,
@@ -1136,11 +708,14 @@ export default {
       // 弹出层标题
       title: "",
       deletNewImgs: [],
+      NewImgs:[],
+     objitempicture:[],
       objitem: [],
       // 是否显示弹出层
       open: false,
       addopen: false,
       homenumber: false,
+      deletupdata:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1237,7 +812,7 @@ export default {
         personPhone: [
           {
             required: true,
-            // validator: checkMobile,
+            validator: checkMobile,
             message: "请输入联系电话",
             trigger: "blur",
           },
@@ -1312,7 +887,7 @@ export default {
       personPhone: [
         {
           required: true,
-          // validator: checkMobile,
+          validator: checkMobile,
           message: "11",
           trigger: "blur",
         },
@@ -1399,11 +974,17 @@ export default {
         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) {
@@ -1420,12 +1001,6 @@ export default {
       this.innerVisible = false;
       // this.stationcancel();
     },
-    // nurseclickxg(row) {
-    //   console.log(row);
-    //   this.form.hospitalName = row.hospitalName;
-    //   this.hospitalId = row.id;
-    //   this.innerVisiblexg = false;
-    // },
     // 科室
     departmentclick(row) {
       console.log(row);
@@ -1442,28 +1017,16 @@ export default {
       }
       this.innerVisibledepartment = false;
     },
-    // departmentclickxg(row) {
+   
-    //   console.log(row);
-    //   this.form.departmentName = row.departmentName;
-    //   this.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.hospitalPersonCertificateList.splice(index, 1);
@@ -1504,16 +1067,10 @@ export default {
         this.hospitalId = this.form.hospitalId;
       }
     },
-    // // 修改医院按钮
-    // clickinnerVisiblexg() {
-    //   this.addresetQuery();
-    //   this.innerVisiblexg = true;
-    // },
     //新增科室按钮
     clicklist(item) {
       this.homenumber = item;
       if (this.homenumber) {
-        // 为查询页面时
         this.hospitalId = this.queryParams.hospitalId;
       } else {
         this.hospitalId = this.form.hospitalId;
@@ -1572,13 +1129,19 @@ export default {
       if (this.deletUploadImages.length > 0) {
         updatePicture({ pictureUrlList: this.deletUploadImages }).then(
           (res) => {
-            this.open = false;
+          }
+        );
+      }
+      console.log("11111",this.NewImgs)
+      if (this.deletupdata.length > 0) {
+        updatePicture({ pictureUrlList: this.deletupdata }).then(
+          (res) => {
+          
           }
         );
       }
       this.imgsurl = { pictureUrlList: [] };
       this.addopen = false;
-      this.open = false;
       this.reset();
     },
     // 表单重置
@@ -1614,6 +1177,8 @@ export default {
         ],
       };
       this.deletUploadImages = [];
+      
+      this.deletupdata = [];
       // this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -1666,7 +1231,7 @@ export default {
       getHospitalPerson(id).then((response) => {
         this.form = response.data;
         this.imgone = this.form.certificateUrl;
-        this.open = true;
+        this.addopen = true;
         this.title = "修改科室人员信息";
       });
     },
@@ -1681,7 +1246,7 @@ export default {
           if (this.form.id != null) {
             updateHospitalPerson(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.addopen = false;
               this.getList();
             });
           } else {

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

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;
           });