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

src/api/his/his.js

@@ -845,6 +845,16 @@ export function getfapiaonumber(){
 
 
 
+export function getHisOrderListtwo(params){
+  return request({
+    url:"/api/hisorder/listtwo",
+    method:"get",
+    params:params
+
+  })
+}
+
+
 
 
 

src/xt_pages/outpatientCharges/summary.vue

@@ -146,7 +146,7 @@
           <!--          >-->
 
 <!--          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
-          <el-button size="small" type="primary" @click="accounts_click = !accounts_click">门诊结账</el-button>
+          <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
           <!--           <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
@@ -531,7 +531,7 @@
       class="centerDialog"
       width="70%"
       title="打印"
-      :visible.sync="accounts_click"
+      :visible.sync="accounts_click_vi"
     >
       <div>
         <div id="accounts_print">
@@ -549,17 +549,19 @@
                 </tr>
                 <tr>
                   <td>起始单号:</td>
-                  <td v-if="tableData2.length > 0">{{tableData2[0].number}}</td>
+                  <td v-if="tableData2&&tableData2.length > 0">{{tableData2[0].number}}</td>
                   <td v-else></td>
                   <td>终止单号:</td>
-                  <td v-if="tableData2.length > 0">{{tableData2[tableData2.length-1].number}}</td>
+                  <td v-if="tableData2&&tableData2.length > 0">{{tableData2[tableData2.length-1].number}}</td>
                   <td v-else></td>
                   <td>缴款人员:</td>
                   <td>{{staff}}</td>
                 </tr>
                 <tr>
                   <td>收费张数:</td>
-                  <td>{{tableData2.length}}</td>
+                  <td v-if="tableData2">{{tableData2.length}}</td>
+                  <td v-else></td>
+
                   <td>作废张数:</td>
                   <td>0</td>
                   <td>退费张数:</td>
@@ -575,7 +577,8 @@
                 </tr>
                 <tr>
                   <td>合计张数:</td>
-                  <td>{{tableData2.length}}</td>
+                  <td v-if="tableData2">{{tableData2.length}}</td>
+                  <td v-else></td>
                   <td>合计金额:</td>
                   <td colspan="3">{{getTotal()}}</td>
                 </tr>
@@ -629,7 +632,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="accounts_click = false">取 消</el-button>
+        <el-button @click="accounts_click_vi = false">取 消</el-button>
         <el-button type="primary" @click="accounts_sum">确 定</el-button>
       </span>
     </el-dialog>
@@ -658,7 +661,8 @@ import {
   getHisDataSix,
   getHisDataThree,
   getHisDataTwo,
-  handleOne
+  handleOne,
+  getHisOrderListtwo
 } from '../../api/his/his'
 
 import { handleData10106, handleData10138Two, handleData10318 } from '../../api/his/his_export'
@@ -732,7 +736,7 @@ export default {
       invoiceParams: {},
       settlementVisible: false,
       settlementObj: {},
-      accounts_click:false,
+      accounts_click_vi:false,
     }
   },
 
@@ -778,24 +782,49 @@ export default {
   },
 
   methods: {
+    accounts_click(){
+      let params = {
+        start_time: this.start_time,
+        end_time: this.end_time,
+      }
+      getHisOrderListtwo(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.accounts_click_vi=  true
+          this.tableData2 =  response.data.data.order2
+
+        }
+      })
+
+    },
     getPsnCash(){
       let result = 0
-      for(let i = 0;i < this.tableData2.length; i++){
-        result = result + this.tableData2[i].psn_cash_pay
+      if(this.tableData2 != null) {
+        for (let i = 0; i < this.tableData2.length; i++) {
+          result = result + this.tableData2[i].psn_cash_pay
+        }
       }
-      return result.toFixed(2)
+        return result.toFixed(2)
     },
     getYibao(){
       let result = 0
-      for(let i = 0;i < this.tableData2.length; i++){
-        result = result + this.tableData2[i].fund_pay_sumamt
+      if(this.tableData2 != null) {
+
+        for (let i = 0; i < this.tableData2.length; i++) {
+          result = result + this.tableData2[i].fund_pay_sumamt
+        }
       }
       return result.toFixed(2)
     },
     getTotal(){
      let result = 0
-      for(let i = 0;i < this.tableData2.length; i++){
-        result = result + this.tableData2[i].medfee_sumamt
+      if(this.tableData2 != null) {
+
+        for (let i = 0; i < this.tableData2.length; i++) {
+          result = result + this.tableData2[i].medfee_sumamt
+        }
       }
       return result.toFixed(2)
     },

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,7 +265,10 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-               list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+             
+              list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+
+              //list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty)
                list[i].stock_in_price = "/"
                list[i].stockMoney = "/"
               
@@ -1086,6 +1089,24 @@ export default {
       }
       return dear_name
     },
+    getAllStockIn(val){
+       var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].warehousing_count
+        }
+      }
+      return count
+    },
+    getAllOutStockIn(val){
+       var count = 0 
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+           count +=val[i].count
+         }
+       }
+       return count
+    } 
   },
 
 }