修改提交

src/views/system/InformationCategory/index.vue

@@ -269,18 +269,18 @@
         </el-form-item>
         <el-form-item label="资讯分类类型" prop="informationCategoryType">
           <el-select
-              v-model="form.informationCategoryType"
+            v-model="form.informationCategoryType"
-              placeholder="请选择"
+            placeholder="请选择"
-              style="width: 250px"
+            style="width: 250px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-option
+            </el-option>
-                v-for="item in options"
+          </el-select>
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
           <!-- <el-radio v-model="form.informationCategoryType" label="HEALTH_NOUS"
             >健康咨询</el-radio
           >
@@ -310,11 +310,13 @@ export default {
   name: "InformationCategory",
   data() {
     return {
-      options: [{
+      options: [
-          value: 'HEALTH_NOUS',
+        {
-          label: '健康咨询'
+          value: "HEALTH_NOUS",
-        }, ],
+          label: "健康咨询",
-        value:"",
+        },
+      ],
+      value: "",
       // 遮罩层
       loading: true,
       // 选中数组

src/views/system/classifyItem/index.vue

@@ -24,14 +24,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分类排序" prop="classifySort">
-        <el-input
-          v-model="queryParams.classifySort"
-          placeholder="请输入分类排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"

src/views/system/person/index.vue

@@ -169,6 +169,7 @@
       :visible.sync="open2"
       width="1048px"
       append-to-body
+      :before-close="cancel"
     >
       <el-form
         ref="form"
@@ -310,7 +311,7 @@
             <el-input
               v-model="item.phone"
               placeholder="请输入联系电话"
-              maxlength="11"
+              maxlength="13"
             />
           </el-form-item>
           <el-form-item
@@ -742,8 +743,14 @@
         @pagination="getList3"
       />
     </el-dialog>
-    <!-- 修改 -->
+    <!-- 修改护理站人员信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :before-close="cancel"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item
           label="所属护理站"
@@ -840,7 +847,7 @@
           <el-input
             v-model="form.phone"
             placeholder="请输入联系电话"
-            maxlength="11"
+            maxlength="13"
           />
         </el-form-item>
         <el-form-item label="居住地址" prop="address">

src/views/system/person/indexjs.js

@@ -16,9 +16,14 @@ export default {
         // 验证手机号的规则
         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\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)) {
+            const isPhone = /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/ //11位合法手机号码
+            const isMob0 = /0\d{2,3}\d{7,8}/ //不带-的座机：02985111752
+            const isMob1 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带一个-：029-85111752
+            const isMob2 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带二个-：029-8511-1752
+            const isMob3 = /^\d{3,4}-\d{3,4}-\d{3,4}$/; //带三个-： 0752-250-520
+            if (isPhone.test(value) || isMob0.test(value) || isMob1.test(value) || isMob2.test(value) || isMob3.test(value)) {
                 return cb();
             }
             cb(new Error("请输入正确的联系电话"));
@@ -26,9 +31,12 @@ export default {
         // 验证手机号的规则
         var checkMobile2 = (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\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)) {
+            const isPhone = /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/ //11位合法手机号码
+            const isMob1 = /0\d{2,3}\d{7,8}/ //不带-的座机：02985111752
+            const isMob2 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带一个-：029-85111752
+            if (isPhone.test(value) || isMob1.test(value) || isMob2.test(value)) {
                 return cb();
             }
             cb(new Error("请输入正确的联系电话"));
@@ -53,15 +61,12 @@ export default {
                     value: "NURSE_TEACHER",
                 },
             ],
-
             innerVisible: false,
             innerVisible2: false,
             innerVisiblexg: false,
             innerVisiblexg2: false,
-
             // 遮罩层
             loading: true,
-
             // 用户导入参数
             upload: {
                 // 是否显示弹出层（用户导入）
@@ -585,4 +590,4 @@ export default {
             );
         },
     },
-};
+};

src/views/system/poser/index.vue

@@ -193,7 +193,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="800px"
+      width="1100px"
       :before-close="cancel"
       append-to-body
     >
@@ -335,7 +335,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="250">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" @click="addPictureUrl"
                   >新增</el-button
@@ -350,7 +350,7 @@
             </el-table-column>
           </el-table>
         </el-form-item>
-        <el-form-item label="海报视频" prop="posterVideoUrl">
+        <el-form-item label="海报视频">
           <!-- <video
             v-if="videoForm.showVideoPath != ''"
             v-bind:src="videoForm.showVideoPath"
@@ -367,12 +367,14 @@
             v-if="open"
           />
         </el-form-item>
-        <el-form-item label="海报简介" prop="posterIntroduce">
+        <el-form-item label="海报简介">
-          <editor
+          <textarea
-            @imgs="imgss"
+            name=""
-            :min-height="100"
+            id=""
+            cols="80"
+            rows="10"
             v-model="form.posterIntroduce"
-          ></editor>
+          ></textarea>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -966,7 +968,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加泉医到家系统海报模块信息（包含咨询简介信息）";
+      this.title = "添加海报模块信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -981,7 +983,7 @@ export default {
         }
         this.nurseItemquery.nurseStationId = response.data.nurseStationId;
         this.open = true;
-        this.title = "修改泉医到家系统海报模块信息（包含咨询简介信息）";
+        this.title = "修改海报模块信息";
       });
     },
     /** 提交按钮 */
@@ -1070,4 +1072,4 @@ export default {
   overflow: hidden;
   font-size: 14px;
 }
-</style>
+</style>

src/views/system/stationAvatar/index.vue

@@ -72,7 +72,7 @@
             />
             <div v-else></div>
           </div>
-          <div class="title" v-if="types != 'posterVideoUrl'">
+          <div class="title" v-if="types != 'posterVideoUrl'&&types!='posterPictureUrl'">
             请上传图片为800x800px的正方形
           </div>
         </el-col>

src/views/system/stationClassify/index.vue

@@ -24,14 +24,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分类排序" prop="classifySort">
-        <el-input
-          v-model="queryParams.classifySort"
-          placeholder="请输入分类排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"

src/views/system/stationItem/index.vue

@@ -309,7 +309,7 @@
             :type="'itemPictureUrl'"
           />
         </el-form-item>
-        <el-form-item label="预约人数上限" prop="nurseStationItem.appointmentLimitCount">
+        <el-form-item label="预约人数上限">
           <el-input
             placeholder="请输入预约人数上限"
             v-model="form.nurseStationItem.appointmentLimitCount"
@@ -317,10 +317,10 @@
             maxLength="8"
           />
         </el-form-item>
-        <el-form-item label="预约时间点间隔" prop="nurseStationItem.appointmentTimeInterval">
+        <el-form-item label="预约时间间隔" prop="nurseStationItem.appointmentTimeInterval">
         <el-select
               v-model="form.nurseStationItem.appointmentTimeInterval"
-              placeholder="请选择预约时间点间隔"
+              placeholder="请选择预约时间间隔"
             >
               <el-option
                 v-for="item in options"

src/views/system/stationItem/stationItemjs.js

@@ -64,34 +64,31 @@ export default {
             // 是否显示弹出层
             open: false,
             options: [{
-                value: 'HALF_HOUR',
+                    value: 'HALF_HOUR',
-                label: '半小时'
+                    label: '半小时'
-              }, {
+                }, {
-                value: 'ONE_HOUR',
+                    value: 'ONE_HOUR',
-                label: '一小时'
+                    label: '一小时'
-              },
+                },
-              {
+                {
-                value: ' NINETY_MINUTES',
+                    value: ' NINETY_MINUTES',
-                label: '九十分钟'
+                    label: '九十分钟'
-              },
+                },
-              {
+                {
-                value: 'TWO_HOUR',
+                    value: 'TWO_HOUR',
-                label: '两小时'
+                    label: '两小时'
-              }
+                }
 
             ],
-              value:"",
+            value: "",
-              optionlist: [{
+            optionlist: [{
                 value: 'HALF_DAY',
-                label: '半小时'
+                label: '半天'
-              }, {
+            }, {
                 value: 'ONE_DAY',
-                label: '一小时'
+                label: '一天'
-              },
+            }, ],
-
+            value1: "",
-
-            ],
-            value1:"",
             //权限查询
             nurseStationlist: [],
             nurseStationlist2: [],
@@ -132,8 +129,8 @@ export default {
                     nurseStationName: "请选择所属护理站",
                     classifyName: '请选择护理项目分类',
                     nurseClassifyId: '',
-                    appointmentLimitCount:"",
+                    appointmentLimitCount: "",
-                    appointmentTimeInterval:"",
+                    appointmentTimeInterval: "",
 
                 },
             },