Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightythree.vue

@@ -56,19 +56,16 @@
                       </div>
                     </td>
                   </tr>
-
                   <tr>
                     <td colspan="3">
                       <div style="line-height:30px;display: inline-block;">
-                        上机前病情:
-                        <label-box
-                          :isChecked="record.assessment_before_dislysis.symptom_before_dialysis == '' ? true : false"
-                          showValue="无特殊"></label-box>&nbsp;
-                        <label-box
-                          :isChecked="record.assessment_before_dislysis.symptom_before_dialysis != '' ? true : false"
-                          showValue="其他:"></label-box>
-                        <span>{{ record.assessment_before_dislysis.symptom_before_dialysis }}</span>
+                        上机前病情: <span>{{ record.assessment_before_dislysis.befor_symptoms }}</span>
                       </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">
+                    
                       <div class="row" style="padding: 2px 0; line-height: 23px;display: inline-block;" >
                         <div class="inline_block" style="flex: 0.8;">
                           T：

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

@@ -770,6 +770,8 @@ export default {
     if(this.lastTreat!=null){
       if(this.receiveTreatmentAsses.condition ==1){
         this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+        this.receiveTreatmentAsses.his_bed = this.lastTreat.his_bed
+        this.receiveTreatmentAsses.his_department = this.lastTreat.his_department
       }
     
     }
@@ -789,6 +791,18 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
+
+    if(this.$store.getters.user.template_info.org_id == 10293){
+        this.receiveTreatmentAsses.way =1
+        this.receiveTreatmentAsses.consciousness =2
+        this.receiveTreatmentAsses.appetite =2
+        this.receiveTreatmentAsses.posture= 1
+        this.receiveTreatmentAsses.danger_level=2
+        this.receiveTreatmentAsses.precaution = 3
+        var arr = [3,4]
+        this.precautionTwo.push(...arr)
+        this.receiveTreatmentAsses.precaution = this.precautionTwo      
+  }
   },
  
 };

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1722,7 +1722,6 @@ export default {
           }
           this.patientInfo = response.data.data.patientInfo
           // console.log("透析记录", this.patientInfo);
-
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,
             '{y}-{m}-{d}'
@@ -1785,7 +1784,8 @@ export default {
           var tableAdvice = doctorAdevieInfo
           console.log('tableAdvice', tableAdvice)
           // console.log('医生', tableAdvice.length)
-          if (tableAdvice.length === 0) {
+          if (tableAdvice == null) {
+            let tableAdvice1=[]
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }
             var obj2 = { advice_name: '', start_time: '' }
@@ -1793,16 +1793,15 @@ export default {
             var obj4 = { advice_name: '', start_time: '' }
             var obj5 = { advice_name: '', start_time: '' }
             var obj6 = { advice_name: '', start_time: '' }
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            tableAdvice.push(obj2)
-            tableAdvice.push(obj3)
-            tableAdvice.push(obj4)
-            tableAdvice.push(obj5)
-            tableAdvice.push(obj6)
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 1) {
+            tableAdvice1.push(obj)
+            tableAdvice1.push(obj1)
+            tableAdvice1.push(obj2)
+            tableAdvice1.push(obj3)
+            tableAdvice1.push(obj4)
+            tableAdvice1.push(obj5)
+            tableAdvice1.push(obj6)
+            this.tableAdvice = tableAdvice1
+          }else if (tableAdvice.length === 1) {
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }
             var obj2 = { advice_name: '', start_time: '' }
@@ -1816,8 +1815,7 @@ export default {
             tableAdvice.push(obj4)
             tableAdvice.push(obj5)
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 2) {
+          }else if (tableAdvice.length === 2) {
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }
             var obj2 = { advice_name: '', start_time: '' }
@@ -1829,8 +1827,7 @@ export default {
             tableAdvice.push(obj3)
             tableAdvice.push(obj4)
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 3) {
+          }else if (tableAdvice.length === 3) {
             // eslint-disable-next-line no-redeclare
             var obj = { advice_name: '', start_time: '' }
             // eslint-disable-next-line no-redeclare
@@ -1846,8 +1843,7 @@ export default {
             tableAdvice.push(obj3)
 
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 4) {
+          }else if (tableAdvice.length === 4) {
             // eslint-disable-next-line no-redeclare
             var obj = { advice_name: '', start_time: '' }
             // eslint-disable-next-line no-redeclare
@@ -1859,8 +1855,7 @@ export default {
             tableAdvice.push(obj1)
             tableAdvice.push(obj2)
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 5) {
+          }else if (tableAdvice.length === 5) {
             // eslint-disable-next-line no-redeclare
             var obj = { advice_name: '', start_time: '' }
             // eslint-disable-next-line no-redeclare
@@ -1868,14 +1863,12 @@ export default {
             tableAdvice.push(obj)
             tableAdvice.push(obj1)
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 6) {
+          }else if (tableAdvice.length === 6) {
             // eslint-disable-next-line no-redeclare
             var obj = { advice_name: '', start_time: '' }
             tableAdvice.push(obj)
             this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length >= 7) {
+          }else if (tableAdvice.length >= 7) {
             this.tableAdvice = tableAdvice
           }
           var doctor = response.data.data.doctor
@@ -1973,7 +1966,7 @@ export default {
           var obj2 = arr2.join(',')
           console.log('obj2', obj2)
           receiverTreatmentAccess.precaution = obj2
-          console.log('接诊评估', receiverTreatmentAccess)
+          console.log('接诊评估2', receiverTreatmentAccess)
           this.receiverTreatmentAccess = receiverTreatmentAccess
           var dialysisway = response.data.data.dialysisway
           console.log('透析处方', dialysisway)

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -41,16 +41,30 @@
                 </div>
               </td>
             </tr>
-
             <tr>
               <td colspan="3">
                 <div style="line-height:30px;display: inline-block;">
                   上机前病情:
-                  <label-box :isChecked="predialysis.symptom_before_dialysis == '' ? true : false"
+                  <!-- <label-box :isChecked="predialysis.symptom_before_dialysis == '' ? true : false"
                     showValue="无特殊"></label-box>&nbsp;
                   <label-box :isChecked="predialysis.symptom_before_dialysis != '' ? true : false"
-                  showValue="其他:"></label-box>
+                  showValue="其他:"></label-box> -->
+                  <div class="inline_block" style="flex: 0.8;">
+                    <div class="under_line" style="width: 50px; text-align: center">
+                      {{
+                        predialysis.befor_symptoms
+                          ? predialysis.befor_symptoms
+                          : "/"
+                      }}
+                    </div>
+                  </div>
                 </div>
+              </td>
+            </tr>
+
+            <tr>
+              <td colspan="3">
+            
                 <div class="row" style="padding: 2px 0; line-height: 23px;display: inline-block;" >
                   <div class="inline_block" style="flex: 0.8;">
                     T：

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -119,7 +119,7 @@
 
             <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  || org_id == 10724"
+                       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/components/drugOutDetail.vue

@@ -210,7 +210,7 @@
            {{getStorehouseName(scope.row.storehouse_id)}}
           </template>
         </el-table-column>
-        <el-table-column label="出货价" align="center">
+        <el-table-column label="出库价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
            <span v-else>
@@ -591,7 +591,11 @@ export default {
              if(this.org_id == 9919){
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
-             }else{
+             }else if(this.org_id == 0){
+                order[i].total_price = order[i].total_price
+             }else if(this.org_id == 10721){
+              order[i].total_price = order[i].total_price
+             } else{
                if(order[i].price > 0){
                   order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
@@ -601,7 +605,7 @@ export default {
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
-                    
+                     
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
@@ -752,8 +756,7 @@ export default {
     },
 
      exportList(){
-        
-        
+         
        
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
@@ -770,7 +773,12 @@ export default {
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
             
-           }else{
+           }else if(this.org_id == 10721){
+            this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+            this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+            this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))))*this.tablePrint[i].price).toFixed(2)
+            this.tablePrint[i].total = this.getTotalPriceTwo(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
+           } else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
@@ -785,7 +793,7 @@ export default {
         
         console.log("wowowoowowowowo",this.tablePrint)
         
-       
+      
       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
@@ -866,8 +874,15 @@ export default {
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
               }
 
-            }else{
+            }else if(this.org_id == 10721){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            }else if(this.org_id == 0){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            } else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+
               if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
@@ -1184,6 +1199,7 @@ export default {
         }
         return str + min_str
       },
+      
       getTotalPrice(arr,max_unit,min_number,min_price){
         console.log("arrwoowowow",arr)
       
@@ -1217,6 +1233,14 @@ export default {
 
         return total*min_price
       },
+      getTotalPriceTwo(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+
+        return total*min_price
+      },
       getCountSix(drug_id,val){
 
         var count = 0

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -319,6 +319,7 @@
         var str = ""
         var min_str = ""
         for(let i=0;i<arr.length;i++){
+          console.log("arr-----",arr)
           arr[i].total_count = 0
           if(arr[i].count_unit == max_unit){
             arr[i].total_count = parseInt(arr[i].count) * min_number

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -157,16 +157,24 @@
              <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)}}
@@ -288,6 +296,7 @@
         drug:{},
         houseList:[],
         patientList:[],
+        adviceMap:[]
       }
     },
     methods:{
@@ -543,6 +552,8 @@
             this.patientList = response.data.data.patientList
 
             this.houseList = response.data.data.houseList
+
+           
           }
        })
      },
@@ -755,7 +766,18 @@
       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

@@ -304,7 +304,7 @@
                   <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>
@@ -1453,8 +1453,8 @@ export default {
           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)
             }
           }
 
@@ -2037,8 +2037,10 @@ export default {
       }
       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 = ""
@@ -2046,7 +2048,7 @@ export default {
     
       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

@@ -1226,7 +1226,7 @@ export default {
         })
        }
 
-       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

@@ -116,11 +116,11 @@
         </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">
@@ -154,6 +154,13 @@
              <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>
@@ -264,7 +271,9 @@
         cancelCountList:[],
         good:{},
         houseList:[],
-        patientList:[]
+        patientList:[],
+        hisPrescription:[]
+
       }
     },
     methods:{
@@ -474,6 +483,8 @@
            this.houseList = response.data.data.houseList
            this.patientList = response.data.data.patients
 
+
+
           
           }
        })