新分支

src/api/dialysis_record.js

   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume,dialysis_strainer) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     order_remark: order_remark,
     catheter_operation:catheter_operation,
     blood_flow_volume:blood_flow_volume,
+    dialysis_strainer:dialysis_strainer,
   }
   console.log('params', params)
   return request({

src/api/drug/drug.js

   })
 }
 
-export function postSelfDrugWarehouse(data){
+export function postSelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
   
   return request({
-    url:"/api/drug/postselfdrugwarehouse",
+    url:"/api/drug/postselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
     method:"post",
     data:data
   })
+}
+
+export function getAllSelfDrugWarehouseInfoList(params){
+
+  return request({
+    url:"/api/drug/getallselfdrugwarehosueinfolist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getSelfDrugWarehouseInfoById(id,params){
+
+  return request({
+    url:"/api/drug/getselfdrugwarehouseinfobyid?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
+ 
+  return request({
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    method:"post",
+    data:data,
+  })
+
+}
+
+export function deleteSelfWarehouseInfo(id,params){
+  
+  return request({
+    url:"/api/drug/deleteselfwarehouseinfo?id="+id,
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/selfPreparedMedicine.js

       hidden: true,
       is_menu: false,
     },
+    {
+      path: '/stock/selfwarehouse/info/edit',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo'),
+      name: 'selfPrepareWaresingEdit',
+      meta: { title: '自备药编辑入库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     {
       path: '/stock/selfwarehouse/out',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseOut'),

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

           ></el-input>
         </el-form-item>
 
+      <el-form-item  label="血滤器:"
+          v-if="isShowFiled('血滤器')"
+          :prop="isName('血滤器')"
+          :rules="isCheckmust('血滤器')">
+          <el-input
+            v-model="form.dialysis_strainer"
+            style="width: 200px"
+            @focus="showInnerDialog('12')"
+          ></el-input>
+      </el-form-item>
+
+      
         <el-form-item
           label="血管通路："
           v-if="isShowFiled('血管通路')"
         catheter_operation:"",
         blood_flow_volume:"" ,
         schedual_type:0,
+        dialysis_strainer:"",
       },
       blood_access_option: [],
       schedules_type: [
       },
       dialyzers: [],
       irrigations: [],
+      dialysisStrainerList:[],
       summary:[],
       blood_access_option_name:"",
       value2:"",
     lastOrder: {
       type: Object,
     },
+    
   },
   mounted() {},
   created() {
     this.form.puncture_way = this.dialysis_order.puncture_way;
     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
+    this.form.dialysis_strainer = this.dialysis_order.dialysis_strainer;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
       console.log("stockType", this.stockType);
       var arr = [];
       var arrTwo = [];
+      var arrThree = []
       for (let i = 0; i < this.stockType.length; i++) {
         if (this.stockType[i].stock_attribute == 2) {
           arr.push(this.stockType[i]);
         if (this.stockType[i].stock_attribute == 3) {
           arrTwo.push(this.stockType[i]);
         }
+        if(this.stockType[i].stock_attribute == 4){
+            arrThree.push(this.stockType[i])
+        }
       }
       var dialyzator = [];
       var irrigation = [];
+      var dialysis_strainer = []
       for (let i = 0; i < arr.length; i++) {
         for (let j = 0; j < arr[i].GoodInfo.length; j++) {
           dialyzator.push(arr[i].GoodInfo[j]);
         }
       }
       this.irrigations = irrigation;
+
+      for(let i=0;i<arrThree.length;i++){
+          for (let j = 0; j < arrThree[i].GoodInfo.length; j++) {
+            dialysis_strainer.push(arrThree[i].GoodInfo[j])
+          }
+        }
+
+        this.dialysisStrainerList = dialysis_strainer
     },
   },
   computed: {},
             this.form.blood_access_id,
             this.form.nuclein_date,
             this.form.catheter_operation,
-            this.form.blood_flow_volume
+            this.form.blood_flow_volume,
+            this.form.dialysis_strainer,
           ).then((rs) => {
             this.loading = false;
             var resp = rs.data;
       ParamsQuery["mode"] = "2";
       ParamsQuery['catheter_operation'] = this.form.catheter_operation
       ParamsQuery["blood_flow_volume"] = this.form.blood_flow_volume
+      ParamsQuery["dialysis_strainer"] = this.form.dialysis_strainer
       if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
         ParamsQuery["mode"] = "3";
       }
           this.InnerDialogProps.selected = this.form.puncture_needle;
           this.InnerDialogProps.isShowTextArea = false;
           break;
+        case '12':
+            for (let i = 0; i < this.dialysisStrainerList.length; i++) {
+              this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialysisStrainerList
+            this.InnerDialogProps.titles = '滤过器'
+            this.InnerDialogProps.type = 'dialysis_strainer'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
+            this.InnerDialogProps.isShowTextArea = false
+        break
         case "13": // 穿刺方式
           this.InnerDialogProps.values = this.puncture_ways;
           this.InnerDialogProps.titles = "穿刺方式";
         case "irrigations":
           this.form.dialysis_irrigation = val.value.join(",");
           break;
+        case 'dialysis_strainer':
+            this.form.dialysis_strainer = val.value.join(',')
+        break
       }
     },
     innerDialogCancle: function () {

src/xt_pages/dialysis/details/dialysisComputer.vue

         <li v-if="isShow('灌流器')">
           <label>灌流器 : </label>
           <span class="content">{{ record.dialysis_irrigation }}</span>
+        </li>
+        <li v-if="isShow('血滤器')">
+          <label>血滤器 : </label>
+          <span class="content">{{ record.dialysis_strainer }}</span>
         </li>
          <li v-if="isShow('血管通路')">
           <label>血管通路 : </label>