Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.2"
+  "version": "1.1.68"
 }

config/prod.env.js

@@ -1,9 +1,9 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
 
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 };

src/pages/home/login.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="container">
+
     <div class="newLogin">
       <div class="login">
         <div class="logo">
@@ -53,12 +54,15 @@
               <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
             <!--</el-checkbox>-->
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
             <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
           <!--</div>-->
+            <span  class="agreeText" @click="agree()">《隐私服务协议》</span>
+
+
         </div>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -131,7 +135,7 @@ export default {
       });
     },
     to: function() {
-      this.$router.push({ path: "/forgetPassword" });
+      this.$router.push({ path: "/privacy" });
     },
     submitForm() {
       const self = this;
@@ -215,9 +219,9 @@ export default {
     //清除cookie
     clearCookie: function() {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
-    },
-    agree() {
-      this.$router.push({ path: "/privacyPolicy" });
+    }, agree() {
+      this.$router.push({ path: "/privacy" });
+
     }
   }
 };

src/pages/main/add_urgent_schedule.vue

@@ -239,7 +239,6 @@
 
       var today = new Date();
       this.date = parseTime(today, "{y}-{m}-{d}");
-
       var hour = today.getHours();
       if (hour > 3 && hour < 11) {
         this.schedule_type = 1;
@@ -248,9 +247,6 @@
       } else {
         this.schedule_type = 3;
       }
-
-
-
     },
     mounted() {
 
@@ -353,7 +349,15 @@
       selectSchTypeAction: function() {
         this.$refs.sch_type_field.blur();
         this.show_sch_type_picker = true;
-
+        //
+        // this.$nextTick(() => {
+        //   // this.$refs.schedule.setColumnIndex(2)
+        //   // .setIndexes(this.schedule_type)
+        //   console.log(this.$refs.schedule)
+        //   console.log(this.$refs.schedule.getColumnIndex)
+        //   console.log(this.$refs.schedule.getColumnValue)
+        //
+        // })
       },
 
       didChangePatient: function(picker, patient, index) {

src/pages/main/dialog/ComputerDialog.vue

@@ -100,6 +100,7 @@
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
         template_id: 0,
+        temp_device_numbers:[],
         blood_drawing:100,
         schedual_type:0,
         schedules_type: [
@@ -136,31 +137,39 @@
       },
     }, mounted () {
 
+
+    },
+    created () {
+      this.temp_device_numbers = this.device_numbers
+
+
+
       if (this.record.id == 0) {
         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){
+          this.schedual_type = 1
+
+        }else if(hour >= 12 && hour < 18){
+
+          this.schedual_type = 2
+
+
+        }else if(hour >= 18){
+          this.schedual_type = 3
+        }
       } else {
         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
 
         } else {
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
-        }
-      }
-    },
-    created () {
-      let now = new Date()
-      let hour = now.getHours()
+          this.schedual_type = this.record.schedual_type
 
-      if (hour >= 6 && hour < 12){
-        this.schedual_type = 1
-
-      }else if(hour >= 12 && hour < 18){
-
-        this.schedual_type = 2
-
-
-      }else if(hour >= 18){
-        this.schedual_type = 3
+        }
       }
 
 
@@ -198,11 +207,11 @@
       // }
       // this.zone_beds = beds
 
-      for (let index = 0; index < this.device_numbers.length; index++) {
-        const device_number = this.device_numbers[index]
-        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['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.zone_beds = this.device_numbers
+      this.zone_beds = this.temp_device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {
@@ -253,12 +262,12 @@
                   Toast.fail(response.data.msg)
                   return false
                 } else {
-                  t.device_numbers = response.data.data.number
-                  for (let index = 0; index < t.device_numbers.length; index++) {
-                    const device_number = t.device_numbers[index]
-                    t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+                  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.device_numbers
+                  t.zone_beds = t.temp_device_numbers
                   t.bed_id = t.zone_beds[0].id
                 }
               })
@@ -281,12 +290,12 @@
               return false
             } else {
               t.zone_beds = []
-              t.device_numbers = response.data.data.number
-              for (let index = 0; index < t.device_numbers.length; index++) {
-                const device_number = t.device_numbers[index]
-                t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              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.device_numbers
+              t.zone_beds = t.temp_device_numbers
               t.bed_id = t.zone_beds[0].id
 
 
@@ -305,12 +314,12 @@
             Toast.fail(response.data.msg)
             return false
           } else {
-            this.device_numbers = response.data.data.number
-            for (let index = 0; index < this.device_numbers.length; index++) {
-              const device_number = this.device_numbers[index]
-              this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+            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.zone_beds = this.device_numbers
+            this.zone_beds = this.temp_device_numbers
           }
         })
       },

src/pages/main/dialog/TreatmentDialog.vue

@@ -241,42 +241,45 @@ export default {
     },
 
     dialysisSummarySelectChange: function(values) {
-      if (this.dialysisSummary.summaryContent == null) {
-        this.dialysisSummary.summaryContent == "";
+      if(this.dialysisSummary.summaryContent == null){
+        this.dialysisSummary.summaryContent == ""
       }
+
       if (this.dialysisSummary.summaryContent == "") {
         this.dialysisSummary.summaryContent = values;
       } else {
-        this.dialysisSummary.summaryContent =
-          this.dialysisSummary.summaryContent + values;
+        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
+          if (
+            this.dialysisSummary.summaryContent
+              .charAt(this.dialysisSummary.summaryContent.length - 1)
+              .indexOf("。") == -1
+          ) {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent + "," + values;
+          } else {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent  + values;
+          }
+        }
       }
     },
     dialysisAfterTeachSelectChange: function(values) {
-      if (this.dialysisSummary.propagandaAndEducationContent == null) {
-        this.dialysisSummary.propagandaAndEducationContent == "";
+      if(this.dialysisSummary.propagandaAndEducationContent == null){
+        this.dialysisSummary.propagandaAndEducationContent == ""
       }
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
         this.dialysisSummary.propagandaAndEducationContent = values;
       } else {
-        this.dialysisSummary.propagandaAndEducationContent =
-          this.dialysisSummary.propagandaAndEducationContent + values;
-        // if (
-        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
-        //   -1
-        // ) {
-        //   if (
-        //     this.dialysisSummary.propagandaAndEducationContent
-        //       .charAt(
-        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
-        //       )
-        //       .indexOf("。") == -1
-        //   ) {
-        //     this.dialysisSummary.propagandaAndEducationContent =
-        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
-        //   } else {
-        //
-        //   }
-        // }
+        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
+          if (
+            this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + "," + values;
+          } else {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + values;
+          }
+        }
       }
     },
     commitInfo: function() {

src/pages/main/today/TodayTab.vue

@@ -227,7 +227,7 @@
       :overlay="true"
       :close-on-click-overlay="false"
     >
-      <monit-dialog
+      <monit-dialog v-if="monit_dialog_reset"
         :monitor_records="monitor_records"
         :last_monitor_record="last_monitor_record"
         :patient="patient"
@@ -371,6 +371,7 @@ import {parseTime} from '@/utils'
         last_prescription:{},
         thoroug_dialog_reset: true,
         prescription_dialog_reset: true,
+        monit_dialog_reset: true,
         receiver_treatment_access: {}, // 接诊评估
         predialysis_evaluation: {}, // 透前评估
         last_predialysis_evaluation: {}, // 上次透前评估
@@ -847,11 +848,6 @@ import {parseTime} from '@/utils'
           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 // 透析处方
@@ -882,13 +878,9 @@ import {parseTime} from '@/utils'
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
           var operators = resp.data.operators // 操作人
-
           var special_premission = resp.data.special_premission // 特殊权限
-
           var config = resp.data.config // 库存自动扣减配置
-
           var types = resp.data.types // 所有系统库存商品类型
-
           var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
           var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record
@@ -922,32 +914,15 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
-          this.prescription_dialog_reset = false
-          this.$nextTick(() => {
-            this.prescription_dialog_reset = true
-          })
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
-
-
-
-          this.receiver_treatment_access =
-              receiver_treatment_access == null
-                ? {id: ''}
-                : receiver_treatment_access
-          this.predialysis_evaluation =
-              predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-              last_predialysis_evaluation == null
-                ? {}
-                : last_predialysis_evaluation
-
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
           this.config = config
           this.goodTypes = types
-
-
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject()
             var initGroupBlock = function (group, advice) {
@@ -1009,27 +984,23 @@ import {parseTime} from '@/utils'
 
           this.double_check = double_check == null ? {id: ''} : double_check
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
-          this.thoroug_dialog_reset = false
-          this.$nextTick(() => {
-            this.thoroug_dialog_reset = true
-          })
-          this.last_assessment_after_dislysis =
-              last_assessment_after_dislysis == null
-                ? {id: ''}
-                : last_assessment_after_dislysis
-          this.treatment_summary =
-              treatment_summary == null ? {id: ''} : treatment_summary
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary = treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-              last_monitor_record == null
-                ? this.last_monitor_record
-                : last_monitor_record
-          this.dialysis_order =
-              dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order =  dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
+          // 强制刷新子组件
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
           this.title = patient.name
 
           dialysisGlobalConfig().then(rs => {
@@ -1534,21 +1505,16 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
+
+
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
 
 
 
-          this.receiver_treatment_access =
-            receiver_treatment_access == null
-              ? {id: ''}
-              : receiver_treatment_access
-          this.predialysis_evaluation =
-            predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-            last_predialysis_evaluation == null
-              ? {}
-              : last_predialysis_evaluation
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
@@ -1616,28 +1582,26 @@ import {parseTime} from '@/utils'
           }
 
           this.double_check = double_check == null ? {id: ''} : double_check
-          this.assessment_after_dislysis =
-            assessment_after_dislysis == null
-              ? {id: ''}
-              : assessment_after_dislysis
-          this.last_assessment_after_dislysis =
-            last_assessment_after_dislysis == null
-              ? {id: ''}
-              : last_assessment_after_dislysis
-          this.treatment_summary =
-            treatment_summary == null ? {id: ''} : treatment_summary
+          this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary =  treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-            last_monitor_record == null
-              ? this.last_monitor_record
-              : last_monitor_record
-          this.dialysis_order =
-            dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null  ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order = dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
           this.title = patient.name
+          // 强制刷新子组件
+
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
         } else {
           this.$toast({
             message: resp.msg

src/pages/privacy/index.vue

@@ -36,7 +36,7 @@
 
 <script>
     export default {
-        name: "privacyPolicy"
+        name: "privacy"
 
     }
 </script>

src/router/index.js

@@ -77,7 +77,7 @@ export default new Router({
     },
     {
       path: "/privacy",
-      name: "privacyPolicy",
+      name: "privacy",
       component: () => import("@/pages/privacy/index")
     }
   ]