修改中能建问题

src/pages/home/login.vue

@@ -45,7 +45,7 @@ export default {
   computed: {
     loginDisable() {
       // return false
-      return this.form.mobile.length == 0 || /^1[234578]\d{9}$/.test(this.form.mobile) == false || this.form.pwd.length == 0
+      return this.form.mobile.length == 0 || /^1[2345789]\d{9}$/.test(this.form.mobile) == false || this.form.pwd.length == 0
     }
   },
   created() {

src/pages/main/DetailsPage.vue

@@ -125,7 +125,6 @@ export default {
     },
     toMyPatients () {
       var patient_id = this.$route.query.patient_id
-      console.log('patientid是谁呢', patient_id)
       this.$router.push('/mypatients/' + patient_id)
     }
   }

src/pages/main/DialysisArea.vue

@@ -265,7 +265,54 @@ export default {
 
   created () {
     this.user_id = this.$store.getters.user.user.id
-    this.requestDialysisScheduals()
+    
+    var storedata = this.$store.getters.scheduals
+    var scheduals = storedata.scheduals
+    if (Object.keys(storedata).length > 0) {
+      var zoneMap = {}
+      var schedualMap = {}
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index]
+        if (schedual.dialysis_order == null) {
+          continue
+        }
+        if (schedualMap[schedual.device_number.zone.name] == null) {
+          schedualMap[schedual.device_number.zone.name] = []
+        }
+        schedualMap[schedual.device_number.zone.name].push(schedual)
+        if (zoneMap[schedual.device_number.zone.name] == null) {
+          zoneMap[schedual.device_number.zone.name] =
+            schedual.device_number.zone
+        }
+      }
+
+      var zones = []
+      zones.push({ value: 0, text: '全部分区' })
+      for (var zoneName in zoneMap) {
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+      }
+
+      zones = zones.sort(function (a, b) {
+        return a.value > b.value
+      })
+      this.zones = zones
+
+      var dialysis_scheduals = []
+      for (let index = 0; index < zones.length; index++) {
+        const zone = zones[index]
+        var scheduals = schedualMap[zone.text]
+        if (scheduals == null) {
+          continue
+        }
+        dialysis_scheduals.push({
+          zone_name: zone.text,
+          scheduals: scheduals
+        })
+      }
+      this.dialysis_scheduals = dialysis_scheduals
+    } else {
+      this.requestDialysisScheduals()
+    }
   },
   mounted () {
     this.timer = window.setInterval(() => {
@@ -334,7 +381,7 @@ export default {
 
             // console.log(resp.data)
             var scheduals = resp.data.scheduals
-            console.log('scheduals是什么', scheduals)
+            this.$store.dispatch("SetScheduals",{scheduals:scheduals})
             var zoneMap = {}
             var schedualMap = {}
             for (let index = 0; index < scheduals.length; index++) {

src/pages/main/WaitingArea.vue

@@ -186,23 +186,19 @@ export default {
         //   }
         // }
         var zone_name = this.zone_options[this.zone_selected].text
-        console.log(zone_name)
         var schedules = [];
+        var filtedSchedules = [];
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
           const scheduleInfo = this.zone_scheduals[o_i];
           var originSchedules = scheduleInfo.scheduals;
-          var filtedSchedules = [];
+          
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i];
             if(this.zone_selected == 0){
               if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
                 filtedSchedules.push(schedule);
               }
-
             }else{
-              console.log(zone_name)
-              console.log(schedule.device_number.zone.name)
-
               if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
                 if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
                   filtedSchedules.push(schedule);
@@ -210,24 +206,25 @@ export default {
               }
             }
           }
-          if (filtedSchedules.length > 0) {
-            schedules.push({
-              zone_name: scheduleInfo.zone_name,
-              scheduals: filtedSchedules
-            });
-          }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
         }
-        return schedules
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
       }
 
       if (this.time_selected != 0) {
         var zone_name = this.zone_options[this.zone_selected].text
-        console.log(zone_name)
         var schedules = [];
+        var filtedSchedules = [];
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
           const scheduleInfo = this.zone_scheduals[o_i];
           var originSchedules = scheduleInfo.scheduals;
-          var filtedSchedules = [];
+          
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i];
             if(this.zone_selected == 0){
@@ -236,9 +233,6 @@ export default {
               }
 
             }else{
-              console.log(zone_name)
-              console.log(schedule.device_number.zone.name)
-
               if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
                 if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
                   filtedSchedules.push(schedule);
@@ -246,14 +240,15 @@ export default {
               }
             }
           }
-          if (filtedSchedules.length > 0) {
-            schedules.push({
-              zone_name: scheduleInfo.zone_name,
-              scheduals: filtedSchedules
-            });
-          }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
         }
-        return schedules
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
       }
 
       var zone_selected = this.zone_selected;
@@ -263,10 +258,11 @@ export default {
       if (zone_selected != 0 || timetype_selected != 0) {
         var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
         var schedules = [];
+        var filtedSchedules = [];
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
           const scheduleInfo = this.zone_scheduals[o_i];
           var originSchedules = scheduleInfo.scheduals;
-          var filtedSchedules = [];
+          
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i];
             if ( zone_name.length == 0 || (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
@@ -275,15 +271,17 @@ export default {
               }
             }
           }
-          if (filtedSchedules.length > 0) {
-            schedules.push({
-              zone_name: scheduleInfo.zone_name,
-              scheduals: filtedSchedules
-            });
-          }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
         }
 
-        return schedules;
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
+
         if (this.select_index == 2) {
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
@@ -389,7 +387,31 @@ export default {
     if (type != null) {
       this.select_index = parseInt(type);
     }
-    this.requestScheduals();
+   
+    var storedata = this.$store.getters.waitscheduals
+    var scheduals = storedata.waitscheduals
+    if (Object.keys(storedata).length > 0) {
+      var totalCount = scheduals.length;
+      var prescription_count = 0;
+      var assessment_before_dislysis_count = 0;
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index];
+        if (schedual.assessment_before_dislysis == null) {
+          assessment_before_dislysis_count += 1;
+        }
+        if (schedual.prescription == null) {
+          prescription_count += 1;
+        }
+      }
+      this.menuList[2].count = assessment_before_dislysis_count;
+      this.menuList[1].count = prescription_count;
+      this.scheduals = scheduals;
+
+      this.zone_options = this.makeZones(scheduals);
+      this.zone_scheduals = this.processScheduals(scheduals);
+    } else {
+      this.requestScheduals();
+    }
   },
   mounted() {
     this.timer = window.setInterval(() => {
@@ -507,6 +529,7 @@ export default {
             this.loading = false;
 
             var scheduals = resp.data.scheduals;
+            this.$store.dispatch("SetWaitScheduals",{waitscheduals:scheduals})
             var totalCount = scheduals.length;
             var prescription_count = 0;
             var assessment_before_dislysis_count = 0;

src/pages/main/dialog/OrdersDialog.vue

@@ -20,7 +20,7 @@
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >修改执行医嘱</span>
-        <span
+        <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) }"
         >医嘱核对</span>
@@ -47,7 +47,7 @@
               <th width="40%">医嘱内容</th>
               <th width="10%">执行时间</th>
               <th width="10%">执行护士</th>
-              <th width="10%">核对人员</th>
+              <th v-if="template_id != 6" width="10%">核对人员</th>
             </tr>
             <template v-for="(group, group_index) in advice_groups">
               <tr
@@ -230,6 +230,7 @@
     data () {
       return {
         isShowDialog: true,
+        template_id: 0,
         isShowExce: true,
         isShowMofifyExce: false,
         title: '临时医嘱',
@@ -261,6 +262,7 @@
       }
     },
     created () {
+      this.template_id = this.$store.getters.user.template_info.template_id
       var date = this.$route.query && this.$route.query.date
       date *= 1000
       var newDate = new Date(date)
@@ -327,13 +329,13 @@
 
     methods: {
       modifyExecAdvice: function () {
-        if(!this.isPremission){
-          Toast.fail('你没有权限修改医嘱！')
-        }else{
+        // if(!this.isPremission){
+        //   Toast.fail('你没有权限修改医嘱！')
+        // }else{
           this.nowExecTime = new Date(this.currentAdvices[0].start_time * 1000)
           this.$refs.mofify_exec_time.open()
 
-        }
+        // }
 
       },
       didCreateAdvices: function (advices) {

src/pages/main/dialog/ThorougDialog.vue

@@ -1258,33 +1258,31 @@
       let tempMinute = ''
       this.template_id = this.$store.getters.user.template_info.template_id
 
-      if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
-        console.log("111111111")
+      if (this.record != null && this.record.id != '' ) {
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
-      }else  {
-        console.log("2222222")
-
-        if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
-          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
-          this.$set(this.formValue, "weight_after", this.record.weight_after)
-          this.$set(this.formValue, "weight_loss", this.record.weight_loss)
-          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
-          this.$set(this.formValue, "actual_displacement", this.record.actual_displacement)
-          this.$set(this.formValue, "actual_treatment_hour", this.record.actual_treatment_hour)
-          this.$set(this.formValue, "actual_treatment_minute", this.record.actual_treatment_minute)
-        } else {
-          this.$set(this.formValue, "actual_ultrafiltration", '')
-          this.$set(this.formValue, "weight_after", '')
-          this.$set(this.formValue, "weight_loss", '')
-          this.$set(this.formValue, "actual_ultrafiltration", '')
-          this.$set(this.formValue, "actual_displacement", '')
-          this.$set(this.formValue, "actual_treatment_hour", '')
-          this.$set(this.formValue, "actual_treatment_minute", '')
-        }
       }
+      // else  {
+        // if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
+        //   this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+        //   this.$set(this.formValue, "weight_after", this.record.weight_after)
+        //   this.$set(this.formValue, "weight_loss", this.record.weight_loss)
+        //   this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+        //   this.$set(this.formValue, "actual_displacement", this.record.actual_displacement)
+        //   this.$set(this.formValue, "actual_treatment_hour", this.record.actual_treatment_hour)
+        //   this.$set(this.formValue, "actual_treatment_minute", this.record.actual_treatment_minute)
+        // } else {
+          // this.$set(this.formValue, "actual_ultrafiltration", '')
+          // this.$set(this.formValue, "weight_after", '')
+          // this.$set(this.formValue, "weight_loss", '')
+          // this.$set(this.formValue, "actual_ultrafiltration", '')
+          // this.$set(this.formValue, "actual_displacement", '')
+          // this.$set(this.formValue, "actual_treatment_hour", '')
+          // this.$set(this.formValue, "actual_treatment_minute", '')
+        // }
+      // }
 
 
 

src/pages/main/index.vue

@@ -41,56 +41,44 @@
     methods: {
 
       requestScheduals () {
-        var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
-        getWaitingScheduals({date: date}).then(rs => {
-          var resp = rs.data
-          // console.log(resp);
-          if (resp.state == 1) {
-            var scheduals = resp.data.scheduals
-            this.scheduals = scheduals
-            console.log(this.scheduals)
-            let doctorAdvice = []
-            for (let i = 0; i < this.scheduals.length; i++) {
-              for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
-                if(this.scheduals[i].dialysis_order == null ){
-                  if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
-                    doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+        var storedata = this.$store.getters.waitscheduals
+        var scheduals = storedata.waitscheduals
+        if (Object.keys(storedata).length > 0){
+              this.scheduals = scheduals
+              console.log(this.scheduals)
+              let doctorAdvice = []
+              for (let i = 0; i < this.scheduals.length; i++) {
+                for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
+                  if(this.scheduals[i].dialysis_order == null ){
+                    if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                    }
                   }
                 }
               }
-            }
-
-            const sorted = this.groupBy(doctorAdvice, function (item) {
-              return [item.groupno]
-            })
-
 
-            this.unReadWaitNum = sorted.length
+              const sorted = this.groupBy(doctorAdvice, function (item) {
+                return [item.groupno]
+              })
+              this.unReadWaitNum = sorted.length
 
-          } else {
-            this.$toast({
-              message: resp.msg
-            })
-          }
-        })
-      },
-      requestDialysisScheduals () {
-        var date = this.$store.getters.app.dialysis_area.schedule_date
-        var type = 0
-        getDialysisScheduals({type: type, date: parseTime(date, '{y}-{m}-{d}')})
-          .then(rs => {
+        } else {
+          var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
+          getWaitingScheduals({date: date}).then(rs => {
             var resp = rs.data
+             this.$store.dispatch("SetRequestScheduals",{resp})
+            // console.log(resp);
             if (resp.state == 1) {
               var scheduals = resp.data.scheduals
+              this.scheduals = scheduals
+              console.log(this.scheduals)
               let doctorAdvice = []
-              for (let index = 0; index < scheduals.length; index++) {
-                const schedual = scheduals[index]
-                if (schedual.dialysis_order == null) {
-                  continue
-                }
-                for (let y = 0; y < schedual.doctor_advice.length; y++) {
-                  if (schedual.doctor_advice[y].execution_state == 2) {
-                    doctorAdvice.push(schedual.doctor_advice[y])
+              for (let i = 0; i < this.scheduals.length; i++) {
+                for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
+                  if(this.scheduals[i].dialysis_order == null ){
+                    if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                    }
                   }
                 }
               }
@@ -99,7 +87,8 @@
                 return [item.groupno]
               })
 
-              this.unReadDialysisNum = sorted.length
+
+              this.unReadWaitNum = sorted.length
 
             } else {
               this.$toast({
@@ -107,8 +96,67 @@
               })
             }
           })
-          .catch(v => {
+        }
+      },
+      requestDialysisScheduals () {
+        var storedata = this.$store.getters.scheduals
+        var scheduals = storedata.scheduals
+        if (Object.keys(storedata).length > 0){
+          let doctorAdvice = []
+          for (let index = 0; index < scheduals.length; index++) {
+            const schedual = scheduals[index]
+            if (schedual.dialysis_order == null) {
+              continue
+            }
+            for (let y = 0; y < schedual.doctor_advice.length; y++) {
+              if (schedual.doctor_advice[y].execution_state == 2) {
+                doctorAdvice.push(schedual.doctor_advice[y])
+              }
+            }
+          }
+
+          const sorted = this.groupBy(doctorAdvice, function (item) {
+            return [item.groupno]
           })
+
+          this.unReadDialysisNum = sorted.length
+        }else {
+          var date = this.$store.getters.app.dialysis_area.schedule_date
+          var type = 0
+          getDialysisScheduals({type: type, date: parseTime(date, '{y}-{m}-{d}')})
+            .then(rs => {
+              var resp = rs.data
+              this.$store.dispatch("SetRequestDialysisScheduals",{resp})
+              if (resp.state == 1) {
+                var scheduals = resp.data.scheduals
+                let doctorAdvice = []
+                for (let index = 0; index < scheduals.length; index++) {
+                  const schedual = scheduals[index]
+                  if (schedual.dialysis_order == null) {
+                    continue
+                  }
+                  for (let y = 0; y < schedual.doctor_advice.length; y++) {
+                    if (schedual.doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(schedual.doctor_advice[y])
+                    }
+                  }
+                }
+
+                const sorted = this.groupBy(doctorAdvice, function (item) {
+                  return [item.groupno]
+                })
+
+                this.unReadDialysisNum = sorted.length
+
+              } else {
+                this.$toast({
+                  message: resp.msg
+                })
+              }
+            })
+            .catch(v => {
+            })
+          }
       }, groupBy (array, f) {
         const groups = {}
         array.forEach(function (o) {

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -133,7 +133,7 @@
                 <div class="inline_block" style="margin-left:10px;">
                   血管通路：
                   <div class="under_line" style="width: 200px;text-align: center;">
-                    {{predialysis.blood_access_part_id?blood_access_part[predialysis.blood_access_part_id]['name']:''}} {{predialysis.blood_access_part_opera_name}}
+                    {{QueryPartById(predialysis.blood_access_part_id)}} {{predialysis.blood_access_part_opera_name}}
                   </div>
                 </div>
               </div>
@@ -748,6 +748,18 @@
       }
     },
     methods: {
+      QueryPartById: function (val) {
+        let vascular_access_part_name = '/'
+        let vascular_access = getDataConfig('hemodialysis', 'vascular_access')
+
+        for (let i = 0; i < vascular_access.length; i++) {
+          if (vascular_access[i].id == val) {
+            vascular_access_part_name = vascular_access[i].name
+          }
+        }
+        return vascular_access_part_name
+
+      },
       getAdminUser(id) {
         if (id == 0) {
           return ''

src/pages/main/today/TodayTab.vue

@@ -389,6 +389,7 @@
       this.date = date
       this.requestDialysisRecord()
       this.requestLongAdvice()
+      this.goTop()
 
     },
     mounted () {
@@ -763,6 +764,14 @@
           console.log(resp)
 
           if (resp.state == 1) {
+            
+            var waitstoredata = this.$store.getters.waitscheduals
+            var waitscheduals = waitstoredata.waitscheduals
+            var storedata = this.$store.getters.scheduals
+            var scheduals = storedata.scheduals
+
+
+
             var patient = resp.data.patient // 患者信息
             var schedual = resp.data.schedual // 患者排班信息
             var prescription = resp.data.prescription // 透析处方
@@ -804,6 +813,33 @@
               resp.data.last_assessment_after_dislysis // 上一次透前评估
             var last_monitor_record = resp.data.last_monitor_record
 
+            
+            if (Object.keys(waitstoredata).length > 0) {
+              for (let index = 0; index < waitscheduals.length; index++) {
+                if(waitscheduals[index].patient_id == patient.id) {
+                  waitscheduals[index].patient = patient
+                  waitscheduals[index].assessment_before_dislysis = predialysis_evaluation
+                  waitscheduals[index].prescription = prescription
+                  waitscheduals[index].doctor_advice = doctor_advices
+                  waitscheduals[index].dialysis_order = dialysis_order
+                }
+              }
+              this.$store.dispatch("SetWaitScheduals",{waitscheduals:waitscheduals})
+            }
+
+            if (Object.keys(storedata).length > 0) {
+              for (let index = 0; index < scheduals.length; index++) {
+                if(scheduals[index].patient_id == patient.id) {
+                  scheduals[index].patient = patient
+                  scheduals[index].assessment_before_dislysis = predialysis_evaluation
+                  scheduals[index].prescription = prescription
+                  scheduals[index].doctor_advice = doctor_advices
+                  scheduals[index].dialysis_order = dialysis_order
+                }
+              }
+              this.$store.dispatch("SetScheduals",{scheduals:scheduals})
+            }
+
             this.patient = patient
             this.schedual = schedual == null ? {} : schedual
             this.prescription = prescription == null ? {id: ''} : prescription
@@ -1185,6 +1221,7 @@
       update_evaluation: function (evaluation) {
         this.predialysis_evaluation = evaluation
         this.closeAssessmentBefore()
+        this.requestDialysisRecord()
       }
       ,
       closeStatOrder: function () {
@@ -1196,6 +1233,7 @@
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
         this.dialysis_order = dialysis_order
+        this.requestDialysisRecord()
         // this.scrollToView('dialysis_computer')
       },
        closeDialysisComputerclose: function (dialysis_order) {
@@ -1214,7 +1252,7 @@
         // this.scrollToView('monitoring')
       }
       ,
-      closeDialysisOff: function (assessment_after_dislysis) {debugger
+      closeDialysisOff: function (assessment_after_dislysis) {
         this.closeDialog(7)
         if (assessment_after_dislysis != undefined) {
           this.assessment_after_dislysis = assessment_after_dislysis

src/pages/main/today/assessmentAfter.vue

@@ -17,7 +17,8 @@
         <li v-if="isShow('实际超滤量')">
           <label for="sjcll">实际超滤量: </label>
           <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
-          <span class="unit">{{actual_ultrafiltration?"L":''}}</span>
+          <span v-if="template_id == 6" class="unit">{{actual_ultrafiltration?"ml":''}}</span>
+          <span v-else class="unit">{{actual_ultrafiltration?"L":''}}</span>
         </li>
         <li v-if="isShow('透析器凝血')">
           <label for="nx">透析器凝血 : </label>
@@ -187,6 +188,7 @@
     data() {
       return {
         title: "透后评估 ",
+        template_id: 0,
         // note: "无明显异常",
         // doctor: "刘小军  医生",
         // info1: [
@@ -216,6 +218,8 @@
       record: {
         type: Object,
       }
+    }, created() {
+      this.template_id = this.$store.getters.user.template_info.template_id
     },
     computed: {
       weight_after: function () {

src/pages/main/today/detailsInfo.vue

@@ -1,4 +1,4 @@
-x<template>
+<template>
   <div class="info ">
     <h2 class="plateTitle"><span class="line"></span><p>基本信息</p><span class="line"></span> </h2>
 

src/pages/main/today/statOrder.vue

@@ -12,7 +12,7 @@
         <th width="31%">医嘱内容</th>
         <th width="18.6%">执行时间</th>
         <th width="10.5%">执行护士</th>
-        <th width="9.4%">核对护士</th>
+        <th v-if="template_id != 6" width="9.4%">核对护士</th>
       </tr>
       <template v-for="(group) in advice_groups">
         <tr v-for="(advice, i) in group.advices" :key="advice.id">
@@ -54,6 +54,7 @@ export default {
   data() {
     return {
       title: "临时医嘱 ",
+      template_id: 0,
       tableDate: [],
     };
   },
@@ -68,6 +69,9 @@ export default {
       }
     }
   },
+   created () {
+      this.template_id = this.$store.getters.user.template_info.template_id
+    },
   methods: {
     setAdvices(advices) {
       if (advices == null) {

src/store/index.js

@@ -11,6 +11,10 @@ import app from './app/app'
 Vue.use(Vuex)
 
 const getters = {
+  requestScheduals: state => state.user.requestScheduals,
+  requestDialysisScheduals: state => state.user.requestDialysisScheduals,
+  scheduals: state => state.user.scheduals,
+  waitscheduals: state => state.user.waitscheduals,
   patient_types: state => state.global_config.patient_types,
   partitions: state => state.global_config.partitions,
   marital_options: state => state.global_config.marital_options,

src/store/user/user.js

@@ -1,45 +1,50 @@
 
 const user = {
   state: {
+
     role_type: 1, // 1.医生 2.护士
+    requestScheduals: {},
+    requestDialysisScheduals: {},
+    waitscheduals: {},
+    scheduals: {},
     user: {
       id: 0,
-      mobile: "",
-      avatar: "",
-      user_name: "",
-      intro: "",
+      mobile: '',
+      avatar: '',
+      user_name: '',
+      intro: '',
       user_type: 0,
-      user_title: 0,
+      user_title: 0
     },
     org: {
       id: 0,
-      org_short_name: "",
-      org_name: "",
-      org_intro: "",
-      org_logo: "",
-      address: "",
+      org_short_name: '',
+      org_name: '',
+      org_intro: '',
+      org_logo: '',
+      address: '',
       province: 0,
       city: 0,
-      district: 0,
+      district: 0
     },
-    serve:{
-      state:0,
-      status:1,
-      start:0,
-      end:0,
+    serve: {
+      state: 0,
+      status: 1,
+      start: 0,
+      end: 0
     },
     subscibe: {
       id: 0,
-			period_start: 0,
-			period_end: 0,
-			state: 3,
+      period_start: 0,
+      period_end: 0,
+      state: 3
     },
-    template_info:{
+    template_info: {
       id: 0,
-      org_id:0,
-      template_id:0,
+      org_id: 0,
+      template_id: 0
     },
-    fileds:[],
+    fileds: []
 
   },
 
@@ -48,7 +53,6 @@ const user = {
       state.fileds = payload.fileds
       console.log(payload.fileds)
       console.log(state.fileds)
-
     },
     SET_USER: (state, user) => {
       state.user.id = user.id
@@ -79,43 +83,66 @@ const user = {
     SET_ROLE_TYPE: (state, type) => {
       state.role_type = type
     },
-    SET_ORG_SERVE:(state, serve)=>{
+    SET_ORG_SERVE: (state, serve) => {
       state.serve.state = serve.state
       state.serve.status = serve.status
       state.serve.start = serve.start
       state.serve.end = serve.end
-    },SET_TEMPLATE:(state, template_info) =>{
+    },
+    // eslint-disable-next-line camelcase
+    SET_TEMPLATE: (state, template_info) => {
       state.template_info.id = template_info.id
       state.template_info.org_id = template_info.org_id
       state.template_info.template_id = template_info.template_id
+    },
+    SET_REQUESTSCHEDUALS: (state, requestScheduals) => {
+      state.requestScheduals = requestScheduals
+    },
+    SET_REQUESTDIALYSISSCHEDUALS: (state, requestDialysisScheduals) => {
+      state.requestDialysisScheduals = requestDialysisScheduals
+    },
+    SET_SCHEDUALS: (state, scheduals) => {
+      state.scheduals = scheduals
+    },
+    SET_WAITSCHEDUALS: (state, waitscheduals) => {
+      state.waitscheduals = waitscheduals
     }
   },
 
   actions: {
-    InitUserInfo({commit}, userInfo) {
+    InitUserInfo ({commit}, userInfo) {
       var user = userInfo.user
       var org = userInfo.org
       var subscibe = userInfo.subscibe
+      // eslint-disable-next-line camelcase
       var template_info = userInfo.template_info
 
       var fileds = userInfo.filed_list
       console.log(userInfo.filed_list)
       console.log(fileds)
 
-      commit("SET_USER", user)
-      commit("SET_ORG", org)
-      commit("SET_SUBSCIBE", subscibe)
-      commit("SET_TEMPLATE", template_info)
+      commit('SET_USER', user)
+      commit('SET_ORG', org)
+      commit('SET_SUBSCIBE', subscibe)
+      commit('SET_TEMPLATE', template_info)
       commit('SET_FILEDS', {
         fileds
       })
-
-
-
-
     },
-    SwitchRoleTypeToDoctor({commit}) {
-      commit("SET_ROLE_TYPE", 1)
+    SwitchRoleTypeToDoctor ({commit}) {
+      commit('SET_ROLE_TYPE', 1)
+    },
+    SetRequestScheduals ({commit}, requestScheduals) {
+      commit('SET_REQUESTSCHEDUALS', requestScheduals)
+    },
+    SetRequestDialysisScheduals ({commit}, requestDialysisScheduals) {
+      commit('SET_REQUESTDIALYSISSCHEDUALS', requestDialysisScheduals)
+    },
+    SetScheduals ({commit}, scheduals) {
+      commit('SET_SCHEDUALS', scheduals)
+    },
+    SetWaitScheduals ({commit}, waitscheduals) {
+      commit('SET_WAITSCHEDUALS', waitscheduals)
     }
   }
 }