8月15日

src/api/advice.js

@@ -543,3 +543,19 @@ export function excutionDoctorAdvice(params) {
     params: params
   })
 }
+
+export function checkNewDoctorAdvice(params) {
+  return request({
+    url: '/api/schedule/checknewdoctoradvice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function settleNewDoctorAdvice(params) {
+  return request({
+    url: '/api/schedule/settlenewdoctoradvice',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -153,8 +153,8 @@
       </div>
       <div>
         <el-button type="primary" size="small" @click="toExcution">执行医嘱</el-button>
-        <el-button type="primary" size="small">医嘱核对</el-button>
-        <el-button type="primary" size="small">收费</el-button>
+        <el-button type="primary" size="small" @click="toCheck">医嘱核对</el-button>
+        <el-button type="primary" size="small" @click="toSettle">收费</el-button>
       </div>
 
 
@@ -445,7 +445,7 @@ import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
-import { getNewSchedualDoctors,excutionDoctorAdvice } from '@/api/advice'
+import { getNewSchedualDoctors,excutionDoctorAdvice,checkNewDoctorAdvice,settleNewDoctorAdvice } from '@/api/advice'
 import { PostSearch } from '@/api/patient'
 export default {
   name: "Patient",
@@ -1154,12 +1154,41 @@ export default {
             var min_unit = response.data.data.drug.min_unit
             var str = drug_name + " "+dose+dose_unit +"*"+min_number +max_unit +"/"+min_unit
             this.$message.error(str +"库存不足,执行失败!")
+            this.exceLoading = false
            }
            var msg = response.data.data.msg
            this.$message.success("保存成功!")
            this.exceLoading = false
           }
        })
+     },
+     toCheck(){
+      var params = {
+        str:str,
+        advice_date: moment(time).format('YYYY-MM-DD'),
+        is_open:this.config.is_open,
+       }
+       checkNewDoctorAdvice(params).then(response=>{
+          if(response.data.state == 1){
+            if(response.data.data.msg == 2){
+              var advice = response.data.data.advice
+              this.$message.error(advice.advice_name +"执行人和核对人不能是同一个人,核对失败!")
+            }
+            this.$message.error("核对成功!")
+          }
+       })
+     },
+     toSettle(){
+       var params = {
+        str:str,
+        advice_date: moment(time).format('YYYY-MM-DD'),
+        is_open:this.config.is_open,
+       }
+       settleNewDoctorAdvice(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("收费成功!")
+          }
+       })
      }
   },
   components: {

src/xt_pages/user/dialysisSolution.vue

@@ -1287,7 +1287,7 @@
             for(let i=0;i<this.dialyzers.length;i++){
               this.dialyzers[i].name = this.dialyzers[i].specification_name
             }
-            console.log("2222222",this.dialyzers)
+            // console.log("2222222",this.dialyzers)
             this.InnerDialogProps.values = this.dialyzers
             this.InnerDialogProps.titles = '透析器'
             this.InnerDialogProps.type = 'dialyzers'