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

src/api/drug/drug_stock.js

@@ -428,6 +428,15 @@ export function getDrugAutoMaticList(params){
 }
 
 
+export function getDrugWarehouseOrderInfo(params){
+   
+  return request({
+    url:"/api/drugstock/getdrugwarehouseorderinfo",
+    method:"get",
+    params:params
+  })
+}
+
 
 
 

src/api/stock.js

@@ -610,4 +610,12 @@ export function getInitializtion(params){
     method:"get",
     params:params
   })
-}
+}
+
+export function getWarehouseOrderInfoList(params){
+   return request({
+      url:"/api/good/getwarehouseorderinfolist",
+      method:"get",
+      params:params
+   })
+} 

src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue

@@ -154,6 +154,8 @@
                                          
                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '人造血管')" showValue="人造血管"></label-box>
                                         &nbsp;
+                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '扣眼')" showValue="扣眼"></label-box>
+                                        &nbsp;
                                     </div>
                                 </td>
                                 <td width='20'></td>

src/xt_pages/dialysis/components/dialysisDrugs.vue

@@ -510,7 +510,7 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-            console.log("过年9999999999",this.scheduleMap)
+           
            }
          
   

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

@@ -588,7 +588,7 @@
               <el-input v-model="form.dosage_of_anticoagulants"></el-input>
           </el-form-item>
         </el-col>
-        
+
 
         <el-col :span="8" v-if="isShow('并发症其他')">
           <el-form-item label="并发症其他: ">
@@ -603,7 +603,7 @@
         </el-col>
         <el-col :span="8" v-if="isShow('透析相关高血压')">
             <el-form-item label="透析相关高血压：">
-        
+
              <el-select v-model="form.hypertenison">
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
@@ -681,7 +681,7 @@
             </el-form-item>
         </el-col>
       </el-form>
-         
+
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="hide">取 消</el-button>
@@ -1215,14 +1215,20 @@ export default {
       this.form.observation_content = predialysis.observation_content
       this.form.inpatient_department = predialysis.inpatient_department
       this.form.observation_content_other = predialysis.observation_content_other
+      if(predialysis.id > 0){
+        this.form.hypertenison = predialysis.hypertenison.toString()
+      }
+      if(predialysis.id > 0){
+        this.form.hypopiesia = predialysis.hypopiesia.toString()
+      }
       if(predialysis.id > 0){
          this.form.hypertenison = predialysis.hypertenison.toString()
       }
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
-    
-    
+
+
       this.form.leave_office_method = predialysis.leave_office_method
       this.form.lapse = predialysis.lapse
       // console.log("透后", predialysis);

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

@@ -2,7 +2,8 @@
   <el-dialog title="双人核对"
              :visible.sync="isVisibility"
              :modal-append-to-body="false"
-             width="854px">
+             width="854px"
+            >
 
     <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       
@@ -202,9 +203,9 @@
         blood_access_part_opera_id:"通路类型:"
       }
     }, methods: {
+      
       show() {
-        console.log(this.double_check)
-
+        
         this.isVisibility = true
         if (this.double_check.id > 0) {
 
@@ -252,9 +253,11 @@
         }
       },
       hide() {
+      
         this.isVisibility = false
       },
       handleCancle: function() {
+      
         this.isVisibility = false
 
       }, 
@@ -776,6 +779,7 @@
       GetDialysateFormulationById(val) {
          this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
          console.log("透析液配方",this.dialysate_formulation_options)
+        
         let name = ''
         let dfl = this.dialysate_formulation_options.length
         for (let index = 0; index < dfl; index++) {
@@ -924,24 +928,37 @@
     },
     watch: {
       isVisibility(val) {
-      
+        
         if(this.prescription!=null && this.prescription.id!=0){
+
           this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+          this.prescription.dialyzer_perfusion_apparatus = ""
           this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
-         
+          // this.prescription.dialysate_formulation = ""
           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
-         
+          this.prescription.kalium = ""
           this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          this.prescription.calcium = ""
           this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
-          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysate_formulation:"")
+          this.prescription.mode_id= ""
+          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysis_duration:"")
+          this.prescription.dialysis_duration=""
           this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          this.prescription.target_ultrafiltration = ""
           this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+          this.prescription.anticoagulant=""
           this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          this.prescription.anticoagulant_shouji = ""
           this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
-          this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
-          this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+         this.prescription.anticoagulant_weichi=""
+         this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+         this.prescription.anticoagulant_zongliang = ""
+         this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+          this.prescription.displace_liqui_part
           this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          this.prescription.replacement_total= ""
           this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+          this.prescription.dialysate_flow= ""
         }
         if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
           this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -543,6 +543,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 39">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -813,6 +823,11 @@
             v-if="org_template_info.template_id == 38"
           >
           </DialysisPrintOrderThirtyEight>
+          <DialysisPrintOrderThirtyNine
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 39"
+          >
+          </DialysisPrintOrderThirtyNine>
         </div>
       </el-container>
     </div>
@@ -870,9 +885,11 @@ import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFiv
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
 import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
 import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
+import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyNine,
     DialysisPrintOrderThirtyEight,
     DialysisPrintOrderThirtySeven,
     DialysisPrintOrderThirtySix,
@@ -1342,6 +1359,13 @@ export default {
           style: style8,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 39) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -176,7 +176,8 @@
                     <td width="100">体液过多症状:</td>
                     <td width="50">
                       <div>
-                        <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box>
+                         <label-box :isChecked="prescription.body_fluid == 1 ? true : false" showValue="无"></label-box>
+                        <!-- <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box> -->
                       </div>
                     </td>
                     <td width="180">

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -8,22 +8,22 @@
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div>
             <div></div>
-            <div  style="position: absolute;left:610px;top:40px;">
-                <span>{{ printDate.slice(0,4) }}</span>
-                <span>{{ printDate.slice(5,7) }}</span>
-                <span>{{ printDate.slice(8,11) }}</span>
+            <div>
+                <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
+                <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
+                <span style="position: absolute;left:660px;top:40px;">{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:60px;left:120px;"> {{ paramsObj.name }}</div>
             <div style="position: absolute;top:60px;left:210px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
+            <div style="position: absolute;top:60px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:60px;left:640px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div style="position: absolute;top:90px;left:290px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:90px;left:290px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:90px;left:460px;">{{ list.psn_cash_money }}</div>
             <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
         </div>
@@ -102,7 +102,7 @@
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:250px;left:610px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
         </div>
         <div style="position: absolute;top:280px;left:460px">现金：{{ list.psn_cash_money }}</div>
         <div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -715,7 +715,7 @@
                   that.loadingtwo = false;
                   that.cal_one = this.cal_one - 1;
                   that.cal_two = this.cal_two + 1;
-                  that.patientTableData.splice(this.current_index, 1)
+                  // that.patientTableData.splice(this.current_index, 1)
 
 
                 }
@@ -2023,7 +2023,7 @@
         console.log(id);
         this.radioStatus = id;
         this.getPatientList()
-      },      changeRadioAndPatient(id) {
+      },   changeRadioAndPatient(id) {
         // console.log(id)
         // this.radioStatus = id
         // this.getPatientList()
@@ -2169,7 +2169,7 @@
             for (let i = 0; i < this.patientTableData.length; i++){
               if(this.patientInfo.id == this.patientTableData[i].id)
               this.$refs.tab.setCurrentRow(this.patientTableData[i]);
-              this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number,this.patientTableData[0].his_patient.id)
+              this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number,this.patientTableData[i].his_patient.id)
             }
 
           }
@@ -2625,9 +2625,6 @@
           'type': this.radio,
           'p_type':2,
           'his_patient_id':his_patient_id
-
-
-
         };
         this.loading = true;
 

src/xt_pages/outpatientCharges/summary.vue

@@ -487,6 +487,22 @@
                     }
                 }
               }
+              var hifmi_pay = 0.00;
+
+              if(order.setl_detail.length > 0){
+                var jsonObj = JSON.parse(order.setl_detail);
+                for (let i = 0; i < jsonObj.length; i++) {
+                  if (order.insutype == '310') {
+                    if (jsonObj[i].fund_pay_type == '310300') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                  }
+                  if (order.insutype == '390')
+                    if (jsonObj[i].fund_pay_type == '390200') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                }
+              }
 
               let obj = {
                 '就诊号': order.mdtrt_id,
@@ -495,7 +511,7 @@
                 '险种类型': insutypeName,
                 '应收金额': order.medfee_sumamt,
                 '实收金额': order.medfee_sumamt,
-                '医保统筹金额': order.fund_pay_sumamt,
+                '医保统筹金额': order.hifp_pay,
                 '大额基金金额': order.hifob_pay,
                 '大病基金金额': hifmi_pay,
                 '补充保险基金金额': order.hifes_pay,

src/xt_pages/stock/detail/print.vue

@@ -81,7 +81,8 @@
               <td width="633" style="line-height: 50px">合计</td>
               <td width="80" style="line-height: 50px">
                 <span v-if="type == 1">{{calTotalPrice()}}</span>
-                <span v-if="type == 3">{{getTotalPrice().toFixed(2)}}</span>
+                <span v-if="type == 3 && org_id!=10090">{{getTotalPrice().toFixed(2)}}</span>
+                <span v-if="type == 3 && org_id==10090">{{getTotalPriceOne().toFixed(2)}}</span>
               </td>
               <td></td>
             </tr>
@@ -186,18 +187,18 @@
         getPrintStockGood(this.queryParams).then(response => {
           if (response.data.state == 1) {
             var stockTotal = response.data.data.stockTotal
-            console.log("stocktOTl",stockTotal)
+          
             this.stockTotal = stockTotal
-            console.log("导出数据",response.data.data.list)
+           
             var info = response.data.data.info
-            console.log("infor2222222",info)
+           
             this.wareOutInfo = info
             var org_id = response.data.data.orgid
-            console.log("org_id",org_id)
+          
             this.org_id = org_id
 
             var informationlist = response.data.data.infomationList
-            console.log('数据列表',informationlist)
+           
             this.informationList = informationlist
             this.stockDatas = []
             for (let i = 0; i < response.data.data.list.length; i++) {
@@ -205,7 +206,7 @@
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
                 }
-
+                console.log("入库打印数据源",this.stockDatas)
               } else if (this.type == 2) {
                 if (response.data.data.list[i].query_sales_return_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
@@ -218,6 +219,7 @@
                 }
                
                 console.log("出库打印数据源",this.stockDatas)
+
                 
               } else if (this.type == 4) {
                 if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
@@ -373,14 +375,14 @@
        for(let i=0;i<this.informationList.length;i++){
         for(let j=0;j<this.wareOutInfo.length;j++){
            if(this.informationList[i].id == this.wareOutInfo[j].good_id){
-             this.wareOutInfo[j].retail_price =  this.informationList[i].retail_price 
+             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price 
            }
         }
        }
       
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
-            sum += (this.wareOutInfo[j].retail_price * this.wareOutInfo[j].count).toFixed(2)
+            sum += (this.wareOutInfo[j].buy_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
        
@@ -391,7 +393,7 @@
        var price = 0
        for(let i=0;i<this.informationList.length;i++){
           if(id == this.informationList[i].id){
-             price = this.informationList[i].retail_price
+             price = this.informationList[i].buy_price
           }
        }
        return price
@@ -403,6 +405,13 @@
        }
        return total_price
      },
+     getTotalPriceOne(){
+       var total_price = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total_price +=(this.getWareOut(this.stockDatas[i].id) * this.getReailPrice(this.stockDatas[i].id))
+       }
+       return total_price
+     },
      unique(arr) {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));

src/xt_pages/stock/detail/stockInDetail.vue

@@ -235,6 +235,8 @@ export default {
     this.goodUnit = this.$store.getters.good_unit
 
     this.getPrintStockGood()
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
+    console.log("机构ID",this.org_id)
   },
   data() {
     return {
@@ -268,7 +270,8 @@ export default {
       dealer: [],
       tableList:[],
       goodUnit:[],
-      stockTotal:[]
+      stockTotal:[],
+      org_id:0,
     };
   },
   methods: {
@@ -389,13 +392,10 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          console.log("数据源头list2222222",response.data.data.list)
-
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            // this.tableList.push(obj)
           }
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -439,7 +439,7 @@ export default {
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
-              // this.doctorOptions.push(this.adminUserOptions[index]);
+            
             }
           }
         }
@@ -642,9 +642,10 @@ export default {
        end_time:this.end_time,
        type:1,
      }
-   
+     
      getPrintStockGood(params).then(response=>{
         if(response.data.state == 1){
+          this.tableList = []
           var stockTotal =  response.data.data.stockTotal
         
           this.stockTotal = stockTotal
@@ -655,9 +656,7 @@ export default {
                this.tableList.push(list[i])
              }
           }
-         
-       
-       
+          console.log("数据源头2222222222",this.tableList)
         }
      })
    },
@@ -727,6 +726,11 @@ export default {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
       },
+      uniqueOne(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+      },
+      
       exportList(){
         var obj = {index:"合计",total:0}
         obj.total = this.calTotalPrice()
@@ -740,25 +744,48 @@ export default {
           this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
 
         }
-        var arr = this.unique(this.tableList)
-        console.log("arrrr",arr)
-        this.tableList = arr
-        this.tableList.push(obj)
-        console.log("数据222222",this.tableList)
-      
-        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-        const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+        console.log("总共条数",this.tableList)
+        if(this.org_id == 10024){
+          var arr = this.uniqueOne(this.tableList)
+          this.tableList = arr
+          this.tableList.push(obj)
+          console.log("去重后条数",this.tableList)
         
-        const data = this.formatJson(filterVal, this.tableList)
-        
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: '耗材入库明细'
-          })
-            this.downloadLoading = false
-          })
+          import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+          const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+          
+          const data = this.formatJson(filterVal, this.tableList)
+          console.log("data222222222",data)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: '耗材入库明细'
+            })
+              this.downloadLoading = false
+            })
+        }
+        if(this.org_id !=10024){
+           var arr = this.unique(this.tableList)
+            this.tableList = arr
+            this.tableList.push(obj)
+            console.log("去重后条数",this.tableList)
+          
+            import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+            const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+            
+            const data = this.formatJson(filterVal, this.tableList)
+            console.log("data222222222",data)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '耗材入库明细'
+              })
+                this.downloadLoading = false
+              })
+        }
+     
         },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -743,12 +743,11 @@ export default {
       },
 
      exportList(){
-      console.log("数据22222",this.tableList)
-      console.log("数据3333",this.goodInfoData)
+      
       for(let i=0;i<this.tableList.length;i++){
          for(let j=0;j<this.goodInfoData.length;j++){
             if(this.tableList[i].id === this.goodInfoData[j].id){
-               this.tableList[i].retail_price = this.goodInfoData[j].retail_price
+               this.tableList[i].buy_price = this.goodInfoData[j].buy_price
             }
          }
       }
@@ -760,7 +759,7 @@ export default {
         this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
         // this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].buy_price
-        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].retail_price).toFixed(2)
+        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
        var arr = this.unique(this.tableList)
@@ -769,7 +768,7 @@ export default {
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','retail_price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','buy_price','total','remark']
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

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

@@ -456,17 +456,23 @@ export default {
         for(let i=0;i<this.tableList.length;i++){
           for(let j=0;j<this.drugList.length;j++){
              if(this.tableList[i].drug_id == this.drugList[j].id){
-               this.tableList[i].retail_price = this.drugList[j].retail_price
+               this.tableList[i].last_price = this.drugList[j].last_price
+               
              }
           }
           this.tableList[i].index = i+1
         }
+        for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].total_price = this.tableList[i].last_price * this.tableList[i].count
+        }
+       console.log("列表数据333333333",this.tableList)
+      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','retail_price','total_price','remark']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','last_price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += this.tableList[i].retail_price * this.tableList[i].count
+         obj.total_price += (this.tableList[i].last_price * this.tableList[i].count)
        }
        for(let j=0;j<this.tableList.length;j++){
           this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -56,7 +56,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -172,7 +172,7 @@
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].price
+            total += this.cancelStockDate[i].price*this.cancelStockDate[i].count 
          }
          return total
       }

src/xt_pages/stock/drugs/drugCancelOurderPrint.vue

@@ -55,7 +55,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -171,7 +171,7 @@
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].price
+            total += this.cancelStockDate[i].price*this.cancelStockDate[i].count
          }
          return total
       }

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -168,6 +168,7 @@
         limit:this.limit,
         page:this.page,
        }
+       console.log("出库数据22222",params)
       getDrugOutDetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.order
@@ -249,7 +250,7 @@
         var price = 0
         for(let i=0;i<this.drugList.length;i++){
           if(id == this.drugList[i].id){
-             price = this.drugList[i].retail_price
+             price = this.drugList[i].last_price
           }
         }
         return price

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -93,8 +93,8 @@
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
         end_time: '',
-        page: 1,
-        limit: 10000,
+        page: this.$route.query.page,
+        limit: this.$route.query.limit,
         goodType: [],
         goodInfo: [],
         tempArr: [],

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -10,7 +10,7 @@
         <div class="dialysis-print-order">
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
-         
+
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -22,7 +22,7 @@
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
               <td style="line-height:18px;" width="80">单位</td>
               <td style="line-height:18px;" width="80">进货价</td>
-              <td style="line-height:18px;" width="80">入库<br>数量</td> 
+              <td style="line-height:18px;" width="80">入库<br>数量</td>
               <td style="line-height:18px;" width="60">总价</td>
               <td style="line-height:18px;" width="80">批号</td>
               <td style="line-height:18px;" width="120">生产日期</td>
@@ -50,7 +50,7 @@
               <td style="line-height: 18px">
                    <span>{{ item.warehousing_count }}</span>
               </td>
-              
+
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
@@ -66,15 +66,19 @@
             </tr>
             </tbody>
           </table>
-        
 
-          <div style="display:flex;margin-top:1px;float:right;">
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId == 10024">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
           </div>
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId !=10024">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
+          </div>
         </div>
 
       </div>
@@ -165,7 +169,7 @@
         }
         return ''
       },
-     
+
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
@@ -177,7 +181,7 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
@@ -229,13 +233,13 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-           
+
             for(let j=0;j<this.list.length;j++){
               this.list[j].manufacturer_name = ""
             }
 
             for(let i=0;i<this.list.length;i++){
-           
+
               for(let j=0;j<this.manufacturer.length;j++){
                  if(this.list[i].manufacturer == this.manufacturer[j].id){
                     this.list[i].manufacturer_name = this.manufacturer[j].manufacturer_name
@@ -331,7 +335,7 @@
       const order_id = this.$route.query.id;
       this.GetOrderDetail(order_id);
       this.getList()
-      
+
     }
 
   }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -10,6 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name" style="font-weight:bold;">{{orgName}}</div>
           <div class="order-title" style="font-weight:normal;">药品出库登记表</div>
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
@@ -47,9 +49,9 @@
              <td  style="line-height:50px">
                 {{(item.count * item.price).toFixed(2)}}
              </td>
-             <td></td>
-             <td></td>
-             <td></td>
+             <td>{{getNumber(item.drug_id)}}</td>
+             <td>{{getProductDate(item.drug_id)}}</td>
+             <td>{{getExpiryDate(item.drug_id)}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
@@ -68,8 +70,8 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
-            <div style="width:70px;">科室：</div><div style="width:100px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
+            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -90,7 +92,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import {  getDrugWarehouseOutInfo } from '@/api/drug/drug_stock'
+  import {  getDrugWarehouseOutInfo,getDrugWarehouseOrderInfo } from '@/api/drug/drug_stock'
   import {getBaseDrugLibList} from '@/api/data'
   export default {
     name: 'dialysisPrintOrder',
@@ -128,7 +130,8 @@
         limit:10000,
         keywords:"",
         orgId:'',
-        orgName:""
+        orgName:"",
+        drugOrderList:[]
       }
     },
     methods: {
@@ -256,6 +259,52 @@
         });
         this.sameRowArr = sameRowArr
       },
+      getDrugWarehouseOrderInfo(){
+        getDrugWarehouseOrderInfo().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("入库单详情",list)
+             this.drugOrderList = list
+           }
+        })
+      },
+      getNumber(id){
+        var number = ""
+        for(let i=0;i<this.drugOrderList.length;i++){
+          if(id == this.drugOrderList[i].drug_id){
+              number = this.drugOrderList[i].number
+          }
+        }
+        return number
+      },
+      getProductDate(id){
+        var product_date = ""
+        for(let i=0;i<this.drugOrderList.length;i++){
+           if(id == this.drugOrderList[i].drug_id){
+             product_date = this.drugOrderList[i].product_date
+           }
+        }
+        return this.getTime(product_date)
+      },
+      getExpiryDate(id){
+         var expiry_date = ""
+         for(let i=0;i<this.drugOrderList.length;i++){
+           if(id == this.drugOrderList[i].drug_id){
+             expiry_date = this.drugOrderList[i].expiry_date
+           }
+        }
+        return this.getTime(expiry_date)
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
@@ -263,6 +312,7 @@
       this.orgId = this.$store.getters.xt_user.org.id;
       this.GetOrderDetail(order_id);
       this.getList()
+      this.getDrugWarehouseOrderInfo()
     }
 
   }

src/xt_pages/stock/drugs/query.vue

@@ -455,7 +455,7 @@
       printOrder(){
         this.$router.push({
           name: "drugQueryPrint",
-          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time}
+          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
         });
       }
     }

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -124,7 +124,7 @@
     created() {
       const order_id = this.$route.query.id
       const warehouse_out_time = this.$route.query.warehouse_out_time
-      console.log("时间搓",warehouse_out_time)
+     
       this.GetConfigInfo()
       this.GetOrderDetail(order_id)
       this.GetTotalCount(warehouse_out_time)
@@ -234,7 +234,7 @@
             }
             this.warehousingOutInfo.info = response.data.data.info
           
-            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
+          
             this.handleSpanTempArr()
           }
         })

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -41,9 +41,9 @@
                                     <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <td>{{item.price}}</td>
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
+                                    <td>{{getNumber(item.good_id)}}</td>
+                                    <td>{{getProductDate(item.good_id)}}</td>
+                                    <td>{{getExpiryDate(item.good_id)}}</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
@@ -63,7 +63,7 @@
                         <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
                           <div style="width:50px;">科室：</div><div style="width:60px;"></div>
                           <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
-                          <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
                           <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
@@ -77,9 +77,10 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList } from "@/api/stock";
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         BreadCrumb
@@ -117,6 +118,7 @@ export default {
             wareoutList:[],
             orgId:'',
             orgName:'',
+            orderInList:[]
         }
     },
     methods:{
@@ -272,7 +274,56 @@ export default {
             }
          }
         return count
-      }
+      },
+
+      getWarehouseOrderInfoList(){
+         getWarehouseOrderInfoList().then(response=>{
+             if(response.data.state == 1){
+               var list = response.data.data.list
+               console.log("入库单详情",list)
+               this.orderInList = list
+             }
+         })
+      },
+      getNumber(id){
+        var name = ""
+        for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+               name = this.orderInList[i].number
+           }
+        }
+        return name
+      },
+      getProductDate(id){
+        var product_date = ""
+         for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+               product_date =  this.orderInList[i].product_date
+           }
+         }
+         return this.getTime(product_date)
+      },
+
+      getExpiryDate(id){
+         var expiry_date = ""
+         for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+              expiry_date = this.orderInList[i].expiry_date
+           }
+         }
+         return this.getTime(expiry_date)
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+
 
     },
     created(){
@@ -284,6 +335,8 @@ export default {
       this.GetOrderDetail(order_id);
       this.GetTotalCount(warehouse_out_time);
       this.getList()
+      //获取所有入库单
+      this.getWarehouseOrderInfoList()
     }
 }
 </script>

src/xt_pages/stock/stockPrint.vue

@@ -83,8 +83,8 @@ export default {
           tableData:[],
           time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
           type_name:"",
-          limit:20,
-          page:1,
+          limit:"",
+          page:"",
           WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
@@ -173,7 +173,8 @@ export default {
       this.type_name = type_name
       var keyword = this.$route.query.keyword
       this.keyword = keyword
-
+      this.page = this.$route.query.page
+      this.limit = this.$route.query.limit
       this.getlist()
     }
 }

src/xt_pages/stock/stockQuery.vue

@@ -332,6 +332,7 @@ export default {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
+        this.start_time = val
         this.GetAllStockQuery();
       }
     },
@@ -341,6 +342,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        this.end_time = val
         this.GetAllStockQuery();
       }
      
@@ -405,7 +407,7 @@ export default {
        this.GetAllStockQuery()
       },
       toPrint(){
-        this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
+        this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
         
       },