Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/project/project.js

@@ -549,4 +549,64 @@ export function getAllGoodInfoList(params){
     method:"Get",
     params:params
   })
+}
+
+
+export function saveGoodList(params,data){
+  
+  return request({
+    url:"/api/savegoodlist",
+    method:"post",
+    params:params,
+    data:data,
+   
+  })
+}
+
+export function getGoodList(params){
+ 
+  return request({
+    url:"/api/getgoodlist",
+    method:"get",
+    params:params,
+  })
+}
+
+
+export function getGoodNameDetail(id,params){
+  
+  return request({
+    url:"/api/getgoodnamedetail?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function updateGoodList(params,data){
+
+  return request({
+    url:"/api/updategoodlist",
+    method:"post",
+    params:params,
+    data:data,
+   
+  })
+}
+
+export function DeleteGoodTeam(id,params){
+ 
+  return  request({
+    url:"/api/deletegoodteam?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function DeleteGood(id,params){
+ 
+  return request({
+    url:"/api/deletegood?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/lang/en.js

@@ -106,6 +106,7 @@ export default {
     DrugDispensing: 'DrugDispensing',
     DispensingDetails: 'DispensingDetails',
     // ConsumablesManagement:'ConsumablesManagement',
+    DrugCodeList:'DrugCodeList',
     MedicianManagement: 'MedicianManagement',
     patiantDispensing: 'patiantDispensing',
     supplyManage: 'Supply Manage',

src/lang/zh.js

@@ -169,7 +169,7 @@ export default {
     DispensingDetails: '发药明细',
     // ConsumablesManagement:'耗材管理',
     MedicianManagement: '药品管理',
-
+    DrugCodeList:"药品追溯",
     otherManagement: '其他管理',
     drugsExpiryDate: '药品有效期预警',
     drugsSurplus: '药品剩余预警',

src/router/index.js

@@ -46,6 +46,7 @@ import supply from './modules/supply'
 import PatientDispensing from './modules/PatientDispensing'
 import DrugDispensing from './modules/DrugDispensing'
 import DispensingDetails from './modules/DispensingDetails'
+import DrugCodeList  from './modules/DrugCodeList'
 // import ConsumablesManagement from './modules/ConsumablesManagement'
 import MedicianManagement from './modules/MedicianManagement'
 
@@ -173,6 +174,7 @@ var _asy_router_map = [
   PatientDispensing, // 患者发药模块
   DrugDispensing, // 药房管理模块
   DispensingDetails, // 药房管理模块
+  DrugCodeList,//药品追溯码
   //ConsumablesManagement, // 药房管理模块
   MedicianManagement, // 药房管理模块
 

src/router/modules/DispensingDetails.js

@@ -12,6 +12,8 @@ export default {
     meta: {
       title: '发药明细',
       noCache: true
-    }
-  },]
+     }
+    },
+
+  ]
 }

src/router/modules/DrugCodeList.js

@@ -0,0 +1,18 @@
+
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/DrugCodeList',
+  component: Layout,
+  name:'DrugCodeList',
+  redirct: 'noredirect',
+  children: [{
+    path: '/Pharmacy/drugCode',
+    component: () => import('@/xt_pages/Pharmacy/drugCode.vue'),
+    name: '药房管理',
+    meta: {
+      title: '药品追溯',
+      noCache: true
+    }
+  },]
+}

src/views/layout/Layout.vue

@@ -139,7 +139,7 @@ export default {
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];
-    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
+    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList']
     let menzhenArr = [];
     let bingliArr = [];
     let touxiArr = [];

src/views/layout/components/Sidebar/index.vue

@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '药房管理'){
-          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
+          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/Pharmacy/drugCode.vue

@@ -0,0 +1,420 @@
+<template>
+    <div>
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div class="cell clearfix">
+          <span>发药时间:</span>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="changeStartTime"
+          ></el-date-picker>-
+          <el-date-picker
+           @change="changeEndTime"
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;margin-right:10px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </div>
+
+
+        <div>
+          <div>上传状态:
+            <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
+                <el-option
+                  v-for="item,index in items"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+            </el-select>
+         </div>
+        </div>
+
+        <div>
+          <el-button type="primary" @click="query()">查询</el-button>
+          <el-button type="primary" @click="exportdata()">导出</el-button>
+        </div>
+      </div>
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                max-height="800"
+                @select="selectCostInfo"
+                @selection-change="changeCostInfoTableData"
+                @select-all="changeAllCostInfoTableData"
+                highlight-current-row>
+        <el-table-column align="center" prop="name" label="患者姓名">
+          <template slot-scope="scope">{{getPatientName(scope.row.patient_id) }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="处方日期">
+          <template slot-scope="scope">{{getTime(scope.row.advice_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="药品名称">
+          <template slot-scope="scope">{{ scope.row.advice_name }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="规格">
+          <template slot-scope="scope">{{getDrugSpec(scope.row.drug_id)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="开药总量">
+          <template slot-scope="scope">{{scope.row.prescribing_number}}{{ scope.row.prescribing_number_unit }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="药品追溯码">
+          <template slot-scope="scope">
+            <div @click="getDrugCode(scope.row.id,scope.row.DataSources,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="上传状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.is_upload == 1">已上传</div>
+            <div v-if="scope.row.is_upload == 2 || scope.row.is_upload == 0">未上传</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="发药状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.is_medicine == 1">已发药</div>
+            <div v-if="scope.row.is_medicine == 2 || scope.row.is_medicine == 0">未发药</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="操作" width="200">
+          <template slot-scope="scope">
+            <div>
+             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>
+            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
+            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
+            </div>
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-size="5"
+        :page-sizes="[10, 20, 50, 100,500,1000,2000]"
+        background
+        style="margin-top:20px;float: right"
+        :total="value"
+      ></el-pagination>
+
+
+
+
+
+      <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+      </el-dialog>
+    </div>
+
+
+  </template>
+
+
+  <script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getHisDrugCodeQueryList,createUploadDrugCode,getPatientDrugCode } from '../../api/new_stock/stock'
+  import { getDictionaryDataConfig } from "@/utils/data";
+  import { uParseTime } from '@/utils/tools'
+  import { changeDrugCode } from "@/api/pharmacy";
+  
+  import axios from 'axios'
+  const moment = require('moment')
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        drugTypeList: [{ id: 0, name: "全部" }],
+        start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
+        end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
+
+        tableData: [],
+        change_type:"3",
+        selection:[],
+        page:1,
+        limit:10,
+        value:0,
+        is_sale:"0",
+        items: [
+          { id: "0", name: '全部' },
+          { id: "1", name: '已上传' },
+          { id: "2", name: '未上传' },
+        ],
+        patientList:[],
+        drugList:[],
+        dialogVisibleOne:false,
+        id:0,
+        is_source:0,
+        drug_code:0,
+        currentRow:{},
+        currentIndex:0,
+        is_drug_open:"2",
+        textarea:'',
+        total:0,
+        faShow:false,
+        is_open:false,
+      }
+    },
+    methods: {
+        changeText(event){
+        // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+        if (event.key === 'Enter') {
+            var textarea = ""
+            textarea += this.textarea + ","
+            this.textarea = textarea
+        }
+       },
+       getDrugCode(id,DataSources,DrugCode,index){
+            this.id = id
+            this.textarea = DrugCode
+            this.currentIndex = index
+            this.dialogVisibleOne = true
+      },
+      saveTextArea(){
+       var params = {
+        id:this.id,
+        data_source:1,
+        drug_code:this.textarea,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].drug_code = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
+         }
+      })
+    },
+    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
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getDrugName(drug_id){
+        var drug_name = ""
+        for(let i=0;i<this.drugList.length;i++){
+           if(drug_id == this.drugList[i].id){
+              drug_name = this.drugList[i].drug_name
+           }
+        }
+        return drug_name
+      },
+      getDrugSpec(drug_id){
+        var specification_name = ""
+        for(let i=0;i<this.drugList.length;i++){
+          if(drug_id == this.drugList[i].id){
+            specification_name = this.drugList[i].specification_name
+          }
+        }
+        return specification_name
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
+      selectCostInfo(selection, row) {
+        this.selection = selection
+      },
+       changeCostInfoTableData(val) {
+        this.selection = val
+      }, changeAllCostInfoTableData(selection) {
+        this.selection = selection
+      },
+      delete(){
+
+
+      },
+      exportdata(){
+        console.log("hahahahh",this.tableData)
+        if(this.tableData!=null && this.tableData.length>0){
+           for(let i=0;i<this.tableData.length;i++){
+             this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id)
+             this.tableData[i].advice_date_str = this.getTime(this.tableData[i].advice_date)
+             if(this.tableData[i].is_upload == 1){
+                this.tableData[i].is_upload_name = "已上传"
+             }
+             if(this.tableData[i].is_upload == 2 || this.tableData[i].is_upload == 0){
+                this.tableData[i].is_upload_name = "未上传"
+             }
+
+             if(this.tableData[i].is_medicine == 1){
+                this.tableData[i].is_medicine_name = "已发药"
+             }
+             if(this.tableData[i].is_medicine == 2 || this.tableData[i].is_medicine == 0){
+                this.tableData[i].is_medicine_name = "未发药"
+             }
+             this.tableData[i].specification_name = this.getDrugSpec(this.tableData[i].drug_id)
+           }
+        }
+
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['患者姓名', '处方日期', '药品名称', '规格', '开药总量', '药品追溯码','上传状态','发药状态']
+          const filterVal = ['patient_name', 'advice_date_str', 'advice_name', 'specification_name', 'prescribing_numbers', 'drug_code','is_upload_name','is_medicine_name']
+
+          const data = this.formatJson(filterVal, this.tableData)
+           excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品追溯'
+         })
+        })
+
+      },formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+
+      query(){
+        this.getlist()
+      },
+      getDrugType(id) {
+        var name = "";
+        for (let i = 0; i < this.drugTypeList.length; i++) {
+          if (this.drugTypeList[i].id == id) {
+            name = this.drugTypeList[i].name;
+          }
+        }
+
+        return name;
+      },
+      getTime(val) {
+        if(val == "" || val == undefined){
+          return ""
+        }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
+      getlist(){
+        this.tableData = []
+        let params = {
+          start_time: this.start_time,
+          end_time: this.end_time,
+          page:this.page,
+          limit:this.limit,
+          is_sale:this.is_sale,
+
+        }
+        getHisDrugCodeQueryList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+             this.tableData = response.data.data.list
+             this.total = response.data.data.total
+             this.drugList = response.data.data.drug
+             this.patientList = response.data.data.patients
+             this.is_open = response.data.data.codeConfig.is_open
+          }
+        })
+      },
+      changeStock(val){
+        this.is_sale = val
+        this.getlist()
+      },
+      changeStartTime(val){
+        this.start_time = val
+      },
+      changeEndTime(val){
+        this.end_time = val
+      },
+      toUpload(row){
+        if(row.is_medicine == 0 || row.is_is_medicine == 2){
+          this.$message.error("该药品未发药,请先发药")
+          this.faShow = true
+          return
+        }
+        var params = {
+          drug_id:row.drug_id,
+          patient_id:row.patient_id,
+         advice_date:row.advice_date,
+        }
+        createUploadDrugCode(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("上传成功!")
+          }
+        })
+      },
+      toFaYao(row){
+
+        if(this.is_open == 1){
+          if(row.drug_code==''){
+             this.$message.error("药品追溯码不能为空!")
+             return
+          }
+        }
+          var params= {
+            drug_id:row.drug_id,
+            patient_id:row.patient_id,
+            advice_date:row.advice_date,
+          }
+        getPatientDrugCode(params).then(response=>{
+          if(response.data.state == 1){
+             this.$message.success("发药成功!")
+             this.getlist()
+          }
+        })
+      }
+    },
+    created() {
+      var drugTypeList = getDictionaryDataConfig("system", "drug_type");
+      this.drugTypeList.push(...drugTypeList);
+      this.getlist()
+    }
+  }
+  </script>
+
+

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -3152,7 +3152,8 @@
                               : "/"
                           }}
                         </div>
-                        ml
+                        <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624 && org_id!=10471"> ml</span>
+                        <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">

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

@@ -153,7 +153,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723">
+                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723">
                         <el-form-item
                         label="目标超滤量(L)：" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -2635,7 +2635,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
 
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
@@ -3063,6 +3063,7 @@ mu
           this.dialysisPrescription.mode_id = pre.mode_id
           this.dialysisPrescription.water_machine = pre.water_machine
           this.zongliang = this.dialysisPrescription.anticoagulant_zongliang
+
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
@@ -3224,8 +3225,18 @@ mu
             this.adminRoles.push(admins[i])
           }
         }
-        console.log("---------",this.targetAdvices)
-        console.log("admin_user_+id2332323223332", this.adminRoles)
+
+        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0){
+          // console.log("中国====================",this.dialysisPrescription.target_ultrafiltration)
+          // console.log("predialysis",this.predialysis)
+          if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
+            //  console.log("进货哈哈好哈哈哈哈")
+             this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
+            //  console.log("日本====================", this.dialysisPrescription.target_ultrafiltration)
+          }
+        }
+        // console.log("---------",this.targetAdvices)
+        // console.log("admin_user_+id2332323223332", this.adminRoles)
       },
       hide() {
         this.isVisibility = false
@@ -5489,6 +5500,8 @@ mu
 
         }
 
+      
+
       },
       stockType: function() {
         console.log('stockType', this.stockType)

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -519,7 +519,7 @@
                       超滤总量：
                       <div class="under_line" style="width: 50px; text-align: center">
                         {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
-                      </div>L
+                      </div>ml
                     </div>
                     <div class="inline_block" style="flex: 1">
                       透析时长：

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2901,8 +2901,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624"> ml</span>
-                      <span v-if="org_id ==9675||org_id==10447 || org_id==10624">L</span>
+                      <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624 && org_id!=10471"> ml</span>
+                      <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471">L</span>
                     </div>
 
                     <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">

src/xt_pages/drugSourceCode/drugChange.vue

@@ -92,11 +92,17 @@
       </el-table-column>
 
       <el-table-column  align="center" prop="name" label="追溯码">
-        <template slot-scope="scope">{{scope.row.drug_code}}</template>
+        <template slot-scope="scope">
+            <div @click="getDrugCode(scope.row.advice_id,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div> 
+          </template>
+        <!-- <template slot-scope="scope">{{scope.row.drug_code}}</template> -->
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="患者姓名">
-        <template slot-scope="scope">{{scope.row.p.name}}</template>
+        <template slot-scope="scope">
+          <!-- {{scope.row.p.name}} -->
+           {{ getPatientName(scope.row.patient_id) }}
+        </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="批号">
@@ -217,6 +223,26 @@
 
     </el-table>
 
+    <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 
   <!-- </div> -->
@@ -228,6 +254,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetDrugChangeStock } from '../../api/new_stock/stock'
 import { getDictionaryDataConfig } from "@/utils/data";
 import { uParseTime } from '@/utils/tools'
+import { changeDrugCode } from "@/api/pharmacy";
 import axios from 'axios'
 const moment = require('moment')
 export default {
@@ -255,10 +282,48 @@ export default {
       changes: [
         { id: 1, name: '已变更' },
         { id: 2, name: '未变更' },
-      ]
+      ],
+      textarea:'',
+      dialogVisibleOne:false,
+      currentRow:{},
+      currentIndex:0,
+      patientList:[]
     }
   },
   methods: {
+     changeText(event){
+        // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+        if (event.key === 'Enter') {
+            var textarea = ""
+            textarea += this.textarea + ","
+            this.textarea = textarea
+        }
+       },
+       getDrugCode(id,DrugCode,index){
+            this.id = id 
+            this.textarea = DrugCode
+            this.currentIndex = index
+            this.dialogVisibleOne = true
+      },
+      saveTextArea(){
+       var params = {
+        id:this.id,
+        data_source:1,
+        drug_code:this.textarea,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].drug_code = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
+         }
+      })
+    },
     deleteStock(row){
       let ids  = row.id
       var that = this;
@@ -446,6 +511,7 @@ export default {
           return false
         } else {
           this.value = response.data.data.total
+          this.patientList =  response.data.data.patientList
           for(let i =0; i < response.data.data.info.length; i++){
             let obj = {
               id:response.data.data.info[i].id,
@@ -460,7 +526,10 @@ export default {
               is_sale:response.data.data.info[i].is_sale,
               pc_date:response.data.data.info[i].pc_date,
               is_bg:response.data.data.info[i].is_change,
-              unit:response.data.data.info[i].Unit
+              unit:response.data.data.info[i].Unit,
+              patient_id:response.data.data.info[i].patient_id,
+              drug_code:response.data.data.info[i].his_advice_info.drug_code,
+              advice_id:response.data.data.info[i].his_advice_info.id
             }
             this.tableData.push(obj)
           }
@@ -471,6 +540,17 @@ export default {
 
 
     },
+    getPatientName(id){
+      console.log("id=-=--------------",id)
+      console.log("patinetlist===========",this.patientList)
+      var name = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(id == this.patientList[i].id){
+          name = this.patientList[i].name
+        }
+      }
+      return name
+    }
   },
   created() {
     var drugTypeList = getDictionaryDataConfig("system", "drug_type");

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -148,6 +148,7 @@
   import { getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import { changeDrugCode } from "@/api/pharmacy";
+  
   import axios from 'axios'
   const moment = require('moment')
   export default {

src/xt_pages/stock/config/goodList.vue

@@ -14,40 +14,20 @@
                     {{scope.$index + 1}}
                 </template>
             </el-table-column>
-            <el-table-column prop="date" label="名称" align="center">
+            <el-table-column prop="date" label="组套名称" align="center">
                 <template slot-scope="scope">
-                    {{scope.row.project_team}}
+                    {{scope.row.project_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="date" label="拼音助记符" width="140" align="center">
+            <el-table-column prop="date" label="排序" width="140" align="center">
                 <template slot-scope="scope">
-                    {{scope.row.pinyin}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="五笔助记符" width="140" align="center">
-                <template slot-scope="scope">
-                   {{scope.row.wubi}}
-                </template>
-            </el-table-column>
-            <el-table-column label="价格" width="100" align="center">
-                <template slot-scope="scope">
-                   {{scope.row.price}}
-                </template>
-            </el-table-column>
-            <el-table-column label="排序" width="100" align="center">
-                <template slot-scope="scope">
-                   {{scope.row.sort}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="备注" align="center">
-                <template slot-scope="scope">
-                   {{scope.row.remark}}
+                    {{scope.row.sort}}
                 </template>
             </el-table-column>
             <el-table-column prop="date" label="操作" width="300" align="center">
                 <template slot-scope="scope">
-                    <el-button @click="editProjectTeam(scope.row.id)" type="primary" size="small">编辑</el-button>
-                    <el-button type="danger" size="small" @click="DeleteProjectTeam(scope.row.id,scope.$index)">删除</el-button>
+                    <el-button @click="editProject(scope.row.id)" type="primary" size="small">编辑</el-button>
+                    <el-button type="danger" size="small" @click="DeleteGood(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -65,9 +45,9 @@
         </el-pagination> 
 
         <el-dialog
-        title="组套详情"
-        :visible.sync="dialogVisible"
-        width="50%"
+          title="组套详情"
+          :visible.sync="dialogVisible"
+          width="50%"
        >
         <span>
         <el-form :model="form">
@@ -111,9 +91,7 @@
                     v-model="form.project_detail"
                     filterable
                     placeholder="请选择"
-                    @change="changeProject"
-                    
-                >
+                    @change="changeProject">
                     <el-option
                     v-for="item in goodList"
                     :key="item.id"
@@ -136,22 +114,28 @@
             
             <el-form-item>
               <el-table
-                :data="tableData"
+                :data="tableDataList"
                 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.row.good_name }}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                  prop="name"
-                  label="数量"
-                  width="180">
+                <el-table-column prop="date" label="规格" width="180" align="center">
+                    <template  slot-scope="scope">
+                        {{ scope.row.specification_name }}
+                   </template>
                 </el-table-column>
-                <el-table-column
-                 prop="address"
-                  label="操作">
+                <el-table-column  prop="name" label="数量" width="180" align="center">
+                    <template  slot-scope="scope">
+                        {{ scope.row.number }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="address" label="操作" align="center">
+                    <template slot-scope="scope">
+                        <el-button type="danger" size="small" @click="DeleteProject(scope.row.id,scope.$index)">删除</el-button>
+                    </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
@@ -160,17 +144,122 @@
         </span>
         <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="saveGoodList">确 定</el-button>
         </span>
-    </el-dialog>
+        </el-dialog>
+
+         
+        <el-dialog
+          title="组套详情"
+          :visible.sync="editDialogVisible"
+          width="50%"
+       >
+        <span>
+        <el-form :model="form">
+          <el-row>
+            <el-col :span="24">
+                <el-form-item
+                    label="组套名称 : "
+                    prop="project_team"
+                    style="width: 100%"
+                    >
+                    <el-input
+                        style="width:200px"
+                        v-model="form.project_name"
+                        placeholder=""
+                        maxlength="30"
+                    ></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row> 
+          <el-row>
+             <el-col :span="24">
+                <el-form-item
+                    label="排序 : "
+                    prop="project_team"
+                    style="width: 100%"
+                    >
+                    <el-input
+                        style="width:200px"
+                        v-model="form.sort"
+                        placeholder=""
+                        maxlength="30"
+                    ></el-input>
+                </el-form-item>
+             </el-col>
+          </el-row>
+        
+     
+            <el-form-item label="组套明细:" style="width: 50%">
+                <el-select
+                    v-model="form.project_detail"
+                    filterable
+                    placeholder="请选择"
+                    @change="changeProject">
+                    <el-option
+                    v-for="item in goodList"
+                    :key="item.id"
+                    :label="item.good_str"
+                    :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="数量" style="width: 50%">
+                    <div style="display: flex">
+                        <el-input
+                        v-model="form.number"
+                        style="margin-right: 10px"
+                        ></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+            </el-form-item>
+            
+            <el-form-item>
+              <el-table
+                :data="tableDataList"
+                border
+                style="width: 100%">
+                <el-table-column prop="date" label="耗材名称" width="180" align="center">
+                    <template  slot-scope="scope" >
+                        {{ scope.row.good_name }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="date" label="规格" width="180" align="center">
+                    <template  slot-scope="scope">
+                        {{ scope.row.specification_name }}
+                   </template>
+                </el-table-column>
+                <el-table-column  prop="name" label="数量" width="180" align="center">
+                    <template  slot-scope="scope">
+                        {{ scope.row.number }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="address" label="操作" align="center">
+                    <template slot-scope="scope">
+                        <el-button type="danger" size="small" @click="DeleteGoodTeam(scope.row.id,scope.$index)">删除</el-button>
+                    </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+
+        </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="updateGoodList">确 定</el-button>
+        </span>
+        </el-dialog>
+     
     </div>
     
   </div>
 </template>
 
 <script>
-import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { getAllGoodInfoList,DeleteProjectTeam } from "@/api/project/project"
+import { getAllGoodInfoList,saveGoodList,getGoodList,getGoodNameDetail,updateGoodList,DeleteGoodTeam,DeleteGood } from "@/api/project/project"
 export default {
    
     data(){
@@ -189,6 +278,7 @@ export default {
             page:1,
             total:0,
             dialogVisible:false,
+            editDialogVisible:false,
             form:{
                 project_name:"",
                 sort:"", 
@@ -196,27 +286,85 @@ export default {
                 project_detail:""
             },
             projectList:[],
-            goodList:[]
+            goodList:[],
+            good_id:0,
+            ids:[],
+            tableDataList:[],
+            goodNameDetail:{}
         }
     },
     methods:{
-        changeProject(){
-            
+        editProject(id){
+         getGoodNameDetail(id).then(response=>{
+           if(response.data.state == 1){
+             var goodNameDetail = response.data.data.goodNameDetail
+             console.log("goodNameDetail",goodNameDetail)
+             this.form.project_name = goodNameDetail.project_name
+             this.form.sort = goodNameDetail.sort
+             this.form.id = goodNameDetail.id
+             this.goodList = []
+             this.goodList =  response.data.data.goodList
+             this.goodNameDetail = goodNameDetail
+             this.editDialogVisible = true
+             if(goodNameDetail!=null){
+               for(let i=0;i<goodNameDetail.xt_good_team_list.length;i++){
+                  goodNameDetail.xt_good_team_list[i].id = goodNameDetail.xt_good_team_list[i].id
+                  goodNameDetail.xt_good_team_list[i].good_name = this.getGoodName(goodNameDetail.xt_good_team_list[i].good_id)
+                  goodNameDetail.xt_good_team_list[i].specification_name = this.getGoodSpecicalName(goodNameDetail.xt_good_team_list[i].good_id)
+                  goodNameDetail.xt_good_team_list[i].number = goodNameDetail.xt_good_team_list[i].count
+               }
+             }
+             this.tableDataList = goodNameDetail.xt_good_team_list
+             
+           }
+         })
         },
-        getlist(){
-
+        changeProject(val){
+          this.good_id = val
         },
-        handleCurrentChange(){
-
+        getGoodList(){
+            var params = {
+               limit:this.limit,
+               page:this.page,
+               keyword:this.search_input
+            }
+          getGoodList(params).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.list
+              this.tableData = list
+              var total = response.data.data.total
+              this.total = total
+             
+            }
+          })
         },
-        handleSizeChange(){
-
+        handleCurrentChange(val){
+           this.page = val;
+           this.getGoodList()
+        },
+        handleSizeChange(val){
+          this.limit = val
+          this.getGoodList()
         },
         searchAction(){
-
+          this.getGoodList()
         },
         addProjectList(){
-            
+           if(this.form.number == ""){
+             this.$message.error("请输入数量!")
+             return
+           }
+           var obj= {id:0,good_id:"",good_name:"",specification_name:"",number:0}  
+           for(let i=0;i<this.goodList.length;i++){
+            if(this.good_id == this.goodList[i].id){
+               obj.id = 0
+               obj.good_id = this.goodList[i].id
+               obj.good_name = this.goodList[i].good_name
+               obj.specification_name = this.goodList[i].specification_name
+               obj.number = parseInt(this.form.number) 
+            }
+           }
+           this.tableDataList.push(obj)
         },
         openForm(){
          getAllGoodInfoList().then(response=>{
@@ -232,11 +380,89 @@ export default {
             }
          })
          
+        },
+        DeleteProjectTeam(id,index){
+
+        },
+        DeleteProject(id,index){
+         this.ids.push(id)
+         this.tableData.splice(index,1)
+        },
+        saveGoodList(){
+           var params = {
+            project_name:this.form.project_name,
+            sort:parseInt(this.form.sort),
+            number:parseInt(this.form.number),
+           } 
+           var data = {
+            info:this.tableDataList
+           }
+         saveGoodList(params,data).then(response=>{
+            if(response.data.state ==1){
+              var lastGoodTeam = response.data.data.lastGoodTeam
+              this.$message.success("保存成功")
+              this.dialogVisible = false
+            }
+         })  
+        },
+        getGoodName(id){
+          var good_name = ""
+          for(let i=0;i<this.goodList.length;i++){
+             if(id == this.goodList[i].id){
+                good_name = this.goodList[i].good_name
+             }
+          }
+          return good_name
+        },
+        getGoodSpecicalName(id){
+          var specification_name = ""
+          for(let i=0;i<this.goodList.length;i++){
+            if(id == this.goodList[i].id){
+              specification_name = this.goodList[i].specification_name
+            }
+          }
+          return specification_name
+        },
+        updateGoodList(){
+            var params = {
+            id:this.id,
+            project_name:this.form.project_name,
+            sort:parseInt(this.form.sort),
+            number:parseInt(this.form.number),
+           } 
+           var data = {
+            info:this.tableDataList
+           }
+          updateGoodList(params,data).then(response=>{
+             if(response.data.state == 1){
+               var lastGoodTeam = response.data.data.lastGoodTeam
+               this.$message.success("保存成功!")
+               this.editDialogVisible = true
+             }
+          })  
+        },
+        DeleteGoodTeam(id,index){
+          DeleteGoodTeam(id,index).then(response=>{
+            if(response.data.state == 1){
+              var team = response.data.data.team
+              this.tableDataList.splice(index,1)
+              this.$message.success("删除成功!")
+            }
+         })
+        },
+        DeleteGood(id,index){
+         DeleteGood(id,index).then(response=>{
+           if(response.data.state == 1){
+             var good = response.data.data.good
+             this.tableData.splice(index,1)
+             this.$message.success("删除成功!")
+           }
+         })
         }
     },
     created(){
-     
-       this.getlist() 
+       
+       this.getGoodList() 
       
     }
 }

src/xt_pages/stock/index.vue

@@ -23,7 +23,7 @@
             <automatic-reduce></automatic-reduce>
           </el-tab-pane>
 
-          <!-- <el-tab-pane label="耗材套装">
+         <!-- <el-tab-pane label="耗材套装">
             <good-list></good-list>
           </el-tab-pane> -->
 

src/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo.vue

@@ -149,7 +149,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -166,7 +166,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-  
+   -->
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>入库数量<span style="color: red">*</span></span>
@@ -211,7 +211,7 @@
             </el-table-column>
         
             
-            <el-table-column width="180" align="center">
+            <!-- <el-table-column width="180" align="center">
               <template slot="header" slot-scope="scope">
                 <span>有效日期<span style="color: red">*</span></span>
               </template>
@@ -232,7 +232,7 @@
                   ></el-date-picker>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column label="生产日期" width="180" align="center">
               <template slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -150,7 +150,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -166,7 +166,7 @@
                   ></el-input>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -157,7 +157,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -173,7 +173,7 @@
                   ></el-input>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
@@ -219,7 +219,7 @@
             </el-table-column>
         
             
-            <el-table-column width="180" align="center">
+            <!-- <el-table-column width="180" align="center">
               <template slot="header" slot-scope="scope">
                 <span>有效日期<span style="color: red">*</span></span>
               </template>
@@ -240,7 +240,7 @@
                   ></el-date-picker>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column label="生产日期" width="180" align="center">
               <template slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -159,7 +159,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -176,7 +176,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-  
+   -->
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>出库数量<span style="color: red">*</span></span>

src/xt_pages/stock/selfPreparedMedicine/newDrugQuery.vue

@@ -172,7 +172,7 @@
         this.getlist()
       },
       toClick(val){
-       
+        console.log("val0000000000000000",val)
          var manufacturer_name = ""
          var specification_name = ""
          for(let i=0;i<this.manufacturerList.length;i++){
@@ -224,6 +224,7 @@
                       child: [],
                       count:0,
                       patient_id:0,
+                      flush_count:item.flush_count,
                     }
                   }
                 })

src/xt_pages/stock/selfPreparedMedicine/selfDrugFlow.vue

@@ -112,24 +112,23 @@
   
        
         
-           <el-table-column prop="drug_name" label="有效期" align="center">
+           <!-- <el-table-column prop="drug_name" label="有效期" align="center">
              <template slot-scope="scope">
                 {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
               
              </template>
-          </el-table-column>
+          </el-table-column> -->
          
           <el-table-column prop="drug_name" label="使用人" align="center">
              <template slot-scope="scope">
                <span > {{getPatientName(scope.row.patient_id)}}</span>
              </template>
           </el-table-column>
-          <el-table-column prop="drug_name" label="剩余库存" align="center">
+          <!-- <el-table-column prop="drug_name" label="剩余库存" align="center" v-if="patient_id>0">
              <template slot-scope="scope">
-               <!-- <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span> -->
                  {{ scope.row.over_count }} {{ drug.min_unit }}
              </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="remark" label="备注" align="center">
              <template slot-scope="scope">
                <span > {{scope.row.remark}}</span>
@@ -221,10 +220,13 @@
         houseList:[],
         patientList:[],
         drug:{},
-        patients:[]
+        patients:[],
+        patient_id:0,
       }
     },
     created(){
+      this.patient_id = this.$route.query.patient_id
+      console.log("病人ID=----------------",this.patient_id)
       this.getlist()
     },
     methods:{

src/xt_pages/stock/selfPreparedMedicine/selfPatientDrugFlow.vue

@@ -112,23 +112,23 @@
   
        
         
-           <el-table-column prop="drug_name" label="有效期" align="center">
+           <!-- <el-table-column prop="drug_name" label="有效期" align="center">
              <template slot-scope="scope">
                 {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
               
              </template>
-          </el-table-column>
+          </el-table-column> -->
          
           <el-table-column prop="drug_name" label="使用人" align="center">
              <template slot-scope="scope">
                <span > {{getPatientName(scope.row.patient_id)}}</span>
              </template>
           </el-table-column>
-          <!-- <el-table-column prop="drug_name" label="剩余库存" align="center">
+          <el-table-column prop="drug_name" label="剩余库存" align="center">
              <template slot-scope="scope">
                  {{ scope.row.over_count }} {{ drug.min_unit }}
              </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column prop="remark" label="备注" align="center">
              <template slot-scope="scope">
                <span > {{scope.row.remark}}</span>