Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/drug/drug.js

@@ -652,3 +652,13 @@ export function getDrugInventoryWarehouseInfoList(params) {
     params: params
   })
 }
+
+
+export function getPurchaseStockQueryList(params){
+  
+  return request({
+    url:"/api/stock/getpurchasestockquerylist",
+    method:"Get",
+    params:params,
+  })
+}

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -338,6 +338,11 @@
           <label>灌流器凝血: </label>
           <span class="content" >{{ this.record.condenser}}</span>
         </li>
+
+        <li v-if="isShow('上次透后体重')">
+          <label>上次透后体重: </label>
+          <span class="content" >{{ this.record.last_after_weight}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

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

@@ -58,6 +58,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('上次透后体重')">
+            <el-form-item label="上次透后体重(kg): " :prop="isName('上次透后体重')" :rules="isCheckmust('上次透后体重')">
+              <el-input v-model="form.last_after_weight"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('穿刺处血肿')">
             <el-form-item label="穿刺处血肿: " :prop="isName('穿刺处血肿')" :rules="isCheckmust('穿刺处血肿')">
               <el-radio-group v-model="form.puncture_point_haematoma">
@@ -879,7 +885,8 @@ export default {
         after_urea:"",
         accumulated_blood_volume:"",
         transfusion_volume:"",
-        condenser:""
+        condenser:"",
+        last_after_weight:""
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1221,6 +1228,12 @@ export default {
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
           data["condenser"] = this.form.condenser
+          if(this.form.last_after_weight >0){
+            data["last_after_weight"] = this.form.last_after_weight.toString()
+          }else{
+            data["last_after_weight"] = ""
+          }
+         
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1060,10 +1060,9 @@ export default {
            const filterVal = ['index','good_number', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
            const data = this.formatJson(filterVal, this.tableList)
-           
+        
            const filename = '进销存查询'
-     
-          
+            
             excel.export_json_to_excel({
               multiHeader,
               header,

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -53,6 +53,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
+       
            <el-button type="primary" size="small" @click="toPrint">打印</el-button>
            <el-button type="primary" size="small" @click="exportList">导出</el-button>
          </div>
@@ -68,16 +69,23 @@
             :class="signAndWeighBoxPatients"
             border
           >
+        
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                  {{getGoodTypeName(scope.row.good_type_id)}}
               </template>
             </el-table-column>
+            <el-table-column label="耗材编码" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="耗材名称" align="center">
               <template slot-scope="scope">
                 {{scope.row.good_name}}
               </template>
             </el-table-column>
+
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
@@ -88,6 +96,17 @@
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                 {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="单位" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.packing_unit}}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
                
                  <el-table-column prop="stockIn" label="数量" width="100">
@@ -157,7 +176,7 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getPurchaseStockQuery } from "@/api/drug/drug"
+import { getStorehouseList,getPurchaseStockQueryList,getGoodOverCount } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
@@ -201,9 +220,10 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
+     dealerList:[],
     }
   
   },
@@ -231,6 +251,7 @@ export default {
              this.goodTypeList.push(goodTypeList[i])
             }
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -244,35 +265,37 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
         }
-      getPurchaseStockQuery(params).then(response=>{
+      getPurchaseStockQueryList(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
+           
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
-              list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-              list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-              
+               list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+               list[i].stock_in_price = list[i].buy_price
+               list[i].stockMoney = (list[i].buy_price * list[i].GoodStartFlowInfo.over_count).toFixed(2)
+            
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-              list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
-              list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
+              list[i].addStockMoney = list[i].buy_price
+              list[i].saleStockMoney = (list[i].stockAdd * list[i].buy_price).toFixed(2)
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-              list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-              
-              // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-
+              list[i].stockOutprice = list[i].retail_price
+              list[i].saleOutMoney = (list[i].outStock * list[i].stockOutprice).toFixed(2)
+             
+             
               list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
-              list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-              list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+              list[i].overPrice = list[i].buy_price
+              list[i].overMoney = (list[i].overStock * list[i].buy_price).toFixed(2)
              
             }
+            console.log("listwowowoowowowow",list)
             this.tableList = list
             this.total = response.data.data.total
 
            this.manufacturerList = response.data.data.manufacturerList
+          
            
          }
       })
@@ -572,11 +595,7 @@ export default {
         countfive +=arr5[i].count
       }
     }
-    console.log("countOne",countOne)
-    console.log("countTwo",countTwo)
-    console.log("countthree",countthree)
-    console.log("countfour",countfour)
-    console.log("*********************")
+   
     count = countOne - countTwo + countthree - countfour + countfive
     if(count > 0 ){
       return count
@@ -610,10 +629,7 @@ export default {
      }
     }
     all_count = count + countOne
-    console.log("count2332323223232o2222222222wide",count)
-    console.log("countONE23232322323323223",countOne)
-    console.log("all_count9999999999999wode",all_count)
-    console.log("-------------------------------------------")
+   
     if(all_count > 0 ){
       return all_count
     }else{
@@ -674,7 +690,8 @@ export default {
     }
    },
    open(){
-    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []
@@ -788,6 +805,7 @@ export default {
         count_two +=val3[i].count
       }
      }
+    
      all_count = count +count_one - count_two
      if(all_count >0){
        return all_count
@@ -920,11 +938,7 @@ export default {
          total_price_four +=val4[i].count * val4[i].buy_price
        }
      }
-     console.log("total_price",total_price)
-     console.log("total_price_three",total_price_three)
-     console.log("total_price_two",total_price_two)
-     console.log("total_price_one",total_price_one)
-     console.log("total_price_four",total_price_four)
+   
      all_price = total_price- total_price_three +total_price_one - total_price_two + total_price_four
      console.log("arrll_price",all_price)
      if(all_price >0){
@@ -976,24 +990,25 @@ export default {
     this.$router.push({path:"/purchase/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
    exportList: function() {
+
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材编码','耗材名称','规格&单位','生产产商','经销商','单位', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+            const header = ['','','','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+            const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:I2', 'J1:L1', 'M1:O1', 'P1:R1','S1:U1']
+            const filterVal = ['index', 'query_date', 'good_type','good_number','good_name','specification_name_one','manufacturer_name','dealer_name','packing_unit','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
-           const data = this.formatJson(filterVal, this.tableList)
-           
-           const filename = '进销存查询'
-     
-          
+            const data = this.formatJson(filterVal, this.tableList)
+            console.log("datae3ooo2o2o2o",data)
+            const filename = '进销存查询'
+      
             excel.export_json_to_excel({
               multiHeader,
               header,
@@ -1002,17 +1017,30 @@ export default {
               filename
             })
         })
+
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
-     
+     toOverCount(){
+       getGoodOverCount().then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           this.$message.success("调试成功")
+         }
+       })
+     },
+     getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
-  // created(){
-  //   this.getStorehouseList()
-  //   this.getlist()
-  //   this.getStockDrugCount()
-  // }
+
 }
 </script>
 

src/xt_pages/stock/stockNewQuery.vue

@@ -10,9 +10,9 @@
               <GoodNewQuery></GoodNewQuery>
             </el-tab-pane>
           
-            <!-- <el-tab-pane label="进销存查询" name="second">
+            <el-tab-pane label="进销存查询" name="second">
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
-            </el-tab-pane> -->
+            </el-tab-pane>
 
              <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>