Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/api/patient.js

@@ -15,14 +15,14 @@ export function EditDialysisSolution(id, solution) {
   })
 }
 
-export function EditAssessmentBeforeDislysis(id, assessment_date, before,mode) {
+export function EditAssessmentBeforeDislysis(id, assessment_date, before, mode) {
   return request({
-    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date+"&mode="+mode,
+    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date + '&mode=' + mode,
     method: 'post',
     data: before,
-    headers:{"Permission":1},
-
-
+    headers: {
+      'Permission': 1
+    }
 
   })
 }

src/api/patient/patient.js

@@ -584,9 +584,9 @@ export function SaveBirthday(data) {
   })
 }
 
-export function getOrgName(params) {
+export function getOrgName(id, params) {
   return request({
-    url: '/m/api/patient/getorgname',
+    url: '/m/api/patient/getorgname?id=' + id,
     method: 'Get',
     params: params
   })
@@ -692,9 +692,9 @@ export function DeleteBed(id, params) {
   })
 }
 
-export function LoginOut(params) {
+export function LoginOut(id, params) {
   return request({
-    url: '/m/api/patient/loginout',
+    url: '/m/api/patient/loginout?id=' + id,
     method: 'get',
     params: params
   })
@@ -725,7 +725,6 @@ export function getBloodPatient(params) {
 }
 
 export function DeletePatient(id, params) {
-  console.log('医嘱id', id)
   return request({
     url: '/m/api/patient/deletePatient?id=' + id,
     method: 'delete',
@@ -762,9 +761,9 @@ export function getMyOrganazition(id, params) {
   })
 }
 
-export function getOrgInformation(params) {
+export function getOrgInformation(id, params) {
   return request({
-    url: '/m/api/org/getorginformation',
+    url: '/m/api/org/getorginformation?id=' + id,
     method: 'get',
     params: params
   })
@@ -793,3 +792,52 @@ export function getMyInforName(id, params) {
     params: params
   })
 }
+
+export function getPartionDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getpartiondetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdatePartition(params) {
+  return request({
+    url: '/m/api/patient/updatepartition',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGroupDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getgroupdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateGroup(params) {
+  return request({
+    url: '/m/api/patient/updategroup',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getBedDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getbeddetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateBed(params) {
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/updatebed',
+    method: 'get',
+    params: params
+  })
+}

src/pages/allDoctorAdvice/index.vue

@@ -13,14 +13,17 @@
         :key="index"
       >
         <div v-for="(it, i) in item.child" :key="i">
-            <p class="time">
+            <div style="display:flex;justify-content:space-between;align-items:center">
+            <p class="time" v-if="i<1">
               {{ it.advice_date ? getTime(it.advice_date) : "" }}
             </p>
+            <van-icon class="ellipsis" name="ellipsis" @click="DeleteFive(item.start_time,item.child[0].execution_staff,index)" />
+            </div>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
-                <span>长期医嘱</span>
-                <span style="margin-left:1rem">
+                <span v-if="i<1">长期医嘱</span>
+                <span style="margin-left:1rem" v-if="i<1">
                   {{ getTimes(it.start_time) }}
                 </span>
               </div>
@@ -40,7 +43,7 @@
                 />
                 </div>
                 <div v-for="(i, index) in childList" :key="index">
-                 <div style="display:flex;justify-content:space-between" v-if="i.parent_id == it.id">
+                 <div style="display:flex;justify-content:space-between" >
                     <p>
                       ▲ {{ i.advice_name }} {{ i.advice_desc
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
@@ -56,24 +59,21 @@
                        />
                   </div>
                 </div>
-              </div>
-              <div
-                class="doctorBox"
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
-              >
-                <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
-                <p>执行护士：{{ getDoctor(item.execution_staff) }}</p>
-                <p>核对护士：{{ getDoctor(item.checker) }}</p>
-              </div>
-            </div>
+                  <div class="doctorBox">
+                      <p>开嘱医生：{{ getDoctor(it.advice_doctor)}}</p>
+                      <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
+                      <p>核对护士：{{ getDoctor(it.checker) }}</p>
+                  </div>
+               </div>
+             </div>
 
             <div
               class="statOrder"
               v-if="it.advice_type == 3 && it.parent_id == 0"
             >
               <div class="longOrderTitle">
-                <span>临时医嘱</span>
-                <span style="margin-left:1rem">
+                <span v-if="i<1">临时医嘱</span>
+                <span style="margin-left:1rem" v-if="i<1">
                   {{ getTimes(item.child[0].start_time) }}
                 </span>
               </div>
@@ -89,7 +89,7 @@
                       <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="newShowTwo=true"
+                        @click="DeleteTwo(it.id,it.execution_state,index)"
                        />
                  </div>
                 <div v-for="(i, index) in childList" :key="index">
@@ -105,14 +105,13 @@
                      <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="newShowThree=true"
+                        @click="DeleteThree(i.id,i.execution_state,index)"
                        />
                   </div>
                 </div>
               </div>
               <div
                 class="doctorBox"
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
               >
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
@@ -121,6 +120,7 @@
             </div>
           </div>
         </div>
+
       </div>
 
         <van-action-sheet
@@ -153,6 +153,14 @@
           @cancel="onCancelThree"
           @select="onSelectThree"
         />
+
+        <van-action-sheet
+          v-model="newShowFour"
+          :actions="actions4"
+          cancel-text="取消"
+          @cancel="onCancelFour"
+          @select="onSelectFour"
+      />
     </div>
   </div>
 </template>
@@ -162,7 +170,8 @@ import {
   GetDoctorAdviceDetail,
   getAllDoctor,
   DeleteChild,
-  DeletePatient
+  DeletePatient,
+  DeleteManagement
 } from "@/api/patient/patient";
 import { Dialog } from "vant";
 import { uParseTime } from "@/utils/tools";
@@ -181,10 +190,12 @@ export default {
       actions1: [{ name: "删除" }],
       actions2: [{ name: "删除" }],
       actions3: [{ name: "删除" }],
+      actions4: [{ name: "全部删除" }],
+      newShow: false,
       newShowOne: false,
       newShowTwo: false,
       newShowThree: false,
-      id: 0,
+      newShowFour: false,
       index: 0,
       state: 0
     };
@@ -210,47 +221,46 @@ export default {
           this.childList = objarr;
           let dataInfo = {};
           doctorAdvicedetail.forEach((item, index) => {
-            let { groupno } = item;
-            if (!dataInfo[groupno]) {
-              dataInfo[groupno] = {
-                groupno,
+            let { start_time } = item;
+            if (!dataInfo[start_time]) {
+              dataInfo[start_time] = {
+                start_time,
                 child: []
               };
             }
-            dataInfo[groupno].child.push(item);
+            dataInfo[start_time].child.push(item);
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
           let arr = [];
 
-          list.map(item => {
-            let arr2 = [];
-            if (item.child.length > 1) {
-              item.child.map(it => {
-                if (arr.indexOf(it.advice_date) == -1) {
-                  arr.push(it.advice_date);
-                } else {
-                  delete it["advice_date"];
-                }
-              });
-              for (var i = item.child.length - 1; i != -1; i--) {
-                let obj = {};
-                obj.checker = item.child[i].checker;
-                obj.execution_staff = item.child[i].execution_staff;
-                obj.user_name = item.child[i].advice_doctor;
-                if (
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-                ) {
-                  console.log("ajsdkljasldkasjdlkasjs");
-                  arr2.push(obj);
-                } else {
-                  console.log("删除");
-                  delete item.child[i]["checker"];
-                  delete item.child[i]["execution_staff"];
-                  delete item.child[i]["advice_doctor"];
-                }
-              }
-            }
-          });
+          // list.map(item => {
+          //   let arr2 = [];
+          //   if (item.child.length > 1) {
+          //     item.child.map(it => {
+          //       if (arr.indexOf(it.advice_date) == -1) {
+          //         arr.push(it.advice_date);
+          //       } else {
+          //         delete it["advice_date"];
+          //       }
+          //     });
+          //     for (var i = item.child.length - 1; i != -1; i--) {
+          //       let obj = {};
+          //       obj.checker = item.child[i].checker;
+          //       obj.execution_staff = item.child[i].execution_staff;
+          //       obj.user_name = item.child[i].advice_doctor;
+          //       if (
+          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
+          //       ) {
+          //         arr2.push(obj);
+          //       } else {
+          //         console.log("删除");
+          //         delete item.child[i]["checker"];
+          //         delete item.child[i]["execution_staff"];
+          //         delete item.child[i]["advice_doctor"];
+          //       }
+          //     }
+          //   }
+          // });
 
           console.log("list是 ", list);
           this.doctorAdvicedetail = list;
@@ -280,23 +290,36 @@ export default {
         }
       }
     },
+    DeleteFive(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowFour = true;
+    },
     toDelete(id, state, index) {
-      console.log("id", id);
-      console.log("state", state);
       this.id = id;
       this.state = state;
       this.index = index;
       this.newShow = true;
     },
     Delete(id, state, index) {
-      console.log("id", id);
-      console.log("state", state);
       this.id = id;
       this.state = state;
       this.index = index;
       this.newShowOne = true;
     },
-
+    DeleteTwo(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowTwo = true;
+    },
+    DeleteThree(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowThree = true;
+    },
     onCancel() {
       this.newShow = false;
     },
@@ -313,10 +336,29 @@ export default {
         this.DeleteChild(this.id, this.index, this.state);
       }
     },
-    onSelectTwo() {},
-    onCancelTwo() {},
-    onCancelThree() {},
-    onSelectThree() {},
+    onSelectTwo(val) {
+      if (val.name === "删除") {
+        this.DeletePatient(this.id, this.state, this.index);
+      }
+      this.newShowTwo = false;
+    },
+    onCancelTwo() {
+      this.newShowTwo = false;
+    },
+    onCancelThree() {
+      this.newShowThree = false;
+    },
+    onSelectThree() {
+      this.DeleteChild(this.id, this.index, this.state);
+    },
+    onSelectFour(val) {
+      if (val.name === "全部删除") {
+        this.DeleteManagement(this.id, this.staff, this.index);
+      }
+    },
+    onCancelFour() {
+      this.newShowFour = false;
+    },
     DeletePatient(id, index, state) {
       if (state == 1) {
         this.$toast("医嘱已执行,无法删除");
@@ -330,6 +372,7 @@ export default {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
             this.GetDoctorAdviceDetail(this.id);
+            this.doctorAdvicedetail.splice(index, 1);
             this.newShow = false;
           }
         });
@@ -347,22 +390,41 @@ export default {
         DeleteChild(id).then(response => {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
-
             this.childList.splice(index, 1);
             this.newShowOne = false;
+            this.newShowThree = false;
+          }
+        });
+      });
+    },
+    DeleteManagement(id, index, staff) {
+      if (staff > 0) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteManagement(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            this.doctorAdvicedetail.splice(index, 1);
+            this.newShowFour = false;
           }
         });
       });
     }
   },
   created() {
-    this.active = parseInt(this.$route.query.active);
     setRem();
     setHeight();
     var id = this.$route.query.id;
+    console.log("id是--------", id);
     this.GetDoctorAdviceDetail(id);
     var patientid = this.$route.query.patientid;
     this.id = patientid;
+    this.active = parseInt(this.$route.query.active);
     this.getAllDoctor();
   }
 };

src/pages/configureCenter/components/Bed.vue

@@ -44,7 +44,7 @@ export default {
       finished: false,
       newShow: false,
       show: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       total: 0,
@@ -114,6 +114,9 @@ export default {
       if (val.name === "删除") {
         this.DeleteBed(this.id, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push("/editbed?id=" + this.id + "&active=" + this.active);
+      }
     },
     onCancel() {
       this.newShow = false;
@@ -129,6 +132,9 @@ export default {
             console.log("msg", msg);
             this.BedNumber.splice(index, 1);
             this.newShow = false;
+          } else {
+            this.$toast("该床位尚有排班安排，不能删除");
+            this.newShow = false;
           }
         });
       });

src/pages/configureCenter/components/Grouping.vue

@@ -40,7 +40,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       group: [],
@@ -94,6 +94,11 @@ export default {
       if (val.name === "删除") {
         this.DeleteGroup(this.id, this.number, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push(
+          "/editgroup?id=" + this.id + "&active=" + this.active
+        );
+      }
     },
     DeleteGroup(id, number, index) {
       if (number !== "") {

src/pages/configureCenter/components/Partition.vue

@@ -23,6 +23,7 @@
         <van-icon class="addIcon" name="add" @click="addPartition" />新增
       </div>
     </div>
+
     <van-action-sheet
       v-model="newShow"
       :actions="actions"
@@ -45,7 +46,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       zone: [],
@@ -113,12 +114,15 @@ export default {
       if (val.name === "删除") {
         this.DeleteZone(this.id, this.number, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push("/editpartition?id=" + this.id);
+      }
     },
     Delete(id, number, index) {
+      this.newShow = true;
       this.id = id;
       this.index = index;
       this.number = number;
-      this.newShow = true;
     },
     DeleteZone(id, number, index) {
       if (number !== "") {

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -30,13 +30,13 @@
          finished-text="没有更多了"
          >
 
-          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
+          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index" v-show="showOne">
             <div class="adviceTitle">
-              <p>{{getTime(item.child[0].start_time)}}</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <p>{{getTime(item.start_time)}}</p>
+              <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.start_time, index, item.child[0].execution_staff)" />
             </div>
 
-         <div v-for="(it,i) in item.child" :key="i">
+         <div v-for="(it,i) in item.child.slice(0,3)" :key="i">
             <div class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0" >
               <div class="statOrderTitle">
                 <span v-if="i<1">长期医嘱</span>
@@ -94,134 +94,11 @@
                 </div>
             </div>
          </div>
-<!--             <div class="doctorBox">-->
-<!--                <p>开嘱医生：{{ item.child[0].user_name }}</p>-->
-<!--                <p>执行护士：{{ getDoctor(item.child[0].execution_staff) }}</p>-->
-<!--                <p>核对护士：{{ getDoctor(item.child[0].checker) }}</p>-->
-<!--              </div>-->
-            <div class="all" @click="toDoctorAdviceDetail(item.groupno)">全部</div>
+            <div class="all" @click="toDoctorAdviceDetail(item.start_time)">全部</div>
           </div>
         </van-list>
       </div>
 
-<!--      <div class="adviceBox" v-show="showOne">-->
-<!--        <van-list-->
-<!--          v-model="loading"-->
-<!--          :finished="finished"-->
-<!--          finished-text="没有更多了"-->
-<!--          @load="onLoad"-->
-<!--        >-->
-<!--          <div-->
-<!--            class="adviceOne"-->
-<!--            v-for="(item, index) in doctorAdvice"-->
-<!--            :key="index"-->
-<!--          >-->
-<!--            <div v-for="(it, i) in item.child" :key="i">-->
-<!--              <div class="adviceTitle" v-if="it.advice_date">-->
-<!--                <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>-->
-<!--                <van-icon-->
-<!--                  class="ellipsis"-->
-<!--                  name="ellipsis"-->
-<!--                  @click="Delete(item.groupno, index, it.execution_staff)"-->
-<!--                />-->
-<!--              </div>-->
-
-<!--              <div-->
-<!--                class="statOrder"-->
-<!--                v-if="it.advice_type == 1 && it.parent_id == 0"-->
-<!--              >-->
-<!--                <div class="statOrderTitle" v-if="i < 3">-->
-<!--                  <span>长期医嘱</span>-->
-<!--                  <span style="margin-left:1rem">-->
-<!--                    {{ getTimes(it.start_time) }}-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--                <div class="orderContent" v-if="i < 3">-->
-<!--                  <p v-if="it.parent_id === 0">-->
-<!--                    {{ it.advice_name }} {{ it.advice_desc-->
-<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
-<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
-<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
-<!--                    {{ it.execution_frequency }}-->
-<!--                  </p>-->
-<!--                  <div v-for="(i, index) in childList" :key="index">-->
-<!--                    <p v-if="i.parent_id == it.id">-->
-<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
-<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
-<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
-<!--                      }}{{ i.single_dose_unit }}-->
-<!--                      {{ i.delivery_way }}-->
-<!--                      {{ i.execution_frequency }}-->
-<!--                    </p>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                  class="doctorBox"-->
-<!--                  v-if="-->
-<!--                    it.user_name ||-->
-<!--                      it.execution_staff ||-->
-<!--                      (it.checker && i == item.child.length)-->
-<!--                  "-->
-<!--                >-->
-<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
-<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
-<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
-<!--                </div>-->
-<!--              </div>-->
-
-<!--              <div-->
-<!--                class="statOrder"-->
-<!--                v-if="it.advice_type == 3 && it.parent_id == 0"-->
-<!--              >-->
-<!--                <div class="longOrderTitle" v-if="i < 3">-->
-<!--                  <span>临时医嘱</span>-->
-<!--                  <span style="margin-left:1rem">-->
-<!--                    {{ getTimes(item.child[0].start_time) }}-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--                <div class="orderContent" v-if="i < 3">-->
-<!--                  <p>-->
-<!--                    {{ it.advice_name }} {{ it.advice_desc-->
-<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
-<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
-<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
-<!--                    {{ it.execution_frequency }}-->
-<!--                  </p>-->
-<!--                  <div v-for="(i, index) in childList" :key="index">-->
-<!--                    <p v-if="i.parent_id == it.id">-->
-<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
-<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
-<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
-<!--                      }}{{ i.single_dose_unit }}-->
-<!--                      {{ i.delivery_way }}-->
-<!--                      {{ i.execution_frequency }}-->
-<!--                    </p>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                  class="doctorBox"-->
-<!--                  v-if="-->
-<!--                    it.user_name ||-->
-<!--                      it.execution_staff ||-->
-<!--                      (it.checker && i == item.child.length)-->
-<!--                  "-->
-<!--                >-->
-<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
-<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
-<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--            <div-->
-<!--              class="all"-->
-<!--              @click="toDoctorAdviceDetail(item.child[0].groupno)"-->
-<!--            >-->
-<!--              全部-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </van-list>-->
-<!--      </div>-->
-
       <div class="noimgBox" v-show="showTwo">
         <img src="../../../assets/images/none.png" alt />
       </div>
@@ -345,7 +222,8 @@ export default {
       index: 0,
       staff: 0,
       childId: 0,
-      state: 0
+      state: 0,
+      list: []
     };
   },
   methods: {
@@ -353,7 +231,7 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
-      this.page = 1;
+      this.form.page = 1;
       this.type = value;
       this.typeShow = false;
       this.doctorAdvice = [];
@@ -367,7 +245,7 @@ export default {
       );
     },
     getstartTime(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -391,7 +269,7 @@ export default {
       this.startShow = false;
     },
     getstartTime2(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -415,7 +293,6 @@ export default {
       );
       this.endShow = false;
     },
-    changeData(val) {},
     getDoctorAdvices(patientid) {
       if (this.type === "全部") {
         this.form.type = 0;
@@ -438,20 +315,25 @@ export default {
           var advice = response.data.data.advice;
           console.log("advice", advice);
           var one = response.data.data.one;
+          console.log("one", one);
+          var total = response.data.data.total;
+          this.total = total;
+          console.log("total", total);
           let dataInfo = {};
           one.forEach((item, index) => {
-            let { groupno } = item;
-            if (!dataInfo[groupno]) {
-              dataInfo[groupno] = {
-                groupno,
+            let { start_time } = item;
+            if (!dataInfo[start_time]) {
+              dataInfo[start_time] = {
+                start_time,
                 child: []
               };
             }
           });
           let list = Object.values(dataInfo);
+          console.log("list", list);
           list.map(item => {
             for (let i = 0; i < advice.length; i++) {
-              if (item.groupno === advice[i].groupno) {
+              if (item.start_time === advice[i].start_time) {
                 item.child.push(advice[i]);
               }
             }
@@ -463,14 +345,11 @@ export default {
             }
           }
           this.childList = objarr;
-          console.log("list", list);
           let arr = this.doctorAdvice;
           arr.push(...list.reverse());
+          console.log("arr", arr);
           this.doctorAdvice = arr;
-          console.log("listtwo", this.doctorAdvice);
-          var total = response.data.data.total;
-          this.total = total;
-          console.log("total", total);
+
           this.loading = false;
         }
       });
@@ -517,6 +396,7 @@ export default {
         }
       }, 1000);
     },
+
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(

src/pages/homeIndex/index.vue

@@ -26,15 +26,7 @@
         </van-swipe-item>
       </van-swipe>
     </div>
-    <van-overlay :show="show" @click="show = false">
-      <div class="arrowBox">
-        <img src="../../assets/images/toparrow.png" alt />
-      </div>
-      <div class="signBox">
-        <p>请点击右上角“+”图标</p>
-        <p style="color:#1989fa">创建自己的医院/组织/团队</p>
-      </div>
-    </van-overlay>
+    <van-overlay :show="show" @click="show = false" />
     <!--<div class="noticeBox">-->
     <!--<i class="iconfont icon-public-notice notice"></i>-->
     <!--<div class="noticeNews">-->
@@ -127,77 +119,67 @@
   import "../../styles/newStyle.scss";
   import {setRem} from "@/libs/functionRem";
 
-  export default {
-    data() {
-      return {
-        show: false,
-        value1: 0,
-        isCreateOrg: false,
-        isSubSuperAdmin:false,
-        org_arr: [],
-        banners: [],
-        apps: [],
-        option1: [
-          {text: "新款商品", value: 0},
-          {text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1},
-          {text: "活动商品", value: 2}
-        ]
-      };
+export default {
+  data() {
+    return {
+      show: true,
+      value1: 0,
+      isCreateOrg: false,
+      org_arr: [],
+      banners: [],
+      apps: [],
+      option1: [
+        { text: "新款商品", value: 0 },
+        { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
+        { text: "活动商品", value: 2 }
+      ]
+    };
+  },
+  methods: {
+    toStaffManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/staff" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
     },
-    methods: {
-      toStaffManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/staff"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toRoleManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/role"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-      },toConfigCenter(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toOrgSetting(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },
-      changeOrg(value){
-        Toast.loading({forbidClick: true, duration: 0})
-        let params={
-          org_id : value
-
-        }
-        ChangeOrg(params).then(response => {
-          if (response.data.state === 1) {
-            //清除之前的数据
-            this.$store.dispatch("SetScheduals", {
-             scheduals: []
-            });
-            this.$store.dispatch("SetWaitScheduals", {
-              waitscheduals: []
-            });
+    toRoleManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/role" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    toConfigCenter() {
+      if (this.isCreateOrg) {
+        this.$router.push("/configurecenter");
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    toOrgSetting() {
+      if (this.isCreateOrg) {
+        this.$router.push("/editorg?id=" + this.value1);
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    changeOrg(value) {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let params = {
+        org_id: value
+      };
+      ChangeOrg(params).then(response => {
+        if (response.data.state === 1) {
+          // 清除之前的数据
 
             var user = response.data.data.user;
             var admin = response.data.data.admin;
@@ -494,25 +476,6 @@
     top: 3.125rem;
     z-index: 9;
   }
-  .arrowBox {
-    text-align: right;
-    img {
-      width: 2.5rem;
-      margin-right: 1.625rem;
-    }
-  }
-  .signBox {
-    width: 18.75rem;
-    height: 5.625rem;
-    margin: 0 auto;
-    background: #fff;
-    border-radius: 0.25rem;
-    text-align: center;
-    padding-top: 1.25rem;
-    p {
-      line-height: 1.5rem;
-    }
-  }
 }
 </style>
 <style lang="scss">

src/pages/my/index.vue

@@ -2,29 +2,27 @@
   <div class="page_my">
     <div class="myTop">
       <img src="../../assets/images/myBanner.png" alt />
-      <div class="avatar">
-        <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
-        <img v-if="roleInfo.avatar == ''" src="../../assets/images/mydefault.png" alt />
-      </div>
-      <div class="userMain" @click="toMyIndex">
-        <div class="userBox">
-          <div class="userTxt">
-            <span v-if="roleInfo.user_name!=''">
-              <p class="userName">{{ roleInfo.user_name }}</p>
-            </span>
-            <span v-if="roleInfo.user_name==''">
-              <p class="userName">{{ userName.name }}</p>
-            </span>
-            <p class="signature">{{ roleInfo.message }}</p>
+        <div class="avatar">
+          <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
+          <img
+            v-if="roleInfo.avatar == ''"
+            src="../../assets/images/mydefault.png"
+            alt
+          />
+        </div>
+        <div class="userMain" @click="toMyIndex">
+          <div class="userBox">
+            <div class="userTxt">
+              <span v-if="roleInfo.user_name!=''"><p class="userName">{{ roleInfo.user_name }}</p></span>
+                <span v-if="roleInfo.user_name==''"><p class="userName">{{ userName.name }}</p></span>
+              <p class="signature">{{ roleInfo.message }}</p>
+            </div>
+            <van-icon name="arrow" />
           </div>
-          <van-icon name="arrow" />
         </div>
+      <div class="invitebox">
+        <img src="../../assets/images/invite.png" alt />
       </div>
-      <router-link to="/invite">
-        <div class="invitebox">
-          <img src="../../assets/images/invite.png" alt />
-        </div>
-      </router-link>
 
       <div class="myInfo" @click="toMyInfo">
         <div class="myInfoLeft">
@@ -45,26 +43,22 @@
     </div>
 
     <div class="myBox">
-      <div class="myBoxOne">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/myIcon2.png" alt />
-          <p>我的医院/组织/团队</p>
+        <div class="myBoxOne">
+          <div class="myInfoLeft">
+            <img src="../../assets/images/myIcon2.png" alt />
+            <p>我的医院/组织/团队</p>
+          </div>
+          <van-icon class="arrow" name="arrow" />
         </div>
-        <van-icon class="arrow" name="arrow" />
-      </div>
       <div class="myBoxTwo noBorder" v-for="(item,index) in organaziton" :key="index">
         <div class="myInfoLeft">
-          <span v-if="item.org_logo == ''">
-            <img src="../../assets/images/m01.png" alt />
-          </span>
-          <span v-if="item.org_logo !==''">
-            <img :src="item.org_logo" />
-          </span>
+          <span v-if="item.org_logo == ''"><img src="../../assets/images/m01.png" alt /></span>
+          <span v-if="item.org_logo !==''"><img :src="item.org_logo"></span>
           <p>{{item.org_name}}</p>
         </div>
-        <div class="myInfoRight" v-if="item.is_super_admin == 1">
-          <div class="myInfoRightBtn" @click="toEditOrg()">管理</div>
-          <van-icon class="arrow" name="arrow" @click="toManage" />
+        <div class="myInfoRight">
+          <div v-if="item.creator == $store.getters.user.org.creator" class="myInfoRightBtn" @click="toEditOrg(item.id)">管理</div>
+          <van-icon class="arrow" name="arrow"  @click="toManage(item.creator,item.id)"/>
         </div>
       </div>
     </div>
@@ -89,21 +83,21 @@
       </router-link>
     </div>
     <div class="myBox">
-      <!--      <div class="myBoxOne">-->
-      <!--        <div class="myInfoLeft">-->
-      <!--          <img src="../../assets/images/myIcon5.png" alt />-->
-      <!--          <p>常见问题</p>-->
-      <!--        </div>-->
-      <!--        <van-icon class="arrow" name="arrow" />-->
-      <!--      </div>-->
+<!--      <div class="myBoxOne">-->
+<!--        <div class="myInfoLeft">-->
+<!--          <img src="../../assets/images/myIcon5.png" alt />-->
+<!--          <p>常见问题</p>-->
+<!--        </div>-->
+<!--        <van-icon class="arrow" name="arrow" />-->
+<!--      </div>-->
 
-      <!--      <div class="myBoxOne" @click="toFeed">-->
-      <!--        <div class="myInfoLeft">-->
-      <!--          <img src="../../assets/images/myIcon6.png" alt />-->
-      <!--          <p>意见反馈</p>-->
-      <!--        </div>-->
-      <!--        <van-icon class="arrow" name="arrow" />-->
-      <!--      </div>-->
+<!--      <div class="myBoxOne" @click="toFeed">-->
+<!--        <div class="myInfoLeft">-->
+<!--          <img src="../../assets/images/myIcon6.png" alt />-->
+<!--          <p>意见反馈</p>-->
+<!--        </div>-->
+<!--        <van-icon class="arrow" name="arrow" />-->
+<!--      </div>-->
 
       <router-link to="/about">
         <div class="myBoxOne">
@@ -136,6 +130,7 @@ import {
   getMyInforName
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
+import { GetHomeData } from "@/api/home";
 export default {
   data() {
     return {
@@ -143,15 +138,16 @@ export default {
       admin_user_id: 0,
       adminid: 0,
       organaziton: [],
-      userName: {}
+      userName: {},
+      creator: 0
     };
   },
   methods: {
     LoginOut() {
-      LoginOut().then(response => {
+      LoginOut(this.adminid).then(response => {
         if (response.data.state === 1) {
           var msg = response.data.data.msg;
-          console.log("msg是", msg);
+          // console.log("msg是", msg);
           this.isRouterAlive = false;
           this.$nextTick(function() {
             this.isRouterAlive = true;
@@ -160,22 +156,32 @@ export default {
         }
       });
     },
+    GetHomeData() {
+      GetHomeData().then(response => {
+        if (response.data.state === 1) {
+          var orgs = response.data.data.orgs;
+          // console.log("orgs", orgs);
+          this.organaziton = orgs;
+        }
+      });
+    },
     getMyInformation(id) {
       getMyInformation(id).then(response => {
         if (response.data.state === 1) {
           var roleInfo = response.data.data.roleInfo;
-          console.log("roleInfo", roleInfo);
+          // console.log("roleInfo", roleInfo);
           this.admin_user_id = roleInfo.id;
           this.adminid = roleInfo.admin_user_id;
           this.roleInfo = roleInfo;
         }
       });
     },
+
     getMyOrganazition(id) {
       getMyOrganazition(id).then(response => {
         if (response.data.state === 1) {
           var organaziton = response.data.data.organaziton;
-          this.organaziton = organaziton;
+          // this.organaziton = organaziton;
         }
       });
     },
@@ -198,11 +204,11 @@ export default {
     toMyInfo() {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
     },
-    toManage() {
-      this.$router.push("/organizationinfo?id=" + this.adminid);
+    toManage(id, orgid) {
+      this.$router.push("/organizationinfo?id=" + id + "&orgid=" + orgid);
     },
-    toEditOrg() {
-      this.$router.push("/newMy");
+    toEditOrg(id) {
+      this.$router.push("/editorg?id=" + id);
     },
     toMyIndex() {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
@@ -213,6 +219,8 @@ export default {
     this.getMyInformation(adminid);
     this.getMyOrganazition(adminid);
     this.getMyInforName(adminid);
+    this.GetHomeData();
+    this.creator = this.$store.getters.user.org.creator;
   }
 };
 </script>

src/pages/my/organizationInfo.vue

@@ -7,7 +7,8 @@
     <div class="organizeBox">
       <div class="organizeBoxOne">
         <div class="organizeBoxOneLeft">
-          <img src="../../assets/images/m01.png" alt />
+          <span v-if="org_logo==''"><img src="../../assets/images/m01.png" alt /></span>
+          <span v-if="org_logo!=''"><img :src="org_logo" alt /></span>
           <p>{{ org_short_name }}</p>
         </div>
         <van-icon class="arrow" name="arrow" />
@@ -27,13 +28,13 @@
       </div>
       <div class="organizeBoxTwo">
         <div>角色</div>
-        <div class="rolebox">
+        <div class="rolebox" v-if="role_name !=''">
           <div class="roleboxBtn">{{ role_name }}</div>
         </div>
       </div>
       <div class="organizeBoxTwo">
         <div>职位</div>
-        <div class="organizeBoxTwoTxt">{{ positionName }}</div>
+        <div class="organizeBoxTwoTxt" v-if="positionName!=''">{{ positionName }}</div>
       </div>
     </div>
   </div>
@@ -51,16 +52,19 @@ export default {
       org_short_name: "",
       telephone: "",
       role_name: "",
-      positionName: ""
+      positionName: "",
+      org_logo: ""
     };
   },
   methods: {
-    getOrgName() {
-      getOrgName().then(response => {
+    getOrgName(id) {
+      getOrgName(id).then(response => {
         if (response.data.state === 1) {
           var name = response.data.data.name;
+          this.org_short_name = name.org_name;
+          this.org_logo = name.org_logo;
           this.telephone = name.telephone;
-          // console.log("name", name);
+          console.log("name", name);
         }
       });
     },
@@ -124,10 +128,11 @@ export default {
   },
   created() {
     this.user_name = this.$store.getters.user.user.user_name;
-    this.org_short_name = this.$store.getters.user.org.org_short_name;
+    // this.org_short_name = this.$store.getters.user.org.org_short_name;
     var id = this.$route.query.id;
     console.log("id", id);
-    this.getOrgName();
+    var orgid = this.$route.query.orgid;
+    this.getOrgName(orgid);
     this.getRoleName(id);
     this.getAllOrganization(id);
   }

src/pages/patientCenter/editOrg/index.vue

@@ -3,16 +3,21 @@
     <div class="createOrganizationTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">创建医院/组织/团队</span>
+       <div style="margin-left:40px">
+        <span @click="spread" id="copy">修改</span>
+      </div>
     </div>
     <div class="tips">填写真实信息，获取更精准服务</div>
     <div class="infoBox">
       <div class="infoOne">
         <p class="infoTitle">机构名称</p>
-        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称"/>
+        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称" :readonly="readonly"/>
       </div>
       <div class="infoOne">
         <p class="infoTitle">机构类型</p>
-        <van-cell is-link @click="showPopup(1)">{{ type_name }}</van-cell>
+        <van-cell is-link>
+          <van-field v-model="type_name" :readonly="readonly" @click="showPopup(1)"></van-field>
+        </van-cell>
         <van-popup v-model="show1" position="bottom" :style="{ height: '60%' }">
           <van-area
             :area-list="orgtype"
@@ -21,12 +26,15 @@
             @confirm="chooseCityTwo"
             :columns-num="2"
             @change="onChangeTwo"
+           :readonly="readonly"
           />
         </van-popup>
       </div>
       <div class="infoOne">
         <p class="infoTitle">机构地区</p>
-        <van-cell is-link @click="showPopup(2)">{{ org_area }}</van-cell>
+        <van-cell is-link>
+          <van-field v-model="org_area" :readonly="readonly" @click="showPopup(2)"></van-field>
+        </van-cell>
         <van-popup v-model="show2" position="bottom" :style="{ height: '60%' }">
           <van-area
             :area-list="area"
@@ -34,23 +42,23 @@
             @cancel="show2=false"
             @confirm="chooseCity"
             @change="onChange"
+            :readonly="readonly"
           />
         </van-popup>
       </div>
       <div class="infoOne">
         <p class="infoTitle">详细地址</p>
-        <van-field v-model="orgForm.address" placeholder="请填写"/>
+        <van-field v-model="orgForm.address" placeholder="请填写" :readonly="readonly"/>
       </div>
       <div class="infoOne">
         <p class="infoTitle">联系人</p>
-        <van-field v-model="orgForm.contact_name" placeholder="请填写"/>
+        <van-field v-model="orgForm.contact_name" placeholder="请填写" :readonly="readonly"/>
       </div>
       <div class="infoOne">
         <p class="infoTitle">联系电话</p>
-        <van-field v-model="orgForm.telephone" placeholder="请填写"/>
+        <van-field v-model="orgForm.telephone" placeholder="请填写" :readonly="readonly"/>
       </div>
     </div>
-    <div class="create" @click="updateOrg()">保存</div>
     <div class="problem">
       遇到问题？点击
       <span @click="contact = true">联系客服</span>
@@ -86,6 +94,7 @@ export default {
   components: {},
   data() {
     return {
+      readonly: true,
       org_area: "",
       type_name: "",
       contact: false,
@@ -4201,27 +4210,39 @@ export default {
     };
   },
   methods: {
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.updateOrg();
+      }
+    },
     showPopup(index) {
-      if (index === 1) {
-        this.show1 = true;
-      } else if (index === 2) {
-        this.show2 = true;
+      if (this.readonly == true) {
+        return false;
+      }
+      if (this.readonly == false) {
+        if (index === 1) {
+          this.show1 = true;
+        } else if (index === 2) {
+          this.show2 = true;
+        }
       }
     },
     // 机构地址
     chooseCity(value) {
-      console.log("city", value);
       this.show2 = false;
       const arr = [];
       value.map(item => {
-        console.log(item);
         arr.push(item.name);
       });
       const str = arr.join("-");
       this.org_area = str;
     },
     chooseCityTwo(value) {
-      console.log("value是什么", value);
       this.show1 = false;
       const arr = [];
       value.map(item => {
@@ -4258,9 +4279,6 @@ export default {
       this.orgForm.district_name = countName;
     },
     onChangeTwo(picker, value, index) {
-      console.log(picker);
-      console.log(value);
-      console.log(index);
       let orgtypeName = "";
       for (let index = 0; index < value.length; index++) {
         orgtypeName = value[0].name;
@@ -4291,11 +4309,11 @@ export default {
     callPhone() {
       window.location.href = "tel://075586526342";
     },
-    getOrgInformation() {
-      getOrgInformation().then(response => {
+    getOrgInformation(id) {
+      getOrgInformation(id).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information;
-          console.log("information", information);
+         // console.log("information", information);
           var typeName = response.data.data.typeName;
           var name = response.data.data.name;
           this.orgForm.org_name = information.org_name;
@@ -4314,6 +4332,7 @@ export default {
         }
       });
     },
+
     updateOrg() {
       if (this.orgForm.org_name.trim().length <= 0) {
         Toast("机构名字不能为空");
@@ -4349,7 +4368,7 @@ export default {
       updateOrg(this.orgForm, this.orgForm.id).then(response => {
         if (response.data.state === 1) {
           var org = response.data.data.org;
-          console.log("org", org);
+          // console.log('org', org)
           this.$router.push("/homeIndex");
         } else {
           Toast.fail(response.data.msg);
@@ -4366,7 +4385,8 @@ export default {
     }
   },
   created() {
-    this.getOrgInformation();
+    var id = this.$route.query.id;
+    this.getOrgInformation(id);
     this.getAllOrgType();
   }
 };

src/pages/patients/editPatient.vue

@@ -4,7 +4,7 @@
       <div class="addPatientsTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
         <span class="titleName">编辑患者</span>
-        <div @click="updatedPatient"><p>保存</p></div>
+        <span @click="spread" id="copy">修改</span>
       </div>
     </van-sticky>
     <div class="basicTitle">基本信息</div>
@@ -13,6 +13,7 @@
         v-model="patientForm.name"
         required
         label="姓名"
+        :readonly="readonly"
         placeholder="请输入"
       />
       <van-field
@@ -21,8 +22,8 @@
         right-icon="arrow"
         placeholder="请选择"
         required
-        readonly
-        @click="show = true"
+        :readonly="readonly"
+        @click="clickSex"
       />
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
         <van-picker :columns="columns" show-toolbar @change="onChange" />
@@ -33,12 +34,13 @@
         label="身份证号"
         @blur="checkIdCardNo"
         placeholder="请输入"
+        :readonly="readonly"
       />
       <van-field
         v-model="patientForm.birthday"
         required
         label="出生日期"
-        readonly
+        :readonly="readonly"
         placeholder="请输入"
       />
       <van-field
@@ -47,6 +49,7 @@
         required
         label="手机号"
         placeholder="请输入"
+        :readonly="readonly"
       />
       <van-cell>
         <!-- 使用 title 插槽来自定义标题 -->
@@ -77,6 +80,7 @@
           clearable
           required
           label="透析号"
+          :readonly="readonly"
         >
           <van-button
             slot="button"
@@ -91,9 +95,9 @@
           v-model="patientForm.patientsoure"
           right-icon="arrow"
           required
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show3 = true"
+          @click="clickPatientSoure"
         />
         <van-popup v-model="show3" position="bottom" :style="{ height: '40%' }">
           <van-picker :columns="columns2" show-toolbar @change="onChange1" />
@@ -103,9 +107,9 @@
           v-model="patientForm.lapseto"
           right-icon="arrow"
           required
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show4 = true"
+          @click="clickLapseto"
         />
         <van-popup v-model="show4" position="bottom" :style="{ height: '40%' }">
           <van-picker :columns="columns4" show-toolbar @change="onChange2" />
@@ -151,9 +155,9 @@
           label="首次透析日期"
           v-model="patientForm.fistDate"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show2 = true"
+          @click="clickDate"
         />
         <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
           <van-datetime-picker
@@ -172,6 +176,7 @@
           label="诊断"
           type="textarea"
           maxlength="50"
+          :readonly="readonly"
           placeholder="请输入主要诊断信息"
         />
       </div>
@@ -183,6 +188,7 @@
           v-model="patientForm.requipmentId"
           label="设备ID"
           placeholder="请输入"
+          :readonly="readonly"
         />
 
         <van-cell>
@@ -227,9 +233,9 @@
           label="首次透析日期"
           v-model="patientForm.memberFistDate"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show12 = true"
+          @click="clickDateTwo"
         />
         <van-popup
           v-model="show12"
@@ -249,9 +255,9 @@
           label="病种"
           v-model="patientForm.patient_type"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show14 = true"
+          @click="clickPatientType"
         />
         <van-popup
           v-model="show14"
@@ -268,9 +274,9 @@
           label="治疗方式"
           v-model="patientForm.treatmentMethod"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show13 = true"
+          @click="clickTreatMethod"
         />
         <van-popup
           v-model="show13"
@@ -403,7 +409,8 @@ export default {
       ],
       illnesslist: [],
       radio: "1",
-      showOne: false
+      showOne: false,
+      readonly: true
     };
   },
   methods: {
@@ -763,6 +770,72 @@ export default {
         "-" +
         birth.substr(6, 2);
     },
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.updatedPatient();
+      }
+    },
+    clickSex() {
+      if (this.readonly == true) {
+        this.show = false;
+      }
+      if (this.readonly == false) {
+        this.show = true;
+      }
+    },
+    clickPatientSoure() {
+      if (this.readonly == true) {
+        this.show3 = false;
+      }
+      if (this.readonly == false) {
+        this.show3 = true;
+      }
+    },
+    clickLapseto() {
+      if (this.readonly == true) {
+        this.show4 = false;
+      }
+      if (this.readonly == false) {
+        this.show4 = true;
+      }
+    },
+    clickDate() {
+      if (this.readonly == true) {
+        this.show2 = false;
+      }
+      if (this.readonly == false) {
+        this.show2 = true;
+      }
+    },
+    clickDateTwo() {
+      if (this.readonly == true) {
+        this.show12 = false;
+      }
+      if (this.readonly == false) {
+        this.show12 = true;
+      }
+    },
+    clickPatientType() {
+      if (this.readonly == true) {
+        this.show14 = false;
+      }
+      if (this.readonly == false) {
+        this.show14 = true;
+      }
+    },
+    clickTreatMethod() {
+      if (this.readonly == true) {
+        this.show13 = false;
+      }
+      if (this.readonly == false) {
+        this.show13 = true;
+      }
+    },
     updatedPatient() {
       if (this.patientForm.name === "") {
         this.$toast("姓名不能为空");

src/router/index.js

@@ -287,7 +287,7 @@ export default new Router({
       name: "longdialysis",
       component: () => import("@/pages/allLongDialysis/index")
     },
-    //,
+    //, 
     {
       path: "/alldoctoradvice",
       name: "/alldoctoradvice",
@@ -305,6 +305,19 @@ export default new Router({
       name: "/addpartition",
       component: () => import("@/pages/configureCenter/newPartition")
     },
+    // 编辑分区
+    {
+      path: '/editpartition',
+      name: 'editpartition',
+      component: () => import('@/pages/configureCenter/editPartion')
+
+    },
+    // 编辑分组
+    {
+      path: '/editgroup',
+      name: 'editgroup',
+      component: () => import('@/pages/configureCenter/editGrouping')
+    },
     // 新增分组
     {
       path: "/addgroup",
@@ -317,6 +330,19 @@ export default new Router({
       name: "/addbed",
       component: () => import("@/pages/configureCenter/newBed")
     },
+    // 编辑床位号
+    {
+      path: '/editbed',
+      name: 'editbed',
+      component: () => import('@/pages/configureCenter/editBed')
+
+    },
+    {
+      path: '/allinspection',
+      name: '/allinspection',
+      component: () => import('@/pages/patientCenter/allCheck/index')
+
+    },
     // 我的页面管理
     {
       path: "/editorg",