新分支

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2730,7 +2730,7 @@
                       上机护士：
                       <div
                         class="under_line"
-                        style="width: 80px; text-align: center"
+                        style="width: 90px; text-align: center"
                       >
                         <span
                           style="height: 30px; display: inline-block"
@@ -2751,7 +2751,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 40px"
+                          style="height: 35px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2773,7 +2773,7 @@
                       穿刺护士：
                       <div
                         class="under_line"
-                        style="width: 80px; text-align: center"
+                        style="width: 90px; text-align: center"
                       >
                         <span
                           style="height: 30px; display: inline-block"
@@ -2794,7 +2794,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 40px"
+                          style="height: 35px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2822,7 +2822,7 @@
                       >
                     
                         <span
-                          style="height: 40px; display: inline-block"
+                          style="height: 35px; display: inline-block"
                           v-if="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2840,7 +2840,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2887,7 +2887,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2923,7 +2923,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -2950,7 +2950,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -2978,7 +2978,7 @@
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}
                         </span>
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.modifier)
                           "
@@ -3006,7 +3006,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -3041,7 +3041,7 @@
                           }}
                         </span>
                         <img
-                          style="height: 40px"
+                          style="height: 30px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null

src/xt_pages/stock/detail/print.vue

@@ -29,7 +29,7 @@
               <td style="line-height: 50px" width="200" v-if="org_id == 10485">经销商</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="50">单位</td>
-
+              <td style="line-height: 50px" width="50" v-if=" type == 2 &&(org_id==0||org_id == 10265)">进货价</td>
               <td style="line-height:50px" width="80">
                 <span v-if="type == 1">进货价</span>
                 <span v-if="type == 2">出货价</span>
@@ -74,6 +74,9 @@
               <td style="line-height: 50px">
                 {{item.packing_unit}}
               </td>
+              <td style="line-height: 50px" v-if="type == 2 && (org_id == 0 || org_id == 10265)">
+                {{item.price}}
+              </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
                 <span v-if="type == 2">

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -925,15 +925,15 @@ export default {
             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
-
+          this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
       
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_price','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

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

@@ -435,9 +435,7 @@ export default {
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
-               console.log("555555555555",order[i])
                if(order[i].price > 0){
-                console.log("近来33232323322323")
                   order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
@@ -489,7 +487,7 @@ export default {
             order[i].total_price = order[i].total_price.toFixed(2)
           }
 
-          console.log("233223322323322332232323",order)
+          console.log("orderwowoowwowoo",order)
           this.tableData = order
 
            let objInfo = {}
@@ -510,7 +508,8 @@ export default {
                   dose:item.dose,
                   dose_unit:item.dose_unit,
                   min_number:item.min_number,
-                  max_unit:item.max_unit
+                  max_unit:item.max_unit,
+                  in_price:item.in_price,
                 }
               }
              }else{
@@ -528,7 +527,8 @@ export default {
                   dose:item.dose,
                   dose_unit:item.dose_unit,
                   min_number:item.min_number,
-                  max_unit:item.max_unit
+                  max_unit:item.max_unit,
+                  in_price:item.in_price,
                 }
               }
              }
@@ -629,8 +629,11 @@ export default {
      },
     exportListDetai(){
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_price','price','count','total_price']
+
+       console.log("hwhhwhwhwhwhw",this.tableData)
+       
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
@@ -732,6 +735,7 @@ export default {
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
+            console.log("很粗扣扣我噢噢",list)
             this.dealerList = response.data.data.dealerList
             this.manufacturerList = response.data.data.manufacturerList
             let objInfo = {}

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -23,7 +23,8 @@
               <td style="line-height: 50px" width="250" v-if="org_id == 0||org_id==10485">经销商</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
-              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height:50px" width="80" v-if="org_id == 0 || org_id == 10265">进货价</td>
+              <td style="line-height:50px" width="80">出货价</td>
               <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
             </tr>
@@ -53,6 +54,9 @@
                 <span v-if="org_id == 9671 || org_id == 9919">{{parseInt(getCountSix(item.drug_id,item.child)/item.min_number)}}</span>
                 <span v-else>{{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
               </td>
+              <td style="line-height:50px" width="80" v-if="org_id == 0 || org_id == 10265">
+                 {{ item.in_price }}
+              </td>
               <td style="line-height:50px">
                   <span v-if="org_id ==9671 || org_id == 9919">{{item.price}}</span>
                   <span v-else>{{item.min_price}}</span>
@@ -227,7 +231,7 @@
           end_time:this.end_time,
           order_type:parseInt(this.order_type),
         }
-        console.log("params22222",params)
+      
         getDrugOutOrderPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
@@ -252,7 +256,8 @@
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
                   manufacturer:item.XtBaseDrug.manufacturer,
-                  dealer:item.XtBaseDrug.dealer
+                  dealer:item.XtBaseDrug.dealer,
+                  in_price:item.XtDrugWarehouseInfo.price,
                 }
               }
             })
@@ -375,7 +380,7 @@
     },
     created() {
       this.org_id = this.$store.getters.xt_user.org.id
-      console.log("jj233223323223",this.org_id)
+     
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.getDrugOutOrderPrint()

src/xt_pages/user/Sitemap.vue

@@ -711,6 +711,8 @@ export default{
       getPatientSitemap(patient_id).then(response=>{
          if(response.data.state == 1){
             var sitemap = response.data.data.sitemap
+           
+
             if(sitemap.is_append == 1){
               this.is_append =true
             }else{