hah阿凡达

src/api/drug/drug.js

@@ -954,4 +954,14 @@ export function getPatientAdviceListDetail(params){
     method:"Get",
     params:params
   })
+}
+
+
+export function getSelfDrugWarhouseInfo(params){
+
+  return request({
+    url:"/api/drug/getselfdrugwarehouseinfo",
+    method:"get",
+    params:params,
+  })
 }

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

@@ -478,6 +478,27 @@ export default {
         accepts.consciousness = 1
         accepts.appetite =1
 
+        if(this.$store.getters.xt_user.template_info.org_id== 10293 || this.$store.getters.xt_user.template_info.org_id == 0){
+          accepts.way =1 
+          accepts.posture = 1
+          accepts.consciousness =1
+          accepts.appetite =1
+          accepts.danger_level=1
+          console.log("this.precaution_arr",this.precaution_arr)
+          this.receiveTreatmentAsses.way =1
+          this.receiveTreatmentAsses.consciousness =2
+          this.receiveTreatmentAsses.appetite =2
+          this.receiveTreatmentAsses.posture= 1
+          this.receiveTreatmentAsses.danger_level=2
+          this.receiveTreatmentAsses.precaution = 3
+          var arr = [3,4]
+          this.precautionTwo.push(...arr)
+          this.receiveTreatmentAsses.precaution = this.precautionTwo   
+          accepts.precaution= ""
+          accepts.precaution = "3,4"
+          
+       }
+
       }
       this.accepts = accepts;
      console.log("accepts", accepts);
@@ -792,17 +813,7 @@ export default {
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
 
-    if(this.$store.getters.user.template_info.org_id == 10293){
-        this.receiveTreatmentAsses.way =1
-        this.receiveTreatmentAsses.consciousness =2
-        this.receiveTreatmentAsses.appetite =2
-        this.receiveTreatmentAsses.posture= 1
-        this.receiveTreatmentAsses.danger_level=2
-        this.receiveTreatmentAsses.precaution = 3
-        var arr = [3,4]
-        this.precautionTwo.push(...arr)
-        this.receiveTreatmentAsses.precaution = this.precautionTwo      
-  }
+   
   },
  
 };

src/xt_pages/dialysis/patientAdviceList.vue

@@ -71,28 +71,52 @@
                         </div>
                     </div> -->
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                        <el-table-column align="center" prop="dialysis_no" label="药品名称">
+                       
+                      <el-table-column align="center" prop="dialysis_no" label="药品编号">
+                            <template slot-scope="scope">
+                                {{ scope.row.drug_id }}
+                            </template>
+                        </el-table-column>
+                       <el-table-column align="center" prop="dialysis_no" label="药品名称">
                             <template slot-scope="scope">
-                                {{ scope.row.advice_name }}
+                               <span v-if="scope.row.drug_id >0">
+                                 {{ scope.row.advice_name }}
+                               </span>
+                               <span v-if="scope.row.drug_id ==0" style="color: red;">
+                                 {{ scope.row.advice_name }}
+                               </span>
                             </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="规格名称">
                             <template slot-scope="scope">{{ scope.row.specification_name }}</template>
                         </el-table-column>
+
+                        <el-table-column align="center" prop="name" label="自备药入库数量">
+                            <template slot-scope="scope">
+                              {{ getCountInfo(scope.row.drug_id) }}
+                            </template>
+                        </el-table-column>
                        
                         <el-table-column align="center" prop="name" label="开药数量">
                             <template slot-scope="scope">
                               {{getTotal(scope.row.child)}}
                             </template>
                         </el-table-column>
+
+                        <el-table-column align="center" prop="name" label="剩余数量">
+                            <template slot-scope="scope">
+                               {{ getCountInfo(scope.row.drug_id) - getTotal(scope.row.child)}}
+                            </template>
+                        </el-table-column>
                         <el-table-column align="center" prop="dialysis_no" label="单位">
                             <template slot-scope="scope">{{scope.row.prescribing_number_unit}}</template>
                         </el-table-column>
                        
                        
-                        <el-table-column align="center" prop="name" label="操作">
+                        <el-table-column align="center" prop="name" label="操作" width="300">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="primary" @click="toDetail(scope.row.advice_name,scope.row.patient_id)">明细</el-button>
+                                <el-button size="mini" type="primary" @click="getSelfDrugWarhouseInfo(scope.row.drug_id,scope.row.patient_id)">入库明细</el-button>
+                                <el-button size="mini" type="primary" @click="toDetail(scope.row.advice_name,scope.row.patient_id)">使用明细</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -132,6 +156,36 @@
             <el-button type="primary" @click="adviceDialogVisible = false">确 定</el-button>
         </span>
      </el-dialog>
+
+
+     <el-dialog
+         title="入库详情"
+        :visible.sync="drugInfoDialogVisible"
+        width="50%">
+        <span>
+         <el-table :data="drugWarehouseInfo" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                
+                <el-table-column align="center" prop="name" label="入库时间">
+                    <template slot-scope="scope">{{getTime(scope.row.ctime)}}</template>
+                </el-table-column>
+                
+                <el-table-column align="center" prop="name" label="入库数量">
+                    <template slot-scope="scope">
+                        {{scope.row.warehousing_count}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="dialysis_no" label="单位">
+                    <template slot-scope="scope">{{scope.row.max_unit}}</template>
+                </el-table-column>
+                
+                
+            </el-table> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="drugInfoDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="drugInfoDialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
     </div>
 </template>
 
@@ -141,7 +195,7 @@
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 const moment = require('moment')
 import { PostSearch } from '@/api/patient'
-import { getCurrentPatient,saveRadio,getPatientAdviceList,DeleteDrugNameById,getDrugSet,getPatientDetail,getPatientAdviceListDetail} from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getPatientAdviceList,DeleteDrugNameById,getDrugSet,getPatientDetail,getPatientAdviceListDetail,getSelfDrugWarhouseInfo} from "@/api/drug/drug"
 import { TimeSelect } from "element-ui";
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -172,7 +226,10 @@ export default {
             outStocklist:[],
             outList:[],
             tableList:[],
-            adviceDialogVisible:false
+            adviceDialogVisible:false,
+            drugInfo:[],
+            drugWarehouseInfo:[],
+            drugInfoDialogVisible:false
         }
     },
     methods:{
@@ -294,6 +351,12 @@ export default {
                    }
                    this.tableData = []
                    this.tableData = arr
+
+                  var drugInfo  = response.data.data.drugInfo
+
+                  this.drugInfo = drugInfo
+
+                  console.log("drugInfo============",drugInfo)
                 }
               
               }
@@ -406,7 +469,43 @@ export default {
         }else {
             return uParseTime(val, '{y}-{m}-{d}')
         }
-     },
+       },
+       getCountInfo(drug_id){
+        var count = 0
+        var arr = []
+        for(let i=0;i<this.drugInfo.length;i++){
+          if(drug_id == this.drugInfo[i].drug_id){
+              arr.push(this.drugInfo[i])
+          }
+        }
+        if(arr!=null && arr.length>0){
+          for(let i =0;i<arr.length;i++){
+             count+=arr[i].warehousing_count
+          }
+        }
+        if (count > 0) {
+           return count
+        }else{
+          return ""
+        }
+       },
+       getSelfDrugWarhouseInfo(drug_id,patient_id){
+          var params = {
+            drug_id:drug_id,
+            patient_id:patient_id
+          }
+         getSelfDrugWarhouseInfo(params).then(response=>{
+          
+            if(response.data.state ==1){
+             
+              var drugWarehouseInfo = response.data.data.drugInfo
+
+              this.drugWarehouseInfo = drugWarehouseInfo
+              this.drugInfoDialogVisible = true
+             
+            }
+         })
+       }
 
     },
     created(){

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1164,7 +1164,7 @@ export default {
    },
    exportList: function() {
 
-       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697){
+       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697 && this.org_id!=10375){
          
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1

src/xt_pages/stock/selfPreparedMedicine/selfDrugQuery.vue

@@ -12,6 +12,7 @@
             
               <el-tab-pane label="患者查询" name="second">
                   <patient-drug-query ref="mychildtwo"></patient-drug-query>
+
               </el-tab-pane>
           </el-tabs>
        </div>