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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721"
+                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721 || org_id == 10724"
                        type="primary">登陆
             </el-button>
 

src/xt_pages/stock/drugs/drugStockFlow.vue

              <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="remark" label="备注" align="center">
+        <el-table-column prop="drug_name" label="批号" align="center" v-if="this.$store.getters.xt_user.template_info.org_id == 10191">
            <template slot-scope="scope">
-             <span > {{scope.row.remark}}</span>
+             <span>{{scope.row.batch_number}}</span>
            </template>
         </el-table-column>
-        <!-- <el-table-column prop="drug_name" label="批号" align="center">
+
+        <el-table-column prop="remark" label="药品追溯码" align="center">
            <template slot-scope="scope">
-             <span>{{scope.row.batch_number}}</span>
+             <span> {{scope.row.drug_code }}</span>
            </template>
-        </el-table-column> -->
+        </el-table-column>
+
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
+       
         <!-- <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              {{getManufacturer(scope.row.manufacturer)}}
         drug:{},
         houseList:[],
         patientList:[],
+        adviceMap:[]
       }
     },
     methods:{
             this.patientList = response.data.data.patientList
 
             this.houseList = response.data.data.houseList
+
+           
           }
        })
      },
       getDrugFlowDetailByDrugId(params).then(response=>{
 
       })
-    }
+    },
+    // getDrugCode(patient_id,advice_date){
+    //    console.log("patinet_id========",patient_id)
+    //    console.log("advice_datre====",advice_date)
+    //   var drug_code = ""
+    //   for(let i=0;i<this.adviceMap.length;i++){
+    //    if(patient_id == this.adviceMap[i].patient_id && advice_date == this.adviceMap[i].advice_date){
+    //        drug_code = this.adviceMap[i].drug_code
+    //    }
+    //   }
+    //   return drug_code
+    // }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

                   <td style="border-right: none; border-inline-end:none;text-align: center">
                     <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
                     <span v-if="is_sys == 12">{{getOutCountTen(item.count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
+                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id,item.warehousing_detail_id)}} </span>
                   </td>
                </tr>
             </template>
           console.log("list999992332232323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
-              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id))
-               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
+              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id))
+               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id)
             }
           }
 
       }
       return max_str + min_str;
     },
-    getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id){
-    
+    getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id,warehousing_detail_id){
+      
+      console.log("warehousing_detail_id",warehousing_detail_id)
+      console.log("tabList-----------------",this.tabList)
       var arr = []
       var total = 0
       var max_str = ""
     
       for(let j=0;j<this.tabList.length;j++){
       
-        if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
+        if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id && warehousing_detail_id == this.tabList[j].warehousing_detail_id){
            arr.push(this.tabList[j])
         }
       }

src/xt_pages/stock/query/purchaseNewStockQuery.vue

         })
        }
 
-       if(this.org_id == 10697 || this.org_id == 0){
+       if(this.org_id == 10697 || this.org_id == 0 || this.org_id == 10375){
         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1

src/xt_pages/stock/stockFlow.vue

         </el-table-column>
    
 
-       <!-- <el-table-column label="批次" align="center">
+       <el-table-column label="批次" align="center" v-if="this.$store.getters.xt_user.template_info.org_id == 10191">
          <template slot-scope="scope">
            <span>{{scope.row.number}}</span>
          </template>
-       </el-table-column> -->
+       </el-table-column>
 
     
         <el-table-column prop="drug_name" label="单价"  align="center">
              <span > {{scope.row.over_count}}</span>
            </template>
         </el-table-column>
+
+        <el-table-column prop="drug_name" label="耗材追溯码" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.good_code}}</span>
+           </template>
+        </el-table-column>
+
         <el-table-column prop="remark" label="备注" align="center">
            <template slot-scope="scope">
              <span > {{scope.row.remark}}</span>
         cancelCountList:[],
         good:{},
         houseList:[],
-        patientList:[]
+        patientList:[],
+        hisPrescription:[]
+
       }
     },
     methods:{
            this.houseList = response.data.data.houseList
            this.patientList = response.data.data.patients
 
+
+
           
           }
        })

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))