自备药

src/api/drug/drug.js

@@ -216,4 +216,14 @@ export function getDrugDescByDrugName(params){
       methods:"get",
       params:params
    })
-}
+}
+
+export function getDrugSet(params){
+  
+   return request({
+      url:"/api/drug/getdrugset",
+      methods:"get",
+      params:params
+   })
+}
+

src/router/modules/dialysis.js

@@ -20,106 +20,68 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/board',
+      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
+      name: '数据看板',
+      meta: {
+        title: '数据看板',
+        noCache: true
+      }
+    },
     // {
-    //   path: '/dialysis/board',
-    //   component: () => import('@/xt_pages/dialysis/bulletinBoard'),
-    //   name: '数据看板',
+    //   path: '/dialysis/consumableDrugs',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
+    //   name: '耗材药品',
     //   meta: {
-    //     title: '数据看板',
+    //     title: '耗材药品',
     //     noCache: true
     //   }
     // },
     // {
-    //   path: '/dialysis/calling',
-    //   component: () => import('@/xt_pages/dialysis/calling'),
-    //   name: '透析叫号',
+    //   path: '/dialysis/consumableDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'consumableDrugs_print',
     //   meta: {
-    //     title: '透析叫号',
+    //     title: 'consumableDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisDrugs_print',
+    //   meta: {
+    //     title: 'dialysisDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisParameters_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisParameters_print',
+    //   meta: {
+    //     title: 'dialysisParameters_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/allSummary_print',
+    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'allSummary_print',
+    //   meta: {
+    //     title: 'allSummary_print',
     //     noCache: true
     //   }
     // },
-
-    {
-      path: '/dialysis/consumableDrugs',
-      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
-      name: '耗材药品',
-      meta: {
-        title: '耗材药品',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/consumableDrugs_print',
-      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'consumableDrugs_print',
-      meta: {
-        title: 'consumableDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisDrugs_print',
-      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisDrugs_print',
-      meta: {
-        title: 'dialysisDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisParameters_print',
-      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisParameters_print',
-      meta: {
-        title: 'dialysisParameters_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/allSummary_print',
-      component: () => import('@/xt_pages/dialysis/allSummary_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'allSummary_print',
-      meta: {
-        title: 'allSummary_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/consumables_print',
-      component: () => import('@/xt_pages/dialysis/consumables_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'consumables_print',
-      meta: {
-        title: 'consumables_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/allsummarydialog_print',
-      component: () => import('@/xt_pages/dialysis/allSummaryDialog_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'allsummarydialog_print',
-      meta: {
-        title: 'allsummarydialog_print',
-        noCache: true
-      }
-    },
-    {
-      path:'/dialysis/dialysisdrugs_print',
-      component:()=>import('@/xt_pages/dialysis/dialysisDrugs_print'),
-      hidden:true,
-      is_menu:false
-    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/router/modules/qcd.js

@@ -240,25 +240,25 @@ export default {
       }
     },
     {
-      path: '/qcd/workAnalysis/index',
-      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
+      path: '/qcd/workAnalysis/doctor',
+      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
       name: 'workAnalysisDoctor',
       meta: {
         title: '工作量分析统计',
         noCache: true
       }
     },
-    // {
-    //   path: '/qcd/workAnalysis/nurse',
-    //   hidden: true,
-    //   is_menu: false,
-    //   component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
-    //   name: 'workAnalysisNurse',
-    //   meta: {
-    //     title: '工作量分析统计护士',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/qcd/workAnalysis/nurse',
+      hidden: true,
+      is_menu: false,
+      component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
+      name: 'workAnalysisNurse',
+      meta: {
+        title: '工作量分析统计护士',
+        noCache: true
+      }
+    },
     {
       path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,

src/router/modules/stock.js

@@ -12,90 +12,31 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/stock/consumablesManagement',
-      component: Layout,
-      redirect: '/stock/in',
-      name: 'consumablesManagement',
-      parentNum: 1,
-      meta: {
-        isChild: true,
-        title: 'consumablesManagement',
-        noCache: true
-      }
-    },
     {
       path: '/stock/in',
       component: () => import('@/xt_pages/stock/stockInOrder'),
       name: 'stockInOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockInOrder', noCache: true }
     },
     {
       path: '/stock/return',
       component: () => import('@/xt_pages/stock/salesReturnOrder'),
       name: 'salesReturnOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'salesReturnOrder', noCache: true }
     },
     {
       path: '/stock/out',
       component: () => import('@/xt_pages/stock/stockOutOrder'),
       name: 'stockOutOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockOutOrder', noCache: true }
     },
     {
       path: '/stock/cancel',
       component: () => import('@/xt_pages/stock/cancelStockOrder'),
       name: 'cancelStockOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    {
-      path: '/stock/in/other',
-      component: () => import('@/xt_pages/stock/otherStockInOrder'),
-      name: 'otherStockInOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherStockInOrder', noCache: true }
-    },
-    {
-      path: '/stock/return/other',
-      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-      name: 'otherSalesReturnOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherSalesReturnOrder', noCache: true }
-    },
-    {
-      path: '/stock/out/other',
-      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-      name: 'otherStockOutOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherStockOutOrder', noCache: true }
-    },
-    {
-      path: '/stock/cancel/other',
-      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-      name: 'otherCancelStockOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherCancelStockOrder', noCache: true }
-    },
+    
     // {
     //   path: "/stock/",
     //   component: Layout,
@@ -150,18 +91,12 @@ export default {
       path: '/stock/query',
       component: () => import('@/xt_pages/stock/stockQuery'),
       name: 'stockQuery',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockQuery', noCache: true }
     },
     {
       path: '/stock/detail',
       component: () => import('@/xt_pages/stock/stockDetailIndex'),
       name: 'stockDetail',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockDetail', noCache: true }
     },
     {
@@ -171,13 +106,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInOrderAdd', noCache: true }
-    },  {
-      path: '/drugstock/in/add',
-      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
-      name: 'drugStockInOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugStockInOrderAdd', noCache: true }
     },
     {
       path: '/stock/in/detail',
@@ -186,13 +114,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInDetail', noCache: true }
-    }, {
-      path: '/drugstock/in/detail',
-      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
-      name: 'drugStockInDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugStockInDetail', noCache: true }
     },
     {
       path: '/stock/return/detail',
@@ -201,13 +122,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnDetail', noCache: true }
-    }, {
-      path: '/drugstock/return/detail',
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
-      name: 'drugSalesReturnDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugSalesReturnDetail', noCache: true }
     },
     {
       path: '/stock/return/add',
@@ -216,13 +130,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnOrderAdd', noCache: true }
-    }, {
-      path: '/drugstock/return/add',
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
-      name: 'drugSalesReturnOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
     },
     {
       path: '/stock/out/add',
@@ -231,13 +138,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutOrderAdd', noCache: true }
-    }, {
-      path: '/drugstock/out/add',
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
-      name: 'drugStockOutOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugStockOutOrderAdd', noCache: true }
     },
     {
       path: '/stock/out/detail',
@@ -246,13 +146,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutDetail', noCache: true }
-    }, {
-      path: '/drugstock/out/detail',
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
-      name: 'drugStockOutDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'drugStockOutDetail', noCache: true }
     },
     {
       path: '/stock/cancel/add',
@@ -261,13 +154,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockOrderAdd', noCache: true }
-    }, {
-      path: '/drugstock/cancel/add',
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
-      name: 'cancelDrugStockOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
     },
     {
       path: '/stock/cancel/detail',
@@ -276,21 +162,11 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockDetail', noCache: true }
-    },  {
-      path: '/drugstock/cancel/detail',
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
-      name: 'cancelDrugStockDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'cancelDrugStockDetail', noCache: true }
     },
     {
       path: '/stock/config',
       component: () => import('@/xt_pages/stock/index'),
       name: 'config',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'config', noCache: true }
     },
     {
@@ -312,146 +188,5 @@ export default {
       is_menu: false,
       meta: { title: 'user_detail', noCache: true }
     },
-    {
-      path: '/stock/selfPreparedMedicine',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-      redirect: '/stock/selfPreparedMedicineIndex',
-      name: 'selfPreparedMedicine',
-      parentNum: 2,
-      meta: {
-        isChild: true,
-        title: 'selfPreparedMedicine',
-        noCache: true
-      }
-    },
-    {
-      path: '/stock/selfPreparedMedicineIndex',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-      name: 'selfPreparedMedicineIndex',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineQuery',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
-      name: 'selfPreparedMedicineQuery',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineQueryPrint',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
-      name: 'selfPreparedMedicineQueryPrint',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineInfo',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
-      name: 'selfPreparedMedicineInfo',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
-    },
-    {
-      path: '/stock/drugs',
-      component: Layout,
-      redirect: '/stock/drugs/stock/in',
-      name: 'stockDrugs',
-      parentNum: 3,
-      meta: {
-        isChild: true,
-        title: 'stockDrugs',
-        noCache: true
-      }
-    },
-
-    {
-      path: '/stock/drugs/stock/in',
-      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
-      name: 'drugsStockIn',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockIn', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/out',
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
-      name: 'drugsStockOut',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockOut', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/return',
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-      name: 'drugsStockReturn',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockReturn', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/cancel',
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-      name: 'drugsStockCancel',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockCancel', noCache: true }
-    },
-    // {
-    //   path: '/stock/drugs/stock/adjustPrice',
-    //   component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
-    //   name: 'drugsAdjustPrice',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsAdjustPrice', noCache: true }
-    // },
-    // {
-    //   path: '/stock/drugs/stock/reportLoss',
-    //   component: () => import('@/xt_pages/stock/drugs/reportLoss'),
-    //   name: 'drugsReportLoss',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsReportLoss', noCache: true }
-    // },
-    {
-      path: '/stock/drugs/stock/query',
-      component: () => import('@/xt_pages/stock/drugs/query'),
-      name: 'drugsQuery',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsQuery', noCache: true }
-    },
-    // {
-    //   path: '/stock/drugs/stock/drugsSurplus',
-    //   component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
-    //   name: 'drugsSurplus',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsSurplus', noCache: true }
-    // },
-    // {
-    //   path: '/stock/drugs/stock/drugsExpiryDate',
-    //   component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
-    //   name: 'drugsExpiryDate',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsExpiryDate', noCache: true }
-    // },
   ]
 }

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -389,7 +389,9 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-
+            <!-- <div style="margin-left:120px;margin-top:-20px;font-size:12px;color:red">
+               库存不足50
+            </div> -->
             
           </el-col>
 

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -83,7 +83,6 @@ export default {
            }) 
         },
         handleCurrentChange(val){
-           console.log("val===",val)
            this.currentRow = val
            this.getRullListByDrugName(val.drug_name)
         },
@@ -94,7 +93,6 @@ export default {
            getRullListByDrugName(params).then(response=>{
               if(response.data.state ==  1){
                 var drugName =  response.data.data.drugName
-                console.log("drugname",drugName)
                 this.tableDatatwo = drugName
               }
            })
@@ -113,6 +111,7 @@ export default {
                 var msg = response.data.data.msg
                 this.$message.success("保存成功")
                 this.visible = false
+                this.$emit('getlist');
              }else {
                 this.$message.error("药品名称规格已存在")
              }

src/xt_pages/stock/selfPreparedMedicine/components/medicineDetail.vue

@@ -24,7 +24,8 @@
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                @change="changeStartime">
             </el-date-picker>
                 <el-date-picker
                 v-model="end_time"
@@ -35,7 +36,8 @@
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                @change="changeEndtime">
             </el-date-picker>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -152,7 +154,9 @@ export default {
                 }
                 if(this.type == 1){
                    stockDetail.push(...outStockDetail)
-                   this.tableData = stockDetail
+                   var arr = stockDetail
+                  var newarr  =  arr.sort((a,b)=>{ return a.storck_time-b.storck_time})
+                  this.tableData = newarr
                 }
                 
                 if(this.type == 2){
@@ -187,6 +191,12 @@ export default {
        getTimes(time) {
         return uParseTime(time, "{y}-{m}-{d}");
       },
+      changeStartime(){
+        this.getDrugDetail()   
+      },
+      changeEndtime(){
+        this.getDrugDetail()
+      }
     },
 
     created(){

src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue

@@ -111,10 +111,15 @@ export default {
         // },
        
         saveOutStock(){
+           var arr=[]
+            for(let i=0;i<this.tableData.length;i++){
+              if(this.tableData[i].outstore_number){
+                  arr.push(this.tableData[i])
+              }
+            }
             const params = {
-               outStocks:this.tableData,
+               outStocks:arr,
             }
-            console.log("outStocks",params)
             if(this.admin_user_id ==''){
               this.$message.error("请选择出库人")
               return
@@ -122,8 +127,9 @@ export default {
           saveOutStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
               if(response.data.state == 1){
                  var msg = response.data.data.msg
-                 console.log("msg",msg)
+                 this.$message.success("保存成功")
                  this.visible = false
+                 this.$emit('getlist');
               }
           })
         },
@@ -132,7 +138,6 @@ export default {
            const params = {
               patient_id:this.patient_id
            }
-           console.log("params",params)
           getDrugDataByPatientId(params).then(response=>{
              if(response.data.state == 1){
                var medicalList = response.data.data.medicalList

src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue

@@ -27,6 +27,7 @@
             </el-select>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+           
             <el-table-column align="center" label="药品名称">
                 <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
@@ -109,20 +110,25 @@ export default {
         //   })
         // },
         saveStock(){
+            var arr=[]
+            for(let i=0;i<this.tableData.length;i++){
+              if(this.tableData[i].store_number){
+                  arr.push(this.tableData[i])
+              }
+            }
             const params ={
-               stocks:this.tableData
+               stocks:arr
             }
             if(this.admin_user_id ==''){
               this.$message.error("请选择入库人")
               return
             }
-           console.log("params",params)
-       
           saveStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
               if(response.data.state == 1){
                  var msg = response.data.data.msg
                  this.$message.success("保存成功")
                  this.visible = false
+                 this.$emit('getlist');
               }
           })
         },

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -70,13 +70,15 @@
                             <template slot-scope="scope">{{scope.row.min_unit}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="自备数量" width="90">
-                            <template slot-scope="scope">{{ scope.row.Total }}</template>
+                            <template slot-scope="scope">
+                              {{getTotal(scope.row.patient_id,scope.row.id)}}
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="已使用" width="90">
                             <template slot-scope="scope">{{getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="剩余" width="90">
-                            <template slot-scope="scope">{{scope.row.Total - getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
+                            <template slot-scope="scope">{{getTotal(scope.row.patient_id,scope.row.id)- getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <!-- <el-table-column align="center" prop="name" label="停用" width="90">
                             <template slot-scope="scope">
@@ -85,7 +87,10 @@
                             </template>
                         </el-table-column> -->
                         <el-table-column align="center" prop="name" label="备注">
-                            <template slot-scope="scope">{{ scope.row.remarks }}</template>
+                            <!-- <template slot-scope="scope">{{ scope.row.remarks }}</template> -->
+                            <template slot-scope="scope">
+                                {{getRemarks(scope.row.patient_id,scope.row.id)}}
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
@@ -111,10 +116,10 @@
                 <el-button type="primary" @click="saveRadio">确 定</el-button>
             </span>
         </el-dialog>
-        <add-medicine ref="addMedicine"></add-medicine>
+        <add-medicine ref="addMedicine" @getlist="getlist"></add-medicine>
         <medicine-detail ref="medicineDetail"></medicine-detail>
-        <warehousing ref="warehousing"></warehousing>
-        <warehouse-out ref="warehouseOut"></warehouse-out>
+        <warehousing  ref="warehousing" @getlist="getlist"></warehousing>
+        <warehouse-out ref="warehouseOut" @getlist="getlist"></warehouse-out>
     </div>
 </template>
 
@@ -126,7 +131,7 @@ import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
 const moment = require('moment')
-import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName } from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName,getDrugSet } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -164,6 +169,7 @@ export default {
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             search_input:"",
             patient_id:0,
+            stockList:[],
             outStocklist:[]
         }
     },
@@ -235,14 +241,18 @@ export default {
                start_time:this.start_time,
                keyword:this.search_input,
             }
-           
           getStockList(params).then(response=>{
              if(response.data.state == 1){
+                var medicalList = response.data.data.medicalList
+                console.log("medicalist",medicalList)
+                this.tableData = medicalList
                 var stocklist =  response.data.data.stocklist
+                console.log("stocklist",stocklist)
+                this.stockList = stocklist
                 var outstocklist = response.data.data.outStocklist
                 this.outStocklist = outstocklist
-                this.tableData = stocklist
-
+                console.log("outStockList",outstocklist)
+              
               }
           })  
         },
@@ -278,11 +288,40 @@ export default {
               }
            }
            return total
+        },
+
+        getDrugSet(){
+         getDrugSet().then(response=>{
+            if(response.data.state == 1){
+              var drugset =  response.data.data.drugSet
+              this.radio  = drugset.drug_start.toString()
+            }
+         })
+        },
+
+        getTotal(patientid,id){
+          var total = 0
+          for(let i=0;i<this.stockList.length;i++){
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
+                total = this.stockList[i].Total
+             }
+          }
+          return total
+        },
+        getRemarks(patientid,id){
+          var remarks = ""  
+           for(let i=0;i<this.stockList.length;i++){
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
+                remarks = this.stockList[i].remarks
+             }
+          }
+          return remarks
         }
     },
     created(){
       //获取当前机构下的所有患者
       this.getCurrentPatient()
+      this.getDrugSet()
     },
     watch: {
      tablePatient: function() {

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -95,7 +95,7 @@
             <el-radio v-model="radio" label="2">不开启</el-radio>
             <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="saveRadio">确 定</el-button>
             </span>
         </el-dialog>
        
@@ -239,7 +239,7 @@ import addMedicine from "./components/addMedicine"
 import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
-import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand }  from "@/api/drug/drug"
+import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand,saveRadio,getDrugSet }  from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -274,7 +274,7 @@ export default {
             value: '',
             tableData:[],
             dialogVisible:false,
-            radio:'1',
+            radio:'2',
             drugDialogVisible:false,
             options:[],
             drugName:[],
@@ -532,7 +532,7 @@ export default {
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
-           console.log("params999",params)
+         
          updatedRulleName(params).then(response=>{
             if(response.data.state == 1){
                var rullername = response.data.data.RullerName
@@ -586,13 +586,37 @@ export default {
           })
           .catch(() => {
           })
-       }
+       },
+
+         saveRadio(){
+          const params = {
+            radio:this.radio
+          }
+         saveRadio(params).then(response=>{
+            if(response.data.state == 1){
+              var drugset = response.data.data.drugSet
+              this.$message.success("保存成功")
+              this.dialogVisible = false
+            } 
+          }) 
+        },
+
+        getDrugSet(){
+         getDrugSet().then(response=>{
+            if(response.data.state == 1){
+              var drugset =  response.data.data.drugSet
+              this.radio  = drugset.drug_start.toString()
+            }
+         })
+        }
     },
     created(){
        //获取药品库所有药品名称
        this.getAllDrugName()
-
        this.getdrugNameList()
+
+       //获取设置
+       this.getDrugSet()
       
      
     },

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -87,13 +87,13 @@
                     <template slot-scope="scope">{{ scope.row.min_unit }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="自备量" width="80">
-                    <template slot-scope="scope">{{ scope.row.store_number }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="已使用" width="80">
                     <template slot-scope="scope">{{ scope.row.Count }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="剩余" width="80">
-                    <template slot-scope="scope">{{ scope.row.store_number - scope.row.Count }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total - scope.row.Count }}</template>
                 </el-table-column>
             </el-table>
         </div>
@@ -166,7 +166,6 @@ export default {
         getAllDrugName().then(response=>{
           if(response.data.state == 1){
              var drugName =  response.data.data.drugName
-             console.log("drugName",drugName)
              this.drugName = drugName
 
              this.getlist()
@@ -180,7 +179,6 @@ export default {
         getRulleName(params).then(response=>{
            if(response.data.state == 1){
              var rulleName = response.data.data.rulleName
-             console.log("rulleName",rulleName)
              this.rulleName = rulleName
            }
         })  
@@ -217,7 +215,6 @@ export default {
             drug_spec:this.drug_spec,
             search_input:this.search_input
           }
-          console.log("params====",params)
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
@@ -233,7 +230,7 @@ export default {
                    }
                 }
               }
-              console.log("stocklist3333",stocklist)
+
               this.tableData = stocklist
             }
         })   

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -401,6 +401,7 @@
                   :value="item.id"
                 ></el-option>
               </el-select>
+              
             </el-form-item>
           </el-col>
           <el-col :span="14">

src/xt_pages/user/doctorAdvice.vue

@@ -964,6 +964,9 @@
                   :value="item.id"
                 ></el-option>
               </el-select>
+              <!-- <div style="color:red;font-size:12px;">
+                库存不足50
+              </div> -->
               </el-form-item>
             </el-col>
 
@@ -1057,6 +1060,7 @@
                     >
                     </el-option>
                   </el-select>
+                
                 </el-col>
               </el-form-item>
             </el-col>