修改华侨医院bug

src/api/advice.js

@@ -111,3 +111,21 @@ export function DeleteSubDoctorAdvice(params){
   })
 }
 
+
+// export function ModifyExecDoctorAdvice(params){
+//   return request({
+//     url:'/m/api/delete/subadvice?advice_id='+params,
+//     method:'Delete',
+//   })
+// }
+
+
+export function ModifyExecDoctorAdvice(params){
+  return request({
+    url:'/m/api/advice/exec/modify',
+    method:'Post',
+    params:params,
+  })
+}
+
+

src/api/dialysis.js

@@ -1,173 +1,161 @@
-import request from "@/utils/request"
+import request from '@/utils/request'
 
-export function getDialysisScheduals(params) {
-    return request({
-        url: "/m/api/scheduals",
-        method: "get",
-        params: params,
-    })
+export function getDialysisScheduals (params) {
+  return request({
+    url: '/m/api/scheduals',
+    method: 'get',
+    params: params,
+  })
 }
 
-export function getWaitingScheduals(params) {
-    return request({
-        url: "/m/api/waiting_scheduals",
-        method: "get",
-        params: params,
-    })
+export function getWaitingScheduals (params) {
+  return request({
+    url: '/m/api/waiting_scheduals',
+    method: 'get',
+    params: params,
+  })
 }
 
-export function getDialysisRecord(params) {
-    return request({
-        url: "/m/api/dialysis/record",
-        method: "get",
-        params: params,
-    })
+export function getDialysisRecord (params) {
+  return request({
+    url: '/m/api/dialysis/record',
+    method: 'get',
+    params: params,
+  })
 }
 
-export function dialysisGlobalConfig() {
-    return request({
-        url: "/m/api/dialysisglobalconfig",
-        method: "get",
-    })
+export function dialysisGlobalConfig () {
+  return request({
+    url: '/m/api/dialysisglobalconfig',
+    method: 'get',
+  })
 }
 
-
-
-export function commitTreatmentSummary(params) {
+export function commitTreatmentSummary (params) {
   return request({
-    url: "/m/api/dialysis/treatmentSummary",
-    method: "post",
+    url: '/m/api/dialysis/treatmentSummary',
+    method: 'post',
     params: params,
 
   })
 }
 
-export function commitDoubleCheck(params) {
+export function commitDoubleCheck (params) {
   return request({
-    url: "/m/api/dialysis/doublecheck",
-    method: "post",
+    url: '/m/api/dialysis/doublecheck',
+    method: 'post',
     params: params,
 
-
   })
 }
 
-
-
-export function commitAcceptsAssessment(params) {
+export function commitAcceptsAssessment (params) {
   return request({
-    url: "/m/api/dialysis/acceptsAssessment",
-    method: "post",
+    url: '/m/api/dialysis/acceptsAssessment',
+    method: 'post',
     params: params,
 
   })
 }
 
-
-export function finish(params) {
+export function finish (params) {
   return request({
-    url: "/m/api/dialysis/finish",
-    method: "post",
+    url: '/m/api/dialysis/finish',
+    method: 'post',
     params: params,
   })
 }
 
-
-
-
-export function commitDialysisPrescription(params) {
+export function commitDialysisPrescription (params) {
   console.log(params)
   return request({
-    url: "/m/api/dialysis/dialysisPrescription",
-    method: "post",
+    url: '/m/api/dialysis/dialysisPrescription',
+    method: 'post',
     params: params,
   })
 }
 
-
-export function commitAssessmentAfterDislysis(params) {
+export function commitAssessmentAfterDislysis (params) {
   return request({
-    url: "/m/api/dialysis/assessmentAfterDislysis",
-    method: "post",
+    url: '/m/api/dialysis/assessmentAfterDislysis',
+    method: 'post',
     params: params,
   })
 }
 
-export function addMonitorRecord(params) {
+export function addMonitorRecord (params) {
   return request({
-    url: "/m/api/monitor/add",
-    method: "post",
+    url: '/m/api/monitor/add',
+    method: 'post',
     params: params,
   })
 }
 
-export function editMonitorRecord(params) {
+export function editMonitorRecord (params) {
   return request({
-    url: "/m/api/monitor/edit",
-    method: "post",
+    url: '/m/api/monitor/edit',
+    method: 'post',
     params: params,
   })
 }
 
-export function deleteMonitorRecord(params) {
+export function deleteMonitorRecord (params) {
   return request({
-    url: "/m/api/monitor/delete",
-    method: "post",
+    url: '/m/api/monitor/delete',
+    method: 'post',
     params: params,
   })
 }
 
-export function GetAllZone(params){
+export function GetAllZone (params) {
   return request({
-    url:'/m/api/dialysis/allzone',
-    method:'get',
-    params:params
+    url: '/m/api/dialysis/allzone',
+    method: 'get',
+    params: params
   })
 }
 
-export function getSchedualPatient(params){
+export function getSchedualPatient (params) {
   return request({
-    url:'/m/api/dialysis/patients',
-    method:'get',
-    params:params
+    url: '/m/api/dialysis/patients',
+    method: 'get',
+    params: params
   })
 }
 
-export function postSolution(params){
+export function postSolution (params) {
   return request({
-    url:'/m/api/solution',
-    method:'post',
-    params:params
+    url: '/m/api/solution',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function startDialysis(params){
+export function startDialysis (params) {
   return request({
-    url:'/m/api/dialysis/start',
-    method:'post',
-    params:params
+    url: '/m/api/dialysis/start',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function getLastAccepts(params){
+export function getLastAccepts (params) {
   return request({
-    url:'/m/api/accepts/get',
-    method:'get',
-    params:params
+    url: '/m/api/accepts/get',
+    method: 'get',
+    params: params
   })
 }
 
-export function getPrintDialysisRecord(params) {
+export function getPrintDialysisRecord (params) {
   return request({
-    url:'/m/api/print/dialysisorder',
-    method:'Get',
-    params:params
+    url: '/m/api/print/dialysisorder',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getUrgentScheduleInitData(params) {
+export function getUrgentScheduleInitData (params) {
   return request({
     url: '/m/api/schedule/urgentinit',
     method: 'Get',
@@ -175,7 +163,7 @@ export function getUrgentScheduleInitData(params) {
   })
 }
 
-export function postUrgentSchedule(params) {
+export function postUrgentSchedule (params) {
   return request({
     url: '/m/api/schedule/urgentadd',
     method: 'post',
@@ -183,32 +171,45 @@ export function postUrgentSchedule(params) {
   })
 }
 
-export function postSign(params) {
+export function postSign (params) {
   return request({
     url: '/m/api/dialysis/sign',
     method: 'Post',
-    params:params
+    params: params
 
   })
 }
 
-
-
-
-
-export function GetMonitor(params){
+export function GetMonitor (params) {
   return request({
-    url:'/m/api/monitor/get',
-    method:'get',
-    params:params
+    url: '/m/api/monitor/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function PostSearch(keyword) {
+export function PostSearch (keyword) {
   return request({
     url: '/m/api/patients/search?keyword=' + keyword,
     method: 'post'
 
   })
 }
+
+export function PostModifyStartDialysis (params) {
+  return request({
+    url: '/m/api/startOrder/edit',
+    method: 'post',
+    params: params,
+  })
+}
+
+export function PostModifyEndDialysis (params) {
+  return request({
+    url: '/m/api/finishOrder/edit',
+    method: 'post',
+    params: params,
+  })
+}
+
+

src/pages/main/dialog/ComputerDialog.vue

@@ -1,259 +1,379 @@
 <template>
- <div>
+  <div>
 
     <div class="Dialog" v-show="!selecting">
-        <div class="DialogTit">
-            <span @click="close()" class="iconfont">&#xe6e9;</span>
-            <h1 class="name">透析上机</h1>
-            <span class="success"></span>
-        </div>
+      <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>
+      </div>
 
-        <div class="DialogContent ">
-          <div class="item" @click="select_bed">
-            <h2 class="name">上机床位</h2>
-            <div class="content">
-              <span class="text" style="width: 100px">{{ device_number_map[bed_id].number }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+      <div class="DialogContent ">
+        <div class="item" @click="select_bed">
+          <h2 class="name">上机床位</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{ device_number_map[bed_id].number }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </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" @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" @click="select_puncture_nurse">
-            <h2 class="name">穿刺者</h2>
-            <div class="content">
-              <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+        <div class="item" @click="select_puncture_nurse">
+          <h2 class="name">穿刺者</h2>
+          <div class="content">
+            <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
 
-          <div class="item">
-            <h2 class="name">上机时间</h2>
-            <div class="content">
-              <span class="text" style="width: 100px"  @click="selectStartTimeAction">{{ start_time_str }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+        <div class="item">
+          <h2 class="name">上机时间</h2>
+          <div class="content">
+            <span class="text" style="width: 100px" @click="selectStartTimeAction">{{ start_time_str }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
 
-          <div class="perform">
-              <!-- <p class="crew">上机人员 : <span>黄海燕 护士</span></p> -->
-              <!-- <button>执行上机</button> -->
-              <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
-            <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
-          </div>
+        <div class="perform">
+          <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
+          <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
         </div>
+      </div>
     </div>
 
     <two-menu ref="selector"></two-menu>
-   <mt-datetime-picker
-     ref="start_time_picker"
-     type="datetime"
-     @confirm="didSelectStartTime"
-     v-model="start_time"
-   ></mt-datetime-picker>
+    <mt-datetime-picker
+      ref="start_time_picker"
+      type="datetime"
+      @confirm="didSelectStartTime"
+      v-model="start_time"
+    ></mt-datetime-picker>
   </div>
 </template>
 
 <script>
-import { startDialysis } from "@/api/dialysis";
-import { Toast } from 'vant';
-import { parseTime } from "@/utils";
+  import {startDialysis,PostModifyStartDialysis} from '@/api/dialysis'
+  import {Toast} from 'vant'
+  import {parseTime} from '@/utils'
 
-import TwoMenu from './TwoMenu'
+  import TwoMenu from './TwoMenu'
 
-export default {
-  name: "ComputerDialog",
-  components: {
-    TwoMenu
-  },
-  data() {
-    return {
-      start_time: new Date(),
-      selecting: false,
-      start_time_str: "",
-      bed_id: 0,
-      nurse_id: 0,
-      puncture_nurse_id: 0,
-
-      zone_beds: [], // 该排班的区里的床位
-    }
-  },
-  props:{
-    schedule: {
-      type: Object,
+  export default {
+    name: 'ComputerDialog',
+    components: {
+      TwoMenu
     },
-    patient_prop: {
-      type: Object,
-    },
-    record: {
-      type: Object,
-    },
-    admins: {
-      type: Array,
-    },
-    device_numbers: {
-      type: Array,
-    },
-    admin_map: {
-      type: Object,
-    },
-    device_number_map: {
-      type: Object,
+    data () {
+      return {
+        start_time: new Date(),
+        selecting: false,
+        start_time_str: '',
+        bed_id: 0,
+        nurse_id: 0,
+        puncture_nurse_id: 0,
+        isPremission: false,
+        zone_beds: [], // 该排班的区里的床位
+        creator: 0,
+      }
     },
-  }, mounted() {
+    props: {
+      schedule: {
+        type: Object,
+      },
+      patient_prop: {
+        type: Object,
+      },
+      record: {
+        type: Object,
+      },
+      admins: {
+        type: Array,
+      },
+      device_numbers: {
+        type: Array,
+      },
+      admin_map: {
+        type: Object,
+      },
+      device_number_map: {
+        type: Object,
+      },
+      special_premission: {
+        type: Array,
+      },
+    }, mounted () {
 
-    if(this.record.id == 0){
-      this.start_time_str = parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-    }else{
-      if(this.record.start_time == 0){
-        this.start_time_str = parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      if (this.record.id == 0) {
+        this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+      } else {
+        if (this.record.start_time == 0) {
+          this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
 
-      }else{
-        this.start_time_str = parseTime(this.record.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+        } else {
+          this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+        }
       }
-    }
-  },
-  created(){
-    var date = this.$route.query && this.$route.query.date;
-    date *= 1000;
-    var newDate = new Date(date);
-    var y = newDate.getFullYear();
-    var m = newDate.getMonth() + 1;
-    var d = newDate.getDate();
-    if (isNaN(y) || isNaN(m) || isNaN(d)) {
-      newDate = new Date();
-      y = newDate.getFullYear();
-      m = newDate.getMonth() + 1;
-      d = newDate.getDate();
-    }
-    this.record_date = y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
+    },
+    created () {
+      var date = this.$route.query && this.$route.query.date
+      date *= 1000
+      var newDate = new Date(date)
+      var y = newDate.getFullYear()
+      var m = newDate.getMonth() + 1
+      var d = newDate.getDate()
+      if (isNaN(y) || isNaN(m) || isNaN(d)) {
+        newDate = new Date()
+        y = newDate.getFullYear()
+        m = newDate.getMonth() + 1
+        d = newDate.getDate()
+      }
+      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.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
 
-    if(this.puncture_nurse_id == 0){
-      this.puncture_nurse_id =  this.$store.getters.user.user.id
-    }
+      if (this.puncture_nurse_id == 0) {
+        this.puncture_nurse_id = this.$store.getters.user.user.id
+      }
 
-    var beds = []
-    for (let index = 0; index < this.device_numbers.length; index++) {
-      const device_number = this.device_numbers[index];
-      if (device_number.zone_id == this.schedule.partition_id) {
-        beds.push(device_number)
+      var beds = []
+      for (let index = 0; index < this.device_numbers.length; index++) {
+        const device_number = this.device_numbers[index]
+        if (device_number.zone_id == this.schedule.partition_id) {
+          beds.push(device_number)
+        }
       }
-    }
-    this.zone_beds = beds
-  },
-  methods: {
-    didSelectStartTime: function(time) {
-      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
-    },
-    selectStartTimeAction: function() {
-      if (this.record.id != 0) {
-        return
+      this.zone_beds = beds
+
+      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
+          }
+        }
       }
-      this.$refs.start_time_picker.open();
-    },
-    commitInfo: function () {
-      Toast.loading({forbidClick: true, duration: 0})
-      let ParamsQuery = {}
-      ParamsQuery['patient_id'] = this.patient_prop.id
-      ParamsQuery['record_date'] = this.record_date
-      ParamsQuery["nurse"] = this.nurse_id
-      ParamsQuery["bed"] = this.bed_id
-      ParamsQuery["start_time"] = this.start_time_str
-      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id
 
-      startDialysis(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          Toast.fail(response.data.msg);
-          return false;
+      if (this.record.id > 0) {
+        if (this.record.creator == 0) {
+          this.creator = this.record.start_nurse
         } else {
-          Toast.success("上机成功");
-          this.$emit('did_start', response.data.data.dialysis_order);
-          var record = this.record
-          for (const key in response.data.data.dialysis_order) {
-            this.$set(record, key, response.data.data.dialysis_order[key])
-            // this.record[key] = response.data.data.dialysis_order[key]
-          }
+          this.creator = this.record.creator
         }
-      });
-    },
-    close: function() {
-      this.$emit('close')
-    },
-    select_bed: function() {
-      if (this.record.id != 0) {
-        return
       }
-      this.selecting = true
-      var t = this
-      this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, "选择床位号", "number", "id", function(select_id) {
-        t.bed_id = select_id
-      }, function() {
-        t.selecting = false
-      })
+
     },
-    select_nurse: function() {
-      if (this.record.id != 0) {
-        return
+    methods: {
+      modify(){
+        let ParamsQuery = {}
+        ParamsQuery['id'] = this.record.id
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['bed'] = this.bed_id
+        ParamsQuery['start_time'] = this.start_time_str
+        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+        PostModifyStartDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            Toast.success('修改成功')
+            this.$emit('did_start', response.data.data.dialysis_order)
+            var record = this.record
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key])
+            }
+          }
+        })
+      },
+      didSelectStartTime: function (time) {
+        this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
+      },
+      selectStartTimeAction: 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.$refs.start_time_picker.open()
+          } else {
+            return
+          }
+        }
+        this.$refs.start_time_picker.open()
+      },
+      commitInfo: function () {
+        Toast.loading({forbidClick: true, duration: 0})
+        let ParamsQuery = {}
+        ParamsQuery['patient_id'] = this.patient_prop.id
+        ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['bed'] = this.bed_id
+        ParamsQuery['start_time'] = this.start_time_str
+        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+
+        startDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            Toast.success('上机成功')
+            this.$emit('did_start', response.data.data.dialysis_order)
+            var record = this.record
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key])
+              // this.record[key] = response.data.data.dialysis_order[key]
+            }
+          }
+        })
+      },
+      close: function () {
+        this.$emit('close')
+      },
+      select_bed: 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.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
+              t.bed_id = select_id
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
+        }
+
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
+          t.bed_id = select_id
+        }, function () {
+          t.selecting = false
+        })
+      },
+      select_nurse: 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.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
+              t.nurse_id = select_id
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
+        }
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
+          t.nurse_id = select_id
+        }, function () {
+          t.selecting = false
+        })
+      }, select_puncture_nurse: 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.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
+              t.puncture_nurse_id = select_id
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
+        }
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
+          t.puncture_nurse_id = select_id
+        }, function () {
+          t.selecting = false
+        })
+      },
+      open: function () {
+        this.selecting = false
+        this.$refs.selector.hide()
       }
-      this.selecting = true
-      var t = this
-      this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择上机护士", "name", "id", function(select_id) {
-        t.nurse_id = select_id
-      }, function() {
-        t.selecting = false
-      })
-    },select_puncture_nurse:function(){
-      if (this.record.id != 0) {
-        return
+    }, 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 {
+            this.creator = this.record.creator
+          }
+
+
+        }
       }
-      this.selecting = true
-      var t = this
-      this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, "选择穿刺护士", "name", "id", function(select_id) {
-        t.puncture_nurse_id = select_id
-      }, function() {
-        t.selecting = false
-      })
-    },
-    open:function(){
-      this.selecting = false;
-      this.$refs.selector.hide();
+
     }
-  }
 
-};
+  }
 </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.3rem;
-    text-align:center;
-    width: 3rem;
-    height: 0.7rem;
-    line-height: 0.7rem;
-    border-radius:4px;
-    margin-top:10px;
+  background:$main-color;
+  color: #fff;
+  font-size: 0.3rem;
+  text-align:center;
+  width: 3rem;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-radius:4px;
+  margin-top:10px;
+  }
   }
-}
 </style>
 

src/pages/main/dialog/DoubleDialog.vue

@@ -52,16 +52,15 @@
 
         </el-form>
 
-        <div class="item"  v-if="this.$store.getters.user.template_info.template_id == 2">
+        <div class="item" v-if="this.$store.getters.user.template_info.template_id == 2">
           <h2 class="name">核对时间</h2>
           <div class="content">
-            <span class="text" style="width: 100px"  @click="selectCheckTimeAction">{{ check_time_str }}</span>
+            <span class="text" style="width: 100px" @click="selectCheckTimeAction">{{ check_time_str }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
 
 
-
         <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
 
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">{{getFirstCheckDesc()}} </p>
@@ -92,266 +91,402 @@
 </template>
 
 <script>
-import { commitDoubleCheck } from "@/api/dialysis";
-import { Toast } from "vant";
-import { uParseTime } from "@/utils/tools";
-import { parseTime } from "@/utils";
-
-export default {
-  name: "DoubleDialog",
-  data() {
-    return {
-      admin_users: [],
-      first_check_isShow: false,
-      second_check_isShow: false,
-      first_check_desc: "",
-      second_check_desc: "",
-      doubleReview: {
-        dialysis_item_check: "1",
-        dialysis_parameter_check: "1",
-        vascular_access_verification: "1",
-        pipeline_connection_check: "1",
-        dialysis_item_desc: "",
-        dialysis_parameter_desc: "",
-        vascular_access_desc: "",
-        pipeline_connection_desc: "",
-        collator: "",
-        creater: 0,
-        modifier: 0,
-        created_time: 0,
-        updated_time: 0,
-        check_time:0,
-        first_check_time:0,
+  import {commitDoubleCheck} from '@/api/dialysis'
+  import {Toast} from 'vant'
+  import {uParseTime} from '@/utils/tools'
+  import {parseTime} from '@/utils'
+
+  export default {
+    name: 'DoubleDialog',
+    data () {
+      return {
+        admin_users: [],
+        first_check_isShow: false,
+        second_check_isShow: false,
+        first_check_desc: '',
+        second_check_desc: '',
+        doubleReview: {
+          dialysis_item_check: '1',
+          dialysis_parameter_check: '1',
+          vascular_access_verification: '1',
+          pipeline_connection_check: '1',
+          dialysis_item_desc: '',
+          dialysis_parameter_desc: '',
+          vascular_access_desc: '',
+          pipeline_connection_desc: '',
+          collator: '',
+          creater: 0,
+          modifier: 0,
+          created_time: 0,
+          updated_time: 0,
+          check_time: 0,
+          first_check_time: 0,
+        },
+        check_time: new Date(),
+        check_time_str: '',
+        patient: {
+          id: 0
+        },
+        doctor: '',
+        record_date: ''
+      }
+    },
+    props: {
+      record: {
+        type: Object,
+        default: () => {
+          return {id: 0}
+        }
       },
-      check_time:new Date(),
-      check_time_str:'',
-      patient: {
-        id: 0
+
+      patient_prop: {
+        type: Object
       },
-      doctor: "",
-      record_date: ""
-    };
-  },
-  props: {
-    record: {
-      type: Object,
-      default: () => {
-        return { id: 0 };
+      admin_users_prop: {
+        type: Array
       }
     },
+    created () {
+      console.log(new Date())
+      this.admin_users = this.admin_users_prop
+      if (this.record.id == '') {
+        this.doubleReview.dialysis_item_check = '1'
+        this.doubleReview.dialysis_parameter_check = '1'
+        this.doubleReview.vascular_access_verification = '1'
+        this.doubleReview.pipeline_connection_check = '1'
+        this.doubleReview.dialysis_item_desc = ''
+        this.doubleReview.dialysis_parameter_desc = ''
+        this.doubleReview.vascular_access_desc = ''
+        this.doubleReview.pipeline_connection_desc = ''
 
-    patient_prop: {
-      type: Object
-    },
-    admin_users_prop: {
-      type: Array
-    }
-  },
-  created() {
-    console.log(new Date())
-    this.admin_users = this.admin_users_prop;
-    if (this.record.id == "") {
-      this.doubleReview.dialysis_item_check = "1";
-      this.doubleReview.dialysis_parameter_check = "1";
-      this.doubleReview.vascular_access_verification = "1";
-      this.doubleReview.pipeline_connection_check = "1";
-      this.doubleReview.dialysis_item_desc = "";
-      this.doubleReview.dialysis_parameter_desc = "";
-      this.doubleReview.vascular_access_desc = "";
-      this.doubleReview.pipeline_connection_desc = "";
-
-    } else {
-      this.doubleReview.dialysis_item_check =
-        this.record.dialysis_item_check + "";
-      this.doubleReview.dialysis_parameter_check =
-        this.record.dialysis_parameter_check + "";
-      this.doubleReview.vascular_access_verification =
-        this.record.vascular_access_verification + "";
-      this.doubleReview.pipeline_connection_check =
-        this.record.pipeline_connection_check + "";
-      this.doubleReview.dialysis_item_desc = this.record.dialysis_item_desc;
-      this.doubleReview.dialysis_parameter_desc = this.record.dialysis_parameter_desc;
-      this.doubleReview.vascular_access_desc = this.record.vascular_access_desc;
-      this.doubleReview.pipeline_connection_desc = this.record.pipeline_connection_desc;
-
-      this.doubleReview.created_time = this.record.created_time;
-      this.doubleReview.creater = this.record.creater;
-      this.doubleReview.updated_time = this.record.updated_time;
-      this.doubleReview.modifier = this.record.modifier;
-      this.doubleReview.check_time = this.record.check_time;
-      this.doubleReview.first_check_time = this.record.first_check_time;
+      } else {
+        this.doubleReview.dialysis_item_check =
+          this.record.dialysis_item_check + ''
+        this.doubleReview.dialysis_parameter_check =
+          this.record.dialysis_parameter_check + ''
+        this.doubleReview.vascular_access_verification =
+          this.record.vascular_access_verification + ''
+        this.doubleReview.pipeline_connection_check =
+          this.record.pipeline_connection_check + ''
+        this.doubleReview.dialysis_item_desc = this.record.dialysis_item_desc
+        this.doubleReview.dialysis_parameter_desc = this.record.dialysis_parameter_desc
+        this.doubleReview.vascular_access_desc = this.record.vascular_access_desc
+        this.doubleReview.pipeline_connection_desc = this.record.pipeline_connection_desc
 
-    }
+        this.doubleReview.created_time = this.record.created_time
+        this.doubleReview.creater = this.record.creater
+        this.doubleReview.updated_time = this.record.updated_time
+        this.doubleReview.modifier = this.record.modifier
+        this.doubleReview.check_time = this.record.check_time
+        this.doubleReview.first_check_time = this.record.first_check_time
 
-    var date = this.$route.query && this.$route.query.date;
-    date *= 1000;
-    var newDate = new Date(date);
-    var y = newDate.getFullYear();
-    var m = newDate.getMonth() + 1;
-    var d = newDate.getDate();
-    if (isNaN(y) || isNaN(m) || isNaN(d)) {
-      newDate = new Date();
-      y = newDate.getFullYear();
-      m = newDate.getMonth() + 1;
-      d = newDate.getDate();
-    }
-    this.record_date =
-      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
-    // this.patient.id = this.patient_prop.id
-  },
-  methods: {
-    didSelectCheckTime: function(time) {
-      this.check_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}" +":00");
-    },
-    selectCheckTimeAction: function() {
-        this.$refs.start_time_picker.open();
+      }
+
+      var date = this.$route.query && this.$route.query.date
+      date *= 1000
+      var newDate = new Date(date)
+      var y = newDate.getFullYear()
+      var m = newDate.getMonth() + 1
+      var d = newDate.getDate()
+      if (isNaN(y) || isNaN(m) || isNaN(d)) {
+        newDate = new Date()
+        y = newDate.getFullYear()
+        m = newDate.getMonth() + 1
+        d = newDate.getDate()
+      }
+      this.record_date =
+        y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
+      // this.patient.id = this.patient_prop.id
     },
-    checkInf: function() {},
-    // initData(doubleReview, patient, doctor) {
-    //   //上层传值
-    //   this.patient = patient;
-    //   this.doubleReview = doubleReview;
-    //   this.doctor = doctor;
-    // },
-    commitInfo: function() {
-      Toast.loading({ forbidClick: true, duration: 0 });
-      let ParamsQuery = this.doubleReview;
-      // ParamsQuery["patient"] = this.patient.id
-      ParamsQuery["patient"] = this.$route.query.patient_id;
-      ParamsQuery["record_date"] = this.record_date;
-      ParamsQuery["check_time"] = this.check_time_str
-      commitDoubleCheck(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          // this.$toast({message: response.data.msg});
-          Toast.fail(response.data.msg);
-          return false;
+    methods: {
+      didSelectCheckTime: function (time) {
+        this.check_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}' + ':00')
+      },
+      selectCheckTimeAction: function () {
+        this.$refs.start_time_picker.open()
+      },
+      checkInf: function () {
+      },
+      // initData(doubleReview, patient, doctor) {
+      //   //上层传值
+      //   this.patient = patient;
+      //   this.doubleReview = doubleReview;
+      //   this.doctor = doctor;
+      // },
+      commitInfo: function () {
+        Toast.loading({forbidClick: true, duration: 0})
+        let ParamsQuery = this.doubleReview
+        // ParamsQuery["patient"] = this.patient.id
+        ParamsQuery['patient'] = this.$route.query.patient_id
+        ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['check_time'] = this.check_time_str
+        commitDoubleCheck(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            // this.$toast({message: response.data.msg});
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            Toast.success('提交成功')
+
+            this.doubleReview.creater = response.data.data.doubleCheck.creater
+            this.doubleReview.check_time =
+              response.data.data.doubleCheck.check_time
+            this.doubleReview.first_check_time =
+              response.data.data.doubleCheck.first_check_time
+            this.doubleReview.modifier = response.data.data.doubleCheck.modifier
+
+            for (const key in response.data.data.doubleCheck) {
+              this.record[key] = response.data.data.doubleCheck[key]
+            }
+            this.$emit('did_update', response.data.data.doubleCheck)
+          }
+        })
+      },
+      close: function () {
+        this.$emit('close')
+      },
+      getFirstCheckDesc: function () {
+        if (this.doubleReview.first_check_time > 0 && this.doubleReview.check_time > 0) {
+          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
+            let time = uParseTime(
+              this.doubleReview.first_check_time,
+              '{y}-{m}-{d}  {h}:{i}'
+            )
+            if (this.doubleReview.creater <= 0) {
+              return ''
+            }
+
+            var desc = ''
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == 'undefined'
+            ) {
+              return ''
+            }
+
+            var leng = this.admin_users.length
+            if (leng == 0) {
+              return ''
+            }
+
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.creater) {
+                let name = this.admin_users[index].name
+                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+
+                break
+              }
+            }
+            return desc
+
+          } else {
+
+            let time = uParseTime(
+              this.doubleReview.check_time,
+              '{y}-{m}-{d}  {h}:{i}'
+            )
+            if (this.doubleReview.modifier <= 0) {
+              return ''
+            }
+
+            var desc = ''
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == 'undefined'
+            ) {
+              return ''
+            }
+
+            var leng = this.admin_users.length
+            if (leng == 0) {
+              return ''
+            }
+
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.modifier) {
+                let name = this.admin_users[index].name
+                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+
+                break
+              }
+            }
+            return desc
+
+          }
+
         } else {
-          Toast.success("提交成功");
 
-          this.doubleReview.creater = response.data.data.doubleCheck.creater;
-          this.doubleReview.check_time =
-            response.data.data.doubleCheck.check_time;
-          this.doubleReview.first_check_time =
-            response.data.data.doubleCheck.first_check_time;
-          this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
+          let time = uParseTime(
+            this.doubleReview.first_check_time,
+            '{y}-{m}-{d}  {h}:{i}'
+          )
+          if (this.doubleReview.creater <= 0) {
+            return ''
+          }
 
-          for (const key in response.data.data.doubleCheck) {
-            this.record[key] = response.data.data.doubleCheck[key];
+          var desc = ''
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == 'undefined'
+          ) {
+            return ''
           }
-          this.$emit("did_update", response.data.data.doubleCheck);
-        }
-      });
-    },
-    close: function() {
-      this.$emit("close");
-    },
-    getFirstCheckDesc: function() {
-      let time = uParseTime(
-        this.doubleReview.first_check_time,
-        "{y}-{m}-{d}  {h}:{i}"
-      );
-      if (this.doubleReview.creater <= 0) {
-        return "";
-      }
 
-      var desc = "";
-      if (
-        this.admin_users == null ||
-        typeof this.admin_users.length == "undefined"
-      ) {
-        return "";
-      }
+          var leng = this.admin_users.length
+          if (leng == 0) {
+            return ''
+          }
 
-      var leng = this.admin_users.length;
-      if (leng == 0) {
-        return "";
-      }
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.creater) {
+              let name = this.admin_users[index].name
+              desc = '首次核对人员:' + name + ' 首次核对时间:' + time
 
-      for (let index = 0; index < leng; index++) {
-        if (this.admin_users[index].id == this.doubleReview.creater) {
-          let name = this.admin_users[index].name;
-          desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+              break
+            }
+          }
+          return desc
 
-          break;
         }
-      }
-      return desc;
-    },
-    getScondCheckDesc: function() {
-      let time = uParseTime(
-        this.doubleReview.check_time,
-        "{y}-{m}-{d} {h}:{i}"
-      );
-      if (this.doubleReview.modifier <= 0) {
-        return "";
-      }
-      var desc = "";
-      if (
-        this.admin_users == null ||
-        typeof this.admin_users.length == "undefined"
-      ) {
-        return desc;
-      }
-      var leng = this.admin_users.length;
-      if (leng == 0) {
-        return desc;
-      }
-      for (let index = 0; index < leng; index++) {
-        if (this.admin_users[index].id == this.doubleReview.modifier) {
-          let name = this.admin_users[index].name;
-          desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
-          break;
+
+      },
+      getScondCheckDesc: function () {
+        if (this.doubleReview.first_check_time > 0 && this.doubleReview.check_time > 0) {
+
+          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
+            let time = uParseTime(
+              this.doubleReview.check_time,
+              '{y}-{m}-{d} {h}:{i}'
+            )
+            if (this.doubleReview.modifier <= 0) {
+              return ''
+            }
+            var desc = ''
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == 'undefined'
+            ) {
+              return desc
+            }
+            var leng = this.admin_users.length
+            if (leng == 0) {
+              return desc
+            }
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.modifier) {
+                let name = this.admin_users[index].name
+                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                break
+              }
+            }
+            return desc
+
+          } else {
+            let time = uParseTime(
+              this.doubleReview.first_check_time,
+              '{y}-{m}-{d} {h}:{i}'
+            )
+            if (this.doubleReview.creater <= 0) {
+              return ''
+            }
+            var desc = ''
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == 'undefined'
+            ) {
+              return desc
+            }
+            var leng = this.admin_users.length
+            if (leng == 0) {
+              return desc
+            }
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.creater) {
+                let name = this.admin_users[index].name
+                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                break
+              }
+            }
+            return desc
+          }
+
+        } else {
+          let time = uParseTime(
+            this.doubleReview.check_time,
+            '{y}-{m}-{d} {h}:{i}'
+          )
+          if (this.doubleReview.modifier <= 0) {
+            return ''
+          }
+          var desc = ''
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == 'undefined'
+          ) {
+            return desc
+          }
+          var leng = this.admin_users.length
+          if (leng == 0) {
+            return desc
+          }
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.modifier) {
+              let name = this.admin_users[index].name
+              desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+              break
+            }
+          }
+          return desc
         }
+
+      },
+      getDate: function (val) {
+        return parseTime(val, '{y}-{m}-{d} {h}:{i}')
       }
-      return desc;
-    },
-    getDate: function(val) {
-      return parseTime(val, "{y}-{m}-{d} {h}:{i}");
-    }
-  }, mounted() {
+    }, mounted () {
 
-    if(this.record.id == 0){
-      this.check_time_str = parseTime(this.check_time, "{y}-{m}-{d} {h}:{i}" +":00");
-    }else{
-      if(this.record.modifier == 0){
-        this.check_time_str = parseTime(this.check_time, "{y}-{m}-{d} {h}:{i}"+":00");
+      if (this.record.id == 0) {
+        this.check_time_str = parseTime(this.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
+      } else {
+        if (this.record.modifier == 0) {
+          this.check_time_str = parseTime(this.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
 
-      }else{
-        this.check_time_str = parseTime(this.record.check_time, "{y}-{m}-{d} {h}:{i}"+":00");
+        } else {
+          this.check_time_str = parseTime(this.record.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
+        }
       }
     }
   }
-};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.choose {
+  .choose {
   .demo-form-inline {
-    border-bottom: 1px #e5e5e5 solid;
-    .el-form-item {
-      margin-bottom: 0;
-      padding: 0.2rem 0.2rem;
-      margin-right: 0;
-    }
-    p {
-      color: $title-color;
-    }
+  border-bottom: 1px #e5e5e5 solid;
+  .el-form-item {
+  margin-bottom: 0;
+  padding: 0.2rem 0.2rem;
+  margin-right: 0;
+  }
+  p {
+  color: $title-color;
+  }
   }
 
   .button {
-    text-align: center;
-    margin-top: 1rem;
-    .submitButton {
-      width: 3rem;
-      height: 0.8rem;
-      line-height: 0.8rem;
-      background: $main-color;
-      color: #fff;
-      font-size: 0.3rem;
-      text-align: center;
-      border-radius: 6px;
-    }
+  text-align: center;
+  margin-top: 1rem;
+  .submitButton {
+  width: 3rem;
+  height: 0.8rem;
+  line-height: 0.8rem;
+  background: $main-color;
+  color: #fff;
+  font-size: 0.3rem;
+  text-align: center;
+  border-radius: 6px;
+  }
+  }
   }
-}
 </style>
 

src/pages/main/dialog/OrdersDialog.vue

@@ -9,12 +9,18 @@
       <div class="yzNav" style="width:100%;">
         <span @click="openNewAdvice">新增医嘱</span>
         <span
+          v-if="isShowExce"
           @click="execAdvice"
-          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
         >执行医嘱</span>
         <span
-          @click="checkAdvice"
+          v-if="isShowMofifyExce"
+          @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
+        >修改执行医嘱</span>
+        <span
+          @click="checkAdvice"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || (this.$store.getters.user.user.user_type == 2 && !isPremission) }"
         >医嘱核对</span>
         <span
           @click="openNewChild"
@@ -70,9 +76,6 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <!-- <span
-                      v-if="advice.drug_spec > 0"
-                    >{{ advice.drug_spec }}{{ advice.drug_spec_unit }}</span> -->
                     <span>{{ advice.advice_desc }}</span>
                     <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                     <span v-if="advice.single_dose"
@@ -157,6 +160,13 @@
       @confirm="handleExecTime"
       v-model="nowExecTime"
     ></mt-datetime-picker>
+
+    <mt-datetime-picker
+      ref="mofify_exec_time"
+      type="datetime"
+      @confirm="handleModifyExecTime"
+      v-model="nowExecTime"
+    ></mt-datetime-picker>
   </div>
 </template>
 
@@ -169,7 +179,8 @@
     DeleteSubDoctorAdvice,
     EditDoctorAdvice,
     ExecDoctorAdvice,
-    getAdviceConfig
+    getAdviceConfig,
+    ModifyExecDoctorAdvice
   } from '@/api/advice'
   import {uParseTime} from '@/utils/tools'
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
@@ -204,12 +215,17 @@
       },
       admin_users_prop: {
         type: Array
+      },
+      special_premission:{
+        type: Array
       }
+
     },
     data () {
       return {
         isShowDialog: true,
-
+        isShowExce: true,
+        isShowMofifyExce: false,
         title: '临时医嘱',
         index: 0,
         doctor: '',
@@ -234,6 +250,7 @@
         currentAdviceIdsStr: '',
         currentAdvices: [],
         currentSubAdvices: [],
+        isPremission:false,
 
       }
     },
@@ -264,16 +281,55 @@
       for (var index in this.unitsOption) {
         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: {
       'advice_groups': function () {
-        console.log(this.advice_groups)
 
+      },
+      'currentAdvices': function (currentAdvices) {
+        if (currentAdvices.length == 0) {
+          this.isShowExce = true
+          this.isShowMofifyExce = false
+        } else {
+          let a = 0
+          for (let i = 0; i < currentAdvices.length; i++) {
+            if (currentAdvices[i].execution_state == 1) {
+              a = a + 1
+            }
+          }
+
+
+          if (a == currentAdvices.length) {
+            this.isShowExce = false
+            this.isShowMofifyExce = true
+          }else{
+            this.isShowExce = true
+            this.isShowMofifyExce = false
+          }
+        }
       }
 
     },
 
     methods: {
+      modifyExecAdvice: function () {
+        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) {
 
         if (advices.length == 0) {
@@ -317,6 +373,7 @@
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
           remark: advice.remark,
+          start_time: advice.start_time,
           // drug_spec: String(advice.drug_spec),
           // drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
@@ -329,28 +386,45 @@
           .then(rs => {
             if (rs.data.state == 1) {
               var resp_advice = rs.data.data.advice
-
-              var group = this.advice_groups[this.current_group_index]
-              for (let index = 0; index < group.advices.length; index++) {
-                const advice = group.advices[index]
-                if (advice.id == resp_advice.id) {
-                  advice.advice_name = resp_advice.advice_name
-                  advice.advice_desc = resp_advice.advice_desc
-                  advice.remark = resp_advice.remark;
-
-                  // advice.drug_spec = resp_advice.drug_spec;
-                  // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
-                  (advice.delivery_way = resp_advice.delivery_way),
-                    (advice.execution_frequency =
-                      resp_advice.execution_frequency),
-                    (advice.single_dose = resp_advice.single_dose),
-                    (advice.single_dose_unit = resp_advice.single_dose_unit),
-                    (advice.prescribing_number = resp_advice.prescribing_number),
-                    (advice.prescribing_number_unit =
-                      resp_advice.prescribing_number_unit)
-                  break
+              if(!rs.data.data.isChange){
+                var group = this.advice_groups[this.current_group_index]
+                for (let index = 0; index < group.advices.length; index++) {
+                  const advice = group.advices[index]
+                  if (advice.id == resp_advice.id) {
+                    advice.advice_name = resp_advice.advice_name
+                    advice.advice_desc = resp_advice.advice_desc
+                    advice.remark = resp_advice.remark;
+                    advice.start_time = resp_advice.start_time;
+                    // advice.drug_spec = resp_advice.drug_spec;
+                    // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
+                    (advice.delivery_way = resp_advice.delivery_way),
+                      (advice.execution_frequency =
+                        resp_advice.execution_frequency),
+                      (advice.single_dose = resp_advice.single_dose),
+                      (advice.single_dose_unit = resp_advice.single_dose_unit),
+                      (advice.prescribing_number = resp_advice.prescribing_number),
+                      (advice.prescribing_number_unit =
+                        resp_advice.prescribing_number_unit)
+                    break
+                  }
+                }
+              }else{
+                // var group = this.advice_groups[this.current_group_index]
+                //先删除旧数据，再插入新数据
+                var adviceArr = this.advice_groups[this.current_group_index].advices
+                for (let y = resp_advice.length - 1; y >= 0; y--) {
+                  for (let i = adviceArr.length - 1; i >= 0; i--) {
+                    if (adviceArr[i].id == resp_advice[y].id || adviceArr[i].parent_id == resp_advice[y].id) {
+                      adviceArr.splice(i, 1)
+                    }
+                  }
                 }
+                var newAdvice = {}
+                newAdvice['advices'] = resp_advice
+                newAdvice['group_no'] = resp_advice[0].groupno
+                this.advice_groups.push(newAdvice)
               }
+
               this.currentAdvices = []
               this.currentSubAdvices = []
               for (let i = 0; i < this.advice_groups.length; i++) {
@@ -501,6 +575,67 @@
                 : response.data.data.advice_templates
           }
         })
+      },handleModifyExecTime(time){
+        var exceTime = this.handleTime(time)
+        var currentAdviceIdArr = []
+        var exceParams = null
+        for (let i = 0; i < this.currentAdvices.length; i++) {
+          if ( this.currentAdvices[i].execution_state == 1) {
+            currentAdviceIdArr.push(this.currentAdvices[i].id)
+          }
+        }
+        this.currentAdviceIdsStr = currentAdviceIdArr.join(',')
+        if (this.current_select_object == 1) {
+          exceParams = {
+            groupno: 0,
+            advice_id: this.currentAdviceIdsStr,
+            execution_time: exceTime
+          }
+
+        } else {
+          var group = this.advice_groups[this.current_group_index]
+          exceParams = {
+            groupno: group.group_no <= 0 ? 0 : group.group_no,
+            advice_id: group.group_no <= 0 ? group.advices[0].id : 0,
+            execution_time: exceTime
+          }
+        }
+
+        ModifyExecDoctorAdvice(exceParams)
+          .then(response => {
+            if (response.data.state == 0) {
+              Toast.fail(response.data.msg)
+              return false
+            } else {
+              Toast.success('执行成功！')
+              var advice = response.data.data.advice
+              if (this.current_select_object == 1) {
+                var ids = this.currentAdviceIdsStr.split(',')
+                var adviceArr = this.advice_groups[this.current_group_index].advices
+                for (let i = 0; i < adviceArr.length; i++) {
+                  for (let a = 0; a < ids.length; a++) {
+                    if ((adviceArr[i].execution_state == 1 && adviceArr[i].id == ids[a]) || (adviceArr[i].execution_state == 1 && adviceArr[i].parent_id == ids[a])) {
+                      adviceArr[i].execution_time = advice.execution_time
+                    }
+                  }
+                }
+              } else {
+                for (let index = 0; index < group.advices.length; index++) {
+                  const adv = group.advices[index]
+                  if (adv.execution_state == 1) {
+                    adv.execution_time = advice.execution_time
+                  }
+                }
+              }
+            }
+          })
+          .catch(err => {
+            Toast.fail(err)
+            return false
+          })
+
+
+
       },
       handleExecTime (time) {
         var exceTime = this.handleTime(time)
@@ -524,7 +659,7 @@
         ExecDoctorAdvice(exceParams)
           .then(response => {
             if (response.data.state == 0) {
-              Toast.fail('执行失败！')
+              Toast.fail(response.data.msg)
               return false
             } else {
               Toast.success('执行成功！')
@@ -592,12 +727,8 @@
               if (rs.data.state == 1) {
                 Toast.success('删除成功')
                 var adviceArr = this.advice_groups[this.current_group_index].advices
-                console.log(adviceArr)
-                console.log(this.currentSubAdvices[0].id)
                 for (let i = adviceArr.length - 1; i >= 0; i--) {
-                  console.log(adviceArr[i].id)
                   if (adviceArr[i].id == this.currentSubAdvices[0].id) {
-                    console.log('delete')
                     adviceArr.splice(i, 1)
                   }
                 }
@@ -831,7 +962,6 @@
           CheckDoctorAdvice(params)
             .then(response => {
               if (response.data.state == 0) {
-                Toast.fail(response.data.msg)
                 return false
               } else {
                 Toast.success('核对成功！')
@@ -900,7 +1030,6 @@
             }
           }
           this.currentAdviceIdsStr = currentAdviceIdArr.join(',')
-          console.log(this.currentAdviceIdsStr)
           this.nowExecTime = new Date(adviceArr[0].start_time * 1000)
         } else {
           if (!(this.current_group_index >= 0 && this.current_advice_index < 0)) {
@@ -940,10 +1069,10 @@
 
         if (
           this.current_advice.stop_state == 1 ||
-          this.current_advice.execution_state == 1||
+          this.current_advice.execution_state == 1 ||
           this.current_advice.check_state == 1
 
-      ) {
+        ) {
           Toast.fail('所选医嘱已停止或执行或核对')
           return false
         }
@@ -1018,6 +1147,7 @@
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
             remark: advice.remark,
+            start_time: advice.start_time,
             // drug_spec: advice.drug_spec,
             // drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
@@ -1060,6 +1190,11 @@
         this.current_advice = null
       },
       selectAdviceAction: function (group_index, advice_index, advice) {
+        console.log(this.current_group_index)
+        console.log(group_index)
+        console.log(advice.parent_id)
+
+
 
         if ((this.current_group_index != -1 && this.current_group_index != group_index) || advice.parent_id > 0) { //选择其他组，将原来的组选择状态清除
           this.currentAdvices = []
@@ -1072,14 +1207,14 @@
           }
         }
 
-        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]
-            if (advices.parent_id > 0) {
-              advices.is_selected = 0
+          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]
+              if (advices.parent_id > 0) {
+                advices.is_selected = 0
+              }
             }
           }
-        }
 
         for (let i = 0; i < this.advice_groups.length; i++) { //设置选择状态
           for (let y = 0; y < this.advice_groups[i].advices.length; y++) {

src/pages/main/dialog/PlaneDialog.vue

@@ -4,7 +4,9 @@
         <div class="DialogTit">
             <span @click="close()" class="iconfont">&#xe6e9;</span>
             <h1 class="name">透析下机</h1>
-            <span class="success"></span>
+            <span class="success" v-if="this.record.state == 1 || 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>
+
         </div>
 
         <div class="DialogContent ">
@@ -44,7 +46,7 @@
 
 <script>
   import {
-    finish
+    finish,PostModifyEndDialysis
   } from "@/api/dialysis";
   import { Toast } from 'vant';
   import TwoMenu from './TwoMenu'
@@ -61,6 +63,8 @@
       end_time_str: "",
       end_time:new Date(),
       nurse_id: 0,
+      isPremission:false,
+      creator:0,
     }
   },
   props:{
@@ -76,6 +80,9 @@
     admin_map: {
       type: Object,
     },
+    special_premission: {
+      type: Array,
+    },
   },mounted() {
       if(this.record.id == 0){
         this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
@@ -109,15 +116,64 @@
     } else {
       this.nurse_id = this.record.finish_nurse
     }
+
+    console.log("下机:"+this.nurse_id)
+
+    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) {
+        this.creator = this.record.finish_nurse
+      } else {
+        this.creator = this.record.finish_creator
+      }
+    }
+
+
   },
   methods: {
+    modify(){
+      let ParamsQuery = {}
+      ParamsQuery['id'] = this.record.id
+      ParamsQuery["nurse"] = this.nurse_id
+      ParamsQuery["end_time"] = this.end_time_str
+      PostModifyEndDialysis(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          Toast.fail(response.data.msg)
+          return false
+        } else {
+          Toast.success('修改成功')
+          this.$emit('did_off', response.data.data.dialysis_order)
+          var record = this.record
+          for (const key in response.data.data.dialysis_order) {
+            this.$set(record, key, response.data.data.dialysis_order[key])
+          }
+        }
+      })
+    },
     didSelectStartTime: function(time) {
       this.end_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
     },
     selectStartTimeAction: function() {
       if (this.record.id != 0) {
         if(this.record.end_time > 0){
-          return
+          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
+          }
         }else{
           this.$refs.start_time_picker.open();
         }
@@ -154,22 +210,65 @@
       this.$emit('close')
     },
     select_nurse: function() {
-      if (this.record != null && this.record.id != '' && this.record.stage == 1) {
-        this.selecting = true
-        var t = this
-        this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
-          console.log("nurse id: ", select_id)
-          t.nurse_id = select_id
-        }, function() {
-          t.selecting = false
-        })
+      if (this.record != null && this.record.id != '') {
+        if(this.record.stage == 1){
+          this.selecting = true
+          var t = this
+          this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
+            console.log("nurse id: ", select_id)
+            t.nurse_id = select_id
+          }, function() {
+            t.selecting = false
+          })
+        }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(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
+              console.log("nurse id: ", select_id)
+              t.nurse_id = select_id
+            }, function() {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
+        }
+
       }
     },
     open:function(){
       this.selecting = false;
       this.$refs.selector.hide();
     }
-  }
+  }, 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)
+
+
+      }
+
+    }
 };
 </script>
 

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

@@ -11,6 +11,11 @@
       <div class="DialogContent choose advice-top">
         <div class="content clearfix">
           <div>
+            <div class="cell" v-show="order.parent_id == 0">
+              <label>开始时间</label>
+              <el-input :value="start_time_str" readonly @focus="selectStartTimeAction"></el-input>
+            </div>
+
             <div class="cell">
               <label>医嘱名称</label>
               <el-input v-model="order.title"></el-input>
@@ -63,6 +68,15 @@
               >
             </div>
 
+            <div class="cell" v-show="order.parent_id == 0">
+              <label>医嘱嘱托</label>
+              <input
+                class="inputBox"
+                style="width:100%"
+                v-model="order.remark"
+              >
+            </div>
+
             <div class="cell" v-show="order.parent_id == 0">
               <label>给药途径</label>
               <el-input
@@ -84,14 +98,7 @@
               ></el-input>
             </div>
 
-            <div class="cell" v-show="order.parent_id == 0">
-              <label>医嘱嘱托</label>
-              <input
-                class="inputBox"
-                style="width:100%"
-                v-model="order.remark"
-              >
-            </div>
+
           </div>
         </div>
       </div>
@@ -146,12 +153,20 @@
       option_key="id"
       option_label_key="name"
     ></single-option-dialog>
+
+    <mt-datetime-picker
+      ref="start_time_picker"
+      type="datetime"
+      @confirm="didSelectStartTime"
+      v-model="start_time"
+    ></mt-datetime-picker>
   </div>
 </template>
 
 <script>
 import SingleOptionDialog from "../new_order/single_option_dialog";
 import { Toast } from "vant";
+import { parseTime } from "@/utils";
 
 export default {
   name: "OrderForm",
@@ -194,7 +209,8 @@ export default {
     return {
       visibility: false,
       sub_dialog_key: 0,
-
+      start_time_str:'',
+      start_time: new Date(),
       mode: 1,
       order: {
         id: 0,
@@ -223,7 +239,16 @@ export default {
     }
   },
   methods: {
+    didSelectStartTime: function(time) {
+      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    },
+    selectStartTimeAction:function(){
+      this.$refs.start_time_picker.open();
+
+    },
     showWithModify: function(order) {
+      console.log(order)
+
       this.mode = 1;
       this.visibility = true;
 
@@ -233,6 +258,9 @@ export default {
       this.order.advice_desc = order.advice_desc;
       this.order.remark = order.remark;
 
+
+      this.start_time_str = parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+
       // this.order.drug_spec = order.drug_spec;
       // this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way =
@@ -276,7 +304,9 @@ export default {
           single_dose: this.order.single_dose,
           single_dose_unit: this.order.single_dose_unit,
           prescribing_number: this.order.prescribing_number,
-          prescribing_number_unit: this.order.prescribing_number_unit
+          prescribing_number_unit: this.order.prescribing_number_unit,
+          start_time:this.start_time_str
+
         });
       }
     },

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -12,8 +12,11 @@
         </div>
         <div class="inline_block" style="margin-left: 25px;">
           住院号：
-          <div class="under_line" style="width: 100px;text-align: left">
-            {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+          <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
+            {{patientInfo.admission_number}}
+          </div>
+          <div class="under_line" style="width: 100px;text-align: left" v-else>
+            {{'/'}}
           </div>
         </div>
         <div class="inline_block" style="margin-left:25px;">
@@ -499,6 +502,10 @@
                     <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
                     <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
                   </div>
+                  <div class="under_line" style="width: 80px;text-align: left" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater&&dialysisOrder.start_nurse != check.modifier">
+                    <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
+                    <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
+                  </div>
                 </div>
                 <div class="inline_block">
                   &emsp;核对时间：
@@ -583,8 +590,11 @@
           </div>
           <div class="inline_block" style="margin-left:25px;">
             住院号：
-            <div class="under_line" style="width: 120px;text-align: left">
-              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+            <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
+              {{patientInfo.admission_number}}
+            </div>
+            <div class="under_line" style="width: 100px;text-align: left" v-else>
+              {{'/'}}
             </div>
           </div>
           <div class="inline_block" style="margin-left:25px;">
@@ -706,44 +716,56 @@
               <div class="row" style="padding: 2px 0;line-height:24px;">
                 <div class="inline_block">
                   透析液(mmol/L)： &emsp;Ca<sup>2+</sup>：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
-                    <span v-else>{{'/'}}</span>
-
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.calcium">
+                    <span>{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    <span>{{'/'}}</span>
                   </div>
                   mmol/L &emsp;Na<sup>+</sup>：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
-                    <span v-else>{{'/'}}</span>
 
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.sodium">
+                    <span>{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    <span>{{'/'}}</span>
                   </div>
                   mmol/L &emsp;K<sup>+</sup>：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
-                    <span v-else>{{'/'}}</span>
-
-
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.kalium">
+                    <span>{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    <span>{{'/'}}</span>
                   </div>
                   mmol/L
                 </div>
                 <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
                   &emsp;置换液后/前稀释 总量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.displace_liqui_value">
+                    {{prescription.displace_liqui_value}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   L
                 </div>
                 <div class="inline_block" v-if="prescription.displace_liqui_part == 1">
                   &emsp;置换液前稀释 总量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.displace_liqui_value">
+                    {{prescription.displace_liqui_value}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   L
                 </div>
                 <div class="inline_block" v-if="prescription.displace_liqui_part == 2">
                   &emsp;置换液后稀释 总量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.displace_liqui_value">
+                    {{prescription.displace_liqui_value}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   L
                 </div>
@@ -757,15 +779,21 @@
                 </div>
                 <div class="inline_block">
                   &emsp;血流量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{prescription.blood_flow_volume?prescription.blood_flow_volume:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.blood_flow_volume">
+                    {{prescription.blood_flow_volume}}
+                  </div>
+                  <div class="under_line" style="width: 70px;text-align: left" v-else>
+                    {{'/'}}
                   </div>
                   ml/min
                 </div>
                 <div class="inline_block">
                   &emsp;透析液流量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="prescription.dialysate_flow">
+                    {{prescription.dialysate_flow}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   ml/min
                 </div>
@@ -773,31 +801,42 @@
               <div class="row" style="padding: 2px 0;line-height:24px;">
                 <div class="inline_block">
                   透前体重：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{predialysis.weight_before?predialysis.weight_before:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="predialysis.weight_before">
+                    {{predialysis.weight_before}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   kg
                 </div>
                 <div class="inline_block">
                   &emsp;设定超滤量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{getFloat(prescription.target_ultrafiltration)?getFloat(prescription.target_ultrafiltration):'/'}}
-
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.target_ultrafiltration)">
+                    {{getFloat(prescription.target_ultrafiltration)}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   L
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{getFloat(prescription.ultrafiltration)?getFloat(prescription.ultrafiltration):'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.ultrafiltration)">
+                    {{getFloat(prescription.ultrafiltration)}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   L
 
                 </div>
                 <div class="inline_block">
                   透后体重：
-                  <div class="under_line" style="width: 70px;text-align: left">
-                    {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="afterdialysis.weight_after">
+                    {{afterdialysis.weight_after}}
+                  </div>
+                  <div class="under_line" style="width: 70px;" v-else>
+                    {{'/'}}
                   </div>
                   kg
                 </div>
@@ -878,8 +917,11 @@
             </div>
             <div class="inline_block" style="margin-left:25px;">
               住院号：
-              <div class="under_line" style="width: 120px;text-align: left">
-                {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+              <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
+                {{patientInfo.admission_number}}
+              </div>
+              <div class="under_line" style="width: 100px;text-align: left" v-else>
+                {{'/'}}
               </div>
             </div>
             <div class="inline_block" style="margin-left:25px;">

src/pages/main/today/TodayTab.vue

@@ -123,7 +123,7 @@
     </van-popup>
 
     <van-popup title="临时医嘱" v-model="menuList[4].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <orders-dialog :patient_prop="patient" :advice_groups="advice_groups" :advice_list_prop="doctor_advices" :admin_users_prop="admin_users" @orderDialog="closeStatOrder" ref="orders_dialog" > </orders-dialog>
+      <orders-dialog :patient_prop="patient" :advice_groups="advice_groups" :advice_list_prop="doctor_advices" :admin_users_prop="admin_users" :special_premission="special_premission" @orderDialog="closeStatOrder" ref="orders_dialog" > </orders-dialog>
     </van-popup>
 
     <van-popup title="双人查对" v-model="menuList[5].showPopup" :overlay="true" :close-on-click-overlay="false">
@@ -133,7 +133,7 @@
 
     <van-popup title="透析上机" v-model="menuList[0].showPopup" :overlay="true" :close-on-click-overlay="false">
       <computer-dialog :schedule="schedual" :patient_prop="patient" :record="dialysis_order" :admins="admin_users"
-                       :device_numbers="device_numbers" :admin_map="admin_user_map"
+                       :device_numbers="device_numbers" :admin_map="admin_user_map" :special_premission="special_premission"
                        :device_number_map="device_number_map" @did_start="closeDialysisComputer"
                        @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
     </van-popup>
@@ -145,7 +145,7 @@
     </van-popup>
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <plane-dialog :patient_prop="patient" :record="dialysis_order" :admins="admin_users" :admin_map="admin_user_map"
+      <plane-dialog :patient_prop="patient" :record="dialysis_order" :admins="admin_users" :admin_map="admin_user_map" :special_premission="special_premission"
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
@@ -271,6 +271,7 @@ export default {
       last_assessment_after_dislysis: {}, // 上次透后评估
       treatment_summary: {}, // 治疗小结
       monitor_records: [], // 透析监测
+      special_premission: [],
       last_monitor_record: {
         id: 0,
         operate_time: new Date().getTime(),
@@ -750,6 +751,10 @@ export default {
           var dialysis_order = resp.data.dialysis_order; // 透析记录
           var operators = resp.data.operators; // 操作人
 
+
+          var special_premission = resp.data.special_premission // 特殊权限
+
+
           var last_predialysis_evaluation =
             resp.data.last_predialysis_evaluation; // 上一次透前评估
           var last_assessment_after_dislysis =
@@ -772,6 +777,8 @@ export default {
               : last_predialysis_evaluation;
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
+          this.special_premission = special_premission
+
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {

src/pages/waitingRoom/components/details.vue

@@ -21,9 +21,9 @@
       <div v-show="index==1" title="透析"></div> -->
 
       <div v-show="index==1" title="今日">
-        <details-menu 
-        ref="detail_menu" 
-        class="clearfix" 
+        <details-menu
+        ref="detail_menu"
+        class="clearfix"
         :patient="patient"
         :schedual="schedual"
         :prescription="prescription"
@@ -39,7 +39,7 @@
         :admin_users="admin_users"
         :devices="devices"
         v-on:did_add_monitor="didAddMonitor" @create_medical_order="createMedicalOrder" @delete_medical_order="delMedicalOrder" @execution_medical_order="executionMedicalOrder" @edit_pre_dialysis="editPreDialysis"></details-menu>
-        
+
         <details-info ref="patient_info" class="clearfix"></details-info>
         <dialysis-prescription ref="prescription" title="透析处方 " :prescription="prescription" :solution="solution"></dialysis-prescription>
         <!-- <past-data title="往期数据"></past-data> -->
@@ -106,6 +106,7 @@ export default {
       dialysis_order : {}, // 透析记录
       admin_users: [], //系统用户列表
       devices: [],//设备
+      special_premission:[],
     };
   },
   components: {
@@ -161,6 +162,8 @@ export default {
           var treatment_summary = resp.data.treatment_summary // 治疗小结
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
+          var special_premission = resp.data.special_premission // 特殊权限
+
 
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
@@ -174,9 +177,9 @@ export default {
           this.treatment_summary = treatment_summary == null ? {id: ""} : treatment_summary
           this.monitor_records = monitor_records == null ? {} : monitor_records
           this.dialysis_order = dialysis_order == null ? {id: ""} : dialysis_order
+          this.special_premission = special_premission
 
           this.$refs.patient_info.setPatientInfo(this.patient, this.schedual.device_number.number)
-          
           this.$refs.patient_detail.setPatientInfo(this.patient, this.schedual.device_number.number)
           // this.$refs.prescription.setPrescription(prescription, solution)
           // this.$refs.accepts_assessment.setRecord(this.receiver_treatment_access)
@@ -188,11 +191,8 @@ export default {
           // this.$refs.dialysis_off.setOrder(this.dialysis_order)
           // this.$refs.assessment_after.setRecord(this.assessment_after_dislysis)
           // this.$refs.treatment_of.setRecord(this.treatment_summary)
-
           // this.$refs.detail_menu.setData(resp.data)
-
           this.title = patient.name
-
         } else {
           this.$toast({
             message: resp.msg
@@ -211,8 +211,6 @@ export default {
       })
     },
     didAddMonitor: function(monitor) {
-      console.log("1111111")
-      console.log(monitor)
       this.$refs.monitoring.addRecords([monitor])
     },
     createMedicalOrder(row) {

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

@@ -295,6 +295,7 @@ export default {
 
     handleExecTime(time) {
       var exceTime = this.handleTime(time);
+      console.log(exceTime)
       var exceParams = {
         id: this.currentRow.id,
         patient: this.patient.id,