提交

src/api/admin_user.js

@@ -139,3 +139,41 @@ export function GetAllFunctionPurview(){
 
 
 
+
+
+
+export function EditPurview(params){
+  return request({
+    url:'/m/api/permission/post',
+    method:'post',
+    params: params,
+  })
+}
+
+
+
+
+export function EditFuncPurview(params){
+  return request({
+    url:'/m/api/functionpermission/post',
+    method:'post',
+    params:params,
+  })
+}
+
+
+export function GetFunctionRoleInfo(params){
+  return request({
+    url:'/m/api/func_role/get',
+    method:'get',
+    params:params,
+  })
+}
+
+
+
+
+
+
+
+

src/api/advice.js

@@ -7,27 +7,31 @@ export function getAdviceConfig () {
   })
 }
 
-export function CreateDoctorAdvice (id, advice) {
+export function CreateDoctorAdvice (id, advice, mode) {
   console.log('id', id)
   return request({
-    url: '/m/api/advice/create?id=' + id,
+    url: '/m/api/advice/create?id=' + id +"&mode="+mode,
     method: 'post',
     data: advice
   })
 }
-export function EditDoctorAdvice (id, advice) {
+export function EditDoctorAdvice (id, advice,mode) {
   return request({
-    url: '/m/api/advice/edit?id=' + id,
+    url: '/m/api/advice/edit?id=' + id+"&mode="+mode,
     method: 'put',
-    data: advice
+    data: advice,
+    headers:{"Permission":1},
+
   })
 }
 
-export function StopDoctorAdvice (id, advice) {
+export function StopDoctorAdvice (id, advice,mode) {
   return request({
-    url: '/m/api/advice/stop?id=' + id,
+    url: '/m/api/advice/stop?id=' + id+"&mode="+mode,
     method: 'Post',
-    data: advice
+    data: advice,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -35,7 +39,9 @@ export function ExecDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -43,24 +49,31 @@ export function CheckDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/check',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
 export function DeleteDoctorAdvice (id) {
   return request({
-    url: '/m/api/advice/delete?id=' + id,
-    method: 'Delete'
+    url: '/m/api/advice/delete?id=' + id+"&mode="+mode,
+    method: 'Delete',
+    headers:{"Permission":1},
+
   })
 }
 
-export function DeleteDoctorAdviceNew (group_no, advice_id) {
+export function DeleteDoctorAdviceNew (group_no, advice_id,mode,is_sub) {
   return request({
     url: '/m/api/newadvice/delete',
     method: 'Delete',
+    headers:{"Permission":1},
     params: {
       groupno: group_no,
-      advice_id: advice_id
+      advice_id: advice_id,
+      mode:mode,
+      is_sub:is_sub,
     }
   })
 }
@@ -73,25 +86,29 @@ export function getSchedualDoctors (params) {
   })
 }
 
-export function batchCreateAdvices (patient_id, group_no, data) {
+export function batchCreateAdvices (patient_id, group_no, data,mode) {
   return request({
     url: '/m/api/advice/creategroup',
     method: 'post',
+    headers:{"Permission":1},
     params: {
       id: patient_id,
-      group_no: group_no
+      group_no: group_no,
+      mode:mode,
     },
     data: data
   })
 }
 
-export function modifyAdviceGroupStartTime (group_no, start_time_str) {
+export function modifyAdviceGroupStartTime (group_no, start_time_str,mode) {
   return request({
     url: '/m/api/advice/group/modify_starttime',
     method: 'post',
+    headers:{"Permission":1},
     params: {
       group_no: group_no,
-      start_time: start_time_str
+      start_time: start_time_str,
+      mode:mode,
     }
   })
 }
@@ -100,6 +117,7 @@ export function ExecSingleDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec/single',
     method: 'Post',
+    headers:{"Permission":1},
     params: params
   })
 }
@@ -107,7 +125,9 @@ export function ExecSingleDoctorAdvice (params) {
 export function DeleteSubDoctorAdvice (params) {
   return request({
     url: '/m/api/delete/subadvice?advice_id=' + params,
-    method: 'Delete'
+    method: 'Delete',
+    headers:{"Permission":1},
+
   })
 }
 
@@ -122,7 +142,9 @@ export function ModifyExecDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec/modify',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 

src/api/dialysis.js

@@ -35,7 +35,9 @@ export function commitTreatmentSummary(params) {
   return request({
     url: '/m/api/dialysis/treatmentSummary',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
 
   })
 }
@@ -44,8 +46,8 @@ export function commitDoubleCheck(params) {
   return request({
     url: '/m/api/dialysis/doublecheck',
     method: 'post',
-    params: params
-
+    params: params,
+    headers:{"Permission":1},
   })
 }
 
@@ -53,7 +55,9 @@ export function commitAcceptsAssessment(params) {
   return request({
     url: '/m/api/dialysis/acceptsAssessment',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
 
   })
 }
@@ -62,7 +66,9 @@ export function finish(params) {
   return request({
     url: '/m/api/dialysis/finish',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -71,7 +77,9 @@ export function commitDialysisPrescription(params) {
   return request({
     url: '/m/api/dialysis/dialysisPrescription',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -79,7 +87,9 @@ export function commitAssessmentAfterDislysis(params) {
   return request({
     url: '/m/api/dialysis/assessmentAfterDislysis',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -87,7 +97,9 @@ export function addMonitorRecord(params) {
   return request({
     url: '/m/api/monitor/add',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -96,7 +108,9 @@ export function editMonitorRecord(params) {
   return request({
     url: '/m/api/monitor/edit',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -104,7 +118,9 @@ export function deleteMonitorRecord(params) {
   return request({
     url: '/m/api/monitor/delete',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -128,7 +144,10 @@ export function postSolution(params) {
   return request({
     url: '/m/api/solution',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
+
   })
 }
 
@@ -136,7 +155,9 @@ export function startDialysis(params) {
   return request({
     url: '/m/api/dialysis/start',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -209,7 +230,9 @@ export function PostModifyStartDialysis(params) {
   return request({
     url: '/m/api/startOrder/edit',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -217,7 +240,9 @@ export function PostModifyEndDialysis(params) {
   return request({
     url: '/m/api/finishOrder/edit',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -225,7 +250,7 @@ export function CreateGroupAdvice(id, groupno, advices) {
   return request({
     url: '/m/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
-    data: advices
+    data: advices,
   })
 }
 
@@ -233,7 +258,9 @@ export function CreateDryWeight(params) {
   return request({
     url: '/m/api/dryweight/commit',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 

src/api/home.js

@@ -28,4 +28,16 @@ export function createOrg(params) {
 }
 
 
+export function modifyPassword(params) {
+  return request({
+    url: '/m/api/modifypsw',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+
+
+
 

src/api/login.js

@@ -15,53 +15,46 @@ export function loginByPwd(mobile, password) {
 export function isLogin() {
   return request({
     url: '/m/api/islogin',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-
 export function getCodeInit() {
   return request({
     url: '/m/api/code',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
 export function getVerifyCode(params) {
   return request({
     url: '/m/api/getcode',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
 export function loginByCode(params) {
   return request({
     url: '/m/api/login/cs',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
-
 export function forgetPassWord(params) {
   return request({
     url: '/m/api/password/commit',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
 export function register(params) {
   return request({
     url: '/m/api/register/commit',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
@@ -69,29 +62,21 @@ export function setName(params) {
   return request({
     url: '/m/api/register/setname',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
-
-
 export function login() {
   return request({
     url: '/m/api/register/login',
-    method: 'post',
+    method: 'post'
   })
 }
 
-
-
-
-
-
 export function createOrg(params) {
   return request({
     url: '/m/api/org/create',
     method: 'post',
-    params:params,
+    params: params
   })
 }

src/api/patient.js

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

src/api/patient/patient.js

@@ -12,11 +12,14 @@ export function getBloodDialysisPatient(page, limit) {
   })
 }
 
-export function getAllBloodDialysisPatient(page, limit) {
+export function getAllBloodDialysisPatient(page, limit, status, source) {
   const params = {
     page: page,
-    limit: limit
+    limit: limit,
+    patientstatus: status,
+    source: source
   }
+
   return request({
     url: '/m/api/patient/getallblooddialysispatient',
     method: 'get',
@@ -123,9 +126,6 @@ export function getDryWeight(id, startime, endtime, limit, page) {
 }
 
 export function getBloodDialysisPatientTwo(page, limit) {
-  console.log('数据出发了没有')
-  console.log('page', page)
-  console.log('limit', limit)
   const params = {
     page: page,
     limit: limit
@@ -496,9 +496,9 @@ export function getInspection(id, limit, page, startime, endtime, projectid) {
   })
 }
 
-export function getMyInformation(params) {
+export function getMyInformation(id, params) {
   return request({
-    url: '/m/api/patient/getmyinformation',
+    url: '/m/api/patient/getmyinformation?id=' + id,
     method: 'get',
     params: params
   })
@@ -513,7 +513,6 @@ export function getPatientName(id, params) {
 }
 
 export function getInspectionDetail(patientid, date, projectid) {
-  console.log('projectid', projectid)
   const params = {
     patientid: patientid,
     date: date,
@@ -527,7 +526,6 @@ export function getInspectionDetail(patientid, date, projectid) {
 }
 
 export function submitFeed(params) {
-  console.log('params', params)
   return request({
     url: '/m/api/patient/savefeed',
     method: 'get',
@@ -601,3 +599,197 @@ export function getRoleName(id, params) {
     params: params
   })
 }
+
+export function SavePartition(params) {
+  return request({
+    url: '/m/api/patient/savepartition',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetAllZone(page, limit) {
+  const params = {
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/m/api/patient/getallzone',
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteZone(id, params) {
+  return request({
+    url: '/m/api/patient/deletezone?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function saveGroup(params) {
+  return request({
+    url: '/m/api/patient/savegroup',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllGroup(page, limit) {
+  const params = {
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/m/api/patient/getallgroup',
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteGroup(id, params) {
+  return request({
+    url: '/m/api/patient/deletegroup?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getAllGroupOne(params) {
+  return request({
+    url: '/m/api/patient/getallgroupone',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SaveBed(params) {
+  return request({
+    url: '/m/api/patient/savebed',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetAllNumber(page, limit) {
+  const params = {
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/m/api/patient/getallnumber',
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteBed(id, params) {
+  return request({
+    url: '/m/api/patient/deletebed?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function LoginOut(params) {
+  return request({
+    url: '/m/api/patient/loginout',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMemberPatient(params) {
+  return request({
+    url: '/m/api/patient/getmemberpatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSlowPatient(params) {
+  return request({
+    url: '/m/api/patient/getslowpatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getBloodPatient(params) {
+  return request({
+    url: '/m/api/patient/getbloodpatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeletePatient(id, params) {
+  console.log('医嘱id', id)
+  return request({
+    url: '/m/api/patient/deletePatient?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function saveName(id, name) {
+  const params = {
+    id: id,
+    name: name
+  }
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/savename',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllOrganization(id, params) {
+  return request({
+    url: '/m/api/patient/getallorganization?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMyOrganazition(id, params) {
+  return request({
+    url: '/m/api/patient/getmyorganazition?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getOrgInformation(params) {
+  return request({
+    url: '/m/api/org/getorginformation',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllOrgType(params) {
+  return request({
+    url: '/m/api/patient/getallorgtype',
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateOrg(params, id) {
+  return request({
+    url: '/m/api/patient/editorg?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMyInforName(id, params) {
+  return request({
+    url: '/m/api/patient/getmyinforname?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/kya_pages/homeIndex/index.vue

@@ -258,4 +258,5 @@ export default {
   }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss">
+</style>

src/pages/allCourseManagement/index.vue

@@ -2,7 +2,7 @@
   <div class="page_allCourse">
     <van-sticky>
       <div class="allCourseTitle">
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">{{ couseDetail.name }}的病程记录</span>
       </div>
     </van-sticky>

src/pages/allDoctorAdvice/index.vue

@@ -13,9 +13,9 @@
         :key="index"
       >
         <div v-for="(it, i) in item.child" :key="i">
-          <p class="time">
-            {{ it.advice_date ? getTime(it.advice_date) : "" }}
-          </p>
+            <p class="time">
+              {{ it.advice_date ? getTime(it.advice_date) : "" }}
+            </p>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
@@ -25,22 +25,36 @@
                 </span>
               </div>
               <div class="orderContent">
-                <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 }}
+                <div style="display:flex;justify-content:space-between">
+                  <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>
+                   <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="toDelete(it.id,it.execution_state,i)"
+                />
+                </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">
+                    <p>
+                      ▲ {{ 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>
+                       <van-icon
+                        class="ellipsis"
+                        name="ellipsis"
+                        @click="Delete(i.id,i.execution_state,index)"
+                       />
+                  </div>
                 </div>
               </div>
               <div
@@ -64,23 +78,36 @@
                 </span>
               </div>
               <div class="orderContent">
-                <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 style="display:flex;justify-content:space-between">
+                    <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>
+                      <van-icon
+                        class="ellipsis"
+                        name="ellipsis"
+                        @click="newShowTwo=true"
+                       />
+                 </div>
                 <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 style="display:flex;justify-content:space-between">
+                    <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>
+                     <van-icon
+                        class="ellipsis"
+                        name="ellipsis"
+                        @click="newShowThree=true"
+                       />
+                  </div>
                 </div>
               </div>
               <div
@@ -95,12 +122,49 @@
           </div>
         </div>
       </div>
+
+        <van-action-sheet
+          v-model="newShow"
+          :actions="actions1"
+          cancel-text="取消"
+          @cancel="onCancel"
+          @select="onSelect"
+        />
+
+         <van-action-sheet
+          v-model="newShowOne"
+          :actions="actions2"
+          cancel-text="取消"
+          @cancel="onCancelOne"
+          @select="onSelectOne"
+        />
+
+          <van-action-sheet
+          v-model="newShowTwo"
+          :actions="actions3"
+          cancel-text="取消"
+          @cancel="onCancelTwo"
+          @select="onSelectTwo"
+        />
+         <van-action-sheet
+          v-model="newShowThree"
+          :actions="actions3"
+          cancel-text="取消"
+          @cancel="onCancelThree"
+          @select="onSelectThree"
+        />
     </div>
   </div>
 </template>
 <script>
 import { setRem, setHeight } from "@/libs/functionRem";
-import { GetDoctorAdviceDetail, getAllDoctor } from "@/api/patient/patient";
+import {
+  GetDoctorAdviceDetail,
+  getAllDoctor,
+  DeleteChild,
+  DeletePatient
+} from "@/api/patient/patient";
+import { Dialog } from "vant";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
@@ -112,7 +176,17 @@ export default {
       patient_name: "",
       patient_date: "",
       parentData: {},
-      doctor: []
+      doctor: [],
+      newShow: false,
+      actions1: [{ name: "删除" }],
+      actions2: [{ name: "删除" }],
+      actions3: [{ name: "删除" }],
+      newShowOne: false,
+      newShowTwo: false,
+      newShowThree: false,
+      id: 0,
+      index: 0,
+      state: 0
     };
   },
   methods: {
@@ -200,12 +274,85 @@ export default {
       });
     },
     getDoctor(id) {
-      console.log("id是", id);
       for (let i = 0; i < this.doctor.length; i++) {
         if ((this.doctor[i].admin_user_id = id)) {
           return this.doctor[i].user_name;
         }
       }
+    },
+    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;
+    },
+
+    onCancel() {
+      this.newShow = false;
+    },
+    onSelect(val) {
+      if (val.name === "删除") {
+        this.DeletePatient(this.id, this.state, this.index);
+      }
+    },
+    onCancelOne() {
+      this.newShowOne = false;
+    },
+    onSelectOne(val) {
+      if (val.name === "删除") {
+        this.DeleteChild(this.id, this.index, this.state);
+      }
+    },
+    onSelectTwo() {},
+    onCancelTwo() {},
+    onCancelThree() {},
+    onSelectThree() {},
+    DeletePatient(id, index, state) {
+      if (state == 1) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeletePatient(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            this.GetDoctorAdviceDetail(this.id);
+            this.newShow = false;
+          }
+        });
+      });
+    },
+    DeleteChild(id, index, state) {
+      if (state == 1) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteChild(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.childList.splice(index, 1);
+            this.newShowOne = false;
+          }
+        });
+      });
     }
   },
   created() {

src/pages/configureCenter/components/Bed.vue

@@ -2,22 +2,23 @@
   <div class="Bed">
     <van-list
       v-model="loading"
+      @load="onLoad"
       :finished="finished"
       finished-text="没有更多了"
-      @load="onLoad"
+      :immediate-check='show'
     >
-      <div class="BedOne">
+      <div class="BedOne" v-for="(item,index) in BedNumber" :key="index">
         <div class="BedLeft">
-          <p>分区名称：A区</p>
-          <p>分区类型：普通区</p>
-          <p>所属分组：护理1组</p>
+          <p>床位号：{{item.number}}</p>
+          <p>分区类型：{{getZone(item.zone_id)}}</p>
+          <p>所属分组：{{getGroup(item.group_id)}}</p>
         </div>
-        <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+        <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.id,index)" />
       </div>
     </van-list>
     <div class="add">
       <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
+        <van-icon class="addIcon" name="add" @click="addBed" />新增
       </div>
     </div>
     <van-action-sheet
@@ -25,29 +26,124 @@
       :actions="actions"
       cancel-text="取消"
       @cancel="onCancel"
+      @select="toDeleteBed"
     />
   </div>
 </template>
 
 <script>
+import { GetAllNumber, DeleteBed } from "@/api/patient/patient";
+import { Dialog } from "vant";
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      show: false,
+      actions: [{ name: "删除" }],
+      page: 1,
+      limit: 10,
+      total: 0,
+      BedNumber: [],
+      Zone: [],
+      Group: [],
+      id: 0,
+      index: 0
     };
   },
   methods: {
-    onLoad() {},
-    onCancel() {}
+    onCancel() {},
+    addBed() {
+      this.$router.push("/addbed?active=" + this.active);
+    },
+    GetAllNumber() {
+      GetAllNumber(this.page, this.limit).then(response => {
+        if (response.data.state === 1) {
+          var number = response.data.data.number;
+          console.log("number", number);
+          let arr = this.BedNumber;
+          arr.push(...number);
+          this.BedNumber = arr;
+          var total = response.data.data.total;
+          console.log("total", total);
+          this.total = total;
+          var zone = response.data.data.zone;
+          this.Zone = zone;
+          var group = response.data.data.group;
+          this.Group = group;
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.GetAllNumber(this.page, this.limit);
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    getZone(id) {
+      for (let i = 0; i < this.Zone.length; i++) {
+        if (id === this.Zone[i].id) {
+          return this.Zone[i].name;
+        }
+      }
+    },
+    getGroup(id) {
+      for (let i = 0; i < this.Group.length; i++) {
+        if (id === this.Group[i].id) {
+          return this.Group[i].name;
+        }
+      }
+    },
+
+    Delete(id, index) {
+      this.newShow = true;
+      this.id = id;
+      this.index = index;
+    },
+    toDeleteBed(val) {
+      if (val.name === "删除") {
+        this.DeleteBed(this.id, this.index);
+      }
+    },
+    onCancel() {
+      this.newShow = false;
+    },
+    DeleteBed(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteBed(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.BedNumber.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    }
+  },
+  created() {
+    console.log("active", this.active);
+    this.GetAllNumber();
   }
 };
 </script>
 
 <style lang="scss" scoped>
 .Bed {
+  margin-bottom: 3.125rem;
   .BedOne {
     padding: 1.375rem 1.125rem 0 1.5rem;
     display: flex;

src/pages/configureCenter/components/Grouping.vue

@@ -6,16 +6,16 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <div class="GroupingOne">
+      <div class="GroupingOne" v-for="(item,index) in this.group" :key="index">
         <div class="GroupingLeft">
-          <p>分组名称：护理1组</p>
+          <p>分组名称：{{item.name}}</p>
         </div>
-        <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+        <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.id,item.number,index)" />
       </div>
     </van-list>
     <div class="add">
       <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
+        <van-icon class="addIcon" name="add" @click="addGrouping" />新增
       </div>
     </div>
     <van-action-sheet
@@ -23,29 +23,108 @@
       :actions="actions"
       cancel-text="取消"
       @cancel="onCancel"
+      @select="OnSelect"
     />
   </div>
 </template>
 
 <script>
+import { getAllGroup, DeleteGroup } from "@/api/patient/patient";
+import { Dialog } from "vant";
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "删除" }],
+      page: 1,
+      limit: 10,
+      group: [],
+      id: 0,
+      index: 0,
+      total: 0,
+      number: ""
     };
   },
   methods: {
-    onLoad() {},
-    onCancel() {}
+    onCancel() {},
+    addGrouping() {
+      this.$router.push("/addgroup?active=" + this.active);
+    },
+    getAllGroup() {
+      getAllGroup(this.page, this.limit).then(response => {
+        if (response.data.state === 1) {
+          var group = response.data.data.group;
+          let arr = this.group;
+          arr.push(...group);
+          this.group = arr;
+          console.log("group", group);
+          var total = response.data.data.total;
+          console.log("total", total);
+          this.total = total;
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getAllGroup(this.page, this.limit);
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    onCancel() {
+      this.newShow = false;
+    },
+    Delete(id, number, index) {
+      this.newShow = true;
+      this.id = id;
+      this.index = index;
+      this.number = number;
+    },
+    OnSelect(val) {
+      if (val.name === "删除") {
+        this.DeleteGroup(this.id, this.number, this.index);
+      }
+    },
+    DeleteGroup(id, number, index) {
+      if (number !== "") {
+        this.$toast("该分组存在床位号，不能删除");
+        this.newShow = false;
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteGroup(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.group.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    }
+  },
+  created() {
+    this.getAllGroup();
   }
 };
 </script>
 
 <style lang="scss" scoped>
 .Grouping {
+  margin-bottom: 3.125rem;
   .GroupingOne {
     padding: 1.375rem 1.125rem 1.125rem 1.5rem;
     display: flex;

src/pages/configureCenter/components/Partition.vue

@@ -6,17 +6,21 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <div class="partitionOne">
+      <div class="partitionOne" v-for="(item, index) in this.zone" :key="index">
         <div class="partitionLeft">
-          <p>分区名称：A区</p>
-          <p>分区类型：普通区</p>
+          <p>分区名称：{{ item.name }}</p>
+          <p>分区类型：{{ item.type }}</p>
         </div>
-        <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+        <van-icon
+          class="ellipsis"
+          name="ellipsis"
+          @click="Delete(item.id,item.number,index)"
+        />
       </div>
     </van-list>
     <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
+      <div style="display: flex; align-items: center;">
+        <van-icon class="addIcon" name="add" @click="addPartition" />新增
       </div>
     </div>
     <van-action-sheet
@@ -24,29 +28,128 @@
       :actions="actions"
       cancel-text="取消"
       @cancel="onCancel"
+      @select="onSelect"
     />
   </div>
 </template>
 
 <script>
+import { GetAllZone, DeleteZone } from "@/api/patient/patient";
+import { Dialog } from "vant";
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "删除" }],
+      page: 1,
+      limit: 10,
+      zone: [],
+      total: 0,
+      id: 0,
+      index: 0,
+      number: 0
     };
   },
   methods: {
     onLoad() {},
-    onCancel() {}
+    onCancel() {},
+    addPartition() {
+      this.$router.push("/addpartition?active=" + this.active);
+    },
+    GetAllZone() {
+      GetAllZone(this.page, this.limit).then(response => {
+        if (response.data.state === 1) {
+          var zone = response.data.data.zone;
+          console.log("分区", zone);
+          for (let i = 0; i < zone.length; i++) {
+            if (zone[i].type === 1) {
+              zone[i].type = "普通";
+            }
+            if (zone[i].type === 2) {
+              zone[i].type = "乙肝";
+            }
+            if (zone[i].type === 3) {
+              zone[i].type = "丙肝";
+            }
+            if (zone[i].type === 4) {
+              zone[i].type = "艾滋病";
+            }
+            if (zone[i].type === 5) {
+              zone[i].type = "肺结核";
+            }
+            if (zone[i].type === 6) {
+              zone[i].type = "梅毒";
+            }
+          }
+          let arr = this.zone;
+          arr.push(...zone);
+          this.zone = arr;
+          var total = response.data.data.total;
+          this.total = total;
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.GetAllZone(this.page, this.limit);
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    onCancel() {
+      this.show = false;
+    },
+    onSelect(val) {
+      if (val.name === "删除") {
+        this.DeleteZone(this.id, this.number, this.index);
+      }
+    },
+    Delete(id, number, index) {
+      this.id = id;
+      this.index = index;
+      this.number = number;
+      this.newShow = true;
+    },
+    DeleteZone(id, number, index) {
+      if (number !== "") {
+        this.$toast("该分区存在床位号，不能删除");
+        this.newShow = false;
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteZone(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.zone.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    }
+  },
+  created() {
+    this.GetAllZone();
   }
 };
 </script>
 
 <style lang="scss" scoped>
 .partition {
+  margin-bottom: 3.125rem;
   .partitionOne {
     padding: 1.375rem 1.125rem 0 1.5rem;
     display: flex;

src/pages/configureCenter/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="page_configureCenter">
     <div class="configureCenterTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">配置中心</span>
     </div>
     <div class="configureCenterMain">
-      <van-tabs v-model="active">
+      <van-tabs v-model="active" sticky>
         <van-tab title="分区">
-          <partition></partition>
+          <partition :active="active"></partition>
         </van-tab>
         <van-tab title="分组">
-          <grouping></grouping>
+          <grouping :active="active"></grouping>
         </van-tab>
         <van-tab title="床位">
-          <bed></bed>
+          <bed :active="active"></bed>
         </van-tab>
       </van-tabs>
     </div>
@@ -28,13 +28,23 @@ export default {
   components: {
     Partition,
     Grouping,
-    Bed,
+    Bed
   },
   data() {
     return {
-      active: 0,
+      active: 0
     };
   },
+  methods: {
+    toReturn() {
+      this.$router.push("/manageconsole");
+    }
+  },
+  created() {
+    if (this.$route.query.active) {
+      this.active = parseInt(this.$route.query.active);
+    }
+  }
 };
 </script>
 

src/pages/configureCenter/newBed.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="page_newBed">
     <div class="newBedTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
       <span class="titleName">新增床位</span>
     </div>
     <div class="infoBox">
       <van-field v-model="name" required label="床位号" placeholder="请输入" />
       <van-field
         label="所属分区"
-        v-model="sex"
+        v-model="zone"
         right-icon="arrow"
         placeholder="请选择"
         required
@@ -16,39 +16,126 @@
         @click="show = true"
       />
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
-        <van-picker :columns="columns" show-toolbar @change="onChange" />
+        <van-picker :columns="columns" show-toolbar @confirm="confirmZone" @cancel="cancelZone"/>
       </van-popup>
+
       <van-field
         label="所属分组"
-        v-model="sex"
+        v-model="group"
         right-icon="arrow"
         placeholder="请选择"
         required
         readonly
-        @click="show = true"
+        @click="show1 = true"
       />
       <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
-        <van-picker :columns="columns" show-toolbar @change="onChange" />
+        <van-picker :columns="columns1" show-toolbar @confirm="confirmGroup" @cancel="cancelGroup"/>
       </van-popup>
     </div>
-    <div class="save">保存</div>
+    <div class="save" @click="SaveBed">保存</div>
   </div>
 </template>
 
-
 <script>
+import { getAllGroupOne, SaveBed } from "@/api/patient/patient";
 export default {
   data() {
     return {
       show: false,
       show1: false,
-      columns: ["男", "女"]
+      columns: [],
+      columns1: [],
+      active: 0,
+      group: "",
+      name: "",
+      zone: "",
+      form: {
+        zone: "",
+        group: ""
+      },
+      data: [],
+      dataOne: []
     };
+  },
+  methods: {
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    },
+    getAllGroupOne() {
+      getAllGroupOne().then(response => {
+        if (response.data.state === 1) {
+          var group = response.data.data.group;
+          for (let i = 0; i < group.length; i++) {
+            this.columns1.push(group[i].name);
+          }
+          this.data = group;
+          var zone = response.data.data.zone;
+          for (let j = 0; j < zone.length; j++) {
+            this.columns.push(zone[j].name);
+          }
+          this.dataOne = zone;
+          console.log("zone", zone);
+        }
+      });
+    },
+    confirmZone(val) {
+      this.zone = val;
+      for (let i = 0; i < this.dataOne.length; i++) {
+        if (this.dataOne[i].name === val) {
+          this.form.zone = this.dataOne[i].id;
+        }
+      }
+      this.show = false;
+    },
+    cancelZone() {
+      this.show = false;
+    },
+    confirmGroup(val) {
+      this.group = val;
+      for (let i = 0; i < this.data.length; i++) {
+        if (val === this.data[i].name) {
+          this.form.group = this.data[i].id;
+        }
+      }
+      this.show1 = false;
+    },
+    cancelGroup() {
+      this.show1 = false;
+    },
+    SaveBed() {
+      if (this.name === "") {
+        this.$toast("床位号不能为空");
+        return false;
+      }
+      if (this.form.zone === "") {
+        this.$toast("所属分区不能为空");
+        return false;
+      }
+      if (this.form.group === "") {
+        this.$toast("所属分组不能为空");
+        return false;
+      }
+      const params = {
+        name: this.name,
+        zone: this.form.zone,
+        group: this.form.group
+      };
+      SaveBed(params).then(response => {
+        if (response.data.state === 1) {
+          var number = response.data.data.number;
+          this.$toast("保存成功");
+          this.$router.push("/configurecenter?active=" + this.active);
+        }
+      });
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    this.getAllGroupOne();
   }
 };
 </script>
 
-
 <style lang="scss" scoped>
 .page_newBed {
   height: 100%;

src/pages/configureCenter/newGrouping.vue

@@ -1,29 +1,53 @@
 <template>
   <div class="page_newGrouping">
     <div class="newGroupingTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
       <span class="titleName">新增分组</span>
     </div>
     <div class="infoBox">
-      <van-field v-model="name" required label="分区名称" placeholder="请输入" />
+      <van-field v-model="name" required label="分组名称" placeholder="请输入" />
     </div>
-    <div class="save">保存</div>
+    <div class="save" @click="saveGroup">保存</div>
   </div>
 </template>
 
-
 <script>
+import { saveGroup } from "@/api/patient/patient";
 export default {
   data() {
     return {
       show: false,
-      columns: ["男", "女"]
+      name: "",
+      active: 0
     };
+  },
+  methods: {
+    saveGroup() {
+      if (this.name === "") {
+        this.$toast("请输入分组名");
+        return false;
+      }
+      const params = {
+        name: this.name
+      };
+      saveGroup(params).then(response => {
+        if (response.data.state === 1) {
+          var group = response.data.data.group;
+          this.$toast("保存成功");
+          this.$router.push("/configurecenter?active=" + this.active);
+        }
+      });
+    },
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
   }
 };
 </script>
 
-
 <style lang="scss" scoped>
 .page_newGrouping {
   height: 100%;

src/pages/configureCenter/newPartition.vue

@@ -1,14 +1,19 @@
 <template>
   <div class="page_newPartition">
     <div class="newPartitionTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
       <span class="titleName">新增分区</span>
     </div>
     <div class="infoBox">
-      <van-field v-model="name" required label="分区名称" placeholder="请输入" />
+      <van-field
+        v-model="form.name"
+        required
+        label="分区名称"
+        placeholder="请输入"
+      />
       <van-field
         label="分区类型"
-        v-model="sex"
+        v-model="type"
         right-icon="arrow"
         placeholder="请选择"
         required
@@ -16,26 +21,100 @@
         @click="show = true"
       />
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
-        <van-picker :columns="columns" show-toolbar @change="onChange" />
+        <van-picker
+          :columns="columns"
+          show-toolbar
+          @confirm="onConfirm"
+          @cancel="oncancel"
+        />
       </van-popup>
     </div>
-    <div class="save">保存</div>
+    <div class="save" @click="SavePartition">保存</div>
   </div>
 </template>
 
-
 <script>
+import { SavePartition } from "@/api/patient/patient";
 export default {
   data() {
     return {
       show: false,
-      columns: ["男", "女"]
+      columns: ["普通", "乙肝", "丙肝", "艾滋病", "肺结核", "梅毒"],
+      form: {
+        name: "",
+        zoneType: ""
+      },
+      type: "",
+      active: 0
     };
+  },
+  methods: {
+    onConfirm(val) {
+      if (val === "普通") {
+        this.type = val;
+        this.form.zoneType = 1;
+        this.show = false;
+      }
+      if (val === "乙肝") {
+        this.type = val;
+        this.form.zoneType = 2;
+        this.show = false;
+      }
+      if (val === "丙肝") {
+        this.type = val;
+        this.form.zoneType = 3;
+        this.show = false;
+      }
+      if (val === "艾滋病") {
+        this.type = val;
+        this.form.zoneType = 4;
+        this.show = false;
+      }
+      if (val === "肺结核") {
+        this.type = val;
+        this.form.zoneType = 5;
+        this.show = false;
+      }
+      if (val === "梅毒") {
+        this.type = val;
+        this.form.zoneType = 6;
+        this.show = false;
+      }
+    },
+    oncancel() {
+      this.show = false;
+    },
+    SavePartition() {
+      if (this.form.name === "") {
+        this.$toast("请输入分区名");
+        return false;
+      }
+      if (this.form.zoneType === "") {
+        this.$toast("请选择分区类型");
+        return false;
+      }
+      const params = {
+        name: this.form.name,
+        type: this.form.zoneType
+      };
+      SavePartition(params).then(response => {
+        if (response.data.state === 1) {
+          var zone = response.data.data.zone;
+          this.$toast("保存成功");
+          this.$router.push("/configurecenter?active=" + this.active);
+        }
+      });
+    },
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
   }
 };
 </script>
 
-
 <style lang="scss" scoped>
 .page_newPartition {
   height: 100%;

src/pages/console/managementConsole/staff_role/editRole/index.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="roleDescription">
       <van-field v-model="name" class="input1" required label="角色名称" placeholder="请填写角色名称" readonly>
-        <van-button slot="button" size="small" @click="del()">删除角色</van-button>
+        <van-button slot="button" size="small" @click="del()" v-if="is_system == 0">删除角色</van-button>
       </van-field>
       <van-field v-model="desc" label="角色描述" placeholder="请填写角色描述"/>
     </div>
@@ -30,7 +30,7 @@
             <p class="disposeName">{{item.name}}</p>
             <p style="visibility: hidden;">1</p>
           </div>
-          <van-switch v-model="item.isCheck" size="24"/>
+          <van-switch @change="changePurviewStatus(item)" v-model="item.isCheck" size="24"/>
         </div>
       </div>
     </div>
@@ -40,7 +40,7 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview} from "@/api/admin_user";
 
   export default {
     data() {
@@ -50,15 +50,63 @@
         checked: false,
         allPurview: [],
         rolePurview:null,
+        is_system:0,
         ids:[],
       };
     }, created() {
       setRem()
+
       this.GetAllPurview()
-      this.GetRoleInfo(this.$route.query.id)
 
 
     }, methods: {
+      changePurviewStatus(value){
+        let purview_ids  = ""
+        let type = 0
+        if (value.pid == 0){ //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
+          console.log(value.sub_purview)
+          if(value.sub_purview.length > 0) {
+
+            purview_ids = value.id + "," + value.sub_purview[0].id
+          }else{
+            purview_ids = value.id
+          }
+        }
+        if (value.isCheck){
+          type = 1 //打开
+        }else{
+          type = 2 //关闭
+        }
+
+
+        let params = {
+          id : this.$route.query.id,
+          purview_id:purview_ids,
+          type : type,
+        }
+
+        EditPurview(params).then(response => {
+          if (response.data.state === 1) {
+            if(type == 1){
+              value.isCheck = true
+            }else{
+              value.isCheck = false
+            }
+          } else {
+            if(type == 1){
+              value.isCheck = false
+            }else{
+              value.isCheck = true
+            }
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+
+
+
+      },
       toSubPurview(purview){
         if(purview.module == 3) {
           this.$router.push({path: "/role/subpurview?id=" + this.$route.query.id + "&pid=" + purview.id + "&module=" + purview.module + "&title=" + purview.name})
@@ -116,8 +164,18 @@
             this.rolePurview = response.data.data.role_purview
             this.name =  response.data.data.role.name
             this.desc = response.data.data.role.intro
+            this.is_system = response.data.data.role.is_system
+
             this.ids = this.rolePurview.PurviewIds.split(',')
 
+            for(let a = 0; a < this.ids.length; a++ ){
+                for (let i = 0; i < this.allPurview.length; i++){
+                  if (parseInt(this.ids[a]) == this.allPurview[i].id){
+                      this.allPurview[i].isCheck = true
+                    }
+                }
+            }
+
           } else {
             this.$toast({
               message: response.data.msg
@@ -125,10 +183,26 @@
           }
         });
 
-      },
+      },GetOtherPurview(){
+        let params = {
+          module: 7,
+          id: 0,
+        }
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              response.data.data.purviews[i]["no_sub"] = true
+              this.allPurview.push(response.data.data.purviews[i])
+            }
 
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
 
-      GetAllPurview() {
+      } ,GetAllPurview() {
         let params = {
           module: 3,
           id: 0,
@@ -161,14 +235,17 @@
               desc: "品牌建设，营销工具",
               no_sub: false
             })
-            this.allPurview.push({
-              module: 0,
-              name: "分销商城",
-              id: 0,
-              icon_url: "https://kuyi.shengws.com/S10.png",
-              desc: "一键开店，分销商品",
-              no_sub: true
-            })
+            // this.allPurview.push({
+            //   module: 7,
+            //   name: "分销商城",
+            //   id: 0,
+            //   icon_url: "https://kuyi.shengws.com/S10.png",
+            //   desc: "一键开店，分销商品",
+            //   no_sub: true
+            // })
+            this.GetOtherPurview()
+            this.GetRoleInfo(this.$route.query.id)
+
 
           } else {
             this.$toast({

src/pages/console/managementConsole/staff_role/functionPurview/index.vue

@@ -6,15 +6,15 @@
     </div>
     <div class="allTitle">
       <van-cell center title="全部权限">
-        <van-switch v-model="checked" slot="right-icon" size="24" />
+        <van-switch v-model="checked"  @change="allChange" slot="right-icon" size="24" />
       </van-cell>
     </div>
     <div class="allTitle1">
       <van-cell center title="功能权限配置"></van-cell>
     </div>
     <div class="allBox">
-      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name != '透析记录'">
-        <van-switch v-model="item.isCheck" slot="right-icon" size="24" />
+      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index">
+        <van-switch v-model="item.isCheck" slot="right-icon" size="24"  @change="changeStatus(item)"/>
       </van-cell>
     </div>
   </div>
@@ -22,7 +22,7 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllFunctionPurview,GetRoleInfo} from "@/api/admin_user";
+  import {GetAllFunctionPurview,GetFunctionRoleInfo,EditFuncPurview} from "@/api/admin_user";
 
   export default {
     data() {
@@ -39,40 +39,234 @@
       };
     }, created() {
       setRem()
+      this.title = this.$route.query.title
+      this.pid = this.$route.query.pid
+      this.module = this.$route.query.module
       this.GetAllPurview()
-      this.GetRoleInfo(this.$route.query.id)
-
 
     }, methods: {
+      allChange(val){
+        if (val){
+          let purview_ids = ""
+
+          for (let i = 0; i < this.allPurview.length; i++){
+            this.allPurview[i].isCheck = true
+            if (purview_ids.length> 0) {
+              purview_ids = purview_ids +","+ this.allPurview[i].id.toString()
+            }else{
+              purview_ids = this.allPurview[i].id.toString()
+
+            }
+          }
+
+          let type = ""
+          if (val){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+            is_all : 1,
+            pid: this.pid,
+          }
+          EditFuncPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = true
+
+            } else {
+              if(type == 1){
+                this.checked = false
+              }else{
+                this.checked = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+        }else {
+          let purview_ids = ""
+
+          for (let i = 0; i < this.allPurview.length; i++) {
+            this.allPurview[i].isCheck = false
+
+            if (purview_ids.length> 0) {
+              purview_ids = purview_ids +","+ this.allPurview[i].id.toString()
+            }else{
+              purview_ids = this.allPurview[i].id.toString()
+
+            }
+          }
+
+          let type = ""
+          if (val){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+            is_all : 1,
+            pid: this.pid,
+          }
+          EditFuncPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = false
+
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
 
-      editRole(){
-        let params = {
-          id: this.$route.query.id,
-          desc:this.desc,
         }
-        EditRoleInfo(params).then(response => {
-          if (response.data.state === 1) {
-            this.$toast({
-              message: "修改成功"
-            });
-          } else {
-            this.$toast({
-              message: response.data.msg
-            });
+      },
+
+      changeStatus(val){
+        //全选按钮相关逻辑
+        let tempPurview = []
+        for (let i = 0; i < this.allPurview.length; i++){
+          if(this.allPurview[i].isCheck){
+            tempPurview.push(this.allPurview[i])
           }
-        });
+        }
+
+        if (tempPurview.length == this.allPurview.length){
+          this.checked = true
+        }else{
+          this.checked = false
+        }
+
+
+        if(!val.isCheck){ //打开
+          let purview_ids = ""
+          let type = ""
+          purview_ids = val.id
+          if (val.isCheck){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+            pid : this.pid
+          }
+          EditFuncPurview(params).then(response => {
+            if (response.data.state === 1) {
+              if(type == 1){
+                val.isCheck = true
+              }else{
+                val.isCheck = false
+              }
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
+        }else{//关闭
+          let purview_ids = ""
+          let type = ""
+          purview_ids = val.id
+          if (val.isCheck){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+            pid : this.pid
+
+          }
+          EditFuncPurview(params).then(response => {
+            if (response.data.state === 1) {
+
+              var b = 0
+              for (let i =0; i < this.allPurview.length; i++){
+                if(this.allPurview[i].isCheck){
+                  b++
+                }
+              }
+              if (b == this.allPurview.length){
+                this.checked = true
+              }else{
+                this.checked = false
+              }
+
+              if(type == 1){
+                val.isCheck = true
+              }else{
+                val.isCheck = false
+              }
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
+        }
+
       },
-      GetRoleInfo(role_id) {
+
+      GetFunctionRoleInfo(role_id) {
         let params = {
           id: role_id,
         }
-        GetRoleInfo(params).then(response => {
+        GetFunctionRoleInfo(params).then(response => {
           if (response.data.state === 1) {
             this.rolePurview = response.data.data.role_purview
-            this.name =  response.data.data.role.name
-            this.desc = response.data.data.role.intro
-            this.ids = this.rolePurview.PurviewIds.split(',')
 
+            this.ids = this.rolePurview.purview_ids.split(',')
+            for(let a = 0; a < this.ids.length; a++ ){
+              for (let i = 0; i < this.allPurview.length; i++){
+                if (parseInt(this.ids[a]) == this.allPurview[i].id){
+                  this.allPurview[i].isCheck = true
+                }
+              }
+            }
+            var b = 0
+            for (let i =0; i < this.allPurview.length; i++){
+              if(this.allPurview[i].isCheck){
+                b++
+              }
+            }
+            if (b == this.allPurview.length){
+              this.checked = true
+            }else{
+              this.checked = false
+            }
           } else {
             this.$toast({
               message: response.data.msg
@@ -80,7 +274,6 @@
           }
         });
       },
-
       GetAllPurview() {
         GetAllFunctionPurview().then(response => {
           if (response.data.state === 1) {
@@ -88,7 +281,7 @@
               response.data.data.funtion_purview[i]['isCheck'] = false
               this.allPurview.push(response.data.data.funtion_purview[i])
             }
-
+            this.GetFunctionRoleInfo(this.$route.query.id)
           } else {
             this.$toast({
               message: response.data.msg

src/pages/console/managementConsole/staff_role/otherPurview/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="allTitle">
       <van-cell center title="全部权限">
-        <van-switch v-model="checked" slot="right-icon" size="24" />
+        <van-switch v-model="checked" slot="right-icon" size="24" @change="allChange"/>
       </van-cell>
     </div>
     <div class="allTitle1">
@@ -20,7 +20,7 @@
         :title="item.name"
         v-for="(item, index) in allPurview"
         :key="index"
-        v-if="!item.no_sub"
+        v-if="!item.no_sub&&item.pid == 0"
         @click="toSubPurview(item)"
       >
       </van-cell>
@@ -32,143 +32,273 @@
         :key="index"
         v-if="item.no_sub"
       >
-        <van-switch v-model="item.isCheck" slot="right-icon" size="24" />
+        <van-switch v-model="item.isCheck" slot="right-icon" size="24"/>
       </van-cell>
     </div>
   </div>
 </template>
 
 <script>
-import { setRem } from "@/libs/functionRem";
-import {
-  GetAllPurview,
-  GetRoleInfo,
-  EditRoleInfo,
-  DeleteRoleInfo
-} from "@/api/admin_user";
-
-export default {
-  data() {
-    return {
-      title: "",
-      desc: "",
-      name: "",
-      checked: false,
-      allPurview: [],
-      ids: [],
-      pid: 0,
-      module: 0
-    };
-  },
-  created() {
-    this.title = this.$route.query.title;
-    this.pid = this.$route.query.pid;
-    this.module = this.$route.query.module;
-    setRem();
-    this.GetAllPurview();
-
-    this.GetRoleInfo(this.$route.query.id);
-  },
-  methods: {
-    toSubPurview(purview) {
-      this.$router.push({
-        path:
-          "/role/subpurview?id=" +
-          this.$route.query.id +
-          "&pid=" +
-          purview.id +
-          "&module=" +
-          purview.module +
-          "&title=" +
-          purview.name
-      });
-    },
-    del() {
-      let params = {
-        role_id: this.$route.query.id,
-        enable: false
-      };
-      DeleteRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({
-            message: "删除成功"
-          });
-          this.$router.go(-1);
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
-    },
-    editRole() {
-      let params = {
-        id: this.$route.query.id,
-        desc: this.desc
+  import {setRem} from "@/libs/functionRem";
+  import {DeleteRoleInfo, EditPurview, EditRoleInfo, GetAllPurview, GetRoleInfo} from "@/api/admin_user";
+
+  export default {
+    data() {
+      return {
+        title: "",
+        desc: "",
+        name: "",
+        checked: false,
+        allPurview: [],
+        ids: [],
+        pid: 0,
+        module: 0,
+        subPurview: [],
       };
-      EditRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({
-            message: "修改成功"
-          });
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
     },
-    GetRoleInfo(role_id) {
-      let params = {
-        id: role_id
-      };
-      GetRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.rolePurview = response.data.data.role_purview;
-          this.name = response.data.data.role.name;
-          this.desc = response.data.data.role.intro;
-          this.ids = this.rolePurview.PurviewIds.split(",");
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
+    created() {
+      this.title = this.$route.query.title;
+      this.pid = this.$route.query.pid;
+      this.module = this.$route.query.module;
+      setRem();
+      this.GetAllPurview();
+
+      // this.GetRoleInfo(this.$route.query.id);
     },
+    methods: {
+      allChange(val) {
+        if (val) {
+          let purview_ids = ""
 
-    GetAllPurview() {
-      let params = {
-        module: this.module,
-        id: this.pid
-      };
-      GetAllPurview(params).then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.purviews.length; i++) {
-            var purview = response.data.data.purviews[i].sub_purview;
-            if (purview.length > 1) {
-              response.data.data.purviews[i]["no_sub"] = false;
+          for (let i = 0; i < this.subPurview.length; i++) {
+            if (purview_ids.length > 0) {
+              purview_ids = purview_ids + "," + this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
             } else {
-              response.data.data.purviews[i]["no_sub"] = true;
+              purview_ids = this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+
             }
-            response.data.data.purviews[i]["isCheck"] = false;
-            this.allPurview.push(response.data.data.purviews[i]);
           }
+
+          const obj = {}
+          // 去重复
+          var purview_arr = purview_ids.split(",").reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, [])
+
+          purview_ids = purview_arr.join(",")
+
+
+          let type = ""
+          if (val) {
+            type = 1 //打开
+          } else {
+            type = 2 //关闭
+          }
+          let params = {
+            id: this.$route.query.id,
+            purview_id: purview_ids,
+            type: type,
+          }
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = true
+
+            } else {
+              if(type == 1){
+                this.checked = false
+              }else{
+                this.checked = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
         } else {
-          this.$toast({
-            message: response.data.msg
+          let purview_ids = ""
+
+          for (let i = 0; i < this.subPurview.length; i++) {
+            if (purview_ids.length > 0) {
+              purview_ids = purview_ids + "," + this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+            } else {
+              purview_ids = this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+
+            }
+          }
+
+          const obj = {}
+          // 去重复
+          var purview_arr = purview_ids.split(",").reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, [])
+
+          purview_ids = purview_arr.join(",")
+
+          let type = ""
+          if (val) {
+            type = 1 //打开
+          } else {
+            type = 2 //关闭
+          }
+          let params = {
+            id: this.$route.query.id,
+            purview_id: purview_ids,
+            type: type,
+          }
+
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = false
+
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
           });
+
+
         }
-      });
+      },
+
+      toSubPurview(purview) {
+        this.$router.push({
+          path:
+            "/role/subpurview?id=" +
+            this.$route.query.id +
+            "&pid=" +
+            purview.id +
+            "&module=" +
+            purview.module +
+            "&title=" +
+            purview.name
+        });
+      },
+      del() {
+        let params = {
+          role_id: this.$route.query.id,
+          enable: false
+        };
+        DeleteRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({
+              message: "删除成功"
+            });
+            this.$router.go(-1);
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      editRole() {
+        let params = {
+          id: this.$route.query.id,
+          desc: this.desc
+        };
+        EditRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({
+              message: "修改成功"
+            });
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      GetRoleInfo(role_id) {
+        let params = {
+          id: role_id
+        };
+        GetRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.rolePurview = response.data.data.role_purview;
+            this.name = response.data.data.role.name;
+            this.desc = response.data.data.role.intro;
+            this.ids = this.rolePurview.PurviewIds.split(",");
+
+            console.log(this.subPurview)
+            for (let a = 0; a < this.ids.length; a++) {
+              for (let i = 0; i < this.subPurview.length; i++) {
+                if (parseInt(this.ids[a]) == this.subPurview[i].id) {
+                  this.subPurview[i]["isCheck"] = true
+                }
+              }
+            }
+
+            //设置全选按键
+            var b = 0
+            for (let i = 0; i < this.subPurview.length; i++) {
+              if (this.subPurview[i].isCheck) {
+                b++
+              }
+            }
+            if (b == this.subPurview.length) {
+              this.checked = true
+            } else {
+              this.checked = false
+            }
+
+
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+
+      GetAllPurview() {
+        this.pid = 0;
+        let params = {
+          module: this.module,
+          id: this.pid
+        };
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              var purview = response.data.data.purviews[i].sub_purview;
+              for (let b = 0; b < purview.length; b++) {
+                this.subPurview.push(purview[b])
+              }
+              if (purview.length > 1) {
+                response.data.data.purviews[i]["no_sub"] = false;
+              } else {
+                response.data.data.purviews[i]["no_sub"] = true;
+              }
+              response.data.data.purviews[i]["isCheck"] = false;
+              this.allPurview.push(response.data.data.purviews[i]);
+              this.GetRoleInfo(this.$route.query.id)
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_qualityControlManagement {
-  height: 100%;
-  overflow-y: auto;
-  background: #fafafa;
+  .page_qualityControlManagement {
+    height: 100%;
+    overflow-y: auto;
+    background: #fafafa;
+
   .qualityControlManagementTitle {
     background: #fff;
     padding: 0 1.125rem;
@@ -176,36 +306,45 @@ export default {
     display: flex;
     align-items: center;
   }
+
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
     margin-right: 7rem;
   }
+
   .titleName {
     font-size: 1.125rem;
     font-weight: 600;
   }
+
   .allTitle {
     margin: 1rem 0;
-    .van-cell__title {
-      font-weight: bold;
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #313234;
+  }
+
   }
   .allTitle1 {
-    .van-cell__title {
-      font-weight: bold;
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #313234;
+  }
+
   }
   .allBox {
     margin-bottom: 1rem;
-    .van-cell__title {
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-size: 1rem;
+    color: #313234;
+  }
+
+  }
   }
-}
 </style>

src/pages/console/managementConsole/staff_role/subPurview/index.vue

@@ -5,18 +5,18 @@
       <span class="titleName">{{title}}</span>
     </div>
     <div class="allTitle">
-      <van-cell center title="全部权限">
-        <van-switch v-model="checked" slot="right-icon" size="24" />
+      <van-cell center title="全部权限" v-if="title != '透析管理'">
+        <van-switch v-model="checked" @change="allChange" slot="right-icon" size="24" />
       </van-cell>
     </div>
     <div class="allTitle1">
       <van-cell center title="功能权限配置"></van-cell>
     </div>
     <div class="allBox">
-      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview()">
+      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview(item)">
       </van-cell>
       <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name != '透析记录'">
-        <van-switch v-model="item.isCheck" slot="right-icon" size="24" />
+        <van-switch v-model="item.isCheck" slot="right-icon" size="24"  @change="changeStatus(item)" />
       </van-cell>
     </div>
   </div>
@@ -24,7 +24,7 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetFunctionRoleInfo} from "@/api/admin_user";
 
   export default {
     data() {
@@ -45,45 +45,260 @@
       this.pid = this.$route.query.pid
       this.module = this.$route.query.module
       this.GetAllPurview()
-      this.GetRoleInfo(this.$route.query.id)
-
+      // this.GetRoleInfo(this.$route.query.id)
 
 
 
     }, methods: {
-      toFunctonPurview(){
-        this.$router.push({path:"/role/functionpurview?id="+this.$route.query.id})
+      isShow(){
+
+
 
       },
+      allChange(val){
+        if (val){
+          let purview_ids = ""
+
+          for (let i = 0; i < this.allPurview.length; i++){
+              this.allPurview[i].isCheck = true
+              if (purview_ids.length> 0) {
+                purview_ids = purview_ids +","+ this.allPurview[i].id.toString()
+              }else{
+                purview_ids = this.allPurview[i].id.toString()
+
+              }
+          }
+          purview_ids = purview_ids +","+ this.$route.query.pid
+
+
+          let type = ""
+          if (val){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+          }
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = true
+
+            } else {
+              if(type == 1){
+                this.checked = false
+              }else{
+                this.checked = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
+
+
+        }else {
+          let purview_ids = ""
+
+          for (let i = 0; i < this.allPurview.length; i++) {
+            this.allPurview[i].isCheck = false
+            // purview_ids = purview_ids + this.allPurview[i].id.toString()
+
+            if (purview_ids.length> 0) {
+              purview_ids = purview_ids +","+ this.allPurview[i].id.toString()
+            }else{
+              purview_ids = this.allPurview[i].id.toString()
+
+            }
+          }
+          purview_ids = purview_ids +","+ this.$route.query.pid
+
+          let type = ""
+          if (val){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+          }
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = false
+
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
 
-      editRole(){
-        let params = {
-          id: this.$route.query.id,
-          desc:this.desc,
         }
-        EditRoleInfo(params).then(response => {
-          if (response.data.state === 1) {
-            this.$toast({
-              message: "修改成功"
-            });
-          } else {
-            this.$toast({
-              message: response.data.msg
-            });
+      },
+      changeStatus(val){
+        let tempPurview = []
+        for (let i = 0; i < this.allPurview.length; i++){
+          if(this.allPurview[i].isCheck){
+            tempPurview.push(this.allPurview[i])
           }
-        });
+        }
+
+        if(!val.isCheck){ //打开
+          let purview_ids = ""
+          let type = ""
+
+          if(tempPurview.length <= 0){ //之前没分配过权限,需要将父节点的id上传
+            purview_ids = val.pid + ","+val.id
+          }else{ //分配过权限，说明父节点id已经上传过，则不需要上传
+            purview_ids = val.id
+          }
+
+          if (val.isCheck){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+          }
+
+
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = false
+              if(type == 1){
+                val.isCheck = true
+              }else{
+                val.isCheck = false
+              }
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
+
+        }else{//关闭
+          let purview_ids = ""
+          let type = ""
+
+          if(tempPurview.length == 1){ //说明只剩当前操作的,则需要将父节点也上传，保证数据不重复
+            purview_ids = val.pid + ","+val.id
+          }else{ //分配过权限，说明父节点id已经上传过，则不需要上传
+            purview_ids = val.id
+          }
+
+          if (val.isCheck){
+            type = 1 //打开
+          }else{
+            type = 2 //关闭
+          }
+          let params = {
+            id : this.$route.query.id,
+            purview_id:purview_ids,
+            type : type,
+          }
+
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+
+              var b = 0
+              for (let i =0; i < this.allPurview.length; i++){
+                if(this.allPurview[i].isCheck){
+                  b++
+                }
+              }
+              if (b == this.allPurview.length){
+                this.checked = true
+              }
+
+              if(type == 1){
+                val.isCheck = true
+              }else{
+                val.isCheck = false
+              }
+
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
+        }
+
       },
-      GetRoleInfo(role_id) {
+      toFunctonPurview(item){
+        this.$router.push({path:"/role/functionpurview?id="+this.$route.query.id+"&pid="+item.id})
+      }, GetRoleInfo(role_id) {
         let params = {
           id: role_id,
         }
         GetRoleInfo(params).then(response => {
           if (response.data.state === 1) {
             this.rolePurview = response.data.data.role_purview
+
+            // this.rolePurview = response.data.data.role_purview
+
             this.name =  response.data.data.role.name
             this.desc = response.data.data.role.intro
             this.ids = this.rolePurview.PurviewIds.split(',')
 
+            for(let a = 0; a < this.ids.length; a++ ){
+              for (let i = 0; i < this.allPurview.length; i++){
+                if (parseInt(this.ids[a]) == this.allPurview[i].id){
+                  this.allPurview[i].isCheck = true
+                }
+              }
+            }
+
+
+
+            //设置全选按键
+            var b = 0
+            for (let i =0; i < this.allPurview.length; i++){
+              if(this.allPurview[i].isCheck){
+                b++
+              }
+            }
+
+            if (b == this.allPurview.length){
+              this.checked = true
+            }else{
+
+              this.checked = false
+
+            }
+
           } else {
             this.$toast({
               message: response.data.msg
@@ -109,6 +324,10 @@
               this.allPurview.push(response.data.data.purviews[i])
             }
 
+            this.GetRoleInfo(this.$route.query.id)
+            // this.GetFuncRoleInfo(this.$route.query.id)
+
+
 
 
 
@@ -120,9 +339,6 @@
         });
 
       },
-
-
-
     }
   };
 </script>

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -22,124 +22,195 @@
         </div>
       </div>
 
-      <div class="adviceBox" v-show="showOne">
+      <div class="adviceBox">
         <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>
+         v-model="loading"
+         :finished="finished"
+         @load="onLoad"
+         finished-text="没有更多了"
+         >
 
-              <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
+          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
+            <div class="adviceTitle">
+              <p>{{getTime(item.child[0].start_time)}}</p>
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+            </div>
+
+         <div v-for="(it,i) in item.child" :key="i">
+            <div class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0" >
+              <div class="statOrderTitle">
+                <span v-if="i<1">长期医嘱</span>
+                <span  v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
+              </div>
+              <div class="orderContent" v-if="i<4">
+                <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
+                    {{ 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>
+                     {{ i.delivery_way }}
+                    {{ i.execution_frequency }}
+                 </p>
                 </div>
               </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
+            <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
+              <div class="longOrderTitle">
+                <span v-if="i<1">临时医嘱</span>
+                <span v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
+              </div>
+              <div class="orderContent" v-if="i<4">
+                <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
+                   {{ 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>
+                     {{ i.delivery_way }}
+                    {{ i.execution_frequency }}</p>
                 </div>
               </div>
             </div>
-            <div
-              class="all"
-              @click="toDoctorAdviceDetail(item.child[0].groupno)"
-            >
-              全部
-            </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>
         </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>
@@ -218,8 +289,7 @@
 import {
   getDoctorAdvices,
   getPatientDetail,
-  DeleteManagement,
-  DeleteChild
+  DeleteManagement
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -230,6 +300,7 @@ export default {
   },
   data() {
     return {
+      docShow: false,
       loading: false,
       finished: false,
       newShow: false,
@@ -241,7 +312,6 @@ export default {
       columns: ["全部", "长期医嘱", "临时医嘱"],
       startTime: "请选择",
       endTime: "请选择",
-      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -249,8 +319,8 @@ export default {
       actions1: [{ name: "删除" }],
       actions2: [{ name: "删除" }],
       form: {
-        type: "",
-        limit: 10,
+        type: 0,
+        limit: 5,
         page: 1
       },
       total: "",
@@ -280,7 +350,7 @@ export default {
         this.patient_id,
         this.type,
         this.startTime,
-        this.endTimes,
+        this.endTime,
         this.form.limit,
         this.form.page
       );
@@ -355,18 +425,10 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var advice = response.data.data.advice;
-          // this.doctorAdvice = advice;
-          let objarr = [];
-          for (let i = 0; i < advice.length; i++) {
-            if (advice[i].parent_id != 0) {
-              objarr.push(advice[i]);
-            }
-          }
-          this.childList = objarr;
-          var total = response.data.data.total;
-          this.total = total;
+          console.log("advice", advice);
+          var one = response.data.data.one;
           let dataInfo = {};
-          advice.forEach((item, index) => {
+          one.forEach((item, index) => {
             let { groupno } = item;
             if (!dataInfo[groupno]) {
               dataInfo[groupno] = {
@@ -374,46 +436,91 @@ export default {
                 child: []
               };
             }
-            dataInfo[groupno].child.push(item);
           });
-          let list = Object.values(dataInfo); // list 转换成功的数据
-          let arr = [];
-
+          let list = Object.values(dataInfo);
           list.map(item => {
-            // console.log(item.child);
-            let arr2 = [];
-            if (item.child.length > 1) {
-              item.child.map((it, index) => {
-                // console.log(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].user_name;
-                if (
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-                ) {
-                  arr2.push(obj);
-                } else {
-                  delete item.child[i]["checker"];
-                  delete item.child[i]["execution_staff"];
-                  delete item.child[i]["user_name"];
-                }
+            for (let i = 0; i < advice.length; i++) {
+              if (item.groupno === advice[i].groupno) {
+                item.child.push(advice[i]);
               }
             }
           });
-
-          var doctor = response.data.data.doctor;
-          this.doctor = doctor;
-          this.doctorAdvice = list.reverse();
+          let objarr = [];
+          for (let i = 0; i < advice.length; i++) {
+            if (advice[i].parent_id != 0) {
+              objarr.push(advice[i]);
+            }
+          }
+          this.childList = objarr;
+          let arr = this.doctorAdvice;
+          arr.push(...list.reverse());
+          this.doctorAdvice = arr;
+          console.log("listtwo", this.doctorAdvice);
+          var total = response.data.data.total;
+          this.total = total;
+          console.log("total", total);
           this.loading = false;
-          this.finished = true;
+
+          // let objarr = []
+          // for (let i = 0; i < advice.length; i++) {
+          //   if (advice[i].parent_id != 0) {
+          //     objarr.push(advice[i])
+          //   }
+          // }
+          // this.childList = objarr
+          // var total = response.data.data.total
+          // this.total = total
+          //
+          // let dataInfo = {}
+          // advice.forEach((item, index) => {
+          //   let { groupno } = item
+          //   if (!dataInfo[groupno]) {
+          //     dataInfo[groupno] = {
+          //       groupno,
+          //       child: []
+          //     }
+          //   }
+          //   dataInfo[groupno].child.push(item)
+          // })
+          // let list = Object.values(dataInfo) // list 转换成功的数据
+          // console.log('list', list)
+          // let arr = []
+          //
+          // list.map(item => {
+          //   // console.log(item.child);
+          //   let arr2 = []
+          //   if (item.child.length > 1) {
+          //     item.child.map((it, index) => {
+          //       // console.log(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].user_name
+          //       if (
+          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
+          //       ) {
+          //         arr2.push(obj)
+          //       } else {
+          //         delete item.child[i]['checker']
+          //         delete item.child[i]['execution_staff']
+          //         delete item.child[i]['user_name']
+          //       }
+          //     }
+          //   }
+          // })
+          //
+          // var doctor = response.data.data.doctor
+          // this.doctor = doctor
+          // this.doctorAdvice = list.reverse()
+          // this.loading = false
+          // this.finished = true
         }
       });
     },
@@ -440,25 +547,25 @@ export default {
     getTimes(time) {
       return uParseTime(time, "{h}:{i}");
     },
-    // onLoad() {
-    //   setTimeout(() => {
-    //     this.page++;
-    //     if (this.page <= Math.ceil(this.total / 10)) {
-    //       this.getDoctorAdvices(
-    //         this.patient_id,
-    //         this.form.type,
-    //         this.startTime,
-    //         this.endTimes,
-    //         this.form.limit,
-    //         this.form.page
-    //       );
-    //     } else {
-    //       this.loading = false;
-    //       this.finished = true;
-    //     }
-    //   }, 1000);
-    // },
-    onLoad() {},
+    onLoad() {
+      setTimeout(() => {
+        this.form.page++;
+        console.log("page", this.form.page);
+        if (this.form.page <= Math.ceil(this.total / 5)) {
+          this.getDoctorAdvices(
+            this.patient_id,
+            this.form.type,
+            this.startTime,
+            this.endTime,
+            this.form.limit,
+            this.form.page
+          );
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 5000);
+    },
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(
@@ -503,7 +610,6 @@ export default {
       }
     },
     toChildDelete(val) {
-      console.log(val);
       if (val.name == "删除") {
         this.DeleteChild(this.id, this.index, this.state);
       }

src/pages/doctorAdvice/components/DryWeight.vue

@@ -3,13 +3,13 @@
     <div>
       <div class="toolBox">
         <div class="toolOne" @click="startShow = true">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex; align-items: center;">
             {{ startTime }}
             <van-icon name="arrow-down" />
           </div>
         </div>
         <div class="toolOne" @click="endShow = true">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex; align-items: center;">
             {{ endTime }}
             <van-icon name="arrow-down" />
           </div>
@@ -97,7 +97,7 @@
 import {
   getDryWeight,
   DeleteDryWeight,
-  getPatientDetail
+  getPatientDetail,
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -105,7 +105,7 @@ const moment = require("moment");
 export default {
   props: {
     active: Number,
-    dryId: String
+    dryId: String,
   },
   data() {
     return {
@@ -131,7 +131,7 @@ export default {
       dry_id: 0,
       dry_index: 0,
       showOne: true,
-      showTwo: false
+      showTwo: false,
     };
   },
   methods: {
@@ -196,7 +196,7 @@ export default {
         this.endTime,
         this.limit,
         this.page
-      ).then(response => {
+      ).then((response) => {
         if (response.data.state === 1) {
           var dryweight = response.data.data.dryweight;
           let arr = this.dryweight;
@@ -215,7 +215,7 @@ export default {
         this.endTimes,
         this.limit,
         this.page
-      ).then(response => {
+      ).then((response) => {
         if (response.data.state === 1) {
           var dryweight = response.data.data.dryweight;
           this.dryweight = dryweight;
@@ -242,7 +242,7 @@ export default {
           this.loading = false;
           this.finished = true;
         }
-      }, 3000);
+      }, 1000);
     },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
@@ -261,9 +261,9 @@ export default {
     DeleteDryWeight(id, index) {
       Dialog.confirm({
         title: "删除提示!",
-        message: "确认删除该条信息吗?,删除后将无法恢复!"
+        message: "确认删除该条信息吗?,删除后将无法恢复!",
       }).then(() => {
-        DeleteDryWeight(id).then(response => {
+        DeleteDryWeight(id).then((response) => {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
             console.log("msg", msg);
@@ -285,7 +285,7 @@ export default {
       );
     },
     getPatientDetail(patientid) {
-      getPatientDetail(patientid).then(response => {
+      getPatientDetail(patientid).then((response) => {
         if (response.data.state === 1) {
           var patientDetail = response.data.data.patientDetail;
           if (patientDetail.blood_patients == 0) {
@@ -300,7 +300,7 @@ export default {
           this.patientName = patientDetail.name;
         }
       });
-    }
+    },
   },
   created() {
     console.log("created");
@@ -310,7 +310,7 @@ export default {
     this.getDryWeight(patientid);
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
-  }
+  },
 };
 </script>
 

src/pages/doctorAdvice/index.vue

@@ -143,7 +143,10 @@ import { uParseTime } from "@/utils/tools";
 import {
   getPatientDetail,
   getBloodDialysisPatientTwo,
-  ToSearch
+  ToSearch,
+  getMemberPatient,
+  getSlowPatient,
+  getBloodPatient
 } from "@/api/patient/patient";
 import { setRem } from "@/libs/functionRem";
 const moment = require("moment");
@@ -403,6 +406,104 @@ export default {
         });
       });
     },
+    // 获取血透病人
+    getBloodPatient() {
+      getBloodPatient().then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          // console.log("血透patient", patient);
+          this.patient = patient;
+          let cityNameList = [];
+          for (let p in patient) {
+            cityNameList.push(patient[p].name);
+          }
+          let firstName = {};
+          this.FirstPin.forEach(item => {
+            firstName[item] = [];
+            cityNameList.forEach(el => {
+              let first = pinyin.getFullChars(el).substring(0, 1);
+              if (first == item) {
+                firstName[item].push(el);
+              }
+            });
+            this.firstNameTwo = firstName;
+            // 判断非空
+            let newObj = {};
+            Object.keys(this.firstNameTwo).map((item, index) => {
+              if (this.firstNameTwo[item].length != 0) {
+                newObj[item] = this.firstNameTwo[item];
+              }
+            });
+            this.firstNameTwo = newObj;
+          });
+        }
+      });
+    },
+    // 获取慢病病人
+    getSlowPatient() {
+      getSlowPatient().then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          // console.log("慢病patient", patient);
+          this.patient = patient;
+          let cityNameList = [];
+          for (let p in patient) {
+            cityNameList.push(patient[p].name);
+          }
+          let firstName = {};
+          this.FirstPin.forEach(item => {
+            firstName[item] = [];
+            cityNameList.forEach(el => {
+              let first = pinyin.getFullChars(el).substring(0, 1);
+              if (first == item) {
+                firstName[item].push(el);
+              }
+            });
+            this.firstNameTwo = firstName;
+            // 判断非空
+            let newObj = {};
+            Object.keys(this.firstNameTwo).map((item, index) => {
+              if (this.firstNameTwo[item].length != 0) {
+                newObj[item] = this.firstNameTwo[item];
+              }
+            });
+            this.firstNameTwo = newObj;
+          });
+        }
+      });
+    },
+    getMemberPatient() {
+      getMemberPatient().then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          // console.log("会员patient", patient);
+          this.patient = patient;
+          let cityNameList = [];
+          for (let p in patient) {
+            cityNameList.push(patient[p].name);
+          }
+          let firstName = {};
+          this.FirstPin.forEach(item => {
+            firstName[item] = [];
+            cityNameList.forEach(el => {
+              let first = pinyin.getFullChars(el).substring(0, 1);
+              if (first == item) {
+                firstName[item].push(el);
+              }
+            });
+            this.firstNameTwo = firstName;
+            // 判断非空
+            let newObj = {};
+            Object.keys(this.firstNameTwo).map((item, index) => {
+              if (this.firstNameTwo[item].length != 0) {
+                newObj[item] = this.firstNameTwo[item];
+              }
+            });
+            this.firstNameTwo = newObj;
+          });
+        }
+      });
+    },
     onSearch(val) {
       ToSearch(val).then(response => {
         if (response.data.state === 1) {
@@ -460,7 +561,19 @@ export default {
     var patientid = this.$route.query.patientid;
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
-    this.getBloodDialysisPatientTwo();
+    var seacherActive = this.$route.query.seacherActive;
+    if (seacherActive == 0) {
+      this.getBloodDialysisPatientTwo();
+    }
+    if (seacherActive == 1) {
+      this.getBloodPatient();
+    }
+    if (seacherActive == 2) {
+      this.getSlowPatient();
+    }
+    if (seacherActive == 3) {
+      this.getMemberPatient();
+    }
   },
   watch: {
     $route(newVal) {

src/pages/home/index.vue

@@ -94,12 +94,12 @@
             <!--<div>服务</div>-->
           <!--</van-tabbar-item>-->
         <!--</router-link>-->
-        <router-link to="/shop" replace>
-          <van-tabbar-item>
-            <i class="iconfont icon-shangcheng iconOne"></i>
-            <div>商城</div>
-          </van-tabbar-item>
-        </router-link>
+<!--        <router-link to="/shop" replace>-->
+<!--          <van-tabbar-item>-->
+<!--            <i class="iconfont icon-shangcheng iconOne"></i>-->
+<!--            <div>商城</div>-->
+<!--          </van-tabbar-item>-->
+<!--        </router-link>-->
         <router-link to="/newMy" replace>
           <van-tabbar-item>
             <i class="iconfont icon-wode iconOne"></i>

src/pages/home/noPassword/index.vue

@@ -210,7 +210,7 @@ export default {
               this.$router.replace("/homeIndex");
             } else {
               this.$toast({
-                message: resp.data.msg
+                message: response.data.msg
               });
             }
           });

src/pages/home/verifyToken.vue

@@ -39,6 +39,11 @@ export default {
           //未登录
           this.$router.replace("/login");
         }
+      }else{
+        this.$toast({
+          message: "数据加载错误，请重新登录"
+        });
+        this.$router.replace("/login");
       }
     });
   },methods:{

src/pages/homeIndex/index.vue

@@ -170,6 +170,7 @@ export default {
     },
     toConfigCenter() {
       if (this.isCreateOrg) {
+        this.$router.push("/configurecenter");
       } else {
         this.$toast({
           message: "你尚未创建机构，请先创建机构"
@@ -178,6 +179,7 @@ export default {
     },
     toOrgSetting() {
       if (this.isCreateOrg) {
+        this.$router.push("/editorg");
       } else {
         this.$toast({
           message: "你尚未创建机构，请先创建机构"
@@ -191,6 +193,8 @@ export default {
       };
       ChangeOrg(params).then(response => {
         if (response.data.state === 1) {
+          // 清除之前的数据
+
           var user = response.data.data.user;
           var admin = response.data.data.admin;
           var org = response.data.data.org;
@@ -234,6 +238,7 @@ export default {
           this.$router.push({ path: "/main" });
           break;
         case 8:
+          this.$router.push({ path: "/shop" });
           break;
         case 9:
           break;
@@ -455,4 +460,5 @@ export default {
   }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss">
+</style>

src/pages/main/DialysisArea.vue

@@ -290,9 +290,10 @@ export default {
   },
 
   created () {
-    this.user_id = this.$store.getters.user.user.id
+    this.user_id = this.$store.getters.user.admin.id
 
     var storedata = this.$store.getters.scheduals
+    console.log(storedata)
     var scheduals = storedata.scheduals
     if (Object.keys(storedata).length > 0) {
       var zoneMap = {}

src/pages/main/dialog/AcceptsDialog.vue

@@ -333,6 +333,8 @@ export default {
         } else {
           for (const key in response.data.data.receiveTreatmentAsses) {
             this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+            this.accepts['id'] = 0
+            this.accepts['creater'] = 0
             this.receiveTreatmentAsses.way = this.accepts.way;
             this.receiveTreatmentAsses.consciousness =
               this.accepts.consciousness;
@@ -391,6 +393,9 @@ export default {
           } else {
             for (const key in response.data.data.receiveTreatmentAsses) {
               this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+              this.accepts['id'] = 0
+              this.accepts['creater'] = 0
+
               this.receiveTreatmentAsses.way = this.accepts.way;
               this.receiveTreatmentAsses.consciousness =
                 this.accepts.consciousness;
@@ -481,12 +486,19 @@ export default {
       return false;
     },
     commitInfo: function() {
+      let mode = 1
       Toast.loading({ forbidClick: true, duration: 0 });
       let ParamsQuery = this.receiveTreatmentAsses;
       // ParamsQuery["patient"] =  this.patient.id
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
-
+      if (this.accepts.id > 0){
+        mode = 2
+        if(this.accepts.creater  != this.$store.getters.user.admin.id){
+          mode = 3
+        }
+      }
+      ParamsQuery["mode"] = mode;
       commitAcceptsAssessment(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);

src/pages/main/dialog/AssessmentDialog.vue

@@ -1453,6 +1453,7 @@ export default {
       return name
     },
     commitInfo: function () {
+      let mode = 1
       Toast.loading({ forbidClick: true, duration: 0 })
       if (this.formValue.dry_weight == undefined) {
         this.formValue.dry_weight = '0'
@@ -1462,11 +1463,21 @@ export default {
       // if (this.formValue.dry_weight == ""){
       //   this.formValue.
       // }
+      console.log(this.predialysis)
+
+      if(this.predialysis.id > 0){
+        mode = 2
+        if(this.predialysis.creater != this.$store.getters.user.admin.id){
+          mode = 3
+        }
+      }
+
 
       EditAssessmentBeforeDislysis(
         this.$route.query.patient_id,
         this.record_date,
-        this.formValue
+        this.formValue,
+        mode
       ).then(response => {
         if (response.data.state == 0) {
           Toast(response.data.msg)
@@ -1480,9 +1491,6 @@ export default {
       });
     },
     showDryWeight: function () {
-      if (this.$store.getters.user.user.user_type == 3) {
-        return
-      }
       this.isShowDialog = false
       this.$refs.dry.open()
       this.propDryForm.doctor = []

src/pages/main/dialog/ComputerDialog.vue

@@ -5,8 +5,8 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析上机</h1>
-        <span class="success" v-if="this.record.id == 0 || this.$store.getters.user.user.id != this.creator"></span>
-        <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
+        <span class="success" v-if="this.record.id ==0"></span>
+        <span class="success" @click="modify()" v-else>修改</span>
       </div>
 
       <div class="DialogContent ">
@@ -43,7 +43,7 @@
         <div class="item" v-if="template_id == 6">
           <label class="name" for="xll">引血(ml/min)</label>
           <div class="content">
-            <input type="tel" @focus="inputFocus"  id="xll" v-model="blood_drawing"/>
+            <input type="tel" @focus="inputFocus" id="xll" v-model="blood_drawing"/>
           </div>
         </div>
 
@@ -56,8 +56,6 @@
         </div>
 
 
-
-
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
           <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
@@ -77,7 +75,7 @@
 
 
 <script>
-  import {startDialysis,PostModifyStartDialysis,GetSchedualNumber} from '@/api/dialysis'
+  import {GetSchedualNumber, PostModifyStartDialysis, startDialysis} from '@/api/dialysis'
   import {Toast} from 'vant'
   import {parseTime} from '@/utils'
 
@@ -88,25 +86,26 @@
     components: {
       TwoMenu
     },
-    data () {
+    data() {
       return {
         start_time: new Date(),
         selecting: false,
         start_time_str: '',
         bed_id: 0,
+        isShow:false,
         nurse_id: 0,
         puncture_nurse_id: 0,
         isPremission: false,
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
         template_id: 0,
-        temp_device_numbers:[],
-        blood_drawing:100,
-        schedual_type:0,
+        temp_device_numbers: [],
+        blood_drawing: 100,
+        schedual_type: 0,
         schedules_type: [
-          {id: 1, name:"上午"},
-          {id: 2, name:"下午"},
-          {id: 3, name:"晚上"},
+          {id: 1, name: "上午"},
+          {id: 2, name: "下午"},
+          {id: 3, name: "晚上"},
         ], // 该排班的区里的床位
       }
     },
@@ -135,32 +134,34 @@
       special_premission: {
         type: Array,
       },
-    }, mounted () {
+    }, mounted() {
 
 
     },
-    created () {
+    created() {
       this.temp_device_numbers = this.device_numbers
 
 
-
       if (this.record.id == 0) {
+        this.isShow = false
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
         let now = new Date()
         let hour = now.getHours()
 
-        if (hour >= 6 && hour < 12){
+        if (hour >= 6 && hour < 12) {
           this.schedual_type = 1
 
-        }else if(hour >= 12 && hour < 18){
+        } else if (hour >= 12 && hour < 18) {
 
           this.schedual_type = 2
 
 
-        }else if(hour >= 18){
+        } else if (hour >= 18) {
           this.schedual_type = 3
         }
       } else {
+        this.isShow = true
+
         if (this.record.start_time == 0) {
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
           this.schedual_type = this.record.schedual_type
@@ -191,11 +192,11 @@
       this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
 
       this.bed_id = (this.record == null || this.record.id == '') ? this.schedule.bed_id : this.record.bed_id
-      this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.start_nurse
-      this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.puncture_nurse
+      this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.admin.id : this.record.start_nurse
+      this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.admin.id : this.record.puncture_nurse
 
       if (this.puncture_nurse_id == 0) {
-        this.puncture_nurse_id = this.$store.getters.user.user.id
+        this.puncture_nurse_id = this.$store.getters.user.admin.id
       }
 
       // var beds = []
@@ -209,13 +210,13 @@
 
       for (let index = 0; index < this.temp_device_numbers.length; index++) {
         const device_number = this.temp_device_numbers[index]
-        this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+        this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
       }
       this.zone_beds = this.temp_device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {
-          if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
+          if (this.$store.getters.user.admin.id == this.special_premission[i].admin_user_id) {
             this.isPremission = true
           }
         }
@@ -230,53 +231,43 @@
       }
 
 
-
     },
     methods: {
-      getSchedualType:function(type){
-        for (let i = 0; i < this.schedules_type.length; i++){
-          if(this.schedules_type[i].id == type){
-            return  this.schedules_type[i].name
+      getSchedualType: function (type) {
+        for (let i = 0; i < this.schedules_type.length; i++) {
+          if (this.schedules_type[i].id == type) {
+            return this.schedules_type[i].name
           }
         }
       },
-      select_type:function(){
+      select_type: function () {
         if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
 
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
-              t.schedual_type = select_id
-
-              let ParamsQuery = {}
-              ParamsQuery['schedual_type'] = select_id
-              GetSchedualNumber(ParamsQuery).then(response => {
-                if (response.data.state == 0) {
-                  Toast.fail(response.data.msg)
-                  return false
-                } else {
-                  t.temp_device_numbers = response.data.data.number
-                  for (let index = 0; index < t.temp_device_numbers.length; index++) {
-                    const device_number = t.temp_device_numbers[index]
-                    t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
-                  }
-                  t.zone_beds = t.temp_device_numbers
-                  t.bed_id = t.zone_beds[0].id
+          this.selecting = true
+          var t = this
+          this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
+            t.schedual_type = select_id
+
+            let ParamsQuery = {}
+            ParamsQuery['schedual_type'] = select_id
+            GetSchedualNumber(ParamsQuery).then(response => {
+              if (response.data.state == 0) {
+                Toast.fail(response.data.msg)
+                return false
+              } else {
+                t.temp_device_numbers = response.data.data.number
+                for (let index = 0; index < t.temp_device_numbers.length; index++) {
+                  const device_number = t.temp_device_numbers[index]
+                  t.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
                 }
-              })
-            }, function () {
-              t.selecting = false
+                t.zone_beds = t.temp_device_numbers
+                t.bed_id = t.zone_beds[0].id
+              }
             })
-          } else {
-            return
-          }
+          }, function () {
+            t.selecting = false
+          })
+
         }
         this.selecting = true
         var t = this
@@ -293,7 +284,7 @@
               t.temp_device_numbers = response.data.data.number
               for (let index = 0; index < t.temp_device_numbers.length; index++) {
                 const device_number = t.temp_device_numbers[index]
-                t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+                t.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
               }
               t.zone_beds = t.temp_device_numbers
               t.bed_id = t.zone_beds[0].id
@@ -306,7 +297,7 @@
         })
 
       },
-      GetSchedualNumber:function(){
+      GetSchedualNumber: function () {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
         GetSchedualNumber(ParamsQuery).then(response => {
@@ -317,7 +308,7 @@
             this.temp_device_numbers = response.data.data.number
             for (let index = 0; index < this.temp_device_numbers.length; index++) {
               const device_number = this.temp_device_numbers[index]
-              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
             }
             this.zone_beds = this.temp_device_numbers
           }
@@ -340,8 +331,13 @@
           rng.select()
         }
       },
-      modify(){
+      modify() {
         let ParamsQuery = {}
+        if (this.$store.getters.user.admin.id == this.record.creator) {
+          ParamsQuery['mode'] = "2"
+        } else {
+          ParamsQuery['mode'] = "3"
+        }
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['id'] = this.record.id
         ParamsQuery['nurse'] = this.nurse_id
@@ -376,17 +372,15 @@
             creator = this.record.creator
           }
 
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.$refs.start_time_picker.open()
-          } else {
-            return
-          }
+          this.$refs.start_time_picker.open()
+
         }
         this.$refs.start_time_picker.open()
       },
       commitInfo: function () {
         Toast.loading({forbidClick: true, duration: 0})
         let ParamsQuery = {}
+        ParamsQuery['mode'] = "1"
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['patient_id'] = this.patient_prop.id
         ParamsQuery['record_date'] = this.record_date
@@ -426,8 +420,6 @@
           } else {
             creator = this.record.creator
           }
-
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
@@ -435,9 +427,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
 
         this.selecting = true
@@ -456,7 +446,7 @@
           } else {
             creator = this.record.creator
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
@@ -464,9 +454,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
         this.selecting = true
         var t = this
@@ -483,7 +471,7 @@
           } else {
             creator = this.record.creator
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
@@ -491,9 +479,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
         this.selecting = true
         var t = this
@@ -510,11 +496,6 @@
     }, watch: {
       'record.id': function (val) {
         if (val > 0) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
-            }
-          }
           if (this.record.creator == 0) {
             this.creator = this.record.start_nurse
           } else {
@@ -531,23 +512,23 @@
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.perform {
+  .perform {
   text-align: center;
   font-size: 0.3rem;
   padding-top: 2rem;
   .crew {
-    color: $pgh-color;
+  color: $pgh-color;
   }
   button {
-    background: $main-color;
-    color: #fff;
-    font-size: 0.45rem;
-    text-align: center;
-    width: 3rem;
-    height: 1.2rem;
-    line-height: 1.2rem;
-    border-radius: 4px;
-    margin-top: 10px;
+  background: $main-color;
+  color: #fff;
+  font-size: 0.45rem;
+  text-align: center;
+  width: 3rem;
+  height: 1.2rem;
+  line-height: 1.2rem;
+  border-radius: 4px;
+  margin-top: 10px;
+  }
   }
-}
 </style>

src/pages/main/dialog/DoubleDialog.vue

@@ -277,9 +277,14 @@ export default {
       Toast.loading({ forbidClick: true, duration: 0 });
       let ParamsQuery = this.doubleReview;
       // ParamsQuery["patient"] = this.patient.id
+      ParamsQuery['mode'] = "1"
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
       ParamsQuery["check_time"] = this.check_time_str;
+      console.log(this.record)
+     if(this.record.id > 0){
+       ParamsQuery['mode'] = "2"
+     }
       commitDoubleCheck(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           // this.$toast({message: response.data.msg});

src/pages/main/dialog/OrdersDialog.vue

@@ -9,12 +9,11 @@
        <div class="yzNav" style="width:100%;">
         <span
           @click="openNewAdvice"
-          :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
         >新增</span>
         <span
           v-if="isShowExce"
           @click="execAdvice"
-          :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >执行</span>
 
         <span
@@ -28,12 +27,12 @@
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
-          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || (this.$store.getters.user.user.user_type == 2 && !isPremission) }"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0)  }"
         >核对</span>
         <span
         id="fontSize"
           @click="openNewChild"
-          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || this.$store.getters.user.user.user_type == 3 }"
+          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1  }"
         >添加子药</span>
         <span
           v-if="currentSubAdvices.length <= 0"
@@ -46,8 +45,8 @@
           :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 }"
         >删除</span>
 
-        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span id="fontSize"  v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span id="fontSize"  v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 
@@ -316,7 +315,6 @@
         currentAdviceIdsStr: '',
         currentAdvices: [],
         currentSubAdvices: [],
-        isPremission:false,
 
       }
     },
@@ -349,12 +347,6 @@
         this.unitsObj[this.unitsOption[index].id] = this.unitsOption[index]
       }
 
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-          this.isPremission = true
-        }
-      }
-
 
     },
     watch: {
@@ -388,15 +380,9 @@
 
     methods: {
       modifyExecAdvice: function () {
-        // if(!this.isPremission){
-        //   Toast.fail('你没有权限修改医嘱！')
-        // }else{
-
-
         this.nowExecTime = new Date(this.currentAdvices[0].execution_time * 1000)
           this.$refs.mofify_exec_time.open()
 
-        // }
 
       },
       didCreateAdvices: function (advices) {
@@ -438,6 +424,14 @@
 
       },
       didModifyAdvice: function (advice) {
+        let mode = "2"
+        console.log(advice.doctor_advice)
+        console.log( this.$store.getters.user.admin.id )
+
+        if (advice.doctor_advice != this.$store.getters.user.admin.id && advice.doctor_advice > 0){
+          mode = "3"
+          console.log("1111111")
+        }
         Toast.loading({forbidClick: true, duration: 0})
         EditDoctorAdvice(advice.id, {
           advice_name: advice.title,
@@ -452,7 +446,7 @@
           single_dose_unit: advice.single_dose_unit,
           prescribing_number: String(advice.prescribing_number),
           prescribing_number_unit: advice.prescribing_number_unit
-        })
+        },mode)
           .then(rs => {
             if (rs.data.state == 1) {
               var resp_advice = rs.data.data.advice
@@ -550,7 +544,8 @@
       },
       didAddSubdrug: function (subdrug) {
         Toast.loading({forbidClick: true, duration: 0})
-        CreateDoctorAdvice(this.patient.id, {
+        let mode = "1"
+        CreateDoctorAdvice(this.patient.id,{
           parent_id: subdrug.parent_id,
           advice_type: 2,
           advice_date: subdrug.record_time,
@@ -565,7 +560,7 @@
           prescribing_number_unit: subdrug.prescribing_number_unit
           // delivery_way: subdrug.delivery_way,
           // execution_frequency: subdrug.execution_frequency
-        })
+        }, mode)
           .then(response => {
             if (response.data.state == 0) {
               Toast.fail(response.data.msg)
@@ -673,7 +668,7 @@
             execution_time: exceTime
           }
         }
-
+        exceParams['mode'] = 8
         ModifyExecDoctorAdvice(exceParams)
           .then(response => {
             if (response.data.state == 0) {
@@ -729,6 +724,7 @@
           }
         }
         Toast.loading({forbidClick: true, duration: 0})
+        exceParams['mode'] = "6"
         ExecDoctorAdvice(exceParams)
           .then(response => {
             if (response.data.state == 0) {
@@ -795,7 +791,14 @@
           message: '确认删除医嘱吗?'
         }).then(() => {
           Toast.loading({forbidClick: true, duration: 0})
-          DeleteSubDoctorAdvice(this.currentSubAdvices[0].id)
+          let is_sub = 1
+          let mode = "4"
+          console.log(this.currentSubAdvices)
+          if (this.currentSubAdvices[0].advice_doctor != this.$store.getters.user.admin.id&& this.currentSubAdvices[0].advice_doctor>0) {
+            mode = "5"
+          }
+
+          DeleteDoctorAdviceNew(0,this.currentSubAdvices[0].id,mode,is_sub)
             .then(rs => {
               if (rs.data.state == 1) {
                 Toast.success('删除成功')
@@ -815,7 +818,6 @@
                 }
 
               } else {
-
                 Toast.fail(rs.data.msg)
               }
             })
@@ -843,29 +845,33 @@
             }
             advice_id = ids.join(',')
 
-            DeleteDoctorAdviceNew(group_no, advice_id)
+            let mode = "4"
+            if (this.currentAdvices[0].advice_doctor != this.$store.getters.user.admin.id&& this.currentAdvices[0].advice_doctor>0) {
+              mode = "5"
+            }
+            let is_sub = 2
+            DeleteDoctorAdviceNew(group_no, advice_id,mode,is_sub)
               .then(rs => {
                 if (rs.data.state == 1) {
-                  Toast.success('删除成功')
-                  var adviceArr = this.advice_groups[this.current_group_index].advices
+                    Toast.success('删除成功')
+                    var adviceArr = this.advice_groups[this.current_group_index].advices
 
-                  for (let y = ids.length - 1; y >= 0; y--) {
-                    for (let i = adviceArr.length - 1; i >= 0; i--) {
-                      if (adviceArr[i].id == ids[y] || adviceArr[i].parent_id == ids[y]) {
-                        adviceArr.splice(i, 1)
+                    for (let y = ids.length - 1; y >= 0; y--) {
+                      for (let i = adviceArr.length - 1; i >= 0; i--) {
+                        if (adviceArr[i].id == ids[y] || adviceArr[i].parent_id == ids[y]) {
+                          adviceArr.splice(i, 1)
+                        }
                       }
                     }
-                  }
-                  this.currentSubAdvices = []
-                  this.currentAdvices = []
-                  for (let i = 0; i < this.advice_groups.length; i++) {
-                    for (let y = 0; y < this.advice_groups[i].advices.length; y++) {
-                      var advices = this.advice_groups[i].advices[y]
-                      advices.is_selected = 0
+                    this.currentSubAdvices = []
+                    this.currentAdvices = []
+                    for (let i = 0; i < this.advice_groups.length; i++) {
+                      for (let y = 0; y < this.advice_groups[i].advices.length; y++) {
+                        var advices = this.advice_groups[i].advices[y]
+                        advices.is_selected = 0
+                      }
                     }
-                  }
-
-                } else {
+                }else{
                   Toast.fail(rs.data.msg)
                 }
               })
@@ -893,7 +899,12 @@
               advice_id = this.current_advice.id
             }
 
-            DeleteDoctorAdviceNew(group_no, advice_id)
+            let mode = "4"
+            if (group.advices[0].advice_doctor != this.$store.getters.user.admin.id&&  group.advices[0].advice_doctor>0) {
+              mode = "5"
+            }
+            let is_sub = 2
+            DeleteDoctorAdviceNew(group_no, advice_id,mode,is_sub)
               .then(rs => {
                 if (rs.data.state == 1) {
                   Toast.success('删除成功')
@@ -944,9 +955,7 @@
         }
       },
       checkAdvice () {
-        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
-          return
-        }
+
         if (this.currentAdvices.length <= 0) {
           return
         }
@@ -965,7 +974,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1001,7 +1010,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1035,6 +1044,7 @@
             }
           }
 
+          params['mode'] = "7"
           CheckDoctorAdvice(params)
             .then(response => {
               if (response.data.state == 0) {
@@ -1077,9 +1087,6 @@
         // });
       },
       execAdvice () {
-        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
-          return
-        }
 
         if (this.currentAdvices.length <= 0) {
           return
@@ -1098,7 +1105,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1131,7 +1138,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1142,10 +1149,6 @@
         this.$refs.exec_time.open()
       },
       openNewChild () {
-        if (this.$store.getters.user.user.user_type == 3) {
-          Toast.fail('你没有权限添加子药！')
-          return
-        }
 
         if (this.current_advice == null){
           return
@@ -1181,11 +1184,6 @@
         return
       },
       openNewAdvice () {
-        if (this.$store.getters.user.user.user_type == 3) {
-          Toast.fail('你没有权限新增医嘱！')
-          return
-        }
-
         this.currentAdvices = []
         this.currentSubAdvices = []
         for (let i = 0; i < this.advice_groups.length; i++) {
@@ -1207,11 +1205,13 @@
         if (this.current_advice_index >= 0) {
           this.index = 3
           var advice = this.currentSubAdvices[0]
+          console.log(advice)
           this.$refs.modify_advice_form.showWithModify({
             id: advice.id,
             parent_id: advice.parent_id,
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
+            advice_doctor: advice.advice_doctor,
             remark: advice.remark,
             drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
@@ -1242,6 +1242,7 @@
             parent_id: advice.parent_id,
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
+            advice_doctor: advice.advice_doctor,
             remark: advice.remark,
             start_time: advice.start_time,
             drug_spec: advice.drug_spec,

src/pages/main/dialog/OrdersDialog_olddddd.vue

@@ -709,7 +709,7 @@ export default {
 
       if (
         this.currentRow.execution_staff > 0 &&
-        this.currentRow.execution_staff == this.$store.getters.user.user.id
+        this.currentRow.execution_staff == this.$store.getters.user.admin.id
       ) {
         Toast.fail('核对与执行不能是同一人')
         return false
@@ -777,7 +777,7 @@ export default {
 
       if (
         this.currentRow.checker > 0 &&
-        this.currentRow.checker == this.$store.getters.user.user.id
+        this.currentRow.checker == this.$store.getters.user.admin.id
       ) {
         Toast.fail('核对与执行不能是同一人')
         return false

src/pages/main/dialog/PlaneDialog.vue

@@ -7,17 +7,13 @@
 
         <span
           class="success"
-          v-if="
-            this.record.state == 1 ||
-              this.$store.getters.user.user.id != this.creator
-          "
+          v-if="this.record.stage == 1"
         ></span>
         <span
+          v-else
           class="success"
           @click="modify()"
-          v-if="isPremission || this.$store.getters.user.user.id == this.creator"
-          >修改</span
-        >
+          >修改</span>
       </div>
 
       <div class="DialogContent">
@@ -184,21 +180,12 @@ export default {
     if (this.record == null || this.record.id == "") {
       this.nurse_id = 0;
     } else if (this.record.stage == 1) {
-      this.nurse_id = this.$store.getters.user.user.id;
+      this.nurse_id = this.$store.getters.user.admin.id;
     } else {
       this.nurse_id = this.record.finish_nurse;
     }
 
-    if (this.record.id > 0) {
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (
-          this.$store.getters.user.user.id ==
-          this.special_premission[i].admin_user_id
-        ) {
-          this.isPremission = true;
-        }
-      }
-    }
+
 
     if (this.record.id > 0) {
       if (this.record.finish_creator == 0) {
@@ -222,6 +209,11 @@ export default {
       ParamsQuery["id"] = this.record.id;
       ParamsQuery["nurse"] = this.nurse_id;
       ParamsQuery["end_time"] = this.end_time_str;
+      ParamsQuery["mode"] = "2";
+      if(this.$store.getters.user.admin.id != this.record.finish_creator){
+        ParamsQuery["mode"] = "3";
+      }
+
       PostModifyEndDialysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);
@@ -244,20 +236,9 @@ export default {
     selectStartTimeAction: function() {
       if (this.record.id != 0) {
         if (this.record.end_time > 0) {
-          var creator = 0;
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse;
-          } else {
-            creator = this.record.finish_creator;
-          }
-          if (
-            this.$store.getters.user.user.id == creator ||
-            this.isPremission
-          ) {
-            this.$refs.start_time_picker.open();
-          } else {
-            return;
-          }
+
+          this.$refs.start_time_picker.open();
+
         } else {
           this.$refs.start_time_picker.open();
         }
@@ -272,6 +253,8 @@ export default {
       ParamsQuery["record_date"] = this.record_date;
       ParamsQuery["nurse"] = this.nurse_id;
       ParamsQuery["end_time"] = this.end_time_str;
+      ParamsQuery["mode"] = "1";
+
 
       finish(ParamsQuery).then(response => {
         if (response.data.state == 0) {
@@ -314,16 +297,7 @@ export default {
             }
           );
         } else {
-          var creator = 0;
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse;
-          } else {
-            creator = this.record.finish_creator;
-          }
-          if (
-            this.$store.getters.user.user.id == creator ||
-            this.isPremission
-          ) {
+
             this.selecting = true;
             var t = this;
             this.$refs.selector.showSingleSelect(
@@ -340,9 +314,7 @@ export default {
                 t.selecting = false;
               }
             );
-          } else {
-            return;
-          }
+
         }
       }
     },
@@ -354,23 +326,12 @@ export default {
   watch: {
     "record.stage": function(val) {
       if (val == 2) {
-        for (let i = 0; i < this.special_premission.length; i++) {
-          if (
-            this.$store.getters.user.user.id ==
-            this.special_premission[i].admin_user_id
-          ) {
-            this.isPremission = true;
-          }
-        }
         if (this.record.finish_nurse == 0) {
           this.creator = this.record.finish_nurse;
         } else {
           this.creator = this.record.finish_creator;
         }
       }
-
-      console.log(this.creator);
-      console.log(this.$store.getters.user.user.id);
     }
   }
 };

src/pages/main/dialog/ThorougDialog.vue

@@ -1403,6 +1403,13 @@ export default {
       let ParamsQuery = this.formValue
       ParamsQuery['patient'] = this.$route.query.patient_id
       ParamsQuery['record_date'] = this.record_date
+      ParamsQuery['mode'] = "1"
+      if(this.record.creater > 0){
+        ParamsQuery['mode'] = "2"
+        if(this.$store.getters.user.admin.id != this.record.creater){
+          ParamsQuery['mode'] = "3"
+        }
+      }
       commitAssessmentAfterDislysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg)

src/pages/main/dialog/TreatmentDialog.vue

@@ -287,6 +287,15 @@ export default {
       let ParamsQuery = this.dialysisSummary;
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["mode"] = "1";
+
+      if (this.record.id > 0){
+        ParamsQuery["mode"] = "2";
+        if(this.record.creater != this.$store.getters.user.admin.id){
+          ParamsQuery["mode"] = "3";
+        }
+      }
+
       commitTreatmentSummary(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -295,6 +295,15 @@ export default {
     },
     didModifyAdvice: function(advice) {
       this.loading = true;
+
+      let mode = "2"
+      console.log(advice.advice_doctor)
+      console.log(console.log(advice.advice_doctor))
+
+      if(advice.advice_doctor != this.$store.getters.user.admin.id && advice.advice_doctor>0){
+         mode = "3"
+      }
+
       EditDoctorAdvice(advice.id, {
         advice_name: advice.title,
         advice_desc: advice.advice_desc,
@@ -307,7 +316,7 @@ export default {
         prescribing_number: String(advice.prescribing_number),
         prescribing_number_unit: advice.prescribing_number_unit,
         drug_spec_unit: advice.drug_spec_unit
-      })
+      },mode)
         .then(rs => {
           if (rs.data.state == 1) {
             var resp_advice = rs.data.data.advice;

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -235,6 +235,7 @@ export default {
         parent_id: 0,
         // start_time: "",
         // record_time: "",
+        advice_doctor:0,
         title: "",
         advice_desc: "",
         drug_spec: "",
@@ -274,6 +275,7 @@ export default {
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
       this.order.remark = order.remark;
+      this.order.advice_doctor = order.advice_doctor
 
       this.start_time_str =
         parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
@@ -324,7 +326,8 @@ export default {
           prescribing_number_unit: this.order.prescribing_number_unit,
           start_time: this.start_time_str,
           drug_spec: this.order.drug_spec,
-          drug_spec_unit: this.order.drug_spec_unit
+          drug_spec_unit: this.order.drug_spec_unit,
+          doctor_advice: this.order.advice_doctor,
         });
       }
     },

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -347,7 +347,8 @@ export default {
       // console.log(adviceJSONs)
 
       this.loading = true;
-      batchCreateAdvices(this.patient_id, this.group_no, data)
+      let mode = "1"
+      batchCreateAdvices(this.patient_id, this.group_no, data,mode)
         .then(rs => {
           this.loading = false;
           var resp = rs.data;

src/pages/main/dialog/subMenu/dryWeightMenu.vue

@@ -50,6 +50,7 @@
 <script>
 import TwoMenu from "../TwoMenu";
 import { CreateDryWeight } from "@/api/dialysis";
+import { Toast } from 'vant'
 
 export default {
   name: "dryWeightMenu",
@@ -69,7 +70,7 @@ export default {
   },
   methods: {
     open() {
-      this.creator = this.$store.getters.user.user.id;
+      this.creator = this.$store.getters.user.admin.id;
       this.dry_weight = this.propsForm.weight;
       this.visibility = true;
     },
@@ -84,13 +85,18 @@ export default {
         id: this.$route.query.patient_id,
         dry_weight: this.dry_weight,
         remark: this.remark,
-        doctor_id: this.creator
+        doctor_id: this.creator,
+        mode: "1",
       };
       CreateDryWeight(params).then(rs => {
         var res = rs.data;
         if (res.state == 1) {
-          this.$message.success("提交成功");
+          Toast("提交成功");
           this.$emit("menu-comfirm-two", res.data.weight);
+        }else {
+          // this.$message.success("提交成功");
+
+          Toast(rs.data.msg)
         }
       });
     },

src/pages/main/dialysis/AdviceTable.vue

@@ -1508,7 +1508,7 @@ export default {
     // this.fetchAllAdminUsers();
     this.queryParams.id = this.$route.query.patient_id;
     this.doctor = this.$store.getters.user.user.user_name;
-    this.doctor_id = this.$store.getters.user.user.id;
+    this.doctor_id = this.$store.getters.user.admin.id;
     this.patient_id = this.$route.query.patient_id;
 
     var date = new Date();

src/pages/main/today/dialysisMonitoring.vue

@@ -29,8 +29,7 @@
           <th v-if="isShow('置换量')&& template_id == 6" width="50px">置换量(ml)</th>
           <th v-if="isShow('置换量')&& template_id != 6" width="50px">置换量(L)</th>
 
-
-          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -54,8 +53,6 @@
             {{ item.pulse_frequency ? item.pulse_frequency : "" }}
           </td>
 
-
-
           <td v-if="isShow('呼吸频率')">
             {{ item.breathing_rate ? item.breathing_rate : "" }}
           </td>
@@ -195,7 +192,7 @@
       </span>
 
       <span v-if="isShow('电导度')">
-        <el-table-column prop="zip" label="电导度(mS/m)" width="200" align="center">
+        <el-table-column prop="zip" label="电导度(mS/cm)" width="200" align="center">
           <template slot-scope="scope">{{scope.row.conductivity?scope.row.conductivity:''}}</template>
         </el-table-column>
       </span>

src/pages/main/today/dialysisPrescription.vue

@@ -117,20 +117,17 @@
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
         </li>
 
-
         <li v-if="isShow('钙名称')&&this.prescription.anticoagulant == 5">
           <label>钙名称: </label>
           <span class="content">{{this.prescription.anticoagulant_gaimingcheng}}</span>
         </li>
 
-
         <li v-if="isShow('钙剂量')&&this.prescription.anticoagulant == 5">
           <label>钙剂量: </label>
           <span class="content">{{this.prescription.anticoagulant_gaijiliang}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml'}}</span>
         </li>
 
-
         <li v-if="isShow('钠')">
           <label>钠 : </label>
           <span class="content">{{sodium != '0'?sodium:""}}</span>
@@ -204,7 +201,7 @@
         <li v-if="isShow('电导度')">
           <label>电导度 : </label>
           <span class="content">{{conductivity != '0'?conductivity:""}}</span>
-          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
         </li>
 
       </ul>
@@ -214,291 +211,337 @@
 </template>
 
 <script>
-  import {getDataConfig} from '@/utils/data'
-  export default {
-    name: 'DialysisPrescription',
-    data () {
-      return {
-        title: '透析处方',
-        perfusion_apparatus_map: {},
-        dialysateFormulationMap: {}
+import { getDataConfig } from "@/utils/data";
+export default {
+  name: "DialysisPrescription",
+  data() {
+    return {
+      title: "透析处方",
+      perfusion_apparatus_map: {},
+      dialysateFormulationMap: {}
+    };
+  },
+  props: {
+    prescription: {
+      type: Object
+    },
+    solution: {
+      type: Object
+    },
+    device_number_map: {
+      type: Object
+    }
+  },
+  computed: {
+    target_ultrafiltration: function() {
+      var v = this.getValueStr(
+        "target_ultrafiltration",
+        "target_ultrafiltration"
+      );
+      v = this.getFloat(v);
+      return v.length == 0 ? "0" : v;
+    },
+    dialysis_mode: function() {
+      var mode = this.getValueStr("mode_id", "mode_id");
+      if (mode.length == 0) {
+        return "";
       }
+      if (this.$store.getters.treatment_mode[mode] != undefined) {
+        return this.$store.getters.treatment_mode[mode].name;
+      }
+      return "";
     },
-    props: {
-      prescription: {
-        type: Object
-      },
-      solution: {
-        type: Object
-      },
-      device_number_map: {
-        type: Object
+    perfusion_apparatus: function() {
+      var v = this.getValueStr("perfusion_apparatus", "perfusion_apparatus");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.perfusion_apparatus_map[v] != undefined) {
+        return this.perfusion_apparatus_map[v].name;
       }
+      return "";
+    },
+    displace_liqui: function() {
+      var v = this.getValueStr("displace_liqui", "displace_liqui");
+      return v.length == 0 ? "0" : v;
+    },
+    anticoagulant_shouji: function() {
+      var v = this.getValueStr("anticoagulant_shouji", "anticoagulant_shouji");
+      return v.length == 0 ? "0" : v;
+    },
+    kalium: function() {
+      var v = this.getValueStr("kalium", "kalium");
+      v = this.getFloat(v);
+      return v == 0 ? "0" : v;
+    },
+    replacement_total: function() {
+      var v = this.getValueStr("replacement_total", "replacement_total");
+      return v.length == 0 ? "0" : v;
+    },
+    bicarbonate: function() {
+      var v = this.getValueStr("bicarbonate", "bicarbonate");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysate_flow: function() {
+      var v = this.getValueStr("dialysate_flow", "dialysate_flow");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysis_duration: function() {
+      var dialysis_duration_hour = this.getValueStr(
+        "dialysis_duration_hour",
+        "dialysis_duration_hour"
+      );
+      var dialysis_duration_minute = this.getValueStr(
+        "dialysis_duration_minute",
+        "dialysis_duration_minute"
+      );
+      if (
+        dialysis_duration_hour.length == 0 &&
+        dialysis_duration_minute.length == 0
+      ) {
+        return "0";
+      } else {
+        var time =
+          dialysis_duration_hour + "h" + dialysis_duration_minute + "min";
+        return time.length == 0 ? "0" : time;
+      }
+    },
+    blood_flow_volume: function() {
+      var v = this.getValueStr("blood_flow_volume", "blood_flow_volume");
+      return v.length == 0 ? "0" : v;
+    },
+    replacement_way: function() {
+      return this.getValueStr("replacement_way", "replacement_way");
+    },
+    anticoagulant_weichi: function() {
+      var v = this.getValueStr("anticoagulant_weichi", "anticoagulant_weichi");
+      return v.length == 0 ? "0" : v;
+    },
+    sodium: function() {
+      var v = this.getValueStr("sodium", "sodium");
+      console.log(v);
+      v = this.getFloat(v);
+      console.log(v);
+      return v == 0 ? "0" : v;
+    },
+    glucose: function() {
+      var v = this.getValueStr("glucose", "glucose");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysate_temperature: function() {
+      var v = this.getValueStr(
+        "dialysate_temperature",
+        "dialysate_temperature"
+      );
+      return v.length == 0 ? "0" : v;
+    },
+    dialyzer: function() {
+      var v = this.getValueStr("dialyzer", "hemodialysis_machine");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.device_number_map[v] != undefined) {
+        return this.device_number_map[v].name;
+      }
+      return "";
+    },
+    dialysate_formulation: function() {
+      var v = this.getValueStr(
+        "dialysate_formulation",
+        "dialysate_formulation"
+      );
+      if (v.length == 0) {
+        return "";
+      }
+      if (v in this.dialysateFormulationMap) {
+        return this.dialysateFormulationMap[v].name;
+      }
+      return "";
+    },
+    prescription_dewatering: function() {
+      var v = this.getValueStr("prescription_dewatering", "dewater");
+      return v.length == 0 ? "0" : v;
+    },
+    anticoagulant: function() {
+      var v = this.getValueStr("anticoagulant", "anticoagulant");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.$store.getters.anticoagulants_confit[v] != undefined) {
+        return this.$store.getters.anticoagulants_confit[v].name;
+      }
+      return "";
+    },
+    anticoagulant_zongliang: function() {
+      var v = this.getValueStr(
+        "anticoagulant_zongliang",
+        "anticoagulant_zongliang"
+      );
+      return v.length == 0 ? "0" : v;
+    },
+    calcium: function() {
+      var v = this.getValueStr("calcium", "calcium");
+      v = this.getFloat(v);
+      return v == 0 ? "0" : v;
     },
-    computed: {
-      target_ultrafiltration: function () {
-        var v = this.getValueStr('target_ultrafiltration', 'target_ultrafiltration')
-        v = this.getFloat(v)
-        return v.length == 0 ? '0' : v
-      },
-      dialysis_mode: function () {
-        var mode = this.getValueStr('mode_id', 'mode_id')
-        if (mode.length == 0) {
-          return ''
-        }
-        if (this.$store.getters.treatment_mode[mode] != undefined) {
-          return this.$store.getters.treatment_mode[mode].name
-        }
-        return ''
-      },
-      perfusion_apparatus: function () {
-        var v = this.getValueStr('perfusion_apparatus', 'perfusion_apparatus')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.perfusion_apparatus_map[v] != undefined) {
-          return this.perfusion_apparatus_map[v].name
-        }
-        return ''
-      },
-      displace_liqui: function () {
-        var v = this.getValueStr('displace_liqui', 'displace_liqui')
-        return v.length == 0 ? '0' : v
-      },
-      anticoagulant_shouji: function () {
-        var v = this.getValueStr('anticoagulant_shouji', 'anticoagulant_shouji')
-        return v.length == 0 ? '0' : v
-      },
-      kalium: function () {
-        var v = this.getValueStr('kalium', 'kalium')
-        v = this.getFloat(v)
-        return v == 0 ? '0' : v
-      },
-      replacement_total: function () {
-        var v = this.getValueStr('replacement_total', 'replacement_total')
-        return v.length == 0 ? '0' : v
-      },
-      bicarbonate: function () {
-        var v = this.getValueStr('bicarbonate', 'bicarbonate')
-        return v.length == 0 ? '0' : v
-      },
-      dialysate_flow: function () {
-        var v = this.getValueStr('dialysate_flow', 'dialysate_flow')
-        return v.length == 0 ? '0' : v
-      },
-      dialysis_duration: function () {
-        var dialysis_duration_hour = (this.getValueStr('dialysis_duration_hour', 'dialysis_duration_hour'))
-        var dialysis_duration_minute = (this.getValueStr('dialysis_duration_minute', 'dialysis_duration_minute'))
-        if (dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0) {
-          return '0'
-        } else {
-          var time = dialysis_duration_hour + 'h' + dialysis_duration_minute + 'min'
-          return time.length == 0 ? '0' : time
-        }
-      },
-      blood_flow_volume: function () {
-        var v = this.getValueStr('blood_flow_volume', 'blood_flow_volume')
-        return v.length == 0 ? '0' : v
-      },
-      replacement_way: function () {
-        return this.getValueStr('replacement_way', 'replacement_way')
-      },
-      anticoagulant_weichi: function () {
-        var v = this.getValueStr('anticoagulant_weichi', 'anticoagulant_weichi')
-        return v.length == 0 ? '0' : v
-      },
-      sodium: function () {
-        var v = this.getValueStr('sodium', 'sodium')
-        console.log(v)
-        v = this.getFloat(v)
-        console.log(v)
-        return v == 0 ? '0' : v
-      },
-      glucose: function () {
-        var v = this.getValueStr('glucose', 'glucose')
-        return v.length == 0 ? '0' : v
-      },
-      dialysate_temperature: function () {
-        var v = this.getValueStr('dialysate_temperature', 'dialysate_temperature')
-        return v.length == 0 ? '0' : v
-      },
-      dialyzer: function () {
-        var v = this.getValueStr('dialyzer', 'hemodialysis_machine')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.device_number_map[v] != undefined) {
-          return this.device_number_map[v].name
-        }
-        return ''
-      },
-      dialysate_formulation: function () {
-        var v = this.getValueStr('dialysate_formulation', 'dialysate_formulation')
-        if (v.length == 0) {
-          return ''
-        }
-        if (v in this.dialysateFormulationMap) {
-          return this.dialysateFormulationMap[v].name
-        }
-        return ''
-      },
-      prescription_dewatering: function () {
-        var v = this.getValueStr('prescription_dewatering', 'dewater')
-        return v.length == 0 ? '0' : v
-      },
-      anticoagulant: function () {
-        var v = this.getValueStr('anticoagulant', 'anticoagulant')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.$store.getters.anticoagulants_confit[v] != undefined) {
-          return this.$store.getters.anticoagulants_confit[v].name
-        }
-        return ''
-      },
-      anticoagulant_zongliang: function () {
-        var v = this.getValueStr('anticoagulant_zongliang', 'anticoagulant_zongliang')
-        return v.length == 0 ? '0' : v
-      },
-      calcium: function () {
-        var v = this.getValueStr('calcium', 'calcium')
-        v = this.getFloat(v)
-        return v == 0 ? '0' : v
-      },
 
-      conductivity: function () {
-        var v = this.getValueStr('conductivity', 'conductivity')
-        return v.length == 0 ? '0' : v
-      },
-      dialyzer_perfusion_apparatus: function () {
-        return this.getValueStr('dialyzer_perfusion_apparatus', 'dialyzer_perfusion_apparatus')
-      },
-      note: function () {
-        return this.getValueStr('remark', 'remark')
-      },
-      body_fluid: function () {
-        var id = this.getValueStr('body_fluid', 'body_fluid')
-        if (id == 0) {
-          return ''
-        }
-        var bodyFluidOptions = this.$store.getters.body_fluid
-        for (let i = 0; i < bodyFluidOptions.length; i++) {
-          if (bodyFluidOptions[i].id == id) {
-            return bodyFluidOptions[i].name
-          }
-        }
-      },
-      special_medicine: function () {
-        var id = this.getValueStr('special_medicine', 'special_medicine')
-        if (id == 0) {
-          return ''
-        }
-        var special_medicine = this.$store.getters.special_medicine
-        for (let i = 0; i < special_medicine.length; i++) {
-          if (special_medicine[i].id == id) {
-            return special_medicine[i].name
-          }
-        }
-      },
-      special_medicine_other: function () {
-        return this.getValueStr('special_medicine_other', 'special_medicine_other')
-      },
-      blood_access: function () {
-        var id = this.getValueStr('blood_access', 'blood_access')
-        if (id == 0) {
-          return ''
+    conductivity: function() {
+      var v = this.getValueStr("conductivity", "conductivity");
+      return v.length == 0 ? "0" : v;
+    },
+    dialyzer_perfusion_apparatus: function() {
+      return this.getValueStr(
+        "dialyzer_perfusion_apparatus",
+        "dialyzer_perfusion_apparatus"
+      );
+    },
+    note: function() {
+      return this.getValueStr("remark", "remark");
+    },
+    body_fluid: function() {
+      var id = this.getValueStr("body_fluid", "body_fluid");
+      if (id == 0) {
+        return "";
+      }
+      var bodyFluidOptions = this.$store.getters.body_fluid;
+      for (let i = 0; i < bodyFluidOptions.length; i++) {
+        if (bodyFluidOptions[i].id == id) {
+          return bodyFluidOptions[i].name;
         }
-        var blood_access = this.$store.getters.blood_access
-        console.log('blood_access', blood_access)
-        for (let i = 0; i < blood_access.length; i++) {
-          if (blood_access[i].id == id) {
-            return blood_access[i].name
-          }
+      }
+    },
+    special_medicine: function() {
+      var id = this.getValueStr("special_medicine", "special_medicine");
+      if (id == 0) {
+        return "";
+      }
+      var special_medicine = this.$store.getters.special_medicine;
+      for (let i = 0; i < special_medicine.length; i++) {
+        if (special_medicine[i].id == id) {
+          return special_medicine[i].name;
         }
-      },
-      displace_liqui: function () {
-        var id = this.getValueStr('displace_liqui_part', 'displace_liqui_part')
-        var displace_liqui_value = this.getValueStr('displace_liqui_value', 'displace_liqui_value')
-        var displace_liqui_part = ''
-        var displace_liqui = this.$store.getters.displace_liqui
-        for (let i = 0; i < displace_liqui.length; i++) {
-          if (displace_liqui[i].id == id) {
-            displace_liqui_part = displace_liqui[i].name
-          }
+      }
+    },
+    special_medicine_other: function() {
+      return this.getValueStr(
+        "special_medicine_other",
+        "special_medicine_other"
+      );
+    },
+    blood_access: function() {
+      var id = this.getValueStr("blood_access", "blood_access");
+      if (id == 0) {
+        return "";
+      }
+      var blood_access = this.$store.getters.blood_access;
+      console.log("blood_access", blood_access);
+      for (let i = 0; i < blood_access.length; i++) {
+        if (blood_access[i].id == id) {
+          return blood_access[i].name;
         }
-        return displace_liqui_part
-      },
-      ultrafiltration: function () {
-        var v = this.getValueStr('ultrafiltration', 'ultrafiltration')
-        v = this.getFloat(v)
-        return v.length == 0 ? '0' : v
-      },
-      target_ktv: function () {
-        var v = this.getValueStr('target_ktv', 'target_ktv')
-        return v.length == 0 ? '0' : v
       }
     },
-    created () {
-      var perfusion_apparatus = this.$store.getters.perfusion_apparatus
-      var map = {}
-      for (let index = 0; index < perfusion_apparatus.length; index++) {
-        const p = perfusion_apparatus[index]
-        map[p.id] = p
+    displace_liqui: function() {
+      var id = this.getValueStr("displace_liqui_part", "displace_liqui_part");
+      var displace_liqui_value = this.getValueStr(
+        "displace_liqui_value",
+        "displace_liqui_value"
+      );
+      var displace_liqui_part = "";
+      var displace_liqui = this.$store.getters.displace_liqui;
+      for (let i = 0; i < displace_liqui.length; i++) {
+        if (displace_liqui[i].id == id) {
+          displace_liqui_part = displace_liqui[i].name;
+        }
       }
-      this.perfusion_apparatus_map = map
+      return displace_liqui_part;
+    },
+    ultrafiltration: function() {
+      var v = this.getValueStr("ultrafiltration", "ultrafiltration");
+      v = this.getFloat(v);
+      return v.length == 0 ? "0" : v;
+    },
+    target_ktv: function() {
+      var v = this.getValueStr("target_ktv", "target_ktv");
+      return v.length == 0 ? "0" : v;
+    }
+  },
+  created() {
+    var perfusion_apparatus = this.$store.getters.perfusion_apparatus;
+    var map = {};
+    for (let index = 0; index < perfusion_apparatus.length; index++) {
+      const p = perfusion_apparatus[index];
+      map[p.id] = p;
+    }
+    this.perfusion_apparatus_map = map;
 
-      var dialysateFormulationOptions = getDataConfig('hemodialysis', 'dialysate_formulation')
-      for (var index in dialysateFormulationOptions) {
-        this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index]
+    var dialysateFormulationOptions = getDataConfig(
+      "hemodialysis",
+      "dialysate_formulation"
+    );
+    for (var index in dialysateFormulationOptions) {
+      this.dialysateFormulationMap[dialysateFormulationOptions[index].id] =
+        dialysateFormulationOptions[index];
+    }
+  },
+  methods: {
+    getDisplaceLiquiValue: function() {
+      return this.getValueStr("displace_liqui_value", "displace_liqui_value");
+    },
+    isShow(name) {
+      var filedList = this.$store.getters.user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 1 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_show == 1
+        ) {
+          return true;
+        }
       }
+      return false;
     },
-    methods: {
-      getDisplaceLiquiValue:function(){
-        return this.getValueStr('displace_liqui_value', 'displace_liqui_value')
-      },
-      isShow (name) {
-        var filedList = this.$store.getters.user.fileds
-        for (let i = 0; i < filedList.length; i++) {
-          if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-            return true
-          }
+    getValueStr(pkey, skey) {
+      if (
+        (this.prescription == null || this.prescription.id == "") &&
+        (this.solution == null || this.solution.id == "")
+      ) {
+        return "";
+      } else if (this.prescription != null && this.prescription.id != "") {
+        if (
+          this.prescription[pkey] == null ||
+          this.prescription[pkey] == undefined
+        ) {
+          return "";
+        }
+        return this.prescription[pkey] + "";
+      } else {
+        if (this.solution[skey] == null || this.solution[skey] == undefined) {
+          return "";
         }
-        return false
-      },
-      getValueStr (pkey, skey) {
-        if ((this.prescription == null || this.prescription.id == '') && (this.solution == null || this.solution.id == '')) {
-          return ''
-        } else if (this.prescription != null && this.prescription.id != '') {
-          if (this.prescription[pkey] == null || this.prescription[pkey] == undefined) {
-            return ''
-          }
-          return this.prescription[pkey] + ''
-        } else {
-          if (this.solution[skey] == null || this.solution[skey] == undefined) {
-            return ''
-          }
-          return this.solution[skey] + ''
+        return this.solution[skey] + "";
+      }
+    },
+    getFloat: function(x) {
+      if (x != ".") {
+        var f = Math.round(x * 100) / 100;
+        var s = f.toString();
+        var rs = s.indexOf(".");
+        if (rs <= 0) {
+          rs = s.length;
+          s += ".";
         }
-      },
-      getFloat: function (x) {
-        if (x != '.') {
-          var f = Math.round(x * 100) / 100
-          var s = f.toString()
-          var rs = s.indexOf('.')
-          if (rs <= 0) {
-            rs = s.length
-            s += '.'
-          }
-          while (s.length <= rs + 1) {
-            s += '0'
-          }
-          return s
-        } else {
-          return '0.0'
+        while (s.length <= rs + 1) {
+          s += "0";
         }
+        return s;
+      } else {
+        return "0.0";
       }
     }
   }
+};
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped></style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

src/pages/my/index.vue

@@ -2,7 +2,6 @@
   <div class="page_my">
     <div class="myTop">
       <img src="../../assets/images/myBanner.png" alt />
-      <router-link to="/myInfo">
         <div class="avatar">
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
@@ -11,16 +10,16 @@
             alt
           />
         </div>
-        <div class="userMain">
+        <div class="userMain" @click="toMyIndex">
           <div class="userBox">
             <div class="userTxt">
-              <p class="userName">{{ roleInfo.user_name }}</p>
+              <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>
         </div>
-      </router-link>
       <div class="invitebox">
         <img src="../../assets/images/invite.png" alt />
       </div>
@@ -42,8 +41,8 @@
         </div>
       </router-link>
     </div>
+
     <div class="myBox">
-      <router-link to="/organizationInfo">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon2.png" alt />
@@ -51,29 +50,20 @@
           </div>
           <van-icon class="arrow" name="arrow" />
         </div>
-      </router-link>
-      <div class="myBoxTwo">
+      <div class="myBoxTwo noBorder" v-for="(item,index) in organaziton" :key="index">
         <div class="myInfoLeft">
-          <img src="../../assets/images/m01.png" alt />
-          <p>我的医院/组织/团队</p>
+          <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">
-          <van-icon class="arrow" name="arrow" />
-        </div>
-      </div>
-      <div class="myBoxTwo noBorder">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/m01.png" alt />
-          <p>我的医院/组织/团队</p>
-        </div>
-        <div class="myInfoRight" @click="toManage">
-          <div class="myInfoRightBtn">管理</div>
-          <van-icon class="arrow" name="arrow" />
+        <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>
       </div>
     </div>
     <div class="myBox">
-      <router-link to="/createorg">
+      <router-link to="/perfectOrg">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon3.png" alt />
@@ -82,7 +72,7 @@
           <van-icon class="arrow" name="arrow" />
         </div>
       </router-link>
-      <router-link to="/forget">
+      <router-link to="/modifypsw">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon4.png" alt />
@@ -93,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">
@@ -133,35 +123,65 @@
   </div>
 </template>
 <script>
-import { getMyInformation } from "@/api/patient/patient";
+import {
+  getMyInformation,
+  LoginOut,
+  getMyOrganazition,
+  getMyInforName
+} from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
     return {
       roleInfo: {},
-      admin_user_id: 0
+      admin_user_id: 0,
+      adminid: 0,
+      organaziton: [],
+      userName: {}
     };
   },
   methods: {
     LoginOut() {
-      this.isRouterAlive = false;
-      this.$nextTick(function() {
-        this.isRouterAlive = true;
+      LoginOut().then(response => {
+        if (response.data.state === 1) {
+          var msg = response.data.data.msg;
+          console.log("msg是", msg);
+          this.isRouterAlive = false;
+          this.$nextTick(function() {
+            this.isRouterAlive = true;
+          });
+          this.$router.replace("/login");
+        }
       });
-      this.$router.push("/login");
     },
-    getMyInformation() {
-      getMyInformation().then(response => {
+    getMyInformation(id) {
+      getMyInformation(id).then(response => {
         if (response.data.state === 1) {
-          var sinature = response.data.data.electronic_signature;
-          console.log("sinature", sinature);
           var roleInfo = response.data.data.roleInfo;
-          console.log("成功", roleInfo);
-          this.admin_user_id = roleInfo.admin_user_id;
+          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;
+        }
+      });
+    },
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
+        if (response.data.state === 1) {
+          var Rolename = response.data.data.Rolename;
+          var username = response.data.data.Username;
+          this.userName = username;
+        }
+      });
+    },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       return uParseTime(time, "{y}-{m}-{d}");
@@ -173,11 +193,20 @@ export default {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
     },
     toManage() {
-      this.$router.push("/organizationinfo?id=" + this.admin_user_id);
+      this.$router.push("/organizationinfo?id=" + this.adminid);
+    },
+    toEditOrg() {
+      this.$router.push("/newMy");
+    },
+    toMyIndex() {
+      this.$router.push("/myInfo?id=" + this.admin_user_id);
     }
   },
   created() {
-    this.getMyInformation();
+    var adminid = this.$store.getters.user.user.id;
+    this.getMyInformation(adminid);
+    this.getMyOrganazition(adminid);
+    this.getMyInforName(adminid);
   }
 };
 </script>

src/pages/my/modifyPassword.vue

@@ -0,0 +1,451 @@
+<template>
+  <div class="page_noPassword">
+    <div class="nopasswordTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+      <span class="titleName">修改密码</span>
+    </div>
+    <div class="forgetmyInput">
+      <el-form ref="forgetForm" :model="forgetForm" :rules="rules">
+        <el-form-item required prop="phone">
+          <div class="phoneLine">
+            <i class="el-icon-mobile mobile"></i>
+            <el-input
+              class="phoneInput"
+              placeholder="请填写手机号码"
+              v-model="forgetForm.phone"
+              v-on:input="watchNum"
+              maxlength="11"
+              @input="change(forgetForm.phone)"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item required prop="code">
+          <div class="code">
+            <i class="iconfont icon-dunpai dunpai"></i>
+            <el-input v-model="forgetForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
+            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <div class="phoneLine">
+            <i class="el-icon-lock lock"></i>
+            <el-input
+              class="phoneInput"
+              v-model="psd"
+              placeholder="请填写新密码"
+              show-password
+              v-on:input="watchNum"
+              clearable
+            ></el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="login" @click="modifyAndLogin()" v-show="loginshow">登录</div>
+    <div class="logintwo" v-show="loginshowtwo">登录</div>
+    <div class="problem">
+      遇到问题？点击
+      <span @click="contact = true">联系客服</span>
+    </div>
+
+    <!-- 弹窗 联系客服 -->
+    <el-dialog
+      title="客服电话"
+      :visible.sync="contact"
+      width="19.1875rem"
+      top="12.5rem"
+      center
+      class="myDialog"
+    >
+      <span class="telephone">0755-86526342</span>
+      <span slot="footer" class="dialog-footer">
+        <span @click="contact = false">取消</span>
+        <span>|</span>
+        <span type="primary" @click="callPhone()">拨打</span>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  // import { getCode, NextStep } from "@/api/login/login";
+  import "@/styles/newStyle.scss";
+  import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
+  import { checkMobile } from "@/utils/tools";
+  import { hex_md5 } from "@/utils/md5";
+
+  export default {
+    data() {
+      var checkMobileRule = (rule, value, callback) => {
+        if (!checkMobile(value)) {
+          callback(new Error("请填写正确的手机号"));
+        } else {
+          callback();
+        }
+      };
+      return {
+        phone: "",
+        code: "",
+        psd: "",
+        contact: false,
+        count_downing: false,
+        count_down: 0,
+        aespass: "",
+        forgetForm: {
+          phone: "",
+          code: ""
+        },
+        rules: {
+          phone: [
+            { required: true, message: "手机号码不能为空" },
+            { validator: checkMobileRule }
+          ],
+          code: [{ required: true, message: "验证码不能为空" }]
+        },
+        loginshow: false,
+        loginshowtwo: true,
+        codeshow: false,
+        codeshowtwo: true
+      };
+    },
+    created() {
+      this.GetCodeInit();
+      this.forgetForm.phone = this.$store.getters.user.admin.mobile
+    },
+    methods: {
+      modifyAndLogin() {
+        if (this.forgetForm.phone.trim().length == 0) {
+          this.$toast({
+            message: "手机号码不能为空!"
+          });
+          return;
+        }
+        if (!checkMobile(this.forgetForm.phone)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+        if (this.forgetForm.code.trim().length == 0) {
+          this.$toast({
+            message: "验证码不能为空!"
+          });
+          return;
+        }
+
+        let params = {
+          mobile: this.forgetForm.phone,
+          code: this.forgetForm.code,
+          password: hex_md5(this.psd)
+        };
+        forgetPassWord(params).then(response => {
+          if (response.data.state === 1) {
+            this.$router.go(-1)
+          }else{
+
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      GetCodeInit() {
+        getCodeInit().then(response => {
+          if (response.data.state === 1) {
+            this.aespass = response.data.data.aespass;
+          }
+        });
+      },
+      getVerifyCode() {
+        if (this.forgetForm.phone.length == 0) {
+          this.$toast({
+            message: "手机号码不能为空!"
+          });
+          return;
+        }
+        if (!checkMobile(this.forgetForm.phone)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+
+        if (!this.count_downing) {
+          let parms = {
+            phone: this.forgetForm.phone,
+            aespass: this.aespass
+          };
+          getVerifyCode(parms).then(response => {
+            if (response.data.state === 1) {
+              this.count_downing = true;
+              this.count_down = 61;
+              this.countDown();
+            }
+          });
+        }
+      },
+
+      callPhone() {
+        window.location.href = "tel://075586526342";
+      },
+      countDown: function() {
+        this.count_down = this.count_down - 1;
+        if (this.count_down === 0) {
+          this.count_downing = false;
+          return;
+        }
+        var t = this;
+        setTimeout(() => {
+          this.countDown();
+        }, 1000);
+      },
+      watchNum() {
+        if (this.forgetForm.phone.length === 11) {
+          this.codeshow = true;
+          this.codeshowtwo = false;
+        } else {
+          this.codeshow = false;
+          this.codeshowtwo = true;
+        }
+
+        if (
+          this.forgetForm.phone === "" ||
+          this.forgetForm.code === "" ||
+          this.psd === ""
+        ) {
+          this.loginshow = false;
+          this.loginshowtwo = true;
+        } else {
+          this.loginshow = true;
+          this.loginshowtwo = false;
+        }
+      },
+      change(value) {
+        this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
+      }
+    },
+    computed: {
+      code_btn_title: function() {
+        if (this.count_down == 0) {
+          return "获取验证码";
+        } else {
+          return "重新发送(" + this.count_down + ")";
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .page_noPassword {
+    overflow: hidden;
+    height: 100%;
+  .nopasswordTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .forgetmyInput {
+    margin-top: 4rem;
+  .phoneLine {
+    width: 84%;
+    margin: 0 auto;
+    display: flex;
+    border-bottom: 1px solid #e6e6e6;
+  .mobile {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+    line-height: 3.375rem;
+    width: 1.5rem;
+  }
+  .phoneInput {
+    width: 95%;
+  }
+  }
+
+  .lock {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+    line-height: 3.375rem;
+    width: 1.5rem;
+  }
+  .code {
+    line-height: 3.375rem;
+    width: 84%;
+    height: 3.375rem;
+    margin: 0 auto;
+    border-bottom: 1px solid #e6e6e6;
+    display: flex;
+    align-items: center;
+
+  .dunpai {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+  }
+  .el-input {
+    float: left;
+    width: 10.6rem;
+    border: none;
+    padding: 0;
+  }
+  .el-input__inner {
+    padding: 0;
+    padding-left: 0.75rem;
+  }
+  .getCode {
+  // float: left;
+    width: 5.75rem;
+    height: 2rem;
+    line-height: 2rem;
+    text-align: center;
+    color: #fff;
+    background: #338afb;
+    border-radius: 1.4375rem;
+    font-size: 0.8125rem;
+  }
+  .getCodetwo {
+    width: 5.75rem;
+    height: 2rem;
+  // line-height: 2rem;
+    text-align: center;
+    color: #fff;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    font-size: 0.8125rem;
+  }
+
+  .el-button--primary {
+    border-color: transparent;
+  }
+  }
+  }
+  .login {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: linear-gradient(
+      -90deg,
+      rgba(129, 159, 246, 1),
+      rgba(81, 119, 238, 1),
+      rgba(75, 102, 234, 1)
+    );
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .problem {
+    width: 84%;
+    font-size: 0.8125rem;
+    margin: 15rem auto 0;
+    text-align: center;
+  span {
+    color: #338afb;
+  }
+  }
+  }
+
+  .el-form-item__error {
+    margin-left: 2.5rem;
+  }
+
+  .logintwo {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .el-button--medium {
+    padding: 0;
+  }
+</style>
+<style lang="scss">
+  .forgetmyInput {
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .el-input {
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+    padding-left: 0;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+    color: #acacac;
+  }
+
+  .phoneLine {
+  .el-input__clear {
+    margin-right: 0.625rem;
+  }
+  .el-input__icon {
+    line-height: 3.375rem;
+    font-size: 1.5rem;
+  }
+  }
+  }
+  .myDialog {
+    line-height: 50%;
+    height: 100%;
+  .el-dialog {
+    border-radius: 10px;
+  }
+  .el-dialog__title {
+    color: #000000;
+  }
+  .telephone {
+    width: 12.5rem;
+    height: 1.125rem;
+    font-size: 1.5rem;
+    font-weight: 500;
+    color: #338afb;
+    margin-left: 2.5rem;
+  }
+  .dialog-footer {
+  > span:nth-of-type(1) {
+    color: #9b9b9b;
+  }
+  > span:nth-of-type(2) {
+    padding: 0 3.125rem;
+    color: #e6e6e6;
+  }
+  > span:nth-of-type(3) {
+    color: #000000;
+  }
+  }
+  }
+</style>

src/pages/my/modifyingName.vue

@@ -3,15 +3,57 @@
     <div class="modifyingNameTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">修改姓名</span>
-      <span>保存</span>
+      <span @click="saveName">保存</span>
     </div>
     <div class="nameBox">
-      <van-field v-model="value" placeholder="请填写姓名" />
+      <van-field v-model="name" placeholder="请填写姓名" />
     </div>
   </div>
 </template>
-
-
+<script>
+import { saveName, getMyInforName } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      name: "",
+      admin_user_id: 0
+    };
+  },
+  methods: {
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
+        if (response.data.state === 1) {
+          var Rolename = response.data.data.Rolename;
+          var username = response.data.data.Username;
+          if (Rolename.user_name != "") {
+            this.name = Rolename.user_name;
+          }
+          if (Rolename.user_name == "") {
+            this.name = username.name;
+          }
+        }
+      });
+    },
+    saveName() {
+      if (this.name === "") {
+        this.$toast("姓名不能为空");
+        return false;
+      }
+      saveName(this.admin_user_id, this.name).then(response => {
+        if (response.data.state === 1) {
+          var role = response.data.data.role;
+          this.$router.push("/myInfo?id=" + this.admin_user_id);
+        }
+      });
+    }
+  },
+  created() {
+    var id = this.$route.query.id;
+    this.getMyInforName(id);
+    this.admin_user_id = id;
+  }
+};
+</script>
 <style lang="scss" scoped>
 .page_modifyingName {
   height: 100%;

src/pages/my/myInfo.vue

@@ -17,15 +17,13 @@
           <van-icon class="arrow" name="arrow" />
         </div>
       </div>
-      <router-link to="/editname">
-        <div class="infoBoxTwo">
+        <div class="infoBoxTwo" @click="editName">
           <p>姓名</p>
           <div class="infoBoxOneRight">
             <p>{{ roleInfo.user_name }}</p>
             <van-icon class="arrow" name="arrow" />
           </div>
         </div>
-      </router-link>
       <div class="infoBoxTwo" @click="show = true">
         <p>性别</p>
         <div class="infoBoxOneRight">
@@ -73,7 +71,7 @@
 </template>
 
 <script>
-import { getMyInformation, SaveSex, SaveBirthday } from "@/api/patient/patient";
+import { getMyInforName, SaveSex, SaveBirthday } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
@@ -86,7 +84,11 @@ export default {
       minDate: new Date(1900, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      roleInfo: {},
+      roleInfo: {
+        avatar: "",
+        user_name: "",
+        message: ""
+      },
       admin_user_id: "",
       form: {
         sex: ""
@@ -94,12 +96,11 @@ export default {
     };
   },
   methods: {
-    getMyInformation() {
-      getMyInformation().then(response => {
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
         if (response.data.state === 1) {
-          var sinature = response.data.data.electronic_signature;
-          console.log("sinature", sinature);
-          var roleInfo = response.data.data.roleInfo;
+          var roleInfo = response.data.data.Rolename;
+          var username = response.data.data.Username;
           if (roleInfo.sex === 1) {
             this.sex = "男";
           }
@@ -107,14 +108,22 @@ export default {
             this.sex = "女";
           }
           this.birthday = this.getTime(roleInfo.birthday);
-          console.log("roleInfo", roleInfo);
-          this.roleInfo = roleInfo;
+          this.roleInfo.user_name = roleInfo.user_name;
+          this.roleInfo.avatar = roleInfo.avatar;
+          this.roleInfo.message = roleInfo.message;
+          if (roleInfo.user_name == "") {
+            this.roleInfo.user_name = username.name;
+          }
+          this.userName = username;
         }
       });
     },
     toMyPersonalsign() {
       this.$router.push("/personalsign?id=" + this.admin_user_id);
     },
+    editName() {
+      this.$router.push("/editname?id=" + this.admin_user_id);
+    },
     onConfirm(value) {
       if (value === "男") {
         this.form.sex = 1;
@@ -127,6 +136,7 @@ export default {
         if (response.data.state === 1) {
           var role = response.data.data.role;
           this.sex = value;
+          this.getMyInformation(this.admin_user_id);
         }
       });
 
@@ -157,19 +167,23 @@ export default {
         if (response.data.state === 1) {
           var role = response.data.data.role;
           this.birthday = this.birthday;
+          this.getMyInformation(this.admin_user_id);
         }
       });
       this.show1 = false;
     },
     getTime(time) {
+      if (time == 0) {
+        return "";
+      }
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       return uParseTime(time, "{y}-{m}-{d}");
     }
   },
   created() {
-    this.getMyInformation();
     var id = this.$route.query.id;
     this.admin_user_id = id;
+    this.getMyInforName(id);
   }
 };
 </script>

src/pages/my/organizationInfo.vue

@@ -39,7 +39,11 @@
   </div>
 </template>
 <script>
-import { getOrgName, getRoleName } from "@/api/patient/patient";
+import {
+  getOrgName,
+  getRoleName,
+  getAllOrganization
+} from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -110,6 +114,12 @@ export default {
           this.positionName = positionName.user_type;
         }
       });
+    },
+    getAllOrganization(id) {
+      getAllOrganization(id).then(response => {
+        if (response.data.state == 1) {
+        }
+      });
     }
   },
   created() {
@@ -119,6 +129,7 @@ export default {
     console.log("id", id);
     this.getOrgName();
     this.getRoleName(id);
+    this.getAllOrganization(id);
   }
 };
 </script>

src/pages/my/personalSign.vue

@@ -18,7 +18,7 @@
   </div>
 </template>
 <script>
-import { SaveMessage } from "@/api/patient/patient";
+import { getMyInformation, SaveMessage } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -27,6 +27,15 @@ export default {
     };
   },
   methods: {
+    getMyInformation(id) {
+      getMyInformation(id).then(response => {
+        if (response.data.state === 1) {
+          var roleInfo = response.data.data.roleInfo;
+          console.log("roleInfo", roleInfo);
+          this.message = roleInfo.message;
+        }
+      });
+    },
     SaveMessage() {
       const params = {
         id: this.admin_user_id,
@@ -45,6 +54,7 @@ export default {
     var id = this.$route.query.id;
     this.admin_user_id = id;
     // console.log("id是什么", id);
+    this.getMyInformation(id);
   }
 };
 </script>

src/pages/patientManagement/components/Blood.vue

@@ -71,6 +71,9 @@ export default {
   props: {
     searchValue: String
   },
+  props: {
+    seacherActive: Number
+  },
   data() {
     return {
       value: "",
@@ -81,7 +84,7 @@ export default {
       type: "归转状态",
       typeOne: "患者来源",
       columns: ["留治", "转出"],
-      columnsOne: ["门诊", "转院"],
+      columnsOne: ["门诊", "住院"],
       searchVal: "",
       active: 0,
       list: [],
@@ -111,7 +114,11 @@ export default {
       list: [],
       loading: false,
       finished: false,
-      patients: []
+      patients: [],
+      form: {
+        transfer_status: 0,
+        patients_source: 0
+      }
     };
   },
   methods: {
@@ -119,19 +126,70 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
-      this.type = value;
-      this.typeShow = false;
+      this.page = 1;
+      if (value === "留治") {
+        this.form.transfer_status = 1;
+        this.type = value;
+        this.typeShow = false;
+        this.patients = [];
+        this.getAllBloodDialysisPatient(
+          this.page,
+          this.limit,
+          this.form.transfer_status,
+          this.form.patients_source
+        );
+      }
+      if (value === "转出") {
+        this.form.transfer_status = 2;
+        this.type = value;
+        this.typeShow = false;
+        this.patients = [];
+        this.getAllBloodDialysisPatient(
+          this.page,
+          this.limit,
+          this.form.transfer_status,
+          this.form.patients_source
+        );
+      }
     },
     onCancelOne(value) {
       this.typeOne = value;
       this.typeShowOne = false;
     },
     onConfirmOne(value) {
-      this.typeOne = value;
-      this.typeShowOne = false;
+      this.page = 1;
+      if (value === "门诊") {
+        this.form.patients_source = 1;
+        this.typeOne = value;
+        this.typeShowOne = false;
+        this.patients = [];
+        this.getAllBloodDialysisPatient(
+          this.page,
+          this.limit,
+          this.form.transfer_status,
+          this.form.patients_source
+        );
+      }
+      if (value === "住院") {
+        this.form.patients_source = 2;
+        this.typeOne = value;
+        this.typeShowOne = false;
+        this.patients = [];
+        this.getAllBloodDialysisPatient(
+          this.page,
+          this.limit,
+          this.form.transfer_status,
+          this.form.patients_source
+        );
+      }
     },
     getAllBloodDialysisPatient() {
-      getAllBloodDialysisPatient(this.page, this.limit).then(response => {
+      getAllBloodDialysisPatient(
+        this.page,
+        this.limit,
+        this.form.transfer_status,
+        this.form.patients_source
+      ).then(response => {
         if (response.data.state === 1) {
           var patient = response.data.data.bloodpatient;
           let arr = this.patients;
@@ -160,7 +218,12 @@ export default {
       }, 1000);
     },
     toPatientDetail(id) {
-      this.$router.push("/patientdetail?patientid=" + id);
+      this.$router.push(
+        "/patientdetail?patientid=" +
+          id +
+          "&seacherActive=" +
+          this.seacherActive
+      );
     },
     SearchAllBlood(val) {
       SearchAllBlood(val).then(response => {

src/pages/patientManagement/components/Member.vue

@@ -20,12 +20,18 @@
 </template>
 
 <script>
-import { getAllMemberPatient, getMemberSearchPatient } from '@/api/patient/patient'
+import {
+  getAllMemberPatient,
+  getMemberSearchPatient
+} from "@/api/patient/patient";
 export default {
   props: {
     searchValue: String
   },
-  data () {
+  props: {
+    seacherActive: Number
+  },
+  data() {
     return {
       loading: false,
       finished: false,
@@ -34,62 +40,67 @@ export default {
       total: 0,
       patients: [],
       list: []
-    }
+    };
   },
   methods: {
-    getAllMemberPatient () {
+    getAllMemberPatient() {
       getAllMemberPatient(this.page, this.limit).then(response => {
         if (response.data.state === 1) {
-          var patients = response.data.data.memberpatient
-          let arr = this.patients
-          arr.push(...patients)
-          this.patients = arr
-          var total = response.data.data.total
-          this.total = total
+          var patients = response.data.data.memberpatient;
+          let arr = this.patients;
+          arr.push(...patients);
+          this.patients = arr;
+          var total = response.data.data.total;
+          this.total = total;
         }
-      })
+      });
     },
-    onLoad () {
+    onLoad() {
       setTimeout(() => {
         for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1)
+          this.list.push(this.list.length + 1);
         }
         // 加载状态结束
-        this.loading = false
+        this.loading = false;
         if (this.patients.length > 10) {
-          this.page++
+          this.page++;
         }
-        this.getAllSlowPatient(this.page, this.limit)
+        this.getAllSlowPatient(this.page, this.limit);
         // 数据全部加载完成
         if (this.list.length >= this.total) {
-          this.finished = true
+          this.finished = true;
         }
-      }, 1000)
+      }, 1000);
     },
-    toPatientDetail (id) {
-      this.$router.push('/patientdetail?patientid=' + id)
+    toPatientDetail(id) {
+      this.$router.push(
+        "/patientdetail?patientid=" +
+          id +
+          "&seacherActive=" +
+          this.seacherActive
+      );
     },
-    getMemberSearchPatient (value) {
+    getMemberSearchPatient(value) {
       getMemberSearchPatient(value).then(response => {
         if (response.data.state === 1) {
-          var memberpatient = response.data.data.memberPatient
+          var memberpatient = response.data.data.memberPatient;
         }
-      })
+      });
     }
   },
-  created () {
+  created() {
     if (this.searchValue) {
-      this.getMemberSearchPatient(this.searchValue)
+      this.getMemberSearchPatient(this.searchValue);
     } else {
-      this.getAllMemberPatient()
+      this.getAllMemberPatient();
     }
   },
   watch: {
-    searchValue (newVal) {
-      this.getMemberSearchPatient(newVal)
+    searchValue(newVal) {
+      this.getMemberSearchPatient(newVal);
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/pages/patientManagement/components/Slow.vue

@@ -19,15 +19,15 @@
 </template>
 
 <script>
-import {
-  getAllSlowPatient,
-  getSlowSearchPatient
-} from '@/api/patient/patient'
+import { getAllSlowPatient, getSlowSearchPatient } from "@/api/patient/patient";
 export default {
   props: {
     searchValue: String
   },
-  data () {
+  props: {
+    seacherActive: Number
+  },
+  data() {
     return {
       loading: false,
       finished: false,
@@ -36,63 +36,68 @@ export default {
       total: 0,
       patients: [],
       list: []
-    }
+    };
   },
   methods: {
-    getAllSlowPatient () {
+    getAllSlowPatient() {
       getAllSlowPatient(this.page, this.limit).then(response => {
         if (response.data.state === 1) {
-          var patients = response.data.data.slowpatient
-          let arr = this.patients
-          arr.push(...patients)
-          this.patients = arr
-          var total = response.data.data.total
-          this.total = total
+          var patients = response.data.data.slowpatient;
+          let arr = this.patients;
+          arr.push(...patients);
+          this.patients = arr;
+          var total = response.data.data.total;
+          this.total = total;
         }
-      })
+      });
     },
-    onLoad () {
+    onLoad() {
       setTimeout(() => {
         for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1)
+          this.list.push(this.list.length + 1);
         }
         // 加载状态结束
-        this.loading = false
+        this.loading = false;
         if (this.patients.length > 10) {
-          this.page++
+          this.page++;
         }
-        this.getAllSlowPatient(this.page, this.limit)
+        this.getAllSlowPatient(this.page, this.limit);
         // 数据全部加载完成
         if (this.list.length >= this.total) {
-          this.finished = true
+          this.finished = true;
         }
-      }, 1000)
+      }, 1000);
     },
-    toPatientDetail (id) {
-      this.$router.push('/patientdetail?patientid=' + id)
+    toPatientDetail(id) {
+      this.$router.push(
+        "/patientdetail?patientid=" +
+          id +
+          "&seacherActive=" +
+          this.seacherActive
+      );
     },
-    getSlowSearchPatient (val) {
+    getSlowSearchPatient(val) {
       getSlowSearchPatient(val).then(response => {
         if (response.data.state === 1) {
-          var slowpatient = response.data.data.slowPatient
-          this.patients = slowpatient
+          var slowpatient = response.data.data.slowPatient;
+          this.patients = slowpatient;
         }
-      })
+      });
     }
   },
-  created () {
+  created() {
     if (this.searchValue) {
-      this.getSlowSearchPatient(this.searchValue)
+      this.getSlowSearchPatient(this.searchValue);
     } else {
-      this.getAllSlowPatient()
+      this.getAllSlowPatient();
     }
   },
   watch: {
-    searchValue (newVal) {
-      this.getSlowSearchPatient(newVal)
+    searchValue(newVal) {
+      this.getSlowSearchPatient(newVal);
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/pages/patientManagement/patientManagement.vue

@@ -14,7 +14,7 @@
       </div>
     </van-sticky>
     <div class="chooseBox">
-      <van-tabs v-model="active">
+      <van-tabs v-model="active" @change="changeActive">
         <van-tab title="全部患者">
           <div class="patientBox">
             <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
@@ -31,13 +31,13 @@
           </div>
         </van-tab>
         <van-tab title="血透患者">
-          <Blood :searchValue="value"></Blood>
+          <Blood :searchValue="value" :seacherActive="active"></Blood>
         </van-tab>
         <van-tab title="慢病患者">
-          <Slow :searchValue="value"></Slow>
+          <Slow :searchValue="value" :seacherActive="active"></Slow>
         </van-tab>
         <van-tab title="会员患者">
-          <Member :searchValue="value"></Member>
+          <Member :searchValue="value" :seacherActive="active"></Member>
         </van-tab>
       </van-tabs>
     </div>
@@ -138,7 +138,9 @@ export default {
       this.$router.push("/addPatints");
     },
     toPatientDetail(id) {
-      this.$router.push("/patientdetail?patientid=" + id);
+      this.$router.push(
+        "/patientdetail?patientid=" + id + "&seacherActive=" + this.active
+      );
     },
     SearchAllPatient(val) {
       SearchAllPatient(val).then(response => {
@@ -147,6 +149,9 @@ export default {
           this.patients = patient;
         }
       });
+    },
+    changeActive(name, title) {
+      this.active = name;
     }
   },
   created() {

src/pages/search/index.vue

@@ -89,8 +89,7 @@ export default {
   },
   created() {
     this.historyWord = localStorage.getItem("searchWord");
-    this.historyWord = this.historyWord.split(","); //将字符串转成数组
-    console.log();
+    this.historyWord = this.historyWord.split(","); // 将字符串转成数组
   }
 };
 </script>

src/pages/waitingRoom/components/dialog/addMonitor.vue

@@ -194,7 +194,7 @@ export default {
         symptom: "", // 症状
         dispose: "", // 处理
         result: "", // 结果
-        monitoring_nurse: this.$store.getters.user.user.id // 监测人
+        monitoring_nurse: this.$store.getters.user.admin.id // 监测人
       },
       doctor: this.$store.getters.user.user.user_name
     };

src/permission.js

@@ -1,21 +1,22 @@
-import router from "./router";
-import store from "./store";
-import  isLogin  from "@/api/login";
+import router from './router'
+import store from './store'
+import isLogin from '@/api/login'
 
-const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/myIndex","/patients","/addPatints","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
+const loginWhiteList = ['/', '/login', '/privacy', '/forgetPassword', '/userAgreement', '/nopassword', '/forget', '/register', '/setname', '/join', '/createorg'] // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
   //   next()
   //   return
-  console.log(store.getters.user.admin)
   if (store.getters.user.admin == null) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      next();
+      next()
     } else {
-      next({ path: "/" });
+      next({
+        path: '/'
+      })
     }
   } else {
-    next();
+    next()
   }
-});
+})

src/router/index.js

@@ -1,148 +1,140 @@
-import Vue from "vue";
-import Router from "vue-router";
+import Vue from 'vue'
+import Router from 'vue-router'
 
-Vue.use(Router);
+Vue.use(Router)
 
 export default new Router({
-  routes: [
-    {
-      path: "/",
-      name: "Home",
-      component: () => import("@/pages/home/verifyToken")
+  routes: [{
+      path: '/',
+      name: 'Home',
+      component: () => import('@/pages/home/verifyToken')
     },
     {
-      path: "/login",
-      name: "Home",
-      component: () => import("@/pages/home/login")
+      path: '/login',
+      name: 'Home',
+      component: () => import('@/pages/home/login')
     },
     {
-      path: "/nopassword",
-      name: "Home",
-      component: () => import("@/pages/home/noPassword")
+      path: '/nopassword',
+      name: 'Home',
+      component: () => import('@/pages/home/noPassword')
     },
     {
-      path: "/setname",
-      name: "Home",
-      component: () => import("@/pages/home/register/name")
+      path: '/setname',
+      name: 'Home',
+      component: () => import('@/pages/home/register/name')
     },
     {
-      path: "/register",
-      name: "Home",
-      component: () => import("@/pages/home/register/register")
+      path: '/register',
+      name: 'Home',
+      component: () => import('@/pages/home/register/register')
     },
     {
-      path: "/join",
-      name: "Home",
-      component: () => import("@/pages/home/noJoinedGroup")
+      path: '/join',
+      name: 'Home',
+      component: () => import('@/pages/home/noJoinedGroup')
     },
     {
-      path: "/forget",
-      name: "Home",
-      component: () => import("@/pages/home/forgetPassword")
+      path: '/forget',
+      name: 'Home',
+      component: () => import('@/pages/home/forgetPassword')
     },
     {
-      path: "/createorg",
-      name: "Home",
-      component: () => import("@/pages/home/createOrg")
+      path: '/createorg',
+      name: 'Home',
+      component: () => import('@/pages/home/createOrg')
     },
     // 首页
     {
-      path: "/myIndex",
-      name: "myIndex",
-      component: () => import("@/pages/home/index"),
-      children: [
-        {
-          path: "/homeIndex",
-          component: () => import("@/pages/homeIndex/index.vue"),
+      path: '/myIndex',
+      name: 'myIndex',
+      component: () => import('@/pages/home/index'),
+      children: [{
+          path: '/homeIndex',
+          component: () => import('@/pages/homeIndex/index.vue'),
           meta: {
             noCache: true // 不会被 <keep-alive> 缓存
           }
         },
         // 我的
         {
-          path: "/newMy",
-          name: "newMy",
-          component: () => import("@/pages/my/index")
+          path: '/newMy',
+          name: 'newMy',
+          component: () => import('@/pages/my/index')
         },
         // 商城
         {
-          path: "/shop",
-          name: "shop",
-          component: () => import("@/pages/shop/index")
+          path: '/shop',
+          name: 'shop',
+          component: () => import('@/pages/shop/index')
         }
       ]
     },
 
     {
-      path: "/perfectOrg",
-      component: () => import("@/pages/org"),
+      path: '/perfectOrg',
+      component: () => import('@/pages/org'),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
     },
     {
-      path: "/manageconsole",
-      name: "console",
-      component: () => import("@/pages/console/managementConsole")
+      path: '/manageconsole',
+      name: 'console',
+      component: () => import('@/pages/console/managementConsole')
     },
     {
-      path: "/manageconsole/staff",
-      name: "staff",
+      path: '/manageconsole/staff',
+      name: 'staff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/staffManagement")
+        import('@/pages/console/managementConsole/staff_role/staffManagement')
     },
     {
-      path: "/staff/editstaff",
-      name: "editstaff",
+      path: '/staff/editstaff',
+      name: 'editstaff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/editStaff")
-    },
-    {
-      path: "/staff/addstaff",
-      name: "addstaff",
+        import('@/pages/console/managementConsole/staff_role/editStaff')
+    }, {
+      path: '/staff/addstaff',
+      name: 'addstaff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/addStaff")
+        import('@/pages/console/managementConsole/staff_role/addStaff')
     },
 
     {
-      path: "/manageconsole/role",
-      name: "role",
+      path: '/manageconsole/role',
+      name: 'role',
       component: () =>
-        import(
-          "@/pages/console/managementConsole/staff_role/privilegeManagement"
-        )
+        import('@/pages/console/managementConsole/staff_role/privilegeManagement')
     },
 
     {
-      path: "/role/user",
-      name: "user",
+      path: '/role/user',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newUser")
+        import('@/pages/console/managementConsole/staff_role/newUser')
     },
 
     {
-      path: "/role/addnewuser",
-      name: "user",
+      path: '/role/addnewuser',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newAddStaff")
-    },
-    {
-      path: "/role/stafflist",
-      name: "user",
+        import('@/pages/console/managementConsole/staff_role/newAddStaff')
+    }, {
+      path: '/role/stafflist',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/employeeList")
-    },
-    {
-      path: "/role/usermanage",
-      name: "user",
+        import('@/pages/console/managementConsole/staff_role/employeeList')
+    }, {
+      path: '/role/usermanage',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/userManage")
-    },
-    {
-      path: "/role/addrole",
-      name: "add_role",
+        import('@/pages/console/managementConsole/staff_role/userManage')
+    }, {
+      path: '/role/addrole',
+      name: 'add_role',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newAddRole")
+        import('@/pages/console/managementConsole/staff_role/newAddRole')
     },
 
     //
@@ -154,225 +146,259 @@ export default new Router({
     // },
 
     {
-      path: "/role/editrole",
-      name: "editrole",
+      path: '/role/editrole',
+      name: 'editrole',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/editRole")
+        import('@/pages/console/managementConsole/staff_role/editRole')
     },
     {
-      path: "/role/subpurview",
-      name: "purview",
+      path: '/role/subpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/subPurview")
+        import('@/pages/console/managementConsole/staff_role/subPurview')
     },
     {
-      path: "/role/otherpurview",
-      name: "purview",
+      path: '/role/otherpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/otherPurview")
-    },
-    {
-      path: "/role/functionpurview",
-      name: "purview",
+        import('@/pages/console/managementConsole/staff_role/otherPurview')
+    }, {
+      path: '/role/functionpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/functionPurview")
+        import('@/pages/console/managementConsole/staff_role/functionPurview')
     },
     // 患者中心
     {
-      path: "/patients",
-      name: "patients",
-      component: () => import("@/pages/patientManagement/patientManagement")
+      path: '/patients',
+      name: 'patients',
+      component: () => import('@/pages/patientManagement/patientManagement')
     },
     // 新增病人
     {
-      path: "/addPatints",
-      name: "addpatients",
-      component: () => import("@/pages/patients/addPatient")
+      path: '/addPatints',
+      name: 'addpatients',
+      component: () => import('@/pages/patients/addPatient')
     },
     // 全部病程
     {
-      path: "/coursedetail",
-      name: "coursedetail",
-      component: () => import("@/pages/allCourseManagement/index")
+      path: '/coursedetail',
+      name: 'coursedetail',
+      component: () => import('@/pages/allCourseManagement/index')
     },
     // 全部干体重
     {
-      path: "/dryweight",
-      name: "dryweight",
-      component: () => import("@/pages/allDryWeight/index")
+      path: '/dryweight',
+      name: 'dryweight',
+      component: () => import('@/pages/allDryWeight/index')
     },
     // 基本信息
     {
-      path: "/editPatient",
-      name: "editPatient",
-      component: () => import("@/pages/patients/editPatient")
+      path: '/editPatient',
+      name: 'editPatient',
+      component: () => import('@/pages/patients/editPatient')
     },
     // 全部排班
     {
-      path: "/editScheduling",
-      name: "editscheduling",
-      component: () => import("@/pages/allScheduling/index")
+      path: '/editScheduling',
+      name: 'editscheduling',
+      component: () => import('@/pages/allScheduling/index')
     },
     // 全部透后宣教
     {
-      path: "/editEducation",
-      name: "editeducation",
-      component: () => import("@/pages/allEducation/index")
+      path: '/editEducation',
+      name: 'editeducation',
+      component: () => import('@/pages/allEducation/index')
     },
     // 全部抢救记录
     {
-      path: "/rescuerecord",
-      name: "rescuerecord",
-      component: () => import("@/pages/allRescue/index")
+      path: '/rescuerecord',
+      name: 'rescuerecord',
+      component: () => import('@/pages/allRescue/index')
     },
     //
     {
-      path: "/patientdetail",
-      name: "patientdetail",
-      component: () => import("@/pages/doctorAdvice/index")
+      path: '/patientdetail',
+      name: 'patientdetail',
+      component: () => import('@/pages/doctorAdvice/index')
     },
     // 搜索
     {
-      path: "/search",
-      name: "search",
-      component: () => import("@/pages/search/index")
+      path: '/search',
+      name: 'search',
+      component: () => import('@/pages/search/index')
     },
     // 我的信息
     {
-      path: "/myInfo",
-      name: "myInfo",
-      component: () => import("@/pages/my/myInfo")
+      path: '/myInfo',
+      name: 'myInfo',
+      component: () => import('@/pages/my/myInfo')
     },
     // 意见反馈
     {
-      path: "/feedBack",
-      name: "feedBack",
-      component: () => import("@/pages/my/feedBack")
+      path: '/feedBack',
+      name: 'feedBack',
+      component: () => import('@/pages/my/feedBack')
     },
     // 关于我们
     {
-      path: "/about",
-      name: "about",
-      component: () => import("@/pages/my/aboutUs")
+      path: '/about',
+      name: 'about',
+      component: () => import('@/pages/my/aboutUs')
     },
     // 公司介绍
     {
-      path: "/introduce",
-      name: "introduce",
-      component: () => import("@/pages/my/companyIntroduction")
+      path: '/introduce',
+      name: 'introduce',
+      component: () => import('@/pages/my/companyIntroduction')
     },
     // 更改名字
     {
-      path: "/editname",
-      name: "editname",
-      component: () => import("@/pages/my/modifyingName")
+      path: '/editname',
+      name: 'editname',
+      component: () => import('@/pages/my/modifyingName')
     },
     // 更改名字
     {
-      path: "/personalsign",
-      name: "personalsign",
-      component: () => import("@/pages/my/personalSign")
+      path: '/personalsign',
+      name: 'personalsign',
+      component: () => import('@/pages/my/personalSign')
     },
 
     // 全部长期透析记录
 
     {
-      path: "/alllongdialysis",
-      name: "longdialysis",
-      component: () => import("@/pages/allLongDialysis/index")
+      path: '/alllongdialysis',
+      name: 'longdialysis',
+      component: () => import('@/pages/allLongDialysis/index')
     },
     //,
     {
-      path: "/alldoctoradvice",
-      name: "/alldoctoradvice",
-      component: () => import("@/pages/allDoctorAdvice/index")
+      path: '/alldoctoradvice',
+      name: '/alldoctoradvice',
+      component: () => import('@/pages/allDoctorAdvice/index')
     },
     // 配置中心
     {
-      path: "/configurecenter",
-      name: "configurecenter",
-      component: () => import("@/pages/configureCenter/index")
+      path: '/configurecenter',
+      name: 'configurecenter',
+      component: () => import('@/pages/configureCenter/index')
     },
-    //
+    // 新增分区
     {
-      path: "/organizationinfo",
-      name: "/organizationinfo",
-      component: () => import("@/pages/my/organizationInfo")
+      path: '/addpartition',
+      name: '/addpartition',
+      component: () => import('@/pages/configureCenter/newPartition')
+    },
+    // 新增分组
+    {
+      path: '/addgroup',
+      name: '/addgroup',
+      component: () => import('@/pages/configureCenter/newGrouping')
+    },
+    // 新增床位号
+    {
+      path: '/addbed',
+      name: '/addbed',
+      component: () => import('@/pages/configureCenter/newBed')
+    },
+    // 我的页面管理
+    {
+      path: '/editorg',
+      name: '/editorg',
+      component: () => import('@/pages/patientCenter/editOrg/index')
+    },
+    {
+      path: '/organizationinfo',
+      name: '/organizationinfo',
+      component: () => import('@/pages/my/organizationInfo')
+    },
+    {
+      path: '/main',
+      name: 'main',
+      component: () => import('@/pages/main/index'),
+      meta: {
+        noCache: true // 不会被 <keep-alive> 缓存
+      }
     },
     {
-      path: "/product",
-      name: "Product",
-      component: () => import("@/pages/product/index")
+      path: '/product',
+      name: 'Product',
+      component: () => import('@/pages/product/index')
     },
     {
-      path: "/main",
-      name: "main",
-      component: () => import("@/pages/main/index")
+      path: '/monitoring',
+      name: 'monitorPage',
+      component: () => import('@/pages/monitoring/index')
     },
     {
-      path: "/details",
-      name: "details",
-      component: () => import("@/pages/main/DetailsPage")
+      path: '/details',
+      name: 'details',
+      component: () => import('@/pages/main/DetailsPage')
     },
     {
-      path: "/monitoring",
-      name: "monitorPage",
-      component: () => import("@/pages/monitoring/index")
+      path: '/monitoring',
+      name: 'monitorPage',
+      component: () => import('@/pages/monitoring/index')
     },
     {
-      path: "/my",
-      name: "my",
-      component: () => import("@/pages/personal/index")
+      path: '/my',
+      name: 'my',
+      component: () => import('@/pages/personal/index')
     },
     {
-      path: "/advice",
-      name: "doctorAdvice",
-      component: () => import("@/pages/advice/index")
+      path: '/advice',
+      name: 'doctorAdvice',
+      component: () => import('@/pages/advice/index')
     },
     {
-      path: "/EditPersonal",
-      name: "EditPersonal",
-      component: () => import("@/pages/personal/EditPersonal")
+      path: '/EditPersonal',
+      name: 'EditPersonal',
+      component: () => import('@/pages/personal/EditPersonal')
     },
     {
-      path: "/ElectronicSignature",
-      name: "ElectronicSignature",
-      component: () => import("@/pages/personal/ElectronicSignature")
+      path: '/ElectronicSignature',
+      name: 'ElectronicSignature',
+      component: () => import('@/pages/personal/ElectronicSignature')
     },
     {
-      path: "/Print",
-      name: "Print",
-      component: () => import("@/pages/main/PrintIndex")
+      path: '/Print',
+      name: 'Print',
+      component: () => import('@/pages/main/PrintIndex')
     },
     {
-      path: "/add_urgent_schedule",
-      name: "AddUrgentSchedule",
-      component: () => import("@/pages/main/add_urgent_schedule")
+      path: '/add_urgent_schedule',
+      name: 'AddUrgentSchedule',
+      component: () => import('@/pages/main/add_urgent_schedule')
     },
     {
-      path: "/Prints",
-      name: "Prints",
-      component: () => import("@/pages/main/Print")
+      path: '/Prints',
+      name: 'Prints',
+      component: () => import('@/pages/main/Print')
     },
     {
-      path: "/forgetPassword",
-      name: "forgetPassword",
-      component: () => import("@/pages/personal/ForgetPassword")
+      path: '/forgetPassword',
+      name: 'forgetPassword',
+      component: () => import('@/pages/personal/ForgetPassword')
     },
     {
-      path: "/changePassword",
-      name: "changePassword",
-      component: () => import("@/pages/personal/ChangePassword")
+      path: '/changePassword',
+      name: 'changePassword',
+      component: () => import('@/pages/personal/ChangePassword')
     },
     {
-      path: "/privacy",
-      name: "privacy",
-      component: () => import("@/pages/privacy/index")
+      path: '/privacy',
+      name: 'privacy',
+      component: () => import('@/pages/privacy/index')
     },
     {
-      path: "/userAgreement",
-      name: "userAgreement",
-      component: () => import("@/pages/userAgreement/index")
+      path: '/userAgreement',
+      name: 'userAgreement',
+      component: () => import('@/pages/userAgreement/index')
+    }, {
+      path: '/modifypsw',
+      name: 'modifyPassword',
+      component: () => import('@/pages/my/modifyPassword')
     }
   ]
-});
+})

src/utils/request.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
-import { Toast } from 'mint-ui'
+// import { Toast } from 'mint-ui'
+import { Toast } from "vant";
 
 // create an axios instance
 const service = axios.create({
@@ -26,7 +27,8 @@ service.interceptors.response.use(
         //     location.reload() // 为了重新实例化vue-router对象 避免bug
         //   })
         // })
-        // location.reload()
+        Toast("登录超时")
+        location.reload()
         return Promise.reject('error')
       } else {
         return response