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

src/api/dialysis.js

@@ -158,7 +158,7 @@ export function postSoulution(params) {
     url: '/api/dialysis/soulution',
     method: 'Post',
     params: params,
-    headers:{"Permission":3},
+    headers:{"Permission":2},
 
   })
 }

src/api/patient.js

@@ -62,7 +62,7 @@ export function createPatientDialysisSolution(id, solution,mode) {
     url: '/api/patients/dialysissolution/create?patient=' + id +"&mode="+mode,
     method: 'post',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
 
   })
@@ -73,7 +73,7 @@ export function editPatientDialysisSolution(patient, id, solution,mode) {
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id+"&mode="+mode,
     method: 'put',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
   })
 }
@@ -317,7 +317,9 @@ export function UpdateDryWeightData(params) {
   return request({
     url: '/api/patient/updatedryweightdata',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":3},
+
   })
 }
 

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

@@ -12,10 +12,6 @@
                    >
           新增医嘱
         </el-button>
-        <el-button round @click="openGroupFrom" :loading="deleLoading"
-                   disabled>新增医嘱
-        </el-button>
-
 
         <el-button v-if="currentRow != null" round
                    @click="execAdvice" :loading="deleLoading">执行医嘱
@@ -1028,6 +1024,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          console.log(this.currentRow)
           let mode ="4"
           if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id){
             mode = "5"
@@ -1065,7 +1062,13 @@
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          let mode = "4"
+
+
+          let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
+
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {
@@ -1100,6 +1103,9 @@
         }).then(() => {
           this.deleLoading = true
           let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -1706,6 +1706,7 @@ export default {
           return false
         }
 
+        console.log(groups[0].advice_doctor)
         this.adminusername = this.getXuserName(groups[0].advice_doctor)
         this.groupForm = {
           advice_type: groups[0].advice_type,

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

@@ -1058,6 +1058,7 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1160,6 +1161,8 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
+
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/user/dryWeight.vue

@@ -159,7 +159,8 @@
           doctors: this.dryWeightForm.doctors,
           remarks: this.dryWeightForm.remarks,
           patient_id: this.patientID,
-          dryweight: this.dryweight
+          dryweight: this.dryweight,
+          mode : "1"
         }
 
         this.$refs[formName].validate((valid) => {
@@ -172,6 +173,9 @@
                 const id = this.$route.params && this.$route.params.id
                 this.getAllData(id)
                 this.getDryWeightData(id)
+              }else{
+                this.$message.error(response.data.msg)
+                return false
               }
             })
           }