518合并代码

src/api/his/advice.js

@@ -15,3 +15,11 @@ export function getPharmacyBaseDrug(params) {
     params: params
   })
 }
+
+export function updatePharmacyBaseDrug(params) {
+  return request({
+    url: '/api/advice/updatepharmacybasedrug',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/test.vue

@@ -72,30 +72,54 @@
       </div>
       <div class="mainRight">
         <el-tabs v-model="titleType">
+           <el-button type="primary" @click="toSend">发药</el-button>
           <el-tab-pane label="明细" name="明细">
-           
+            
            <el-table
             :data="tableData"
             border
             style="width: 100%">
-            <el-table-column prop="date" label="序号" width="180">
+            <el-table-column prop="date" label="序号" width="180" align="center">
               <template slot-scope="scope">
-
+                 {{scope.$index + 1}}
               </template>
             </el-table-column>
-            <el-table-column  prop="name" label="单据编码" width="180">
+           
+            <el-table-column prop="address" label="患者姓名" align="center">
+               <template slot-scope="scope">
+                 {{getPatientName(scope.row.patient_id)}}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="患者姓名">
+            <el-table-column prop="address" label="单次用量" align="center">
+              <template  slot-scope="scope">
+                 {{scope.row.single_dose}}
+               </template>
             </el-table-column>
-            <el-table-column prop="address" label="单次用量">
+             <el-table-column prop="address" label="用法" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.delivery_way}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="用法">
+             <el-table-column prop="address" label="频率" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.execution_frequency}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="频率">
+             <el-table-column prop="address" label="天数" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.day}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="天数">
+            <el-table-column prop="address" label="总量" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.prescribing_number}}
+               </template>
             </el-table-column>
-            <el-table-column prop="address" label="总量">
+            <el-table-column  prop="name" label="数据来源" width="180" align="center">
+                <template  slot-scope="scope">
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
+               </template>
             </el-table-column>
           </el-table>
 
@@ -108,7 +132,7 @@
 </template>
 
 <script>
-import { getTodayAdviceList,getPharmacyBaseDrug } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug } from "@/api/his/advice";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 const moment = require('moment')
 export default {
@@ -129,6 +153,7 @@ export default {
       keywords: "",
       start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       tableData:[],
+      patientList:[],
     };
   },
 
@@ -226,11 +251,58 @@ export default {
         if(response.data.state == 1){
            var advicelist = response.data.data.advicelist
            console.log("advicelist23323232323323",advicelist)
+           for(let i=0;i<advicelist.length;i++){
+             advicelist[i].type = 1
+             advicelist[i].day = " "
+             this.tableData.push(advicelist[i])
+           }
            var hisAdviceList = response.data.data.hisAdviceList
            console.log("hisadvicelist23233232233",hisAdviceList)
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableData.push(hisAdviceList[i])
+           }
            var patient = response.data.data.patient
            console.log("patient23322323232332",patient)
+           console.log("tabedaadddddddd",this.tableData)
+           this.patientList = patient
+        }
+      })
+    },
+    getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+             name = this.patientList[i].name
+          }
+       }
+       return name
+    },
+    toSend(){
+      var blood_ids = []
+      var his_ids = []
+      var bloodStr = ""
+      var hisStr = ""
+      console.log("table3223233232322323",this.tableData)
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].type == 1){
+          blood_ids.push(this.tableData[i].id)
+        }
+        if(this.tableData[i].type == 2){
+          his_ids.push(this.tableData[i].id)
         }
+      }
+
+      console.log("blood_ids223我",blood_ids)
+      console.log("his_ids22222我",his_ids)
+      bloodStr = blood_ids.join(",")
+      hisStr =  his_ids.join(",")
+       var params = {
+         bloodStr:bloodStr,
+         hisStr:hisStr,
+       }
+      updatePharmacyBaseDrug(params).then(response=>{
+
       })
     }
   },