医嘱

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.60"
+  "version": "1.0.89"
 }

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/api/dialysis.js

@@ -225,7 +225,7 @@ export function PostModifyEndDialysis (params) {
 
 export function CreateGroupAdvice(id, groupno, advices){
   return request({
-    url:'/api/advice_remind/create?id='+id + '&groupno=' + groupno,
+    url:'/m/api/advice_remind/create?id='+id + '&groupno=' + groupno,
     method:'post',
     data:advices,
   })

src/pages/main/dialog/AssessmentDialog.vue

@@ -16,8 +16,8 @@
         </div>
         <div class="item" v-if="isShow('干体重')">
           <h2 class="name">干体重(kg)</h2>
-          <div class="content">
-            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight"/>
+          <div class="content" @click="showDryWeight">
+            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" disabled="disabled"/>
           </div>
         </div>
         <div class="item" v-if="isShow('衣物重')">
@@ -333,6 +333,10 @@
     <!--<two-menu title="二级菜单" v-show="true" ></two-menu>-->
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
+
+
+    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
+                        :propsForm="propForm"></check-box-sub-menu>
   </div>
 </template>
 
@@ -346,6 +350,10 @@
   export default {
     name: 'PrescriptionDialog',
     props: {
+      dry_weight:{
+        type: Object,
+
+      },
       patient_prop: {
         type: Object,
       },
@@ -1115,6 +1123,11 @@
             this.$emit('evaluation', response.data.data.evaluation)
           }
         })
+      },showDryWeight:function(){
+
+
+
+
       },
       close: function () {
         this.$emit('close')
@@ -1181,7 +1194,7 @@
       // console.log(this.predialysis)
       this.formValue = this.predialysis
       if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
-        this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+        // this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
         this.$set(this.formValue, 'additional_weight', this.last_predialysis['additional_weight'].toString())
         this.$set(this.formValue, 'internal_fistula', this.last_predialysis['internal_fistula'])
         this.$set(this.formValue, 'internal_fistula_skin', this.last_predialysis['internal_fistula_skin'])
@@ -1189,6 +1202,10 @@
         this.$set(this.formValue, 'blood_access_part_opera_id', this.last_predialysis['blood_access_part_opera_id'])
       }
 
+      if (this.predialysis.id == undefined && this.dry_weight.id != undefined) {
+        this.$set(this.formValue, 'dry_weight', this.dry_weight.adjusted_value.toString())
+      }
+
       this.hemorrhage_state = this.formValue.is_hemorrhage == 0
     }
   }

src/pages/main/dialog/PrescriptionDialog.vue

@@ -5,7 +5,7 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析处方</h1>
-        <button @click="showmsgtip">{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</button>
+        <button @click="showmsgtip">{{patient.name}} [透析号 {{patient.dialysis_no}} ]</button>
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 
@@ -312,27 +312,27 @@
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
 
     <msg-tip style="width:500px;" :visibility="msgtip_visibility" :predialysis="predialysis"
-                           :last_predialysis="last_predialysis"
-                           :record="record"
-                           :last_record="last_record"
-                           :patient_prop="patient"
-                           :prescription_prop="prescription_prop"
-                           v-on:menu-msg-tip="menuMsgTip"></msg-tip>
+             :last_predialysis="last_predialysis"
+             :record="record"
+             :last_record="last_record"
+             :patient_prop="patient"
+             :prescription_prop="prescription_prop"
+             v-on:menu-msg-tip="menuMsgTip"></msg-tip>
 
   </div>
 </template>
 
 <script>
-import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
-import MultipleSubMenu from './subMenu/multipleSubMenu'
-import {commitDialysisPrescription, CreateGroupAdvice, postSign, postSolution} from '@/api/dialysis'
+  import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
+  import MultipleSubMenu from './subMenu/multipleSubMenu'
+  import {commitDialysisPrescription, CreateGroupAdvice, postSign, postSolution} from '@/api/dialysis'
 
-import {Toast} from 'vant'
-import {getDataConfig} from '@/utils/data'
+  import {Toast} from 'vant'
+  import {getDataConfig} from '@/utils/data'
 
-import {parseTime} from '@/utils'
-import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
-import MsgTip from './subMenu/MsgTip'
+  import {parseTime} from '@/utils'
+  import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
+  import MsgTip from './subMenu/MsgTip'
 
   export default {
     name: 'PrescriptionDialog',
@@ -343,17 +343,17 @@ import MsgTip from './subMenu/MsgTip'
           return new Array()
         }
       },
-      predialysis:{
-        type:Object
+      predialysis: {
+        type: Object
       },
       last_predialysis: {
-        type:Object
+        type: Object
       },
-      record:{
-        type:Object
+      record: {
+        type: Object
       },
       last_record: {
-        type:Object
+        type: Object
       },
       patient_prop: {
         type: Object
@@ -406,7 +406,7 @@ import MsgTip from './subMenu/MsgTip'
     },
     data () {
       return {
-        is_pre:0,
+        is_pre: 0,
         loading: false,
         signUrl: '',
         isShowDesc: true,
@@ -426,8 +426,8 @@ import MsgTip from './subMenu/MsgTip'
           result: [],
           operators: [],
 
-      },
-      is_show: false,
+        },
+        is_show: false,
 
         perfusion_apparatus: {},
         replacementWays: [],
@@ -516,7 +516,7 @@ import MsgTip from './subMenu/MsgTip'
         zhiShow: true,
         totalShow: true,
         huShow: true,
-        doctorAdvices:[],
+        doctorAdvices: [],
         propForm: {
           title: '',
           list: [],
@@ -529,22 +529,21 @@ import MsgTip from './subMenu/MsgTip'
       }
     },
 
-
-  methods: {
-    showmsgtip(){
+    methods: {
+      showmsgtip () {
         this.msgtip_visibility = true
         this.isShowDialog = false
 
-    },
-    isPermission () {
-      if (this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)) {
-        return false
-      } else{
-        return true
-      }
-    },
-    isShow (name) {
-      var filedList = this.$store.getters.user.fileds
+      },
+      isPermission () {
+        if (this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)) {
+          return false
+        } else {
+          return true
+        }
+      },
+      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) {
@@ -740,13 +739,12 @@ import MsgTip from './subMenu/MsgTip'
         this.isShowDialog = true
 
       },
-    menuMsgTip: function () {
-      this.msgtip_visibility = false
-      this.isShowDialog = true
-    },
-
-    menuComfirmThree: function (targetAdvices) {
+      menuMsgTip: function () {
+        this.msgtip_visibility = false
+        this.isShowDialog = true
+      },
 
+      menuComfirmThree: function (targetAdvices) {
 
         if (targetAdvices.length > 0) {
           if (this.is_pre == 1) {
@@ -759,29 +757,37 @@ import MsgTip from './subMenu/MsgTip'
                 Toast.fail(response.data.msg)
                 return false
               } else {
+
+                var d = new Date();
+                var year = d.getFullYear();
+                var month=d.getMonth()+1;
+                var day=d.getDate();
+                var hour=d.getHours();
+                var minute=d.getMinutes();
+                var time = year+'-'+month+'-'+day+' '+hour+':'+minute
+
+                Toast.success('提交成功')
                 let params = {
                   advices: targetAdvices,
                   advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                   advice_doctor: targetAdvices[0].advice_doctor,
                   advice_type: targetAdvices[0].advice_type,
-                  parent_id: this.patient_id,
-                  start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  parent_id: this.$route.query.patient_id,
+                  start_time: time,
                   remark: '',
                 }
+
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
-                    this.doctorAdvices = resp.data.advices
-                    Toast.success('提交成功')
-
-                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                    this.finish()
+                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
 
                   } else {
 
                   }
                 })
 
+                this.finish()
               }
             })
 
@@ -796,16 +802,36 @@ import MsgTip from './subMenu/MsgTip'
                 return false
               } else {
                 Toast.success('提交成功')
+                var d=new Date();
+                var year=d.getFullYear();
+                var month=change(d.getMonth()+1);
+                var day=change(d.getDate());
+                var hour=change(d.getHours());
+                var minute=change(d.getMinutes());
+                var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+                let params = {
+                  advices: targetAdvices,
+                  advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  advice_doctor: targetAdvices[0].advice_doctor,
+                  advice_type: targetAdvices[0].advice_type,
+                  parent_id: this.$route.query.patient_id,
+                  start_time: time,
+                  remark: '',
+                }
+                CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+                  var resp = rs.data
+                  if (resp.state == 1) {
+                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
+                    this.$emit('longSolution', response.data.data.solution,resp.data.advices)
+                  } else {
 
-                this.$emit('advice')
-                this.$emit('longSolution', response.data.data.solution,this.doctorAdvices)
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                  }
+                })
                 this.finish()
               }
             })
           }
-        }else{
-
+        } else {
           if (this.is_pre == 1) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
@@ -818,7 +844,7 @@ import MsgTip from './subMenu/MsgTip'
               } else {
                 Toast.success('提交成功')
 
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
               }
             })
@@ -835,9 +861,8 @@ import MsgTip from './subMenu/MsgTip'
               } else {
                 Toast.success('提交成功')
 
-                this.$emit('advice')
-                this.$emit('longSolution', response.data.data.solution,this.doctorAdvices)
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                this.$emit('longSolution', response.data.data.solution, this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
               }
             })
@@ -903,21 +928,21 @@ import MsgTip from './subMenu/MsgTip'
             treatment_mode_name = treatment_mode[keys].name
           }
         }
-      for (let keys in treatment_mode) {
-        if (treatment_mode[keys].id == val) {
-          treatment_mode_name = treatment_mode[keys].name
-          console.log('这是什么', treatment_mode[keys].name)
-          if (treatment_mode_name == 'HD') {
-            this.zhiShow = false
-            this.totalShow = false
-            this.huShow = false
-          } else {
-            this.zhiShow = true
-            this.totalShow = true
-            this.huShow = true
+        for (let keys in treatment_mode) {
+          if (treatment_mode[keys].id == val) {
+            treatment_mode_name = treatment_mode[keys].name
+            console.log('这是什么', treatment_mode[keys].name)
+            if (treatment_mode_name == 'HD') {
+              this.zhiShow = false
+              this.totalShow = false
+              this.huShow = false
+            } else {
+              this.zhiShow = true
+              this.totalShow = true
+              this.huShow = true
+            }
           }
         }
-      }
 
         return treatment_mode_name
       },
@@ -978,8 +1003,8 @@ import MsgTip from './subMenu/MsgTip'
       },
       commitInfo: function () {
         this.is_pre = 1
-
         if (this.prescription_prop.id == '') {
+
           if (this.is_open == 0) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
@@ -992,7 +1017,7 @@ import MsgTip from './subMenu/MsgTip'
               } else {
                 Toast.success('提交成功')
 
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
               }
             })
@@ -1021,16 +1046,14 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                  this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                   this.finish()
                 }
               })
             }
 
-
           } else if (this.is_open == 2) {
             if (this.waitUploadAdvices.length > 0) {
-
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1042,43 +1065,50 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                  this.finish()
-                }
-              })
-            } else {
-              Toast.loading({forbidClick: true, duration: 0})
-              let ParamsQuery = this.dialysisPrescription
-              ParamsQuery['patient'] = this.$route.query.patient_id
-              ParamsQuery['record_date'] = this.record_date
-              commitDialysisPrescription(ParamsQuery).then(response => {
-                if (response.data.state == 0) {
-                  Toast.fail(response.data.msg)
-                  return false
-                } else {
-                  this.advice_visibility = false
+                  var d=new Date();
+                  var year=d.getFullYear();
+                  var month=change(d.getMonth()+1);
+                  var day=change(d.getDate());
+                  var hour=change(d.getHours());
+                  var minute=change(d.getMinutes());
+                  var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+
                   let params = {
                     advices: this.waitUploadAdvices,
                     advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                     advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                     advice_type: this.waitUploadAdvices[0].advice_type,
-                    parent_id: this.patient_id,
-                    start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    parent_id: this.$route.query.patient_id,
+                    start_time: time,
                     remark: '',
                   }
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                     var resp = rs.data
                     if (resp.state == 1) {
-                      this.doctorAdvices = resp.data.advices
-                      Toast.success('提交成功')
-                      this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                      this.finish()
+                      this.$emit('prescription', response.data.data.prescription, resp.data.advices)
                     } else {
 
                     }
                   })
 
+                  this.finish()
+                }
+              })
+            } else {
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              commitDialysisPrescription(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  this.advice_visibility = false
 
+                  Toast.success('提交成功')
+                  this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
+                  this.finish()
                 }
               })
             }
@@ -1100,7 +1130,7 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                  this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                   this.finish()
 
                 }
@@ -1132,7 +1162,7 @@ import MsgTip from './subMenu/MsgTip'
                   } else {
                     Toast.success('提交成功')
 
-                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                    this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                     this.finish()
 
                   }
@@ -1143,7 +1173,6 @@ import MsgTip from './subMenu/MsgTip'
             } else if (this.is_open == 2) {
               if (this.waitUploadAdvices.length > 0) {
 
-
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1153,52 +1182,64 @@ import MsgTip from './subMenu/MsgTip'
                     Toast.fail(response.data.msg)
                     return false
                   } else {
-                    Toast.success('提交成功')
-                    this.$emit('prescription', response.data.data.prescription)
-                    this.finish()
 
-                  }
-                })
-              }
-              else {
-                Toast.loading({forbidClick: true, duration: 0})
-                let ParamsQuery = this.dialysisPrescription
-                ParamsQuery['patient'] = this.$route.query.patient_id
-                ParamsQuery['record_date'] = this.record_date
-                commitDialysisPrescription(ParamsQuery).then(response => {
-                  if (response.data.state == 0) {
-                    Toast.fail(response.data.msg)
-                    return false
-                  } else {
-                    this.advice_visibility = false
+
+                    var d=new Date();
+                    var year=d.getFullYear();
+                    var month=change(d.getMonth()+1);
+                    var day=change(d.getDate());
+                    var hour=change(d.getHours());
+                    var minute=change(d.getMinutes());
+                    var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+
+
                     let params = {
                       advices: this.waitUploadAdvices,
                       advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
-                      parent_id: this.patient_id,
-                      start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      parent_id: this.$route.query.patient_id,
+                      start_time: time,
                       remark: '',
                     }
+
                     CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                       var resp = rs.data
                       if (resp.state == 1) {
                         this.doctorAdvices = resp.data.advices
-                        Toast.success('提交成功')
-                        this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                        this.finish()
+                        this.$emit('prescription', response.data.data.prescription, resp.data.advices)
 
                       } else {
 
                       }
                     })
 
+                    Toast.success('提交成功')
+                    this.finish()
+
+                  }
+                })
+              } else {
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                commitDialysisPrescription(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+
+                    Toast.success('提交成功')
+                    this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
+                    this.finish()
+
                   }
                 })
 
               }
             }
-          }else{
+          } else {
 
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
@@ -1210,7 +1251,7 @@ import MsgTip from './subMenu/MsgTip'
                 return false
               } else {
                 Toast.success('提交成功')
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
 
               }
@@ -1218,7 +1259,6 @@ import MsgTip from './subMenu/MsgTip'
 
           }
 
-
         }
       }, commitSolutionInfo: function () {
         this.is_pre = 2
@@ -1294,46 +1334,53 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('advice')
-                  this.$emit('longSolution', response.data.data.solution)
-                  this.$emit('prescription', response.data.data.prescription)
-                  this.finish()
+                  var d=new Date();
+                  var year=d.getFullYear();
+                  var month=change(d.getMonth()+1);
+                  var day=change(d.getDate());
+                  var hour=change(d.getHours());
+                  var minute=change(d.getMinutes());
+                  var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+
 
-                }
-              })
-            } else {
-              Toast.loading({forbidClick: true, duration: 0})
-              let ParamsQuery = this.dialysisPrescription
-              ParamsQuery['patient'] = this.$route.query.patient_id
-              ParamsQuery['record_date'] = this.record_date
-              postSolution(ParamsQuery).then(response => {
-                if (response.data.state == 0) {
-                  Toast.fail(response.data.msg)
-                  return false
-                } else {
-                  this.advice_visibility = false
                   let params = {
                     advices: this.waitUploadAdvices,
                     advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                     advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                     advice_type: this.waitUploadAdvices[0].advice_type,
-                    parent_id: this.patient_id,
-                    start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    parent_id: this.$route.query.patient_id,
+                    start_time: time,
                     remark: '',
                   }
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                     var resp = rs.data
                     if (resp.state == 1) {
                       this.doctorAdvices = resp.data.advices
-
+                      this.$emit('longSolution', response.data.data.solution, resp.data.advices)
+                      this.$emit('prescription', response.data.data.prescription, resp.data.advices)
 
                     } else {
 
                     }
                   })
+
+                  this.finish()
+
+                }
+              })
+            } else {
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              postSolution(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+
                   Toast.success('提交成功')
 
-                  this.$emit('advice')
                   this.$emit('longSolution', response.data.data.solution)
                   this.$emit('prescription', response.data.data.prescription)
                   this.finish()
@@ -1358,7 +1405,6 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('advice')
                   this.$emit('longSolution', response.data.data.solution)
                   this.$emit('prescription', response.data.data.prescription)
                   this.finish()
@@ -1393,7 +1439,6 @@ import MsgTip from './subMenu/MsgTip'
                   } else {
                     Toast.success('提交成功')
 
-                    this.$emit('advice')
                     this.$emit('longSolution', response.data.data.solution)
                     this.$emit('prescription', response.data.data.prescription)
                     this.finish()
@@ -1416,29 +1461,38 @@ import MsgTip from './subMenu/MsgTip'
                     return false
                   } else {
                     this.advice_visibility = false
+
+
+                    var d=new Date();
+                    var year=d.getFullYear();
+                    var month=change(d.getMonth()+1);
+                    var day=change(d.getDate());
+                    var hour=change(d.getHours());
+                    var minute=change(d.getMinutes());
+                    var time = year+'-'+month+'-'+day+' '+hour+':'+minute
+
+
                     let params = {
                       advices: this.waitUploadAdvices,
                       advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
-                      parent_id: this.patient_id,
-                      start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      parent_id: this.$route.query.patient_id,
+                      start_time: time,
                       remark: '',
                     }
                     CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                       var resp = rs.data
                       if (resp.state == 1) {
                         this.doctorAdvices = resp.data.advices
-                        Toast.success('提交成功')
-                        this.$emit('advice')
-                        this.$emit('longSolution', response.data.data.solution)
-                        this.$emit('prescription', response.data.data.prescription)
-                        this.finish()
+                        this.$emit('longSolution', response.data.data.solution,resp.data.advices)
+                        this.$emit('prescription', response.data.data.prescription,resp.data.advices)
                       } else {
 
                       }
                     })
-
+                    Toast.success('提交成功')
+                    this.finish()
 
                   }
                 })
@@ -1461,7 +1515,7 @@ import MsgTip from './subMenu/MsgTip'
                 })
               }
             }
-          }else{
+          } else {
 
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription

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

@@ -0,0 +1,115 @@
+<template>
+  <div>
+
+    <div class="Dialog" v-if="visibility">
+      <div class="DialogTit">
+        <span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>
+        <h1 class="name">干体重调整</h1>
+        <span class="success" @click="commitDryWeight()"></span>
+      </div>
+
+      <div class="optionsBox">
+        <div class="item">
+          <label class="name" for="xll">干体重</label>
+          <div class="content">
+            <input type="tel" id="xll" v-model="dry_weight"/>
+          </div>
+        </div>
+
+        <div class="item" @click="select_nurse">
+          <h2 class="name">医生</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{ admin_map[nurse_id].name }}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+        <div class="item">
+          <h2 class="name">备注</h2>
+          <div class="content">
+            <input type="tel" id="xll" v-model="remark"/>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <two-menu ref="selector"></two-menu>
+
+  </div>
+
+
+</template>
+
+<script>
+  import TwoMenu from '../TwoMenu'
+
+  export default {
+    name: 'dryWeightMenu',
+    components: {TwoMenu},
+    props: {
+      title: '',
+      dry_weight: 0,
+      remark: '',
+      index: 0,
+      visibility: false,
+    },
+    methods: {
+      closeDialog () {
+        this.$emit('menu-cancle-two')
+      }, commitDryWeight () {
+
+        this.$emit('menu-cancle-two')
+      },
+    },
+    data () {
+      return {}
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  li {
+  height: 1rem;
+  line-height: 1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/today/TodayTab.vue

@@ -126,7 +126,7 @@
     </van-popup>
 
     <van-popup title="透前评估" v-model="menuList[3].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <assessment-dialog :predialysis="predialysis_evaluation" :last_predialysis="last_predialysis_evaluation"
+      <assessment-dialog :predialysis="predialysis_evaluation" :last_predialysis="last_predialysis_evaluation" :dry_weight="dryWeight"
                          :patient_prop="patient" @evaluation="update_evaluation" @close="closeAssessmentBefore"
                          ref="assessment_dialog"></assessment-dialog>
     </van-popup>
@@ -309,6 +309,7 @@
         goTopShow: false,
         goodTypes: [],
         goodInfos: [],
+        dryWeight:{},
 
         longAdvices: [],
         waitUploadAdvices: [],
@@ -584,6 +585,8 @@
             var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
             var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
             var doctor_advices = resp.data.doctor_advices // 临时医嘱
+            this.dryWeight = resp.data.dry_weight
+
 
             for (let i = 0; i < doctor_advices.length; i++) {
               doctor_advices[i]['is_selected'] = 0
@@ -761,7 +764,7 @@
             var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
             var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
             var doctor_advices = resp.data.doctor_advices // 临时医嘱
-
+            this.dryWeight = resp.data.dry_weight
 
             if(prescription == null || prescription.creater == 0){
               this.isPullData = 1
@@ -980,8 +983,6 @@
                 this.is_open = resp.data.is_open_remind
                 this.longAdvices = totalAdvice
                 this.waitUploadAdvices = waitUploadAdvices
-                console.log(this.longAdvices)
-                console.log(this.waitUploadAdvices)
 
                 break