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

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

@@ -997,14 +997,15 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
 
-            console.log(this.prescription)
 
             if (this.prescription.creater <= 0) {
-              mode = 1
+              ParamsQuery['mode'] = "1"
             } else {
-              mode = 2
+              ParamsQuery['mode'] = "2"
+              if (this.$store.getters.xt_user.user.id  != this.dialysisPrescription.creater){
+                ParamsQuery['mode'] = "3"
+              }
             }
-
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1124,12 +1125,13 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             console.log(this.prescription)
-
+            let mode = ""
             if (this.prescription.creater <= 0) {
               mode = 1
             } else {
               mode = 2
             }
+            ParamsQuery['mode'] = mode
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {

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

@@ -1058,6 +1058,7 @@ export default {
             parseFloat(this.form.displacement_flow_quantity) == NaN
               ? 0
               : parseFloat(this.form.displacement_flow_quantity);
+
           this.form.ktv =
             parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
 
@@ -1131,7 +1132,7 @@ export default {
 
           const params = {
             patient_id: this.patient_id,
-            record_id: this.table_current_row.id
+            record_id: this.table_current_row.id,
             mode: mode
 
           };

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -821,33 +821,65 @@
         this.$refs[formName].validate(valid => {
           if (valid) {
             if (_this.nameForm.isEdit) {
-              var submitForm = {
-                advice_type: _this.groupForm.advice_type,
-                advice_date: _this.groupForm.advice_date,
-                start_time: _this.groupForm.start_time,
-                advice_name: _this.nameForm.advice_name,
-                advice_desc: _this.nameForm.advice_desc,
-                single_dose: '' + _this.nameForm.single_dose,
-                single_dose_unit: _this.nameForm.single_dose_unit,
-                drug_spec: '' + _this.nameForm.drug_spec,
-                drug_spec_unit: _this.nameForm.drug_spec_unit,
-                prescribing_number: '' + _this.nameForm.prescribing_number,
-                prescribing_number_unit: _this.nameForm.prescribing_number_unit,
-                delivery_way: _this.nameForm.delivery_way,
-                execution_frequency: _this.nameForm.execution_frequency,
-                isEdit: 0,
-                id: 0,
-                advice_doctor: '',
-                remark: _this.groupForm.remark,
-                parent_id: _this.groupSelectRow.parent_id,
-                groupno: _this.groupForm.groupno,
-                frequency_type: _this.nameForm.frequency_type,
-                day_count: _this.nameForm.day_count.toString(),
-                week_days: this.weeks
-                  .filter(function(s) {
-                    return s && s.trim()
-                  })
-                  .join(',')
+              var submitForm = null
+              if(!this.isChild){
+
+                 submitForm = {
+                  advice_type: _this.groupForm.advice_type,
+                  advice_date: _this.groupForm.advice_date,
+                  start_time: _this.groupForm.start_time,
+                  advice_name: _this.nameForm.advice_name,
+                  advice_desc: _this.nameForm.advice_desc,
+                  single_dose: '' + _this.nameForm.single_dose,
+                  single_dose_unit: _this.nameForm.single_dose_unit,
+                  drug_spec: '' + _this.nameForm.drug_spec,
+                  drug_spec_unit: _this.nameForm.drug_spec_unit,
+                  prescribing_number: '' + _this.nameForm.prescribing_number,
+                  prescribing_number_unit: _this.nameForm.prescribing_number_unit,
+                  delivery_way: _this.nameForm.delivery_way,
+                  execution_frequency: _this.nameForm.execution_frequency,
+                  isEdit: 0,
+                  id: 0,
+                  advice_doctor: '',
+                  remark: _this.groupForm.remark,
+                  parent_id: _this.groupSelectRow.parent_id,
+                  groupno: _this.groupForm.groupno,
+                  frequency_type: _this.nameForm.frequency_type,
+                  day_count: _this.nameForm.day_count.toString(),
+                  week_days: this.weeks
+                    .filter(function(s) {
+                      return s && s.trim()
+                    })
+                    .join(',')
+                }
+
+              }else{
+                 submitForm = {
+                  advice_type: _this.groupForm.advice_type,
+                  advice_date: _this.groupForm.advice_date,
+                  start_time: _this.groupForm.start_time,
+                  advice_name: _this.nameForm.advice_name,
+                  advice_desc: _this.nameForm.advice_desc,
+                  single_dose: '' + _this.nameForm.single_dose,
+                  single_dose_unit: _this.nameForm.single_dose_unit,
+                  drug_spec: '' + _this.nameForm.drug_spec,
+                  drug_spec_unit: _this.nameForm.drug_spec_unit,
+                  prescribing_number: '' + _this.nameForm.prescribing_number,
+                  prescribing_number_unit: _this.nameForm.prescribing_number_unit,
+                  delivery_way: _this.nameForm.delivery_way,
+                  execution_frequency: _this.nameForm.execution_frequency,
+                  isEdit: 0,
+                  id: 0,
+                  advice_doctor: '',
+                  remark: _this.groupForm.remark,
+                  parent_id: _this.groupSelectRow.parent_id,
+                  groupno: _this.groupForm.groupno,
+                  frequency_type: 0,
+                  day_count: "0",
+                  week_days: "",
+                }
+
+
               }
               let mode = ''
 
@@ -1402,11 +1434,13 @@
             week_days: this.groupSelectRow.week_day,
             frequency_type: this.groupSelectRow.frequency_type
           }
-          // console.log(this.nameForm.week_days)
-          if(this.isChild = true){
-          }else{
+
+          if(!this.isChild){
             this.weeks = this.groupSelectRow.week_day.split(',')
+
           }
+
+
           this.nameFormTitle = '修改医嘱内容'
         } else {
           this.nameForm = {