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

src/store/modules/globalConfig.js

@@ -939,6 +939,21 @@ const global_config = {
         zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      17: {
+        id: 17,
+        name: '肝素钠',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/data/druguseTemplate.vue

@@ -1181,9 +1181,17 @@
                 <el-form-item label="给药途径 :" required prop="name">
                   <el-input v-model="drugwayForm.name" placeholder="给药途径"></el-input>
                 </el-form-item>
-                <el-form-item label="编码 :" required prop="name">
+                <el-form-item label="bbx01 :" required prop="name" v-if="$store.getters.xt_user.org_id == 10206 || $store.getters.xt_user.org_id == 0">
+                  <el-input v-model="drugwayForm.code" placeholder="bbx01"></el-input>
+                </el-form-item>
+
+                <el-form-item label="编码 :" required prop="name" v-if="$store.getters.xt_user.org_id != 10206 && $store.getters.xt_user.org_id !=0">
                   <el-input v-model="drugwayForm.code" placeholder="给药途径编码"></el-input>
                 </el-form-item>
+
+                <el-form-item label="bby01 :" required prop="name">
+                  <el-input v-model="drugwayForm.bby01" placeholder="bby01"></el-input>
+                </el-form-item>
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="drugwayFormVisible = false">取消</el-button>
@@ -1447,6 +1455,7 @@
           name: '',
           id: 0,
           code:"",
+          bby01:"",
         },
         efForm: {
           name: '',
@@ -1984,7 +1993,8 @@
         this.drugwayForm = {
           name: '',
           code:'',
-          id: 0
+          id: 0,
+          bby01:"",
         }
         this.drugwayFormVisible = true
         this.dialogTitle = '新增给药途径'
@@ -1997,7 +2007,8 @@
         this.drugwayForm = {
           name: row.name,
           id: row.id,
-          code:row.code
+          code:row.code,
+          bby01:row.bby01
         }
 
         this.drugwayFormVisible = true
@@ -2021,6 +2032,8 @@
                     var drugway = response.data.data.drugway
                     this.drugways[this.currentIndex].name = drugway.name
                     this.drugways[this.currentIndex].code = drugway.code
+                    this.drugways[this.currentIndex].bby01 = drugway.bby01
+
 
                     this.drugways[this.currentIndex].updated_time =
                       drugway.updated_time

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

@@ -1188,7 +1188,7 @@ export default {
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
-          console.log("Data",data)
+        
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
@@ -1504,6 +1504,7 @@ export default {
   },
   created() {
     // console.log("this.form", this.form.consciousness);
+    
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4280,7 +4280,7 @@ export default {
         
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510){
+        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510 || this.org_id ==10567 ){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
             
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/role/components/AdminInfoForm.vue

@@ -68,7 +68,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :span="24" v-if="$store.getters.xt_user.org_id != 10206">
+      <el-row :span="24" v-if="$store.getters.xt_user.org_id != 10206 && $store.getters.xt_user.org_id != 0">
         <el-col :span="8">
           <el-form-item label="医保医师编码:">
             <el-input v-model="form.doctor_number"></el-input>
@@ -77,7 +77,7 @@
       </el-row>
 
 
-      <el-row :span="24" v-if="$store.getters.xt_user.org_id == 10206">
+      <el-row :span="24" v-if="$store.getters.xt_user.org_id == 10206  || $store.getters.xt_user.org_id ==  0">
         <el-col :span="8">
           <el-form-item label="员工ID:">
             <el-input v-model="form.doctor_number"></el-input>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -142,6 +142,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
+
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.count }}
@@ -260,6 +266,8 @@ export default {
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
+      patientsList:[]
+        
     };
   },
   methods: {
@@ -405,7 +413,8 @@ export default {
           this.dealerList = response.data.data.dealerList
           var listgroup = response.data.data.listgroup
           
-          this.
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -759,7 +768,17 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
+     },
+     getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
      }
+     return name
+    }
   }
 };
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -154,6 +154,11 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">
@@ -165,6 +170,7 @@
             </span>
           </template>
         </el-table-column>
+      
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
@@ -280,6 +286,7 @@ export default {
       wareOutList:[],
       manufacturerList:[],
       dealerList:[],
+      patientsList:[],
     };
   },
   methods: {
@@ -353,7 +360,9 @@ export default {
           this.total = response.data.data.total;
           this.wareOutList = []
           this.wareOutList =  response.data.data.list
-          console.log("党的20大长长",this.wareOutList)
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
+         
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -413,7 +422,9 @@ export default {
            this.houseList.push(response.data.data.houseList[i])
           }
           this.wareOutList =  response.data.data.list
-          console.log("党的20大长长",this.wareOutList)
+          // console.log("党的20大长长",this.wareOutList)
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -1034,7 +1045,17 @@ export default {
          }
       }
       return total
-    }
+    },
+    getPatientName(id){
+     
+      var name =""
+      for(let i=0;i<this.patientsList.length;i++){
+        if(id == this.patientsList[i].id){
+          name = this.patientsList[i].name
+        }
+      }
+      return name
+     }
   }
 };
 </script>

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

@@ -133,6 +133,11 @@
           {{scope.row.price}}
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{scope.row.count}}
@@ -236,7 +241,8 @@ export default {
       tableDataList:[],
       drugTypeList:[],
       dealerList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      patientsList:[]
     };
   },
   methods: {
@@ -352,6 +358,7 @@ export default {
            var list = response.data.data.orderPrint
            this.dealerList =  response.data.data.dealerList
            this.manufacturerList =  response.data.data.manufacturerList
+           this.patientsList =response.data.data.patientsList
            //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
@@ -365,6 +372,7 @@ export default {
            }
            this.tableDataList = list
            console.log("数据我我我",this.tableDataList)
+
            var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -515,7 +523,17 @@ export default {
         }
       }
       return name
-    }
+    },
+    getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
+     }
+     return name
+    },
   }
 };
 </script>

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

@@ -162,6 +162,11 @@
            </span>
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{scope.row.count}}
@@ -290,7 +295,8 @@ export default {
       storehouse_id:0,
       houseList:[],
       dealerList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      patientsList:[]
     };
   },
   methods: {
@@ -430,12 +436,16 @@ export default {
         if(response.data.state == 1){
           var order = response.data.data.order
           console.log("order233322332323223",order)
+
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
           this.houseList.push(obj)
           for(let i=0;i<response.data.data.houseList.length;i++){
            this.houseList.push(response.data.data.houseList[i])
           }
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
+
           var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -586,6 +596,16 @@ export default {
       }
       return name
     },
+    getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
+     }
+     return name
+    },
 
      exportList(){