Merge remote-tracking branch 'origin/jihan_0203_运营管理端功能开发' into jihan_0203_运营管理端功能开发

src/views/system/InformationCategory/index.vue

@@ -269,6 +269,7 @@
           <el-select
               v-model="form.informationCategoryType"
               placeholder="请选择"
+              style="width: 250px"
             >
               <el-option
                 v-for="item in options"
@@ -284,7 +285,7 @@
           <el-radio v-model="form.informationCategoryType" label="OTHER"
             >其他</el-radio
           > -->
-        </el-form-item> 
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/system/hospitalDepartment/index.vue

@@ -171,7 +171,7 @@
     <el-dialog
       :title="title"
       :visible.sync="addopen"
-      width="600px"
+      width="900px"
       append-to-body
       :before-close="cancel"
     >
@@ -272,6 +272,7 @@
             <el-input
               v-model="item.departmentSort"
               placeholder="请输入科室显示顺序"
+              style="width:250px"
             />
           </el-form-item>
           <el-button
@@ -439,13 +440,20 @@
             style="width: 250px"
           />
         </el-form-item>
-        <el-form-item label="科室联系电话" prop="departmentAddress">
+        <el-form-item label="科室地址" prop="departmentAddress">
           <el-input
             v-model="form.departmentAddress"
             placeholder="请输入科室地址"
             style="width: 250px"
           />
         </el-form-item>
+        <el-form-item label="科室显示顺序" prop="departmentSort">
+          <el-input
+            v-model="form.departmentSort"
+            placeholder="请输入科室显示顺序"
+            style="width: 250px"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -610,6 +618,15 @@ export default {
             message: "",
           },
         ],
+        departmentSort: [
+          {
+            required: true,
+            message: "请选择科室显示顺序",
+            trigger: "blur",
+            message: "",
+          },
+        ],
+
       },
     };
   },
@@ -737,6 +754,13 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        hospitalName:"",
+        departmentCode:"",
+        departmentName:"",
+      };
       this.handleQuery();
     },
     // 多选框选中数据

src/views/system/informationInfo/index.vue

@@ -177,7 +177,7 @@
         prop="informationTitle"
       />
       <el-table-column label="资讯编码" align="center" prop="informationCode" />
-    
+
       <el-table-column label="显示顺序" align="center" prop="informationSort" />
       <el-table-column
         label="操作"
@@ -221,7 +221,6 @@
         :rules="rules"
         label-width="140px"
         :inline="true"
-      
       >
         <el-form-item label="资讯标题" prop="informationTitle">
           <el-input
@@ -272,16 +271,16 @@
           <el-input
             v-model="form.informationSort"
             placeholder="请输入显示顺序"
+            style="width:250px"
           />
         </el-form-item>
         <el-form-item label="资讯图文内容" prop="informationContent">
           <editor
             @imgs="imgs"
-   
             maxlength="300"
             :min-height="102"
             placeholder="请输入资讯图文内容"
-            style="width: 80%;margin-left:18%;margin-top: -5%;"
+            style="width: 80%; margin-left: 18%; margin-top: -5%"
             v-model="form.informationContent"
           />
         </el-form-item>
@@ -336,7 +335,10 @@
             @click="informationInfoinfo"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuery"
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="addresetQuerylist"
             >重置</el-button
           >
         </el-form-item>
@@ -450,7 +452,7 @@ export default {
       title: "",
       total2: 0,
       imgsurl: { pictureUrlList: [] },
-     
+
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -530,7 +532,17 @@ export default {
     innerVisiblecancel() {
       this.innerVisible = false;
     },
+    //重置
     addresetQuery() {
+      this.nurseStationqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        informationCategoryCode: "",
+        informationCategoryName: "",
+      };
+      this.getList();
+    },
+    addresetQuerylist() {
       this.nurseStationqueryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -556,7 +568,6 @@ export default {
       // this.nnerVisibleindex = index;
       // console.log(this.nnerVisibleindex);
       this.innerVisible = true;
-
     },
     imgUrl(imgUrl) {
       this.form.leadThumbnailUrl = imgUrl;
@@ -586,9 +597,9 @@ export default {
       //   this.form.hospitalName = row.hospitalName;
       //   this.form.hospitalId = row.id;
       // } else {
-        this.form.informationCategoryId = row.id;
+      this.form.informationCategoryId = row.id;
       this.form.informationCategoryName = row.informationCategoryName;
-      
+
       // }
       this.innerVisible = false;
     },
@@ -635,7 +646,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.form.informationCategoryName="请选择资讯分类";
+      this.form.informationCategoryName = "请选择资讯分类";
       this.title = "添加资讯信息管理";
     },
     /** 修改按钮操作 */

src/views/system/stationItem/index.vue

@@ -292,18 +292,7 @@
             maxlength="50"
           />
         </el-form-item>
-        <!-- <el-form-item
+
-          label="提前预约时长"
-          prop="nurseStationItem.advanceAppointDuration"
-        >
-          <el-input
-            v-model="form.nurseStationItem.advanceAppointDuration"
-            placeholder="提前预约时长(单位小时)"
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>5){value=value.slice(0,5)}"
-            type="number"
-            min="0"
-          />
-        </el-form-item> -->
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             placeholder="请输入排序"
@@ -320,19 +309,47 @@
             :type="'itemPictureUrl'"
           />
         </el-form-item>
+        <el-form-item label="预约人数上限" prop="nurseStationItem.appointmentLimitCount">
+          <el-input
+            placeholder="请输入预约人数上限"
+            v-model="form.nurseStationItem.appointmentLimitCount"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            maxLength="8"
+          />
+        </el-form-item>
+        <el-form-item label="预约时间点间隔" prop="nurseStationItem.appointmentTimeInterval">
+        <el-select
+              v-model="form.nurseStationItem.appointmentTimeInterval"
+              placeholder="请选择预约时间点间隔"
+            >
+              <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="nurseStationItem.advanceAppointDuration">
+        <el-select
+              v-model="form.nurseStationItem.advanceAppointDuration"
+              placeholder="请选择提前预约时长"
+            >
+              <el-option
+                v-for="item in optionlist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
         <el-form-item
           label="项目内容简介"
           prop="nurseStationItem.nurseItemContent"
         >
-          <!-- <el-input
+
-            maxlength="300"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-            placeholder="请输入内容"
-            style="width: 208px"
-            v-model="form.nurseStationItem.nurseItemContent"
-          >
-          </el-input> -->
           <editor
             @imgs="imgs"
             maxlength="300"

src/views/system/stationItem/stationItemjs.js

@@ -63,6 +63,35 @@ export default {
             title: "",
             // 是否显示弹出层
             open: false,
+            options: [{
+                value: 'HALF_HOUR',
+                label: '半小时'
+              }, {
+                value: 'ONE_HOUR',
+                label: '一小时'
+              },
+              {
+                value: ' NINETY_MINUTES',
+                label: '九十分钟'
+              },
+              {
+                value: 'TWO_HOUR',
+                label: '两小时'
+              }
+              
+            ],
+              value:"",
+              optionlist: [{
+                value: 'HALF_DAY',
+                label: '半小时'
+              }, {
+                value: 'ONE_DAY',
+                label: '一小时'
+              },
+           
+              
+            ],
+            value1:"",
             //权限查询
             nurseStationlist: [],
             nurseStationlist2: [],
@@ -102,7 +131,10 @@ export default {
                     sort: "",
                     nurseStationName: "请选择所属护理站",
                     classifyName: '请选择护理项目分类',
-                    nurseClassifyId: ''
+                    nurseClassifyId: '',
+                    appointmentLimitCount:"",
+                    appointmentTimeInterval:"",
+               
                 },
             },
             idd: 1,
@@ -117,14 +149,24 @@ export default {
                 "nurseStationItem.sort": [
                     { required: true, message: "排序不能为空", trigger: "blur" },
                 ],
-                // "nurseStationItem.advanceAppointDuration": [
+                "nurseStationItem.advanceAppointDuration": [
-                //     { required: true, message: "提前预约时长不能为空", trigger: "blur" },
+                    { required: true, message: "提前预约时长不能为空", trigger: "blur" },
-                // ],
+                ],
                 "nurseStationItem.itemPictureUrl": [{
                     required: true,
                     trigger: "blur",
                     message: "请选择项目头像",
                 }, ],
+                "nurseStationItem.appointmentLimitCount": [{
+                    required: true,
+                    trigger: "blur",
+                    message: "请输入预约人数上限",
+                }, ],
+                "nurseStationItem.appointmentTimeInterval": [{
+                    required: true,
+                    trigger: "blur",
+                    message: "请选择预约时间点间隔",
+                }, ],
                 nurseStationId: [
                     { required: true, trigger: "blur", message: "请选择所属护理站" },
                 ],
@@ -526,7 +568,7 @@ export default {
                         this.form.nurseStationItemPrices.forEach(e => {
                             e.price = Number(e.price)
                         })
-                        this.form.nurseStationItem.advanceAppointDuration = 0
+                     
                         updateNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
@@ -536,7 +578,7 @@ export default {
                         this.form.nurseStationItemPrices.forEach(e => {
                             e.price = Number(e.price)
                         })
-                        this.form.nurseStationItem.advanceAppointDuration = 0
+                   
                         addNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
                             this.$forceUpdate();
@@ -570,4 +612,5 @@ export default {
             this.upload.open = true;
         },
     },
-};
+};
+