518合并代码

src/api/his/advice.js

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

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

@@ -1413,8 +1413,7 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-              console.log("子药23223332323332",this.form.parent_id)
-              console.log("232322332323232",this.form.parent_id)
+            
 
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
@@ -1427,7 +1426,7 @@
                     break
                   }
                 }
-                console.log("spliceIndex233232323232",spliceIndex)
+               
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1440,7 +1439,7 @@
                     }
                   }
 
-                  console.log("doctore_advic4233232323232",this.doctor_advices)
+                 
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
@@ -2366,14 +2365,6 @@
                  this.doctor_advices.push(his_advices[i])
               }
             }
-
-            this.$notify({
-              title: '成功',
-              message: '新增医嘱成功',
-              type: 'success',
-              duration: 2000
-            })
-
             this.currentIndex = -1
             this.currentRow = null
             this.setCurrent()

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -766,10 +766,9 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-       
+       console.log("val232332322323323232323",val)
         var arr = []
        
-       
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
         }
@@ -798,6 +797,7 @@ export default {
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
+            this.recordInfo.recordData[i].license_number = val.number
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -782,7 +782,7 @@
             this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-            this.recordInfo.recordData[i].license_number = ""
+            this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].warehouse_info_id = 0
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count

src/xt_pages/stock/test.vue

@@ -30,10 +30,10 @@
             @change="startTimeChange"
           ></el-date-picker>
 
-        <el-input @keyup.enter.native='searchAction' v-model="keywords"
+        <!-- <el-input @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
         <el-button  class="filter-item" type="primary" icon="el-icon-search"
-                   @click="searchAction">搜索</el-button>
+                   @click="searchAction">搜索</el-button> -->
           </div>
 
           <el-table
@@ -52,16 +52,55 @@
             ref="singleTable"
             @current-change="handleCurrentChange"
           >
-            <el-table-column align="center" prop="name" label="姓名" wdith="89">
-              <template slot-scope="scope"></template>
+            <el-table-column align="center" prop="name" label="名称" wdith="89">
+              <template slot-scope="scope">
+                {{scope.row.drug_name}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="规格" wdith="89">
+              <template slot-scope="scope">
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="库存" wdith="89">
+              <template slot-scope="scope">
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
       <div class="mainRight">
         <el-tabs v-model="titleType">
-          <el-tab-pane label="明细" name="明细"></el-tab-pane>
-          <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+          <el-tab-pane label="明细" name="明细">
+           
+           <el-table
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column prop="date" label="序号" width="180">
+              <template slot-scope="scope">
+
+              </template>
+            </el-table-column>
+            <el-table-column  prop="name" label="单据编码" width="180">
+            </el-table-column>
+            <el-table-column prop="address" label="患者姓名">
+            </el-table-column>
+            <el-table-column prop="address" label="单次用量">
+            </el-table-column>
+             <el-table-column prop="address" label="用法">
+            </el-table-column>
+             <el-table-column prop="address" label="频率">
+            </el-table-column>
+             <el-table-column prop="address" label="天数">
+            </el-table-column>
+            <el-table-column prop="address" label="总量">
+            </el-table-column>
+          </el-table>
+
+          </el-tab-pane>
+         
         </el-tabs>
       </div>
     </div>
@@ -69,9 +108,9 @@
 </template>
 
 <script>
-import { getTodayAdviceList } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug } from "@/api/his/advice";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
+const moment = require('moment')
 export default {
   components: {
     BreadCrumb,
@@ -88,7 +127,8 @@ export default {
       titleType: "明细",
       patient_id: 0,
       keywords: "",
-      start_time:new Date(),
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      tableData:[],
     };
   },
 
@@ -131,8 +171,8 @@ export default {
       this.getPatientList();
     },
     handleCurrentChange(row) {
-      this.patient_id = row.id;
-     
+    
+      this.getPharmacyBaseDrug(row.id)
     },
     getlist(){
       var params = {
@@ -140,8 +180,58 @@ export default {
         keywords:this.keywords,
       }  
       getTodayAdviceList(params).then(response=>{
-
+         if(response.data.state == 1){
+           var list =  response.data.data.list
+           this.$refs.singleTable.setCurrentRow(list[0])
+           this.patientTableData = list
+         }
       }) 
+    }, 
+     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
+    startTimeChange(){
+
+    },
+    getPharmacyBaseDrug(drug_id){
+      var params = {
+        start_time:this.start_time,
+        drug_id:drug_id,
+      }
+      console.log("param23232323322332",params)
+      getPharmacyBaseDrug(params).then(response=>{
+        if(response.data.state == 1){
+           var advicelist = response.data.data.advicelist
+           console.log("advicelist23323232323323",advicelist)
+           var hisAdviceList = response.data.data.hisAdviceList
+           console.log("hisadvicelist23233232233",hisAdviceList)
+           var patient = response.data.data.patient
+           console.log("patient23322323232332",patient)
+        }
+      })
     }
   },
   created() {