Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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

@@ -642,13 +642,47 @@
       v-on:dialog-comfirm="DialogComfirm"
       v-on:dialog-cancle="DialogCancle"
     ></multi-select-box>
+
+    <el-dialog
+          title="提示"
+          :visible.sync="infoDialogVisible"
+          width="30%">
+          <span>
+           <el-form>
+             <el-row>
+               <span>申请日期:</span>
+                <span>
+                    <el-date-picker
+                      type="datetime"
+                      format="yyyy-MM-dd HH:mm"
+                      value-format="yyyy-MM-dd HH:mm"
+                      placeholder="选择时间"
+                      v-model="selected_date"
+                  ></el-date-picker>
+                </span>
+             </el-row>
+             <el-row>
+               <span>备注:</span>
+                <span>
+                   <el-input v-model="remark" style="width:200px"></el-input>
+                </span>
+             </el-row>
+           </el-form>
+         
+          </span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="infoDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="saveInformation">确 定</el-button>
+          </span>
+        </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { getDataConfig } from '@/utils/data'
 import MultiSelectBox from './MultiSelectBox'
-import { postAssessmentAfterDislysis } from '@/api/dialysis'
+import { postAssessmentAfterDislysis,saveInformation } from '@/api/dialysis'
 import { uParseTime } from '@/utils/tools'
 import store from '@/store'
 import { parseTime } from '@/utils'
@@ -818,7 +852,9 @@ export default {
       consciousnessList:[],
       fallriskList:[],
       machineList:[],
-      
+      infoDialogVisible:false,
+      selected_date:"",
+      remark:""
     }
   },
   watch: {
@@ -1138,6 +1174,9 @@ export default {
               this.loading = false
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                if(response.data.code == 600000008){
+                  this.infoDialogVisible = false
+                }
                 return false
               } else {
                 this.$notify({
@@ -1426,7 +1465,23 @@ export default {
             }
           }
         })
-    }
+    },
+    saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:2,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
   },
   created() {
     // console.log("this.form", this.form.consciousness);

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

@@ -507,16 +507,19 @@ export default {
 
     handleComfirm: function (formName) {
       // var arr = [];
-      for (let i = 0; i < this.precaution_arr.length; i++) {
-        for (let j = 0; j < this.precautionTwo.length; j++) {
-          if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-            this.arr.push(this.precaution_arr[i].id);
+        if(this.precaution_arr!=null && this.precaution_arr.length >0){
+        for (let i = 0; i < this.precaution_arr.length; i++) {
+          for (let j = 0; j < this.precautionTwo.length; j++) {
+            if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+              this.arr.push(this.precaution_arr[i].id);
+            }
           }
         }
+        var obj = this.arr.join(",");
       }
-      // this.precautionchange()
-      var obj = this.arr.join(",");
+      
       this.receiveTreatmentAsses.precaution = obj;
+
       let ParamsQuery = this.receiveTreatmentAsses;
 
       console.log("ParamsQuery", ParamsQuery);

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

@@ -388,6 +388,7 @@ import {
   PostModifyStartDialysis,
   startDialysis,
 } from "@/api/dialysis_record";
+  import { saveInformation } from '@/api/dialysis'
 import { uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import { parseTime } from "@/utils";
@@ -931,7 +932,7 @@ export default {
             } else {
 
               this.$message.error(resp.msg);
-              if(response.data.code == 600000008){
+              if(resp.code == 600000008){
                 this.infoDialogVisible = true
               }
             }

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

@@ -1235,11 +1235,45 @@
                 v-on:dialog-cancle="innerDialogCancle"
         ></multi-select-box>
 
+
+     <el-dialog
+      title="提示"
+      :visible.sync="infoDialogVisible"
+      width="30%">
+      <span>
+        <el-form>
+          <el-row>
+            <span>申请日期:</span>
+            <span>
+                <el-date-picker
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  placeholder="选择时间"
+                  v-model="selected_date"
+              ></el-date-picker>
+            </span>
+          </el-row>
+          <el-row>
+            <span>备注:</span>
+            <span>
+                <el-input v-model="remark" style="width:200px"></el-input>
+            </span>
+          </el-row>
+        </el-form>
+      
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="infoDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveInformation">确 定</el-button>
+      </span>
+    </el-dialog>
+
     </div>
 </template>
 
 <script>
-  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution } from '@/api/dialysis'
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
   import store from '@/store'
@@ -1675,6 +1709,7 @@
         zongliang:"",
         educationList:[],
         value:"",
+        infoDialogVisible:false
       }
 
     },
@@ -2092,6 +2127,9 @@ mu
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
+                    if(response.data.code == 600000008){
+                       this.infoDialogVisible = true
+                    }
                     this.isLoading = false
                     return false
                   } else {
@@ -2128,6 +2166,9 @@ mu
                           this.isLoading = false
                         } else {
                           this.isLoading = false
+                          if(resp.code == 600000008){
+                            this.infoDialogVisible = true
+                          }
                         }
                       }
                     )
@@ -2157,6 +2198,9 @@ mu
                 postSoulution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
+                    if(response.data.code == 600000008){
+                     this.infoDialogVisible = true
+                    }
                     this.isLoading = false
                     return false
                   } else {
@@ -2200,6 +2244,9 @@ mu
                           this.isLoading = false
                         } else {
                           this.isLoading = false
+                          if(resp.code == 600000008){
+                            this.infoDialogVisible = true
+                          }
                         }
                       }
                     )
@@ -2249,6 +2296,9 @@ mu
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
+                   if(response.data.code == 600000008){
+                      this.infoDialogVisible = true
+                    }
                   return false
                 } else {
                   this.$notify({
@@ -2284,6 +2334,9 @@ mu
               postSoulution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
+                   if(response.data.code == 600000008){
+                     this.infoDialogVisible = true
+                    }
                   return false
                 } else {
                   this.$notify({
@@ -2754,6 +2807,9 @@ mu
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
+                     if(response.data.code == 600000008){
+                      this.infoDialogVisible = true
+                     }
                     return false
                   } else {
                     this.$notify({
@@ -2797,6 +2853,9 @@ mu
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                        this.infoDialogVisible = true
+                       }
                       return false
                     } else {
                       this.$notify({
@@ -2846,6 +2905,9 @@ mu
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                        this.infoDialogVisible = true
+                       }
                       return false
                     } else {
                       this.$notify({
@@ -2880,6 +2942,9 @@ mu
                             // this.doctorAdvices = resp.data.advices
                             this.$emit('advice')
                           } else {
+                             if(resp.code == 600000008){
+                               this.infoDialogVisible = true
+                             }
                           }
                         }
                       )
@@ -2918,6 +2983,9 @@ mu
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                        this.infoDialogVisible = true
+                       }
                       return false
                     } else {
                       this.$notify({
@@ -2961,6 +3029,9 @@ mu
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                        this.infoDialogVisible = true
+                       }
                       return false
                     } else {
                       this.$notify({
@@ -3004,6 +3075,9 @@ mu
                     postPrescription(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                         if(response.data.code == 600000008){
+                            this.infoDialogVisible = true
+                          }
                         return false
                       } else {
                         this.$notify({
@@ -3053,6 +3127,9 @@ mu
                     postPrescription(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                        if(response.data.code == 600000008){
+                           this.infoDialogVisible = true
+                        }
                         return false
                       } else {
                         this.$notify({
@@ -3092,6 +3169,9 @@ mu
                             // this.doctorAdvices = resp.data.advices
                             this.$emit('advice')
                           } else {
+                             if(resp.code == 600000008){
+                              this.infoDialogVisible = true
+                             }
                           }
                         })
 
@@ -3125,6 +3205,9 @@ mu
                     postPrescription(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                        if(response.data.code == 600000008){
+                            this.infoDialogVisible = true
+                          }
                         return false
                       } else {
                         this.$notify({
@@ -3172,6 +3255,9 @@ mu
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
+                    if(response.data.code == 600000008){
+                       this.infoDialogVisible = true
+                    }
                     return false
                   } else {
                     this.$notify({
@@ -3262,6 +3348,9 @@ mu
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                         this.infoDialogVisible = true
+                      }
                       return false
                     } else {
                       this.$notify({
@@ -3312,6 +3401,9 @@ mu
                     postSoulution(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                        if(response.data.code == 600000008){
+                          this.infoDialogVisible = true
+                        }
                         return false
                       } else {
                         this.$notify({
@@ -3367,6 +3459,9 @@ mu
                     postPrescription(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                        if(response.data.code == 600000008){
+                            this.infoDialogVisible = true
+                        }
                         return false
                       } else {
                         this.$notify({
@@ -3401,6 +3496,9 @@ mu
                               // this.doctorAdvices = resp.data.advices
                               this.$emit('advice')
                             } else {
+                               if(resp.code == 600000008){
+                                 this.infoDialogVisible = true
+                                }
                             }
                           }
                         )
@@ -3435,6 +3533,9 @@ mu
                     postSoulution(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                        if(response.data.code == 600000008){
+                          this.infoDialogVisible = true
+                        }
                         return false
                       } else {
                         this.$notify({
@@ -3482,6 +3583,9 @@ mu
                     postSoulution(ParamsQuery).then(response => {
                       if (response.data.state == 0) {
                         this.$message.error(response.data.msg)
+                         if(response.data.code == 600000008){
+                          this.infoDialogVisible = true
+                         }
                         return false
                       } else {
                         this.$notify({
@@ -3531,6 +3635,9 @@ mu
                       postSoulution(ParamsQuery).then(response => {
                         if (response.data.state == 0) {
                           this.$message.error(response.data.msg)
+                           if(response.data.code == 600000008){
+                           this.infoDialogVisible = true
+                          }
                           return false
                         } else {
                           this.$notify({
@@ -3583,6 +3690,9 @@ mu
                       postSoulution(ParamsQuery).then(response => {
                         if (response.data.state == 0) {
                           this.$message.error(response.data.msg)
+                          if(response.data.code == 600000008){
+                           this.infoDialogVisible = true
+                          }
                           return false
                         } else {
                           this.$notify({
@@ -3621,6 +3731,9 @@ mu
                               // this.doctorAdvices = resp.data.advices
                               this.$emit('advice')
                             } else {
+                               if(resp.code == 600000008){
+                                 this.infoDialogVisible = true
+                                }
                             }
                           })
                           const prescription_resp = response.data.data.prescription
@@ -3660,6 +3773,9 @@ mu
                       postSoulution(ParamsQuery).then(response => {
                         if (response.data.state == 0) {
                           this.$message.error(response.data.msg)
+                          if(response.data.code == 600000008){
+                           this.infoDialogVisible = true
+                         }
                           return false
                         } else {
                           this.$notify({
@@ -3707,6 +3823,9 @@ mu
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
+                       if(response.data.code == 600000008){
+                         this.infoDialogVisible = true
+                       }
                       return false
                     } else {
                       this.$notify({

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

@@ -191,8 +191,9 @@
             return time.getTime() > Date.now()
           }
         },
-        remark:""
-       
+        remark:"",
+        infoDialogVisible:false,
+        selected_date:"",
       }
     },
     props: {

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

@@ -1754,6 +1754,40 @@
       </div>
       <!--</div>-->
     </el-dialog>
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="infoDialogVisible"
+      width="30%">
+      <span>
+        <el-form>
+          <el-row>
+            <span>申请日期:</span>
+            <span>
+                <el-date-picker
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  placeholder="选择时间"
+                  v-model="selected_date"
+              ></el-date-picker>
+            </span>
+          </el-row>
+          <el-row>
+            <span>备注:</span>
+            <span>
+                <el-input v-model="remark" style="width:200px"></el-input>
+            </span>
+          </el-row>
+        </el-form>
+      
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="infoDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveInformation">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -1766,7 +1800,7 @@ import {
   getTodayMonitor,
 } from "@/api/dialysis_record";
 import store from "@/store";
-
+import { saveInformation } from '@/api/dialysis'
 import request from "@/utils/request";
 
 export default {
@@ -1854,6 +1888,9 @@ export default {
       anticoagulantsConfit: {},
       bloodPressureMmonitoringSite: [],
       complicationList: [],
+      infoDialogVisible:false,
+      selected_date:"",
+      remark:""
     };
   },
   props: {
@@ -2716,6 +2753,9 @@ export default {
                 ? 0
                 : parseFloat(this.form.heparin_amount);
             this.$message.error(resp.msg);
+            if(resp.code == 600000008){
+              this.infoDialogVisible = false
+            }
           }
         }
       );
@@ -2813,6 +2853,9 @@ export default {
                 }
               }
               this.$message.success("删除成功");
+              if(response.data.code =600000008){
+                this.infoDialogVisible = true
+              }
             }
           });
         })
@@ -2864,6 +2907,22 @@ export default {
       }
       return name;
     },
+   saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:7,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
   },
   watch: {
     patient: {

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

@@ -489,7 +489,7 @@ export default {
           module:1,
           remark:this.remark,
         }
-        console.log("params32222222222----",params)
+       
       saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information