新分支

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -1172,7 +1172,7 @@
                                   "
                                   >【开始透析】引血 {{ record.dialysis_order.blood_drawing }} ml/min</template
                                 >
-                                {{ monitor_record.end }}
+                                {{ monitor_record.dispose }} {{ monitor_record.end }}
                                  &nbsp;
                                 &nbsp;
                               </span>

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -98,12 +98,12 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-            <!-- <span v-if="org_id !=10599 && org_id!=10138 && org_id!=10278">
+            <span v-if="org_id !=10599">
               {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
-            </span> -->
-            <span>
-              <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
-              <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            </span>
+            <span v-if="org_id ==10599">
+              <span v-if="scope.row.dialysis_prescription!=null && scope.row.dialysis_prescription.id == 0"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+              <span v-if="scope.row.dialysis_prescription!=null && scope.row.dialysis_prescription.id > 0"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
             </span>
           
             <!-- {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}} -->
@@ -602,7 +602,7 @@
         //  console.log("arrTwo",arrTwo)
          const tHeader = arr
         const filterVal = arrTwo
-        console.log("list23323223wo",this.list)
+       
         if(this.list!=null && this.list.length > 0){
           for(let i=0;i<this.list.length;i++){
             this.list[i].name0 = i+1

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -46,8 +46,8 @@
                     {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
                   </span>
                   <span v-if="org_id==10599">
-                    <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
-                     <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
+                    <span v-if="item.dialysis_prescription!=null && item.dialysis_prescription.id == 0"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                     <span v-if="item.dialysis_prescription!=null & item.dialysis_prescription.id >0"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
                   </span>
                 
                 </td>

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -239,9 +239,9 @@ export default {
                     }
                 }
              }
-             console.log("寄哪里地方5555",this.$route.query.keywords)
+            //  console.log("寄哪里地方5555",this.$route.query.keywords)
              if(this.$route.query.keywords!=""){
-                console.log("寄哪里地方",this.$route.query.keywords)
+                // console.log("寄哪里地方",this.$route.query.keywords)
                for(let i=0;i<list.length;i++){
                  list[i].new_arr = []
                  for(let j=0;j<list[i].his_advice_list.length;j++){
@@ -251,13 +251,14 @@ export default {
                     }
                  }
                }
-          }
-          if(list!=null && list.length>0){
-            for(let i=0;i<list.length;i++){
-                list[i].his_advice_list =[]
-                list[i].his_advice_list = list[i].new_arr 
+             if(list!=null && list.length>0){
+                for(let i=0;i<list.length;i++){
+                    list[i].his_advice_list =[]
+                    list[i].his_advice_list = list[i].new_arr 
+                }
             }
-         }
+          }
+         
         }
         
        

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1087,7 +1087,7 @@
                                 >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
 
-                              {{ monitor.end }}  &nbsp;
+                              {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
                           </div>

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

@@ -17,7 +17,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10265 || org_id == 0"
+      v-if="org_id == 10265"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiOne"
@@ -25,7 +25,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10480"
+      v-if="org_id == 10480|| org_id == 0"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiTwo"
@@ -445,6 +445,7 @@ export default {
          limit:this.limit,
          storehouse_id:this.storehouse_id,
       }
+      console.log("jajjfjajfjajfdj")
       getDrugOutDetail(params).then(response=>{
         this.tableData = []
         this.tableList = []
@@ -545,7 +546,7 @@ export default {
                   dose_unit:item.dose_unit,
                   min_number:item.min_number,
                   max_unit:item.max_unit,
-                  in_price:item.in_price,
+                  in_price:item.infor_price,
                 }
               }
              }else{
@@ -564,7 +565,7 @@ export default {
                   dose_unit:item.dose_unit,
                   min_number:item.min_number,
                   max_unit:item.max_unit,
-                  in_price:item.in_price,
+                  in_price:item.infor_price,
                 }
               }
              }
@@ -591,8 +592,10 @@ export default {
 
            for(let i=0;i<list.length;i++){
               list[i].total_price = list[i].count * list[i].price
+             
             }
-
+           
+          console.log("list----------------------",list)
           this.tableList = list
           var total = response.data.data.total
           this.total = total
@@ -813,7 +816,7 @@ export default {
        var out_total = 0
        var in_total =0
       console.log("tatbledateawowowo",this.tableData)
- 
+   
       for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
@@ -831,7 +834,7 @@ export default {
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].out_count = this.tableData[i].count
-            this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
+            this.tableData[i].in_retail_price = (this.tableData[i].infor_price/this.tableData[i].min_number).toFixed(2)
             this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
             this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id) 
             if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
@@ -867,7 +870,7 @@ export default {
 
       import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','药品名称', '药品规格', '批号','生成厂家','药品类型','报销方式','入库单价','出库单价','出库数量','实际出库数量','单位','出库金额','实际出库金额','实际成本','出库对象','有效日期','出库日期','操作时间','出库单号','备注']
-        const filterVal = ['index','drug_name', 'specification_name', 'batch_number','manufacturer_name','drug_type','project_name','in_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
+        const filterVal = ['index','drug_name', 'specification_name', 'batch_number','manufacturer_name','drug_type','project_name','infor_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
 
        console.log("hwhhwhwhwhwhw",this.tableData)