新分支

src/api/config.js

@@ -225,3 +225,30 @@ export function changeGoodOutOpen(params) {
     params: params
   })
 }
+
+export function changeSelfPrescriptionOpen(params){
+  
+  return request({
+    url:"/api/changeselfprescriptionopen",
+    method:"get",
+    params:params,
+  })
+}
+
+export function changeSelfPrescriptionOutOpen(params){
+ 
+  return request({
+    url:"/api/changeselfprescriptionoutopen",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSelfPrintList(params){
+  
+  return request({
+    url:"/api/getselfprintlist",
+    method:"get",
+    params:params,
+  })
+}

src/api/drug/drug.js

@@ -764,4 +764,13 @@ export function postSelfDrugOutInfoWarehouse(){
     method:"Get",
     params:params,
   })
+}
+
+export function getSelfDrugBatchNumber(params){
+
+  return request({
+    url:"/api/drug/getselfdrugbatchnumber",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/data/basicConfig.vue

@@ -49,6 +49,14 @@
             <!-- <p style="margin-top:20px;">药品耗材在结算时出库：
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
             </p> -->
+
+            <p style="margin-top:20px;">药品在保存处方时同步到自备库：
+               <el-switch v-model="self_prescription_out_open" @change="changeSelfPrescriptionOpen"></el-switch>
+            </p>
+
+            <p style="margin-top:20px;">药品在执行时自备药出库：
+               <el-switch v-model="self_drug_out_open" @change="changeSelfPrescriptionOutOpen"></el-switch>
+            </p>
         </div>
 
 
@@ -104,7 +112,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -128,6 +136,8 @@ export default {
       drug_out_open:false,
       drug_settle_open:false,
       good_out_open:false,
+      self_prescription_out_open:false,
+      self_drug_out_open:false
     };
   },
   methods: {
@@ -463,15 +473,78 @@ export default {
           this.$message.success("保存成功!")
         }
       })
-    }
-    
+    },
 
+    changeSelfPrescriptionOpen(){
+      var self_info_open = 0
+      if(this.self_prescription_out_open == true){
+          self_info_open = 1
+      }
+      if(this.self_prescription_out_open == false){
+         self_info_open =2
+      }
+      var params = {
+        is_open:self_info_open
+      }
+      changeSelfPrescriptionOpen(params).then(response=>{
+        if(response.data.state ==1){
+          var selfPrescriptionOpen = response.data.data.selfPrescriptionOpen
+          this.$message.success("保存成功!")
+        }
+      })
+    },
+    changeSelfPrescriptionOutOpen(){
+        var out_info_open = 0 
+        if(this.self_drug_out_open == true){
+          out_info_open = 1
+        }
+        if(this.self_drug_out_open == false){
+          out_info_open = 2
+        }
+        var params = {
+          is_open:out_info_open,
+        }
+      changeSelfPrescriptionOutOpen(params).then(response=>{
+         if(response.data.state ==1){
+          var selfPrescriptionOpen = response.data.data.selfPrescriptionOutOpen
+          this.$message.success("保存成功!")
+         }
+     })
+    },
+
+    getSelfPrintList(){
+      getSelfPrintList().then(response=>{
+        if(response.data.state ==1){
+         
+          var selfPrescriptionOpen =  response.data.data.selfPrescriptionOpen
+
+          if(selfPrescriptionOpen.is_open ==1){
+            this.self_prescription_out_open = true
+          }
+
+          if(selfPrescriptionOpen.is_open ==2){
+            this.self_prescription_out_open = false
+          }
+
+           var selfPrescriptionOutOpen = response.data.data.selfPrescriptionOutOpen
+
+           if(selfPrescriptionOutOpen.is_open ==1){
+            this.self_drug_out_open = true
+           }
+           if(selfPrescriptionOutOpen.is_open ==2){
+            this.self_drug_out_open = false
+           }
+        }
+      })
+    }
   },
   created() {
     this.getInitIsOpenConfig()
     // this.getMonitorConfig()
     // this.getOrderConfig()
     this.getDataPrintList()
+
+    this.getSelfPrintList()
   }
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -702,6 +702,28 @@
                           >
                             血浆胆红素吸附
                           </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 24"
+                          >
+                            I-HDF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 25"
+                          >
+                            HD高通
+                          </div>
                           <div
                             class="under_line"
                             style="

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -896,11 +896,19 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10485){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId ==10138){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10278){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10610){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10537){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
@@ -908,7 +916,7 @@ export default {
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
          
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610&&this.orgId==0){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -358,7 +358,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugOutInfoWarehouse} from "@/api/drug/drug"
+    import { getallPatientList,postSearchSelfDrugList,postSelfDrugOutInfoWarehouse,getSelfDrugBatchNumber} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -970,6 +970,8 @@
         this.currentIndex = val;
       },
       handleSelect(val) {
+
+        
         var arr = [];
 
         for (let i = 0; i < this.recordInfo.recordData.length; i++) {
@@ -987,8 +989,7 @@
         var total_count = 0;
         for (let i = 0; i < val.drug_warehouse_info.length; i++) {
           if (val.max_unit == val.drug_warehouse_info[i].max_unit) {
-            val.drug_warehouse_info[i].stock_max_number =
-              val.drug_warehouse_info[i].stock_max_number * val.min_number;
+             val.drug_warehouse_info[i].stock_max_number = val.drug_warehouse_info[i].stock_max_number * val.min_number;
           }
         }
 
@@ -1057,7 +1058,20 @@
           }
         }
       },
-        querySearchAsync(keyword, cb) {
+      getDrugBatchNumber(id) {
+        var params = {
+          id: id,
+        };
+        getSelfDrugBatchNumber(params).then((response) => {
+          if (response.data.state == 1) {
+            var list = response.data.data.list;
+
+            this.numberList = [];
+            this.numberList = list;
+          }
+        });
+       },
+      querySearchAsync(keyword, cb) {
           let key = "";
           if (keyword != undefined) {
             key = keyword;