11月14日 库存扣减更新

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -595,8 +595,8 @@
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
-              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date)
-              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date)
+              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,'{y}-{m}-{d}')
+              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,'{y}-{m}-{d}')
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name
               response.data.data.list[i].name =  response.data.data.list[i].drug.dose +''+response.data.data.list[i].drug.dose_unit+"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit+"/"+response.data.data.list[i].drug.max_unit
 

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

@@ -584,35 +584,25 @@ export default {
        const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','出货价','数量','总价']
        const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
-         this.tableData[i].index = i+1
-   
-        this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
-        this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
-        this.tableData[i].time = this.getTime(this.tableData[i].ctime)
-        this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
-        if(this.org_id == 9671 || this.org_id == 9919){
-          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
-          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
-        }else{
-          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
-        }
-    
-       }
-       console.log("数据23323",this.tableData)
-       
-       let obj = {'index':'合计','total_price':0.00}
-       for(let i=0;i<this.tableData.length;i++){
-         obj.total_price += this.tableData[i].total
-       }
-       
-       this.tableData.push(obj)
-       for(let j=0;j<this.tableData.length;j++){
-          this.tableData[j].total_price = this.tableData[j].total_price.toFixed(2)
+         if(this.tableData[i].is_total == 0){
+            this.tableData[i].index = i+1
+      
+            this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            if(this.org_id == 9671 || this.org_id == 9919){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+            }else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+            }
+         }
        }
        const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
-       
+     
        excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/stockDamaged.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column prop="date" label="总报损金额"  align="center">
           <template  slot-scope="scope">
-            {{scope.row.count}}
+            {{getAllDamageCount(scope.row.good_id,scope.row.buy_price)}}
             </template>    
         </el-table-column>
         <el-table-column prop="name" label="操作"  align="center">
@@ -645,7 +645,7 @@ export default {
        getReportStockList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-     
+            console.log("报损金额22222",list)
             this.total = response.data.data.total
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
@@ -749,6 +749,15 @@ export default {
         }
         return count
       },
+      getAllDamageCount(good_id,price){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return (count * price).toFixed(2)
+      },
       changeReason(val){
         this.form.type = val
         this.toDamagedDetail(this.good_id)

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -11,18 +11,18 @@
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:100px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:100px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="1">
               性别:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
@@ -39,7 +39,7 @@
             <td style="text-align:center;width:100px" colspan="1">
               婚姻:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                  <span v-if="patient.marital_status == 0"></span>
                  <span v-if="patient.marital_status == 1">未婚</span>
@@ -48,18 +48,18 @@
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;width:100px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               职业: 
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;width:100px" colspan="1">
+             <td style="text-align:center;width:300px" colspan="1">
               电话:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.phone}}
               </span>
@@ -70,7 +70,7 @@
             <td style="text-align:center;width:100px" colspan="1">
               住址:
             </td>   
-            <td style="text-align:center;width:300px" colspan="11">
+            <td style="text-align:center;width:500px" colspan="12">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.home_address}}
@@ -78,18 +78,18 @@
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院时间:
             </td>
-            <td style="text-align:center;width:300px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:200px" colspan="1">
+            <td style="text-align:center;width:250px" colspan="1">
               出院时间:
             </td>
-            <td style="text-align:center;width:300px" colspan="1">
+            <td style="text-align:center;width:250px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.discharge_time)}}
               </span>
@@ -97,16 +97,16 @@
             <td style="text-align:center;width:100px"  colspan="2">
               住院天数:
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{getTimeDay(hosDetail.admission_time,hosDetail.discharge_time)}}
                
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               转归:
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.lapseto == 1">留治</span>
                 <span v-if="patient.lapseto == 2">转归</span>
@@ -118,10 +118,10 @@
             <td style="text-align:center;width:50px" colspan="1">
               检查号:
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               X线:
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.xray}}
               </span>
@@ -142,10 +142,10 @@
                 {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               超声:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.ultrasound}}
               </span>
@@ -160,7 +160,7 @@
             </td>
           </tr>
           <tr>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院诊断:
               <span style="display:inline-block;margin-left:10px;">
                
@@ -173,7 +173,7 @@
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               出院诊断:
             </td>
              <td style="text-align:center;width:170px" colspan="11">
@@ -185,7 +185,7 @@
             
           </tr>
            <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院时病情:
             </td>
            <td style="text-align:center;width:170px" colspan="11">
@@ -198,7 +198,7 @@
           </tr>
         
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               诊断经过:
            
             </td>
@@ -223,7 +223,7 @@
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               出院医嘱:
             </td>
             <td style="text-align:center;width:170px" colspan="11">