8月15日

src/router/modules/stock.js

@@ -12,12 +12,12 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/stock/query',
-      component: () => import('@/xt_pages/stock/stockQuery'),
-      name: 'stockQuery',
-      meta: { title: 'stockQuery', noCache: true }
-    },
+    // {
+    //   path: '/stock/query',
+    //   component: () => import('@/xt_pages/stock/stockQuery'),
+    //   name: 'stockQuery',
+    //   meta: { title: 'stockQuery', noCache: true }
+    // },
     {
       path: '/stock/new/query',
       component: () => import('@/xt_pages/stock/stockNewQuery'),

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -131,7 +131,73 @@
     >
     </el-pagination>
 
-   
+    
+    <el-dialog
+      title="耗材统计表"
+      :visible.sync="startDialogVisible"
+      width="70%">
+      <span>
+        <div class="cell clearfix">
+          <label class="title"> <span class="name">排班班次</span> : </label>
+           <el-select v-model="schedulType" placeholder="请选择">
+            <el-option
+              v-for="item in schedulArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+           </el-select>
+           <label class="title"> <span class="name">病区选择</span> : </label>
+           <el-select v-model="partitionType" placeholder="请选择">
+            <el-option
+              v-for="item in partitionArr"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+           </el-select>
+        </div> 
+       <el-table
+        :data="tableList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center" width="55" label="序号">
+           <template slot-scope="scope">
+            
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"  width="55" label="耗材名称">
+         <template slot-scope="scope">
+           
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"  width="55" label="规格">
+           <template slot-scope="scope">
+          
+           </template>
+        </el-table-column>
+       
+        <el-table-column  align="center"  width="55" label="数量">
+           <template slot-scope="scope">
+          
+           </template>
+        </el-table-column>
+        
+     
+
+      </el-table>
+      </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>
 </template>
 
@@ -200,7 +266,9 @@
         body_fluid_option:[],
         displace_liqui_part_option:[],
         blood_access_option:[],
-        hemodialysisPipelinesOptions:[]
+        hemodialysisPipelinesOptions:[],
+        startDialogVisible:false,
+        tableList:[],
       }
     },
     created() {
@@ -293,21 +361,18 @@
         this.schedulType = scheduleType
         this.query.schedule_type = scheduleType
         this.query.page = 1
-        
-
+        this.getlist()
       },
       selectPartitionType(partitionType) {
         this.partitionType = partitionType
         this.query.partition_id = partitionType
         this.query.page = 1
-
-       
-
+        this.getlist()
       },
       selectGoodType(goodType){
         this.goodType = goodType
         this.query.good_type = goodType
-       
+        this.getlist()
       },
       getAllZone: function() {
         GetAllZone().then(response => {
@@ -321,7 +386,7 @@
         })
       },
       statistics() {
-        this.$refs.consumables.show()
+        this.startDialogVisible = true
       },
       handleScheduleDateChange(val) {
         this.query.schedule_date = val

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

@@ -31,13 +31,13 @@
          </div>
         
          <div>
-          <el-button
+          <!-- <el-button
             size="small"
             class="filter-item"
             type="primary"
             @click="toCheck"
             >脚本
-          </el-button>
+          </el-button> -->
           <el-button
             size="small"
             class="filter-item"

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

@@ -153,7 +153,8 @@ export default {
             this.loading = false
             var list = response.data.data.list
             for (let i = 0; i < list.length; i++) {
-                   //期初结余入库
+
+              //期初结余入库
               if(list[i].DrugWarehouseInfoStart!=null && list[i].DrugWarehouseInfoStart.length > 0){
                 for(let j=0;j<list[i].DrugWarehouseInfoStart.length;j++){
                   if(list[i].max_unit == list[i].DrugWarehouseInfoStart[j].max_unit){
@@ -171,6 +172,16 @@ export default {
                 }
               }
 
+              //期初结余退库
+               if(list[i].WareStartStockCancelInfo!=null && list[i].WareStartStockCancelInfo.length>0){
+                for(let j=0;j<list[i].WareStartStockCancelInfo.length;j++){
+                  if(list[i].max_unit == list[i].WareStartStockCancelInfo[j].max_unit){
+                    list[i].WareStartStockCancelInfo[j].count =  list[i].WareStartStockCancelInfo[j].count*list[i].min_number
+                  }
+                }
+              }
+
+
               //期末结余入库
               if(list[i].DrugWarehouseInfoEnd!=null && list[i].DrugWarehouseInfoEnd.length > 0){
                 for(let j=0;j<list[i].DrugWarehouseInfoEnd.length;j++){
@@ -189,6 +200,15 @@ export default {
                 }
               }
 
+              //期末结余退库
+               if(list[i].WareEndStockCancelInfo!=null && list[i].WareEndStockCancelInfo.length>0){
+                for(let j=0;j<list[i].WareEndStockCancelInfo.length;j++){
+                  if(list[i].max_unit == list[i].WareEndStockCancelInfo[j].max_unit){
+                    list[i].WareEndStockCancelInfo[j].count =  list[i].WareEndStockCancelInfo[j].count*list[i].min_number
+                  }
+                }
+              }
+
               //期中增加
               if(list[i].DrugWarehouseInfoStartEnd!=null && list[i].DrugWarehouseInfoStartEnd.length > 0){
                 for(let j=0;j<list[i].DrugWarehouseInfoStartEnd.length;j++){
@@ -206,6 +226,15 @@ export default {
                    }
                 }
               }
+
+              //期中退库
+              if(list[i].WareStartEndStockCancelInfo!=null && list[i].WareStartEndStockCancelInfo.length > 0){
+                for(let j=0;j<list[i].WareStartEndStockCancelInfo.length;j++){
+                   if(list[i].max_unit == list[i].WareStartEndStockCancelInfo[j].max_unit){
+                     list[i].WareStartEndStockCancelInfo[j].count =list[i].min_number * list[i].WareStartEndStockCancelInfo[j].count
+                   }
+                }
+              }
            
            
 
@@ -264,6 +293,7 @@ export default {
              }
             }
 
+
            
              for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -118,8 +118,12 @@
        
         <el-table-column prop="drug_name" label="单价" align="center">
            <template slot-scope="scope">
+             <span v-if="scope.row.consumable_type == 2 && scope.row.xt_drug_warehouse_out_info!=null">{{scope.row.xt_drug_warehouse_out_info.price}}</span>
+             <span v-else>
               <span v-if="scope.row.price >0">{{scope.row.price}}</span>
               <span v-if="scope.row.price == 0">{{getPrice(scope.row.drug_id)}}</span>
+             </span>
+            
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
@@ -278,7 +282,8 @@
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
             this.drug =  response.data.data.drug
-         
+            var outlist = response.data.data.outlist
+            console.log("outlist",outlist)
            }
          })  
        },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -665,6 +665,7 @@ export default {
       outList:[],
       warehouseOutList:[],
       exportLoding:false,
+      outInfoList:[],
     };
   },
   methods: {
@@ -1475,17 +1476,28 @@ export default {
           this.exportLoding = false
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
+          this.outInfoList = response.data.data.outInfoList
+          console.log("outInfoList2233232232",this.outInfoList)
         }
       });
     },
     toExport() {
-     
+      console.log("exportlist23323232233",this.exportList)
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
       }
      
       for (let i = 0; i < this.exportList.length; i++) {
+        this.exportList[i].retail_price_one = 0
+        if(this.outInfoList.length!=null){
+          for(let j=0;j<this.outInfoList.length;j++){
+           if(this.exportList[i].warehouse_out_id == this.outInfoList[j].warehouse_out_id && this.exportList[i].drug_id == this.outInfoList[j].drug_id){
+            this.exportList[i].retail_price_one = this.outInfoList[j].price
+           }
+        }
+        }
+       
         if (this.exportList[i].dealer == 0) {
           this.exportList[i].dealer = "";
         }
@@ -1501,7 +1513,7 @@ export default {
           "/" +
           this.exportList[i].max_unit;
 
-        this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2);
+        // this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2);
         this.exportList[i].out_count = this.getAllOut(this.exportList[i].count,this.exportList[i].max_unit,this.exportList[i].min_unit,this.exportList[i].min_number)
         this.exportList[i].expiry_date = this.getTime(
           this.exportList[i].expire_date
@@ -1554,9 +1566,9 @@ export default {
           "unit",
           "batch_number",
           "out_count",
-          "retail_price",
+          "retail_price_one",
           "price",
-          "total_price",
+          "retail_price",
           "manufacturer",
           "product_date",
           "expiry_date",
@@ -2074,8 +2086,8 @@ export default {
        if(drug_id == this.warehouseOutList[i].drug_id){
           price = this.warehouseOutList[i].price
        }
-       return price
       }
+      return price
     }
   },
 };

src/xt_pages/stock/query/goodNewQuery.vue

@@ -31,7 +31,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
           <div>
-            <el-button size="small" type="primary" @click="toClickTwo">脚本</el-button>
+            <!-- <el-button size="small" type="primary" @click="toClickTwo">脚本</el-button> -->
             <el-button size="small" type="primary" @click="exportList">导出</el-button>
             <el-button size="small" type="primary" @click="toPrint">打印</el-button>
           </div>

src/xt_pages/stock/stockOutOrder.vue

@@ -837,12 +837,8 @@
                   <span>使用数量</span>
                 </template>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.is_total == 0"
-                    >{{ scope.row.count - scope.row.cancel_count}}{{ scope.row.packing_unit }}</span
-                  >
-                  <span v-if="scope.row.is_total == 1"
-                    >{{ scope.row.total }}
-                  </span>
+                  <span v-if="scope.row.is_total == 0">{{ scope.row.count - scope.row.cancel_count}}{{ scope.row.packing_unit }}</span>
+                  <span v-if="scope.row.is_total == 1">{{ scope.row.total}}</span>
                 </template>
               </el-table-column>
               <el-table-column min-width="60" align="center">
@@ -1383,17 +1379,19 @@ export default {
     },
 
     handleSearch(val) {
+      console.log("val322332232332i",val)
       this.is_sys = val.is_sys;
       this.tableList = [];
       this.editdialogVisibleThree = false;
-      this.GetOrderDetailOne(val.id);
+      this.GetOrderDetailOne(val.id,val.warehouse_out_time);
 
       this.GetTotalCount(val.warehouse_out_time);
     },
 
-    GetOrderDetailOne(id) {
+    GetOrderDetailOne(id,warehouse_out_time) {
       const params = {
         id: id,
+        warehouse_out_time:warehouse_out_time,
       };
       getOrderDetailByOrderId(params).then((response) => {
         if (response.data.state == 1) {
@@ -1924,17 +1922,25 @@ export default {
             }
           }
           console.log("2o32o3o3232j32oo23o2332oj2wo",arr)
-          for (let i = 0; i <arr.length; i++) {
-            var obj = arr[i];
+          var arrTwo= []
+          for(let i=0;i<arr.length;i++){
+            if((arr[i].count - arr[i].cancel_count)!=0){
+               arrTwo.push(arr[i])
+            }
+          }
+          console.log("arrTwo8888888",arrTwo)
+          for (let i = 0; i <arrTwo.length; i++) {
+            var obj = arrTwo[i];
             obj["is_total"] = 0;
             this.userList.push(obj);
-            if(arr[i].is_sys == 1){
-              total = total + arr[i].count - arr[i].cancel_count;
+            if(arrTwo[i].is_sys == 1){
+              total = total + arrTwo[i].count - arrTwo[i].cancel_count;
             }else{
-              total = total + arr[i].count;
+              total = total + arrTwo[i].count;
             }
             
           }
+          console.log("user_list23322323232323",this.userList)
           this.userList.push({
             is_total: 1,
             total: total,

src/xt_pages/user/dialysisSolution.vue

@@ -3,7 +3,10 @@
     <patient-sidebar :id="patientID" defaultActive="2-1"></patient-sidebar>
     <div class="patient-app-container app-container">
       <div class="Total">
+        <!-- <div class="plan" >透析计划</div> -->
+        <!-- <table-title title="长期透析处方"></table-title> -->
         <div class="sum">
+          <!-- <span>透析总频率:<el-input :value="totalrate" disabled style="width:180px"></el-input></span> -->
           <el-button
             type="primary"
             size="small"
@@ -39,7 +42,7 @@
           min-width="50"
         >
           <template slot-scope="scope">
-            {{modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:''}}
+            {{ modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:'' }}
           </template>
         </el-table-column>
         <el-table-column
@@ -53,7 +56,25 @@
             {{ scope.row.dialysis_duration_minute }} 分钟
           </template>
         </el-table-column>
-      
+        <!-- <el-table-column
+          prop="period"
+          label="频率"
+          align="center"
+          min-width="50">
+          <template slot-scope="scope" >
+              <span v-if="scope.row.parent_id === 0" >{{scope.row.period}}{{scope.row.times}}</span>
+              <span v-else >--</span>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column
+          prop="name"
+          label="处方名"
+          align="center"
+          min-width="50">
+          <template slot-scope="scope" >
+              <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
+          </template>
+        </el-table-column> -->
         <el-table-column
           prop="doctor"
           label="医生"
@@ -86,13 +107,17 @@
             <span>{{ scope.row.updated_time | parseTime("{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-
-        <el-table-column  align="center" label="状态" width="60">
-          <template slot-scope="scope">
-            <span v-if="scope.row.solution_status == 1">生效</span>
-            <span v-if="scope.row.solution_status == 2">失效</span>
-          </template>
-        </el-table-column>
+        <!-- <el-table-column
+           prop="state"
+           label="状态"
+           align="center"
+           min-width="40">
+           <template slot-scope="scope" >
+               <span v-if="scope.row.initiate_mode==1">启用</span>
+               <span v-else-if="scope.row.initiate_mode==2">停用</span>
+               <span v-else>未知</span>
+             </template>
+        </el-table-column> -->
         <el-table-column label="操作" align="center" min-width="140">
           <template slot-scope="scope">
             <el-tooltip
@@ -108,22 +133,19 @@
                 @click="openEdit(scope.$index, scope.row)"
               ></el-button>
             </el-tooltip>
-
-
-             <el-tooltip
-              class="item"
-              effect="dark"
-              content="查看更多"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                @click="toClick(scope.row)">
-                查看更多
-              </el-button>
-            </el-tooltip>
-         
+            <!--   <el-button
+                 size="mini"
+                 type="primary"
+                 @click="openChildEdit(scope.$index, scope.row)" v-else>编辑</el-button>
+
+               <el-button
+                 size="mini"
+                 type="success"
+                 @click="openNewChild(scope.$index, scope.row)" v-if="scope.row.parent_id===0">新增</el-button>
+               <el-button
+                 size="mini"
+                 type="danger"
+                 @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -140,99 +162,8 @@
         :total="total"
       >
       </el-pagination>
-      
-      <div v-show="startShow">
-        <el-row :gutter="20">
-          <el-col :span="6"><div class="grid-content bg-purple">透析模式:{{modeOptions[current_solution.mode_id]?modeOptions[current_solution.mode_id].name:''}}</div></el-col>
-        </el-row>
-         <el-row :gutter="20">
-          <el-col :span="6"><div class="grid-content bg-purple">透析时长:{{current_solution.dialysis_duration_hour}}小时{{current_solution.dialysis_duration_minute}}分钟</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">血流量(ml/min):{{current_solution.blood_flow_volume}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">透析液配方:{{getDialysateFormulation(current_solution.dialysate_formulation)}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">抗凝剂:{{getAnticoagulant(current_solution.anticoagulant)}}</div></el-col>
-        </el-row>
-
-         <el-row :gutter="20">
-          <el-col :span="6"><div class="grid-content bg-purple">首剂:
-            <span v-if="current_solution.anticoagulant == 6">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 7">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 5">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 4">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 3">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 2">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 1">(mg)</span>
-            {{current_solution.anticoagulant_shouji}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">维持:
-              <span v-if="current_solution.anticoagulant == 7">(iu/h)</span>
-              <span v-if="current_solution.anticoagulant == 6">(iu/h)</span>
-              <span v-if="current_solution.anticoagulant == 5">(ml/h)</span>
-              <span v-if="current_solution.anticoagulant == 4">(mg/h)</span>
-              <span v-if="current_solution.anticoagulant == 3">(iu/h)</span>
-              <span v-if="current_solution.anticoagulant == 2">(mg/h)</span>
-              <span v-if="current_solution.anticoagulant == 1">(mg/h)</span>
-            {{current_solution.anticoagulant_weichi}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">总量:
-            <span v-if="current_solution.anticoagulant == 5">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 6">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 7">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 4">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 3">(iu)</span>
-            <span v-if="current_solution.anticoagulant == 2">(mg)</span>
-            <span v-if="current_solution.anticoagulant == 1">(mg)</span>
-            {{current_solution.anticoagulant_zongliang}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">钾(mmol/L):{{current_solution.kalium}}</div></el-col>
-        </el-row>
-
-       <el-row :gutter="20">
-          <el-col :span="6"><div class="grid-content bg-purple">钠(mmol/L):{{current_solution.sodium}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">钙:(mmol/L){{current_solution.calcium}}</div></el-col>
-          <el-col :span="6"><div class="grid-content bg-purple">透析器/灌流器:{{current_solution.dialyzer_perfusion_apparatus}}</div></el-col>
-        </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">透析器:{{current_solution.dialysis_dialyszers}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">灌流器:{{current_solution.dialysis_irrigation}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">碳酸氢盐(mmol/L):{{current_solution.bicarbonate}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">葡萄糖(mmol/L):{{current_solution.glucose}}</div></el-col>
-         </el-row>
-
-            <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">透析液流量(ml/min):{{current_solution.dialysate_flow}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">透析液温度(℃):{{current_solution.dialysate_temperature}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">电导度(mS/cm):{{current_solution.conductivity}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">体液过多症状:{{getBodyFluid(current_solution.body_fluid)}}</div></el-col>
-         </el-row>
-
-           <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">体液过多其他症状:{{current_solution.body_fluid_other}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">透析前使用特殊药物:{{current_solution.special_medicine}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">使用其他特殊药物:{{current_solution.special_medicine_other}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">血管通路:{{getBloodAccess(current_solution.blood_access)}}</div></el-col>
-         </el-row>
-
-           <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">血浆分离器:{{current_solution.plasma_separator}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">透析管路:{{getHemodialysisPipelines(current_solution.hemodialysis_pipelines)}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">透析管路支数:{{current_solution.hemodialysis_pipelines_count}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">穿刺针:{{current_solution.puncture_needle}}</div></el-col>
-         </el-row>
-
-           <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">穿刺针支数:{{current_solution.puncture_needle_count}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">促红素:{{current_solution.epo_count}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">促红素支数:{{current_solution.epo_count}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">最大超滤率(ml/h):{{current_solution.max_ultrafiltration_rate}}</div></el-col>
-         </el-row>
-           <el-row :gutter="20">
-            <el-col :span="6"><div class="grid-content bg-purple">备注:{{current_solution.remark}}</div></el-col>
-         </el-row>
-      </div>
-
     </div>
 
-   
-
-
     <el-dialog
       :title="isEdit ? '编辑透析处方' : '新增透析处方'"
       :visible.sync="dialogVisible"
@@ -606,6 +537,25 @@
               </el-select>
             </el-form-item>
 
+            <!-- <el-form-item
+              label="置换方式："
+              v-if="
+                isShows('置换液')   && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
+              "
+            >
+              <el-select
+                v-model="addPlan.displace_liqui_part"
+                placeholder="请选择"
+              >
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="(option, index) in displace_liqui_part_option"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id"
+                ></el-option>
+              </el-select>
+            </el-form-item> -->
           </el-col>
 
           <el-col :span="8" v-if="isShows('置换液总量')  && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
@@ -629,6 +579,8 @@
             </el-form-item>
           </el-col>
 
+          <!-- </el-row>
+          <el-row :gutter="20" > -->
           <el-col :span="8" v-if="isShows('实际超滤量')">
             <el-form-item label="实际超滤量(L)">
               <el-input v-model="addPlan.ultrafiltration"></el-input>
@@ -777,118 +729,8 @@
       v-on:dialog-comfirm="innerDialogComfirm"
       v-on:dialog-cancle="innerDialogCancle">
     </multi-select-box>
-     
 
 
-
-    <el-dialog
-      :visible.sync="startDialogVisible"
-      width="1010px"
-    >
-      <el-table
-        ref="solutionTable"
-        :data="tableList"
-        border
-        fit
-        highlight-current-row
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :row-style="{ color: '#303133' }"
-        style="width: 100%"
-      >
-        <el-table-column type="index" align="center" label="序号" width="60">
-        </el-table-column>
-        <el-table-column
-          prop="mode_name"
-          align="center"
-          label="透析模式"
-          min-width="50"
-        >
-          <template slot-scope="scope">
-            {{modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:''}}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="dialysis_duration"
-          align="center"
-          label="透析时长"
-          min-width="50"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.dialysis_duration_hour }} 小时
-            {{ scope.row.dialysis_duration_minute }} 分钟
-          </template>
-        </el-table-column>
-      
-        <el-table-column
-          prop="doctor"
-          label="医生"
-          align="center"
-          min-width="110"
-        >
-          <template slot-scope="scope">
-            <span>{{ getAdminUserName(scope.row.registrars_id) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="created_time"
-          align="center"
-          label="创建日期"
-          min-width="60"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.created_time | parseTime("{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="updated_time"
-          align="center"
-          label="更新日期"
-          min-width="60"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.updated_time | parseTime("{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column  align="center" label="状态" width="60">
-          <template slot-scope="scope">
-            <span v-if="scope.row.solution_status == 1">生效</span>
-            <span v-if="scope.row.solution_status == 2">失效</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        align="right"
-        @size-change="handleSizeChangeOne"
-        @current-change="handleCurrentChangeOne"
-        :current-page="pageOne"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="totalOne"
-      >
-      </el-pagination>
-      <span slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="startDialogVisible = false"
-          >取消</el-button
-        >
-        <el-button
-          type="primary"
-          @click="startDialogVisible = false"
-         
-          >确定</el-button
-        >
-      </span>
-    </el-dialog>
-
   </div>
 </template>
 
@@ -903,8 +745,7 @@ import {
   editChildPatientDialysisSolution,
   editDialysisSolutionDetail,
   editPatientDialysisSolution,
-  findePatientDialysisLongSolutions,
-  getDialysisSolutionDetailList
+  fetchPatientDialysisSolutions
 } from '@/api/patient'
 
 import { getSystemPrescription } from '@/api/config'
@@ -1190,12 +1031,6 @@ export default {
       {id:2,name:"无"}
      ],
      oxygenShow:false,
-     startDialogVisible:false,
-     tableList:[],
-     totalOne:0,
-     pageOne:1,
-     limitOne:10,
-     startShow:false,
     }
   },
   watch: {
@@ -1361,8 +1196,6 @@ export default {
     },
 
     tableCurrentChange(current) {
-      console.log("current",current)
-      this.startShow = true
       if (typeof current === 'undefined' || current == null) {
         this.current_solution = {
           id: 0,
@@ -1487,7 +1320,18 @@ export default {
               duration: 2000
             })
             this.tableData.splice(index, 1)
-           
+            // if (row.parent_id>0) {
+            //   this.tableData.splice(index,1);
+            // }else {
+            //     var resetTableData = this.tableData;
+            //     this.tableData = [];
+            //     var that = this;
+            //     resetTableData.forEach(function(item, itemindex){
+            //         if (item.id != row.id && item.parent_id != row.id) {
+            //             that.tableData.push(item);
+            //         }
+            //     });
+            // }
           }
         })
       })
@@ -1671,7 +1515,7 @@ export default {
               // this.tableData[this.current_index].updated_time = response.data.data.solution.updated_time;
 
               this.current_index = -1
-              this.FindePatientDialysisLongSolutions()
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1713,7 +1557,7 @@ export default {
               }
               this.total += 1
               // this.$refs[formName].resetFields()
-              this.FindePatientDialysisLongSolutions()
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1725,23 +1569,11 @@ export default {
     },
     handleSizeChange(val) {
       this.queryParams.limit = val
-      this.FindePatientDialysisLongSolutions()
-    },
-    handleCurrentChange(val) {
-      this.queryParams.page = val
-      this.FindePatientDialysisLongSolutions()
-    },
-   handleSizeChangeOne(val) {
-      this.queryParams.limit = val
-      this.FindePatientDialysisLongSolutions()
+      this.fetchPatientDialysisSolutions()
     },
     handleCurrentChange(val) {
       this.queryParams.page = val
-      this.FindePatientDialysisLongSolutions()
-    },
-     handleCurrentChangeOne(val) {
-      this.queryParams.page = val
-      this.FindePatientDialysisLongSolutions()
+      this.fetchPatientDialysisSolutions()
     },
     openEdit(index, row) {
       console.log("ro233344433344444444",row)
@@ -2049,8 +1881,8 @@ export default {
         }
       })
     },
-    FindePatientDialysisLongSolutions() {
-      findePatientDialysisLongSolutions(this.queryParams).then(response => {
+    fetchPatientDialysisSolutions() {
+      fetchPatientDialysisSolutions(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.tableData = response.data.data.solutions
           this.total = response.data.data.total
@@ -2139,10 +1971,12 @@ export default {
       ) {
         return false
       }
+      // this.current_model = this.modeOptions[thismode];
       this.addPlan.mode_name = this.modeOptions[thismode].name
       const params = {
         id: thismode
       }
+
       getSystemPrescription(params).then(response => {
         if (response.data.state == 1) {
            var prescription =   response.data.data.prescription
@@ -2326,103 +2160,6 @@ export default {
       this.addPlan.oxygen_time = ""
      }
     },
-    toClick(val){
-      var params = {
-        mode_id:val.mode_id,
-        patient_id:val.patient_id,
-        page:this.pageOne,
-        limit:this.limitOne,
-      }
-      getDialysisSolutionDetailList(params).then(response=>{
-        if(response.data.state == 1){
-          this.startDialogVisible = true
-          var list = response.data.data.list
-          this.totalOne = response.data.data.total
-          this.tableList = list
-        }
-      })
-    },
-
-    //修改
-    getDialysateFormulation(id){
-      var name = ""
-      for(let i=0;i<this.dialysate_formulation.length;i++){
-        if(id == this.dialysate_formulation[i].id){
-          name = this.dialysate_formulation[i].name
-        }
-      }
-      return name
-    },
-    getAnticoagulant(id){
-      var name = ""
-      if(id == 1){
-         name = "无肝素"
-      }
-      if(id == 2){
-        name = "普通肝素"
-      }
-      if(id == 3){
-        name = "低分子肝素"
-      }
-      if(id == 4){
-        name = "阿加曲班"
-      }
-      if(id == 5){
-         name ="枸橼酸钠"
-      }
-      if(id == 6){
-        name = "低分子肝素钙"
-      }
-      if(id == 7){
-        name = "低分子肝素钠"
-      }
-      if(id ==8){
-        name = "依诺肝素"
-      }
-      if(id ==9){
-        name = "达肝素"
-      }
-      if(id ==10){
-        name = "体外抗凝"
-      }
-      if(id ==11){
-        name = "那曲肝素"
-      }
-      if(id ==12){
-        name = "无抗凝剂"
-      }
-     if(id ==13){
-        name = "那曲肝素钙"
-      }
-      return name
-    },
-    getBodyFluid(id){
-     var name = ""
-     for(let i=0;i<this.body_fluid_option.length;i++){
-       if(id == this.body_fluid_option[i].id){
-          name = this.body_fluid_option[i].name
-       }
-     }
-     return name
-    },
-    getBloodAccess(id){
-      var name = ""
-      for(let i=0;i<this.blood_access_option.length;i++){
-        if(id == this.blood_access_option[i].id){
-           name = this.blood_access_option[i].name
-        }
-      }
-      return name
-    },
-    getHemodialysisPipelines(id){
-      var name = ""
-      for(let i=0;i<this.hemodialysisPipelinesOptions.length;i++){
-        if(id == this.hemodialysisPipelinesOptions[i].id){
-            name = this.hemodialysisPipelinesOptions[i].name
-        }
-      }
-      return name
-    }
   },
   created() {
     const id = this.$route.params && this.$route.params.id
@@ -2440,7 +2177,7 @@ export default {
 
     this.GetDeviceData()
     this.fetchAllAdminUsers()
-    this.FindePatientDialysisLongSolutions()
+    this.fetchPatientDialysisSolutions()
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set
     this.replacementWays = this.$store.getters.replacement_ways
@@ -2531,3 +2268,4 @@ export default {
   background-color: #d0d3da;
 }
 </style>
+