Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -43,7 +43,7 @@
           <el-button v-if="dialysis_order.id == 0" @click="submit" type="primary" :loading="loading">执行上机</el-button>
           <el-button v-else type="info" :disabled="true">已上机</el-button>
           <el-button
-            v-if="dialysis_order.id > 0 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            v-if="dialysis_order.id > 0"
             type="primary" @click="editOrder">修改上机
           </el-button>
 
@@ -252,13 +252,6 @@
           this.schedual_type = this.dialysis_order.schedual_type
         }
 
-        if (this.dialysis_order.id > 0) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.xt_user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
-            }
-          }
-        }
 
         if (this.dialysis_order.id > 0) {
           if (this.dialysis_order.creator == 0) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1016,8 +1016,11 @@
                   type: 'success',
                   duration: 2000
                 })
+                var date = new Date()
+
+                var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+                var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 
-                console.log(hour + ':' + minute)
                 const params = {
                   advices: results,
                   advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
@@ -1067,6 +1070,10 @@
                   duration: 2000
                 })
                 console.log(hour + ':' + minute)
+                var date = new Date()
+
+                var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+                var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 
                 const params = {
                   advices: results,
@@ -1323,25 +1330,13 @@
               })
             }
           } else if (this.is_open == 2) {
+            var date = new Date()
+
+            var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
             if (this.waitUploadAdvices.length > 0) {
-              const params = {
-                advices: this.waitUploadAdvices,
-                advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                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('advice')
-                } else {
 
-                }
-              })
 
               if (this.patient.id <= 0) {
                 this.$message.error('没有选择患者')
@@ -1366,6 +1361,27 @@
                     duration: 2000
                   })
 
+                  const params = {
+                    advices: this.waitUploadAdvices,
+                    advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                    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('advice')
+                    } else {
+
+                    }
+                  })
+
                   const prescription_resp = response.data.data.prescription
                   var prescription = this.prescription
                   for (var index in prescription_resp) {
@@ -1491,25 +1507,12 @@
                 })
               }
             } else if (this.is_open == 2) {
-              if (this.waitUploadAdvices.length > 0) {
-                const params = {
-                  advices: this.waitUploadAdvices,
-                  advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                  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('advice')
-                  } else {
+              var date = new Date()
 
-                  }
-                })
+              var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+              var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
+              if (this.waitUploadAdvices.length > 0) {
 
                 if (this.patient.id <= 0) {
                   this.$message.error('没有选择患者')
@@ -1534,6 +1537,28 @@
                       duration: 2000
                     })
 
+                    const params = {
+                      advices: this.waitUploadAdvices,
+                      advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                      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('advice')
+                      } else {
+
+                      }
+                    })
+
+
                     const prescription_resp = response.data.data.prescription
                     var prescription = this.prescription
                     for (var index in prescription_resp) {
@@ -1720,25 +1745,13 @@
               })
             }
           } else if (this.is_open == 2) {
+            var date = new Date()
+
+            var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
             if (this.waitUploadAdvices.length > 0) {
-              const params = {
-                advices: this.waitUploadAdvices,
-                advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                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('advice')
-                } else {
 
-                }
-              })
 
               if (this.patient.id <= 0) {
                 this.$message.error('没有选择患者')
@@ -1765,6 +1778,26 @@
                     type: 'success',
                     duration: 2000
                   })
+                  const params = {
+                    advices: this.waitUploadAdvices,
+                    advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                    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('advice')
+                    } else {
+
+                    }
+                  })
 
                   const prescription_resp = response.data.data.prescription
                   var prescription = this.prescription
@@ -1900,25 +1933,13 @@
                 })
               }
             } else if (this.is_open == 2) {
+              var date = new Date()
+
+              var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+              var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
               if (this.waitUploadAdvices.length > 0) {
-                const params = {
-                  advices: this.waitUploadAdvices,
-                  advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
-                  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('advice')
-                  } else {
 
-                  }
-                })
 
                 if (this.patient.id <= 0) {
                   this.$message.error('没有选择患者')
@@ -1941,6 +1962,26 @@
                       type: 'success',
                       duration: 2000
                     })
+                    const params = {
+                      advices: this.waitUploadAdvices,
+                      advice_date: uParseTime(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: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
+                      start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                      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('advice')
+                      } else {
+
+                      }
+                    })
                     const prescription_resp = response.data.data.prescription
                     const solution_resp = response.data.data.solution
                     var prescription = this.prescription

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -30,7 +30,7 @@
           <!--</el-button>-->
           <!--<el-button v-else :disabled="true" type="info">未上机</el-button>-->
           <el-button
-            v-if="dialysis_order.stage == 2 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            v-if="dialysis_order.stage == 2 "
             type="primary" @click="modifyFinish">修改下机
           </el-button>
 

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -965,7 +965,7 @@ export default {
       let mode = "1"
        if(this.form.id > 0){
          mode = "2"
-         if(this.form.creator > 0 && this.form.creator != this.$store.getters.xt_user.user.id){
+         if(this.form.monitoring_nurse > 0 && this.form.monitoring_nurse != this.$store.getters.xt_user.user.id){
           mode = "3"
          }
       }
@@ -1053,8 +1053,9 @@ export default {
       })
         .then(() => {
           let mode = "4"
-          // if(this.table_current_row)
-
+          if(this.table_current_row.creator > 0 && this.table_current_row.creator != this.$store.getters.xt_user.user.id){
+            mode = "5"
+          }
 
           const params = {
             patient_id: this.patient_id,

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -656,7 +656,8 @@
         parent_id: 0,
         remind: 0,
         frequency_type: 0,
-        day_count: ''
+        day_count: '',
+        doctor:0,
       },
       adviceTypeOptions: {
         type: Array,
@@ -685,7 +686,6 @@
 
           return
         }
-        console.log(this.groupSelectRow)
         var content = ''
         if (this.groupSelectRow.children.length > 0) {
           content = '确认删除此医嘱内容,包括它的子药？'
@@ -702,20 +702,17 @@
         })
           .then(() => {
 
-            console.log(this.groupForm.advice_type)
-            console.log(this.$store.getters.xt_user.user.id)
-            console.log(this.$store.getters.xt_user.user.id)
 
 
             let mode = ''
             if (this.groupForm.advice_type == 1) {
               mode = '1-6'
-              if (this.groupForm.advice_doctor != this.$store.getters.xt_user.user.id) {
+              if (this.groupForm.doctor != this.$store.getters.xt_user.user.id) {
                 mode = '1-7'
               }
             } else if (this.groupForm.advice_type == 3) {
               mode = '4-1'
-              if (this.groupForm.advice_doctor != this.$store.getters.xt_user.user.id) {
+              if (this.groupForm.doctor != this.$store.getters.xt_user.user.id) {
                 mode = '5-1'
               }
             }
@@ -723,6 +720,7 @@
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
+
               } else {
                 this.$notify({
                   title: '成功',
@@ -776,46 +774,46 @@
                     }
                   }
                 }
-              }
-            })
 
-            if (isChild) {
-              for (const index in this.groupForm.adviceNames) {
-                if (
-                  this.groupForm.adviceNames[index].row_key ==
-                  this.groupSelectRow.parent_row
-                ) {
-                  for (const j in this.groupForm.adviceNames[index].children) {
+                if (isChild) {
+                  for (const index in this.groupForm.adviceNames) {
+                    if (
+                      this.groupForm.adviceNames[index].row_key ==
+                      this.groupSelectRow.parent_row
+                    ) {
+                      for (const j in this.groupForm.adviceNames[index].children) {
+                        if (
+                          this.groupForm.adviceNames[index].children[j].row_key ==
+                          this.groupSelectRow.row_key
+                        ) {
+                          this.groupForm.adviceNames[index].children.splice(j, 1)
+                          this.$set(
+                            this.groupForm.adviceNames,
+                            index,
+                            this.groupForm.adviceNames[index]
+                          )
+                          this.toggleRowExpansion()
+                          break
+                        }
+                      }
+                    }
+                  }
+                } else {
+                  for (const index in this.groupForm.adviceNames) {
                     if (
-                      this.groupForm.adviceNames[index].children[j].row_key ==
+                      this.groupForm.adviceNames[index].row_key ==
                       this.groupSelectRow.row_key
                     ) {
-                      this.groupForm.adviceNames[index].children.splice(j, 1)
-                      this.$set(
-                        this.groupForm.adviceNames,
-                        index,
-                        this.groupForm.adviceNames[index]
-                      )
+                      this.groupForm.adviceNames.splice(index, 1)
                       this.toggleRowExpansion()
                       break
                     }
                   }
                 }
               }
-            } else {
-              for (const index in this.groupForm.adviceNames) {
-                if (
-                  this.groupForm.adviceNames[index].row_key ==
-                  this.groupSelectRow.row_key
-                ) {
-                  this.groupForm.adviceNames.splice(index, 1)
-                  this.toggleRowExpansion()
-                  break
-                }
-              }
-            }
-          })
-          .catch(() => {
+            })
+
+          }).catch(() => {
           })
       },
       submitNameForm(formName) {
@@ -853,16 +851,18 @@
               }
               let mode = ''
 
-              //TODO 修改他人
+
+
+
               if (_this.groupForm.advice_type == 1) {
                 // if(_this.nameForm.)
                 mode = '1-3'
-                if (_this.groupForm.advice_doctor != _this.$store.getters.xt_user.user.id) {
+                if (_this.groupForm.doctor != _this.$store.getters.xt_user.user.id) {
                   mode = '1-4'
                 }
               } else if (_this.groupForm.advice_type == 3) {
                 mode = '2-1'
-                if (_this.groupForm.advice_doctor != _this.$store.getters.xt_user.user.id) {
+                if (_this.groupForm.doctor != _this.$store.getters.xt_user.user.id) {
                   mode = '3-1'
                 }
               }

src/xt_pages/user/doctorAdvice.vue

@@ -2863,9 +2863,12 @@
           start_time: uParseTime(groups[0].start_time, '{y}-{m}-{d} {h}:{i}'),
           adviceNames: [],
           advice_doctor: groups[0].user_name,
+          doctor: groups[0].advice_doctor,
+
           remark: groups[0].remark,
           groupno: groupno
         }
+        console.log(groups[0])
 
         var childMap = {}
         for (const index in groups) {