新分支

src/api/project/project.js

@@ -541,3 +541,12 @@ export function getInvoice(params){
     params:params
   })
 }
+
+export function getAllGoodInfoList(params){
+
+  return request({
+    url:"/api/getallgoodinforlist",
+    method:"Get",
+    params:params
+  })
+}

src/store/modules/globalConfig.js

@@ -864,6 +864,21 @@ const global_config = {
         calcium: 1,
         bicarbonate: 1
       },
+      44: {
+        id: 44,
+        name: '导管溶栓',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
     },
     anticoagulants_confit: { // 抗凝剂
       1: {

src/xt_pages/data/components/addDrugs.vue

@@ -26,6 +26,13 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                       </div>
+                      
+                      <!-- <div v-if="org_id == 0">
+                        <el-form-item label="药品规格 : ">
+                            <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
+                                      maxlength="30"></el-input>
+                        </el-form-item>
+                      </div> -->
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -55,7 +62,7 @@
                             </el-form-item>
                             <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">*</span>
                             <el-form-item prop="min_number" class="noMargin">
-                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;"  type="number" placeholder="拆零"> </el-input>
+                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;"  type="number" placeholder="拆零" @keyup.native="changeTextOne(form.min_number)"> </el-input>
                             </el-form-item>
                             <el-form-item prop="min_unit" class="noMargin">
                               <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位">
@@ -206,7 +213,7 @@
                         </el-form-item>
                         <el-form-item label="包装零售价(元) : " prop="retail_price">
                           <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
+                                      maxlength="30"  @keyup.native="changeText(form.retail_price)"></el-input>
                         </el-form-item>
                         <el-form-item label="进货价(元) : " prop="last_price">
                             <el-input v-model="form.last_price" style="width:160px;" placeholder=""
@@ -226,7 +233,7 @@
                             <el-input v-model="form.number" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="药物分类 : " prop="drug_classify">
+                        <el-form-item label="药物分类 : ">
                             <el-select v-model="form.drug_classify" style="width:160px;" placeholder="请选择">
                                 <el-option
                                         v-for="(item, index) in drugClassifyList"
@@ -666,7 +673,8 @@
           bby01:"",
           is_project:"",
           is_show:"",
-          is_self_drug:"2"
+          is_self_drug:"2",
+        
         },
 
         rules: {
@@ -749,6 +757,13 @@
 
     },
     methods: {
+      changeText(retail_price){
+       
+        this.form.min_price = (retail_price/this.form.min_number).toFixed(2)
+      },
+      changeTextOne(min_number){
+        this.form.min_price = (this.form.retail_price/min_number).toFixed(2)
+      },
       cancle: function(formName) {
         this.$emit('dialog-cancle', this.getValue())
       },

src/xt_pages/data/components/drugs.vue

@@ -74,14 +74,14 @@
         >点击导出
         </el-button>
 
-        <!-- <el-button
+        <el-button
           style="margin-left:10px;"
           @click="jiaoBen()"
           class="filter-item"
           type="primary"
           size="small"
         >脚本
-        </el-button> -->
+        </el-button>
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -511,21 +511,31 @@
          this.getList()
       },
       getName(id) {
-        for (let i = 0; i < this.manufacturers.length; i++) {
-          if (this.manufacturers[i].id == id) {
-            return this.manufacturers[i].manufacturer_name
-          }
+        if(id == 0){
+          return ''
+        }else{
+          for (let i = 0; i < this.manufacturers.length; i++) {
+            if (this.manufacturers[i].id == id) {
+              return this.manufacturers[i].manufacturer_name
+            }
+         }
+          return ''
         }
-        return ''
+        
       },
       getDealer(id){
-        var name = "";
-        for(let i=0;i<this.dealer.length;i++){
-          if(this.dealer[i].id == id){
-             name = this.dealer[i].dealer_name
+        if (id == 0) {
+          return ""
+        }else{
+          var name = "";
+          for(let i=0;i<this.dealer.length;i++){
+            if(this.dealer[i].id == id){
+              name = this.dealer[i].dealer_name
+            }
           }
+          return name
         }
-        return name
+       
       },
       goodInfoDialogComfirm: function(val) {
 

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

@@ -953,7 +953,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
+                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
@@ -964,12 +964,12 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26 && this.$store.getters.xt_user.template_info.org_id !=10206">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26"
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
-                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26 || this.$store.getters.xt_user.template_info.org_id == 10206">
+                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -92,7 +92,7 @@
           </div>
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
-            <div class="under_line" style="width: 50px; text-align: center">
+            <div class="under_line" style="width: 100px; text-align: center">
               <span v-if="org_id!=9538 && org_id!=0">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
@@ -1840,7 +1840,7 @@
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
                           <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 "> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469 || org_id == 0"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
@@ -2237,6 +2237,7 @@
                             "
                             >({{ advice.remark }})</span
                           >
+                          <span v-if="org_id == 0 || org_id == 10644">({{ advice.remark }})</span>
                         </td>
 
                         <td height="32px">
@@ -2353,8 +2354,8 @@
 
                         "
                         >
-                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
-                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }} {{ advice.remark }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}  {{ advice.remark }}</span>
                         </td>
                       <td height="32px">
                         <span
@@ -2550,7 +2551,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id == 10489"
+                      v-if="org_id ==10206 || org_id ==10633 || org_id == 10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2573,8 +2574,8 @@
 
                         "
                         >
-                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
-                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}{{ advice.remark }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}{{ advice.remark }}</span>
                         </td>
                       <td height="32px">
                         <span
@@ -3918,8 +3919,10 @@
                             v-if="
                               advice.parent_id == 0 && advice.remark.length > 0
                             "
-                            >({{ advice.remark }})</span
-                          >
+                            >({{ advice.remark }})
+
+                            
+                          </span>
                         </td>
 
                         <td height="32px">
@@ -5477,7 +5480,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489 || this.org_id == 0){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5561,7 +5564,7 @@ export default {
                   this.projects[i].execution_staff= this.projects[i].execution_staff
                   this.projects[i].advice_name =  this.projects[i].team.project_team
                   this.projects[i].advice_doctor = this.projects[i].doctor
-
+                  this.projects[i].remark = this.projects[i].remark
 
                   newHisArr.push(this.projects[i])
                   // this.doctor_advices_2.push(this.project[i])
@@ -5574,6 +5577,7 @@ export default {
                   this.projects[i].execution_time = this.projects[i].execution_time
                   this.projects[i].execution_staff= this.projects[i].execution_staff
                   this.projects[i].advice_doctor = this.projects[i].doctor
+                  this.projects[i].remark = this.projects[i].remark
                   newHisArr.push(this.projects[i])
 
 

src/xt_pages/stock/config/goodList.vue

@@ -0,0 +1,243 @@
+<template>
+    <div>
+     <div class="page_inspection">
+        <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
+            <div class="cell clearfix" style="margin-bottom:0;">
+                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
+                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
+            </div>
+            <el-button type="primary" @click="openForm(0)">新增</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+            <el-table-column prop="date" label="序号" width="80" align="center">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="名称" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.project_team}}
+                </template>
+            </el-table-column>
+            <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}}
+                </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>
+                </template>
+            </el-table-column>
+        </el-table>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+         >
+        </el-pagination> 
+
+        <el-dialog
+        title="组套详情"
+        :visible.sync="dialogVisible"
+        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="tableData"
+                border
+                style="width: 100%">
+                <el-table-column
+                prop="date"
+                label="耗材名称&规格"
+                width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="数量"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                 prop="address"
+                  label="操作">
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+
+        </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { getAllGoodInfoList,DeleteProjectTeam } from "@/api/project/project"
+export default {
+   
+    data(){
+        return{
+            search_input:'',
+            options: [{
+            value: '1',
+            label: '是'
+            }, {
+            value: '2',
+            label: '否'
+            },],
+            value: '',
+            tableData: [],
+            limit:10,
+            page:1,
+            total:0,
+            dialogVisible:false,
+            form:{
+                project_name:"",
+                sort:"", 
+                number:"",
+                project_detail:""
+            },
+            projectList:[],
+            goodList:[]
+        }
+    },
+    methods:{
+        changeProject(){
+            
+        },
+        getlist(){
+
+        },
+        handleCurrentChange(){
+
+        },
+        handleSizeChange(){
+
+        },
+        searchAction(){
+
+        },
+        addProjectList(){
+            
+        },
+        openForm(){
+         getAllGoodInfoList().then(response=>{
+            if(response.data.state ==1){
+               var goodList = response.data.data.goodList
+               if(goodList!=null && goodList.length>0){
+                 for(let i=0;i<goodList.length;i++){
+                   goodList[i].good_str = goodList[i].good_name+ " " + goodList[i].specification_name
+                 }
+               }
+               this.goodList = goodList
+               this.dialogVisible = true
+            }
+         })
+         
+        }
+    },
+    created(){
+     
+       this.getlist() 
+      
+    }
+}
+</script>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -911,6 +911,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
           type:1,
+          storehouse_id:this.storehouse_id,
         }
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
@@ -936,6 +937,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
+       this.getGoodDetailPrintList()
      }
   }
 };

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -987,6 +987,7 @@ export default {
           this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
+          this.tableDataList[i].patient_name = this.getPatientName(this.tableDataList[i].patient_id)
           this.tableDataList[i].out_count = this.tableDataList[i].count
           this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
           this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].GoodInfo.dealer)
@@ -1009,8 +1010,8 @@ export default {
       
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','number','product_date_name','expiry_date_name','user_name','in_price','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -468,6 +468,7 @@ export default {
         start_time:this.start_time,
         end_time:this.end_time,
         order_type:this.order_type,
+        storehouse_id:this.storehouse_id,
       }
     
      getDrugWarehouseInfoPrint(params).then(response=>{
@@ -616,6 +617,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
+       this.getDrugWarehouseInfoPrint()
      }
   }
 };

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -735,8 +735,8 @@ export default {
       console.log("hwhhwhwhwhwhw",this.tableData)
      
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用人','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','count','total_price']
 
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
@@ -755,6 +755,7 @@ export default {
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
+            this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id) 
             if(this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
               if(this.tableData[i].count >=this.tableData[i].min_number){

src/xt_pages/stock/index.vue

@@ -23,6 +23,10 @@
             <automatic-reduce></automatic-reduce>
           </el-tab-pane>
 
+          <!-- <el-tab-pane label="耗材套装">
+            <good-list></good-list>
+          </el-tab-pane> -->
+
         </el-tabs>
 
       </div>
@@ -37,7 +41,7 @@
   import GoodType from './config/goodType'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import AutomaticReduce from './config/automaticReduce'
-  
+  import GoodList from './config/goodList'
   export default {
     name: 'service',
     components: {
@@ -47,7 +51,7 @@
       Manufacturer,
       Dealer,
       BreadCrumb,
-      
+      GoodList,
     },
     data() {
       return {