新分支

src/api/drug/drug.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import url from 'postcss-url'
 
 export function getCurrentPatient(params) {
   return request({
@@ -670,4 +671,41 @@ export function getCheckGoodBatchList(id,params){
     method:"get",
     params:params,
   })
+}
+
+
+export function getAllSelfDrugInfoList(params){
+
+  return request({
+    url:"/api/drug/getallselfdruginfolist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getallPatientList(params){
+
+  return request({
+    url:"/api/drug/getallpatientlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postSearchSelfDrugList(keyword,params){
+
+  return request({
+    url:"/api/drug/postsearchselfdruglist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
+
+export function postSelfDrugWarehouse(data){
+  
+  return request({
+    url:"/api/drug/postselfdrugwarehouse",
+    method:"post",
+    data:data
+  })
 }

src/api/patient.js

@@ -1102,4 +1102,22 @@ export function deleteSolution(id,params){
     method:"Get",
     params:params,
   })
+}
+
+export function saveTreamtPlan(data){
+
+  return request({
+    url:"/api/patient/savetreamentplan",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getTreamentPlan(params){
+
+  return request({
+    url:"/api/patient/gettreamentplan",
+    method:"get",
+    params:params
+  })
 }

src/lang/zh.js

@@ -189,7 +189,9 @@ export default {
     selfPreparedMedicine: '自备药管理',
     wareHouseManage: '仓库管理',
     inventoryTransfer: '库存调拨',
-
+    selfPrepareWaresing:"自备药入库",
+    selfPrepareWaresingOut:"自备药出库",
+    selfPrepareWareOut:"自备药出库",
     // consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',

src/router/modules/selfPreparedMedicine.js

@@ -12,6 +12,28 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/stock/selfwarehouse/info',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseInfo'),
+      name: 'selfPrepareWaresing',
+      meta: { title: '自备药入库', noCache: true }
+
+    },
+    {
+      path: '/stock/selfwarehouse/info/add',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo'),
+      name: 'selfPrepareWaresingAdd',
+      meta: { title: '自备药入库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+    {
+      path: '/stock/selfwarehouse/out',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseOut'),
+      name: 'selfPrepareWareOut',
+      meta: { title: '自备药出库', noCache: true }
+
+    },
     {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

src/xt_pages/management/index.vue

@@ -31,14 +31,14 @@
           >搜索</el-button
         >
 
-        <!-- <el-button
+        <el-button
           class="filter-item"
           type="primary"
           icon="el-icon-search"
           size="small"
           @click="Auto()"
           >脚本</el-button
-        > -->
+        >
       </div>
 
       <div class="cell clearfix">

src/xt_pages/role/admin.vue

@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button>
 
         <!-- <el-button
           type="primary"

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -2,14 +2,14 @@
     <div class="main-contain">
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
-            <el-button
+            <!-- <el-button
                 size="small"
                 @click="setting"
                 class="filter-item"
                 style="float:right;"
                 type="primary"
                 >设置
-            </el-button>
+            </el-button> -->
         </div>
 
         <div class="app-container">
@@ -60,14 +60,46 @@
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">自备药列表</div>
                         <div>
-                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
+                            <!-- <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button> -->
                             <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
                             <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
                         </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="药品名称" width="120">
-                            <template slot-scope="scope">{{scope.row.drug_name}}</template>
+                            <template slot-scope="scope">
+                              <el-form-item style="padding-top: 20px">
+                                  <el-autocomplete
+                                    class="checkSearch"
+                                    popper-class="my-autocomplete"
+                                    v-model="scope.row.drug_name"
+                                    :fetch-suggestions="querySearchAsync"
+                                    :trigger-on-focus="true"
+                                    placeholder="请输入药品名称"
+                                    @select="handleSelect"
+                                    @input="changeDrugName(scope.$index)"
+                                    style="width: 160px"
+                                  >
+                                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                                    <template slot-scope="{ item }">
+                                      <div class="name">
+                                        {{
+                                          item.drug_name +
+                                          item.dose +
+                                          item.dose_unit +
+                                          "*" +
+                                          item.min_number +
+                                          item.min_unit +
+                                          "/" +
+                                          item.max_unit +
+                                          "  " +
+                                          item.manufacturer
+                                        }}
+                                      </div>
+                                    </template>
+                                  </el-autocomplete>
+                                </el-form-item>
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="规格名称">
                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>

src/xt_pages/stock/stockOutOrder.vue

@@ -2526,8 +2526,7 @@ export default {
       }
      }
      if(count > 0){
-      console.log("good_id",good_id)
-      console.log("数量我哦哦我",count)
+     
       return count
      }else{
       return 0 
@@ -2536,7 +2535,6 @@ export default {
      
     },
     getRow(row){
-      console.log("row233323232",row)
       var name = ""
       if(this.stockFlowList!=null && this.stockFlowList.length > 0){
         for(let i=0;i<this.stockFlowList.length;i++){

src/xt_pages/user/Informed/Informedconsent.vue

@@ -124,7 +124,7 @@
                   <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity" @getPatientMeDicalList="getPatientMeDicalList"></Medicalhistory>
                 </div>
                 <div v-if="show14">
-                  <heal_informed :patient_id ="this.patientID" ></heal_informed>
+                  <heal_informed :patient_id ="this.patientID" ref="childSeventy" ::patientTreamentPlan="patientTreamentPlan" @getTreamentPlan="getTreamentPlan"></heal_informed>
                 </div>
                 <div v-if="show15">
                   <criticalpatient_informed :patient_id ="this.patientID" ref="childFivety" :patientCritaicalInformedPrint="patientCritaicalInformedPrint" @getPatientCriticalList="getPatientCriticalList"></criticalpatient_informed>
@@ -160,7 +160,7 @@ import Medicalhistory from './components/Medicalhistory'
 import heal_informed from './components/heal_informed'
 import criticalpatient_informed from './components/criticalpatient_informed'
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList } from '@/api/patient'
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
 export default {
 
   components: {
@@ -226,7 +226,8 @@ export default {
       dialyzerInformedPrint:{},
       therapyinformePrint:{},
       patientCritaicalInformedPrint:{},
-      patientCritaicalInformedOnePrint:{}
+      patientCritaicalInformedOnePrint:{},
+      patientTreamentPlan:{}
     }
 
   },
@@ -390,6 +391,15 @@ export default {
         }
       })
     },
+    getTreamentPlan(){
+      getTreamentPlan().then(response=>{
+        if(response.data.state ==1){
+          var list = response.data.data.treamentPlan
+          this.patientTreamentPlan = list  
+          this.$refs.childSeventy.show(list)
+        }
+      })
+    },
    
     rowClick(row, column, event){
      console.log('1111',row);
@@ -660,6 +670,7 @@ export default {
           this.show14=true,
           this.show15=false,
           this.show16=false
+          this.getTreamentPlan()
         }
         if(row.value==15){
      

src/xt_pages/user/Informed/components/heal_informed.vue

@@ -81,7 +81,7 @@
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button type="primary" @click="saveTreamtPlan">确 定</el-button>
         </span>
       </el-dialog>
 
@@ -91,7 +91,7 @@
 <script>
 import print from "print-js";
 import Editor from '@/components/Editor'
-import { getPatientDetailInformedconsent  } from '@/api/patient'
+import { getPatientDetailInformedconsent,saveTreamtPlan  } from '@/api/patient'
 import { jsGetAge, uParseTime } from "@/utils/tools";
 const content=`<p style='padding-left: 2em;margin-top: 10px;margin-bottom: 4px'>
   <span class="abs-index"></span>患者透析过程中出现低血压95/76mmHg，诉有头晕，予以最低超滤量，并回0.9%氯化钠200m1，原来超滤量减少200ml，建议患者控制透析间期体重增加不超5%，患者本人表示不同意医生处理方案，认为超滤量不能改，而且不能回水，那样会导致积水，经解释沟通后，患者家属仍坚持低血压时不予改超滤量，不同意回水处理，并表示后果自负，今由于患者本人多次不同意医生的处理方案，多次拒绝医生一切处理方案，医生也已将透析中反复低血压可能导致的后果如:导致内痿血流不足，内痿栓塞，内痿朋塌，严重低血压导致休克死亡等后果充分告知其家属，患者家属表示知情，后果自负，签字为证
@@ -117,7 +117,10 @@ export default{
   props: {
     patient_id: {
         type: Number,
-      }
+      },
+    patientTreamentPlan:{
+       type:Object,
+    }
   },
   components:{
     Editor
@@ -174,9 +177,38 @@ export default{
       },
       bianji(){
         this.dialogVisible=true
+      },
+      show(val){    
+       if(val!=null){
+        console.log("valw233223",val)
+         if(val.content!=""){
+           this.content = ""
+           this.content = val.content
+         }
+         
+       }
+     },
+      saveTreamtPlan(){
+        var params = {
+          content:this.$refs.editor.content
+         }
+        saveTreamtPlan(params).then(response=>{
+            if(response.data.state ==1){
+              var list = response.data.data.list
+              this.$emit('fMethod',list);
+              this.dialogVisible = false
+              this.$emit("getTreamentPlan","");
+            }
+        })
       }
   },
   created(){
+    console.log("hahhahahahahahwo",this.patientTreamentPlan)
+    if(this.patientTreamentPlan!=null && this.patientTreamentPlan.id >0){
+      
+      this.content = ""
+      this.content = this.patientTreamentPlan.content
+    }
     this.getlist()
   }
 }